From: Yehuda Sadeh <yehuda@redhat.com>
Date: Fri, 27 Feb 2015 18:35:45 +0000 (-0800)
Subject: Merge pull request #33 from andrewgaul/multi-delete
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c9e76672df59f29a2a8894705db4be54fab0c476;p=s3-tests.git

Merge pull request #33 from andrewgaul/multi-delete

Ensure multi-delete removes keys

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
---

c9e76672df59f29a2a8894705db4be54fab0c476
diff --cc s3tests/functional/test_s3.py
index 18c84953,6680965e..0f8a5838
--- a/s3tests/functional/test_s3.py
+++ b/s3tests/functional/test_s3.py
@@@ -877,19 -862,8 +879,20 @@@ def test_multi_object_delete()
          result = bucket.delete_keys(stored_keys)
          eq(len(result.deleted), 2)
          eq(len(result.errors), 0)
+         eq(len(bucket.get_all_keys()), 0)
  
 +@attr(resource='object')
 +@attr(method='put')
 +@attr(operation='write key')
 +@attr(assertion='correct etag')
 +def test_object_write_check_etag():
 +    bucket = get_new_bucket()
 +    key = bucket.new_key('foo')
 +    res = _make_request('PUT', bucket, key, body='bar', authenticated=True)
 +    eq(res.status, 200)
 +    eq(res.reason, 'OK')
 +    eq(res.getheader("ETag"), '"37b51d194a7513e45b56f6524f2d51f2"')
 +
  @attr(resource='object')
  @attr(method='all')
  @attr(operation='complete object life cycle')