From: Stephon Striplin <stephon.striplin@dreamhost.com>
Date: Fri, 15 Jul 2011 21:57:46 +0000 (-0700)
Subject: fix test_bucket_acl_grant_nonexist_user
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5136608e76872ddf85537d361fac0f916a48728e;p=s3-tests.git

fix test_bucket_acl_grant_nonexist_user

* Change user_id to avoid name conflict
* Check for error_code
---

diff --git a/s3tests/functional/test_s3.py b/s3tests/functional/test_s3.py
index b31215a4..81922160 100644
--- a/s3tests/functional/test_s3.py
+++ b/s3tests/functional/test_s3.py
@@ -888,13 +888,14 @@ def test_bucket_acl_grant_userid_write():
 def test_bucket_acl_grant_nonexist_user():
     bucket = get_new_bucket()
     # add alt user
-    bad_user_id = 'foo'
+    bad_user_id = '_foo'
     policy = bucket.get_acl()
     policy.acl.add_user_grant('FULL_CONTROL', bad_user_id)
     print policy.to_xml()
     e = assert_raises(boto.exception.S3ResponseError, bucket.set_acl, policy)
     eq(e.status, 400)
     eq(e.reason, 'Bad Request')
+    eq(e.error_code, 'InvalidArgument')
 
 
 # This test will fail on DH Objects. DHO allows multiple users with one account, which