@@ -363,6 +363,7 @@ test_s3cmd("Create one bucket", ['mb', pbucket(1)],

     must_find = "Bucket '%s/' created" % pbucket(1))

+

 ## ====== Create multiple buckets

 test_s3cmd("Create multiple buckets", ['mb', pbucket(2), pbucket(3)],

     must_find = [ "Bucket '%s/' created" % pbucket(2), "Bucket '%s/' created" % pbucket(3)])

@@ -376,9 +377,8 @@ test_s3cmd("Invalid bucket name", ["mb", "--bucket-location=EU", pbucket('EU')],

 ## ====== Buckets list

-# Modified for Minio

 test_s3cmd("Buckets list", ["ls"],

-    must_find = [ "autotest-1", "autotest-2", "autotest-3" ], must_not_find_re = "autotest-EU")

+    must_find = [ pbucket(1), pbucket(2), pbucket(3) ], must_not_find_re = pbucket('EU'))

 ## ====== Sync to S3

@@ -474,7 +474,6 @@ if have_encoding:

 test_s3cmd("Sync from S3", ['sync', '%s/xyz' % pbucket(1), 'testsuite-out'],

     must_find = must_find)

-

 ## ====== Remove 'demo' directory

 test_rmdir("Remove 'dir-test/'", "testsuite-out/xyz/dir-test/")

@@ -615,7 +615,7 @@ test_s3cmd("Recursive copy, set ACL", ['cp', '-r', '--acl-public', '%s/xyz/' % p

 test_s3cmd("Verify ACL and MIME type", ['info', '%s/copy/etc2/Logo.PNG' % pbucket(2) ],

     must_find_re = [ "MIME type:.*image/png",

                      "ACL:.*\*anon\*: READ",

-                     "URL:.*http://%s.%s/copy/etc2/Logo.PNG" % (bucket(2), cfg.host_base) ])

+                     "URL:.*https?://%s.%s/copy/etc2/Logo.PNG" % (bucket(2), cfg.host_base) ])

 ## ====== modify MIME type

 test_s3cmd("Modify MIME type", ['modify', '--mime-type=binary/octet-stream', '%s/copy/etc2/Logo.PNG' % pbucket(2) ])

@@ -623,14 +623,14 @@ test_s3cmd("Modify MIME type", ['modify', '--mime-type=binary/octet-stream', '%s

 test_s3cmd("Verify ACL and MIME type", ['info', '%s/copy/etc2/Logo.PNG' % pbucket(2) ],

     must_find_re = [ "MIME type:.*binary/octet-stream",

                      "ACL:.*\*anon\*: READ",

-                     "URL:.*http://%s.%s/copy/etc2/Logo.PNG" % (bucket(2), cfg.host_base) ])

+                     "URL:.*https?://%s.%s/copy/etc2/Logo.PNG" % (bucket(2), cfg.host_base) ])

 test_s3cmd("Modify MIME type back", ['modify', '--mime-type=image/png', '%s/copy/etc2/Logo.PNG' % pbucket(2) ])

 test_s3cmd("Verify ACL and MIME type", ['info', '%s/copy/etc2/Logo.PNG' % pbucket(2) ],

     must_find_re = [ "MIME type:.*image/png",

                      "ACL:.*\*anon\*: READ",

-                     "URL:.*http://%s.%s/copy/etc2/Logo.PNG" % (bucket(2), cfg.host_base) ])

+                     "URL:.*https?://%s.%s/copy/etc2/Logo.PNG" % (bucket(2), cfg.host_base) ])

 test_s3cmd("Add cache-control header", ['modify', '--add-header=cache-control: max-age=3600, public', '%s/copy/etc2/Logo.PNG' % pbucket(2) ],

     must_find_re = [ "modify: .*" ])