From: Alfredo Deza <alfredo@deza.pe>
Date: Mon, 15 Dec 2014 15:41:59 +0000 (-0500)
Subject: Revert "test_bucket_create_exists should fail on recreate"
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=abc9e67120351f72b97509183edd92f42af48310;p=s3-tests.git

Revert "test_bucket_create_exists should fail on recreate"

This reverts commit c82649b6353893770af8cd453af38d61dfd1e363.

The suite does not support duality in behaviors (e.g.
US Standard vs. Regional behavior) so we adhere to US
Standard only.

Signed-off-by: Alfredo Deza <alfredo@deza.pe>
---

diff --git a/s3tests/functional/test_s3.py b/s3tests/functional/test_s3.py
index 3c8ff22f..d243d2a8 100644
--- a/s3tests/functional/test_s3.py
+++ b/s3tests/functional/test_s3.py
@@ -2791,15 +2791,11 @@ def test_bucket_create_naming_dns_dash_dot():
 @attr(resource='bucket')
 @attr(method='put')
 @attr(operation='re-create')
-@attr(assertion='fails 409')
+@attr(assertion='idempotent success')
 def test_bucket_create_exists():
-    # aws-s3 default region allows recreation of buckets
-    # but all other regions fail with BucketAlreadyOwnedByYou.
     bucket = get_new_bucket(targets.main.default)
-    e = assert_raises(boto.exception.S3CreateError, get_new_bucket, targets.main.default, bucket.name)
-    eq(e.status, 409)
-    eq(e.reason, 'Conflict')
-    eq(e.error_code, 'BucketAlreadyOwnedByYou')
+    # REST idempotency means this should be a nop
+    get_new_bucket(targets.main.default, bucket.name)
 
 
 @attr(resource='bucket')