@@ -138,8 +138,9 @@ def test(label, cmd_args = [], retcode = 0, must_find = [], must_not_find = [],

     p = Popen(cmd_args, stdout = PIPE, stderr = STDOUT, universal_newlines = True)

     stdout, stderr = p.communicate()

-    if retcode != p.returncode:

-        return failure("retcode: %d, expected: %d" % (p.returncode, retcode))

+    if type(retcode) not in [list, tuple]: retcode = [retcode]

+    if p.returncode not in retcode:

+        return failure("retcode: %d, expected one of: %s" % (p.returncode, retcode))

     if type(must_find) not in [ list, tuple ]: must_find = [must_find]

     if type(must_find_re) not in [ list, tuple ]: must_find_re = [must_find_re]

@@ -379,8 +380,8 @@ test_s3cmd("Change ACL to Private", ['setacl', '--acl-private', '%s/xyz/etc/l*.p

 ## ====== Verify Private ACL

 if have_wget:

     test("Verify Private ACL", ['wget', '-O', 'testsuite-out/logo.png', 'http://%s.%s/xyz/etc/logo.png' % (bucket(1), cfg.host_base)],

-        retcode = 8,

-        must_find_re = [ 'ERROR 403: Forbidden' ])

+         retcode = [1, 8],

+         must_find_re = [ 'ERROR 403: Forbidden' ])

 ## ====== Change ACL to Public

@@ -543,14 +543,14 @@ def subcmd_batch_del(uri_str = None, bucket = None, remote_list = None):

             response = s3.object_batch_delete(remote_list)

             output('\n'.join((u"File %s deleted" % remote_list[p]['object_uri_str']) for p in remote_list))

-        if remote_list:

+        if len(remote_list):

             keys_count = len(remote_list)

         else:

             keys_count = 0

         if keys_count < 1000 or not batch_mode:

             break

-        if remote_list:

+        if len(remote_list):

             last_key = S3Uri(remote_list[remote_list.keys()[-1]]['object_uri_str'])

         else:

             last_key = None

@@ -687,11 +687,11 @@ def subcmd_cp_mv(args, process_fce, action_str, message):

 def cmd_cp(args):

     s3 = S3(Config())

-    subcmd_cp_mv(args, s3.object_copy, "copy", "File %(src)s copied to %(dst)s")

+    subcmd_cp_mv(args, s3.object_copy, "copy", u"File %(src)s copied to %(dst)s")

 def cmd_mv(args):

     s3 = S3(Config())

-    subcmd_cp_mv(args, s3.object_move, "move", "File %(src)s moved to %(dst)s")

+    subcmd_cp_mv(args, s3.object_move, "move", u"File %(src)s moved to %(dst)s")

 def cmd_info(args):

     s3 = S3(Config())