teardown: clean object versions

also don't set acls on buckets, objects before removing, no need for
that.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>

diff --git a/s3tests/functional/__init__.py b/s3tests/functional/__init__.py
index 51dd5067a690194c43c1d13ebc76426ce0f2a906..0b0561f21f902897fd3a3519c137b853c9ce4d37 100644 (file)
--- a/s3tests/functional/__init__.py
+++ b/s3tests/functional/__init__.py
@@ -59,17 +59,19 @@ def nuke_prefixed_buckets_on_conn(prefix, name, conn):
         name=name,
         prefix=prefix,
         )
+
     for bucket in conn.get_all_buckets():
+        print 'prefix=',prefix
         if bucket.name.startswith(prefix):
             print 'Cleaning bucket {bucket}'.format(bucket=bucket)
             try:
-                bucket.set_canned_acl('private')
-                for key in bucket.list():
+                # bucket.set_canned_acl('private')
+                for key in bucket.list_versions():
                     print 'Cleaning bucket {bucket} key {key}'.format(
                         bucket=bucket,
                         key=key,
                         )
-                    key.set_canned_acl('private')
+                    # key.set_canned_acl('private')
                     key.delete()
                 bucket.delete()
             except boto.exception.S3ResponseError as e: