test-obsync: test ACL translation, run unit tests

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>

diff --git a/src/obsync/test-obsync.py b/src/obsync/test-obsync.py
index abe382dd2a6305d75b0b728dd41da7ed56e0d057..3d5bc4b6552681f7c351e7687d5358bb13933b1b 100755 (executable)
--- a/src/obsync/test-obsync.py
+++ b/src/obsync/test-obsync.py
@@ -25,7 +25,8 @@ import sys
 
 global opts
 global tdir
-global user
+global user1
+global user2
 
 ###### Helper functions #######
 def getenv(e):
@@ -34,8 +35,6 @@ def getenv(e):
     else:
         return None
 
-user = getenv("USER")
-
 def obsync(src, dst, misc):
     full = ["./obsync.py"]
     e = {}
@@ -51,13 +50,6 @@ def obsync(src, dst, misc):
         e["DST_SKEY"] = dst.skey
     else:
         full.append(dst)
-    has_owner = False
-    for m in misc:
-        if m == "-O" or m == "--owner":
-            has_owner = True
-    if (has_owner == False):
-        full.append("--owner")
-        full.append(user)
     full.extend(misc)
     if (opts.more_verbose):
         for f in full:
@@ -130,6 +122,9 @@ elif (not os.environ.has_key("URL2")):
                         getenv("SKEY1")))
     if (opts.verbose):
         print "have scratch1_url: will test bucket transfers"
+    user1 = getenv("USER1")
+    if (user1 == None):
+        raise Exception("You must specify a USER1 to use with URL1")
 else:
     opts.buckets.append(ObSyncTestBucket(getenv("URL1"), getenv("AKEY1"),
                         getenv("SKEY1")))
@@ -143,6 +138,15 @@ if (len(opts.buckets) == 0):
     print >>sys.stderr, "invalid usage. -h for help."
     sys.exit(1)
 
+user1 = getenv("USER1")
+user2 = getenv("USER2")
+if (user1 == None):
+    raise Exception("You must specify a USER1. If URL1 exists, we will use \
+USER1 with it.")
+if (user2 == None):
+    raise Exception("You must specify a USER2. If URL2 exists, we will use \
+USER2 with it.")
+
 # set up temporary directory
 tdir = tempfile.mkdtemp()
 if (opts.verbose):
@@ -183,6 +187,9 @@ subprocess.check_call(["cp", "-r", "%s/dir1" % tdir, "%s/dir1a" % tdir])
 # make sure it's still the same
 compare_directories("%s/dir1" % tdir, "%s/dir1a" % tdir)
 
+# Run unit tests
+ret = obsync("", "", ["--unit"])
+
 # we should fail here, because we didn't supply -c
 ret = obsync("file://%s/dir1" % tdir, "file://%s/dir2" % tdir, [])
 if (ret == 0):
@@ -237,6 +244,35 @@ failed to delete files from the destination!")
 obsync_check("file://%s/dir1" % tdir, "file://%s/dir1b2" % tdir,
             ["--no-preserve-acls", "-c"])
 
+
+# Create synthetic ACL
+obsync_check("file://%s/dir1" % tdir, "file://%s/dira" % tdir, ["-c"])
+synthetic_xml = \
+"<AccessControlPolicy xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\">\n\
+<Owner>\n\
+<ID>" + user1 + "</ID>\n\
+<DisplayName></DisplayName>\n\
+</Owner>\n\
+<AccessControlList>\n\
+<Grant>\n\
+  <Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" \
+xsi:type=\"CanonicalUser\">\n\
+    <ID>" + user1 + "</ID>\n\
+    <DisplayName></DisplayName>\n\
+  </Grantee>\n\
+  <Permission>FULL_CONTROL</Permission>\n\
+</Grant>\n\
+</AccessControlList>\n\
+</AccessControlPolicy>"
+f = open("%s/dira/.a$acl" % tdir, "w")
+try:
+    f.write(synthetic_xml)
+finally:
+    f.close()
+# test ACL transformations
+obsync_check("file://%s/dira" % tdir, "file://%s/dirb" % tdir,
+            ["-d", "-c", "--xuser", user1 + "=" + user2])
+
 if (len(opts.buckets) >= 1):
     # first, let's empty out the S3 bucket
     os.mkdir("%s/empty1" % tdir)
@@ -297,6 +333,9 @@ if (len(opts.buckets) >= 1):
                 ["--no-preserve-acls"])
     obsync_check(opts.buckets[0], "file://%s/dir1_no-preserve-acls" % tdir,
                 ["--no-preserve-acls", "-c"])
+    # test ACL transformations, again
+    obsync_check("file://%s/dirb" % tdir, opts.buckets[0],
+                ["-d", "-c", "--xuser", user2 + "=" + user1])
 
 if (len(opts.buckets) >= 2):
     if (opts.verbose):