openstack/swift
Code Issues Proposed changes

Merge "pep8 fix: assertEquals -> assertEqual"

Browse Source
This commit is contained in:
Jenkins 2015-08-06 23:15:11 +00:00 committed by Gerrit Code Review
commit 0b5be0e1a3
3 changed files with 118 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/functional/test_account.py
View File

@ -190,7 +190,7 @@ class TestAccount(unittest.TestCase):
# cannot read account # cannot read account
resp = retry(get, use_account=3) resp = retry(get, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 403) self.assertEqual(resp.status, 403)
# grant read access # grant read access
acl_user = tf.swift_test_user[2] acl_user = tf.swift_test_user[2]
@ -241,7 +241,7 @@ class TestAccount(unittest.TestCase):
# cannot read account # cannot read account
resp = retry(get, use_account=3) resp = retry(get, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 403) self.assertEqual(resp.status, 403)
# grant read-write access # grant read-write access
acl_user = tf.swift_test_user[2] acl_user = tf.swift_test_user[2]
@ -282,7 +282,7 @@ class TestAccount(unittest.TestCase):
# cannot read account # cannot read account
resp = retry(get, use_account=3) resp = retry(get, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 403) self.assertEqual(resp.status, 403)
# grant admin access # grant admin access
acl_user = tf.swift_test_user[2] acl_user = tf.swift_test_user[2]
@ -321,7 +321,7 @@ class TestAccount(unittest.TestCase):
# and again, cannot read account # and again, cannot read account
resp = retry(get, use_account=3) resp = retry(get, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 403) self.assertEqual(resp.status, 403)
@requires_acls @requires_acls
def test_protected_tempurl(self): def test_protected_tempurl(self):

126
test/functional/test_container.py
View File

@ -729,7 +729,7 @@ class TestContainer(unittest.TestCase):
# cannot list containers # cannot list containers
resp = retry(get, use_account=3) resp = retry(get, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 403) self.assertEqual(resp.status, 403)
# grant read-only access # grant read-only access
acl_user = tf.swift_test_user[2] acl_user = tf.swift_test_user[2]
@ -742,22 +742,22 @@ class TestContainer(unittest.TestCase):
# read-only can list containers # read-only can list containers
resp = retry(get, use_account=3) resp = retry(get, use_account=3)
listing = resp.read() listing = resp.read()
self.assertEquals(resp.status, 200) self.assertEqual(resp.status, 200)
self.assertIn(self.name, listing) self.assertIn(self.name, listing)
# read-only can not create containers # read-only can not create containers
new_container_name = str(uuid4()) new_container_name = str(uuid4())
resp = retry(put, new_container_name, use_account=3) resp = retry(put, new_container_name, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 403) self.assertEqual(resp.status, 403)
# but it can see newly created ones # but it can see newly created ones
resp = retry(put, new_container_name, use_account=1) resp = retry(put, new_container_name, use_account=1)
resp.read() resp.read()
self.assertEquals(resp.status, 201) self.assertEqual(resp.status, 201)
resp = retry(get, use_account=3) resp = retry(get, use_account=3)
listing = resp.read() listing = resp.read()
self.assertEquals(resp.status, 200) self.assertEqual(resp.status, 200)
self.assertIn(new_container_name, listing) self.assertIn(new_container_name, listing)
@requires_acls @requires_acls
@ -788,13 +788,13 @@ class TestContainer(unittest.TestCase):
self.assertEqual(resp.status, 204) self.assertEqual(resp.status, 204)
resp = retry(get, self.name, use_account=1) resp = retry(get, self.name, use_account=1)
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
self.assertEqual(resp.getheader('X-Container-Meta-Test'), value) self.assertEqual(resp.getheader('X-Container-Meta-Test'), value)
# cannot see metadata # cannot see metadata
resp = retry(get, self.name, use_account=3) resp = retry(get, self.name, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 403) self.assertEqual(resp.status, 403)
# grant read-only access # grant read-only access
acl_user = tf.swift_test_user[2] acl_user = tf.swift_test_user[2]
@ -814,7 +814,7 @@ class TestContainer(unittest.TestCase):
# read-only can read container metadata # read-only can read container metadata
resp = retry(get, self.name, use_account=3) resp = retry(get, self.name, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
self.assertEqual(resp.getheader('X-Container-Meta-Test'), value) self.assertEqual(resp.getheader('X-Container-Meta-Test'), value)
@requires_acls @requires_acls
@ -844,7 +844,7 @@ class TestContainer(unittest.TestCase):
# cannot list containers # cannot list containers
resp = retry(get, use_account=3) resp = retry(get, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 403) self.assertEqual(resp.status, 403)
# grant read-write access # grant read-write access
acl_user = tf.swift_test_user[2] acl_user = tf.swift_test_user[2]
@ -857,36 +857,36 @@ class TestContainer(unittest.TestCase):
# can list containers # can list containers
resp = retry(get, use_account=3) resp = retry(get, use_account=3)
listing = resp.read() listing = resp.read()
self.assertEquals(resp.status, 200) self.assertEqual(resp.status, 200)
self.assertIn(self.name, listing) self.assertIn(self.name, listing)
# can create new containers # can create new containers
new_container_name = str(uuid4()) new_container_name = str(uuid4())
resp = retry(put, new_container_name, use_account=3) resp = retry(put, new_container_name, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 201) self.assertEqual(resp.status, 201)
resp = retry(get, use_account=3) resp = retry(get, use_account=3)
listing = resp.read() listing = resp.read()
self.assertEquals(resp.status, 200) self.assertEqual(resp.status, 200)
self.assertIn(new_container_name, listing) self.assertIn(new_container_name, listing)
# can also delete them # can also delete them
resp = retry(delete, new_container_name, use_account=3) resp = retry(delete, new_container_name, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
resp = retry(get, use_account=3) resp = retry(get, use_account=3)
listing = resp.read() listing = resp.read()
self.assertEquals(resp.status, 200) self.assertEqual(resp.status, 200)
self.assertNotIn(new_container_name, listing) self.assertNotIn(new_container_name, listing)
# even if they didn't create them # even if they didn't create them
empty_container_name = str(uuid4()) empty_container_name = str(uuid4())
resp = retry(put, empty_container_name, use_account=1) resp = retry(put, empty_container_name, use_account=1)
resp.read() resp.read()
self.assertEquals(resp.status, 201) self.assertEqual(resp.status, 201)
resp = retry(delete, empty_container_name, use_account=3) resp = retry(delete, empty_container_name, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
@requires_acls @requires_acls
def test_read_write_acl_metadata(self): def test_read_write_acl_metadata(self):
@ -916,13 +916,13 @@ class TestContainer(unittest.TestCase):
self.assertEqual(resp.status, 204) self.assertEqual(resp.status, 204)
resp = retry(get, self.name, use_account=1) resp = retry(get, self.name, use_account=1)
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
self.assertEqual(resp.getheader('X-Container-Meta-Test'), value) self.assertEqual(resp.getheader('X-Container-Meta-Test'), value)
# cannot see metadata # cannot see metadata
resp = retry(get, self.name, use_account=3) resp = retry(get, self.name, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 403) self.assertEqual(resp.status, 403)
# grant read-write access # grant read-write access
acl_user = tf.swift_test_user[2] acl_user = tf.swift_test_user[2]
@ -935,7 +935,7 @@ class TestContainer(unittest.TestCase):
# read-write can read container metadata # read-write can read container metadata
resp = retry(get, self.name, use_account=3) resp = retry(get, self.name, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
self.assertEqual(resp.getheader('X-Container-Meta-Test'), value) self.assertEqual(resp.getheader('X-Container-Meta-Test'), value)
# read-write can also write container metadata # read-write can also write container metadata
@ -943,20 +943,20 @@ class TestContainer(unittest.TestCase):
headers = {'x-container-meta-test': new_value} headers = {'x-container-meta-test': new_value}
resp = retry(post, self.name, headers=headers, use_account=3) resp = retry(post, self.name, headers=headers, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
resp = retry(get, self.name, use_account=3) resp = retry(get, self.name, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
self.assertEqual(resp.getheader('X-Container-Meta-Test'), new_value) self.assertEqual(resp.getheader('X-Container-Meta-Test'), new_value)
# and remove it # and remove it
headers = {'x-remove-container-meta-test': 'true'} headers = {'x-remove-container-meta-test': 'true'}
resp = retry(post, self.name, headers=headers, use_account=3) resp = retry(post, self.name, headers=headers, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
resp = retry(get, self.name, use_account=3) resp = retry(get, self.name, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
self.assertEqual(resp.getheader('X-Container-Meta-Test'), None) self.assertEqual(resp.getheader('X-Container-Meta-Test'), None)
@requires_acls @requires_acls
@ -986,7 +986,7 @@ class TestContainer(unittest.TestCase):
# cannot list containers # cannot list containers
resp = retry(get, use_account=3) resp = retry(get, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 403) self.assertEqual(resp.status, 403)
# grant admin access # grant admin access
acl_user = tf.swift_test_user[2] acl_user = tf.swift_test_user[2]
@ -999,36 +999,36 @@ class TestContainer(unittest.TestCase):
# can list containers # can list containers
resp = retry(get, use_account=3) resp = retry(get, use_account=3)
listing = resp.read() listing = resp.read()
self.assertEquals(resp.status, 200) self.assertEqual(resp.status, 200)
self.assertIn(self.name, listing) self.assertIn(self.name, listing)
# can create new containers # can create new containers
new_container_name = str(uuid4()) new_container_name = str(uuid4())
resp = retry(put, new_container_name, use_account=3) resp = retry(put, new_container_name, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 201) self.assertEqual(resp.status, 201)
resp = retry(get, use_account=3) resp = retry(get, use_account=3)
listing = resp.read() listing = resp.read()
self.assertEquals(resp.status, 200) self.assertEqual(resp.status, 200)
self.assertIn(new_container_name, listing) self.assertIn(new_container_name, listing)
# can also delete them # can also delete them
resp = retry(delete, new_container_name, use_account=3) resp = retry(delete, new_container_name, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
resp = retry(get, use_account=3) resp = retry(get, use_account=3)
listing = resp.read() listing = resp.read()
self.assertEquals(resp.status, 200) self.assertEqual(resp.status, 200)
self.assertNotIn(new_container_name, listing) self.assertNotIn(new_container_name, listing)
# even if they didn't create them # even if they didn't create them
empty_container_name = str(uuid4()) empty_container_name = str(uuid4())
resp = retry(put, empty_container_name, use_account=1) resp = retry(put, empty_container_name, use_account=1)
resp.read() resp.read()
self.assertEquals(resp.status, 201) self.assertEqual(resp.status, 201)
resp = retry(delete, empty_container_name, use_account=3) resp = retry(delete, empty_container_name, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
@requires_acls @requires_acls
def test_admin_acl_metadata(self): def test_admin_acl_metadata(self):
@ -1058,13 +1058,13 @@ class TestContainer(unittest.TestCase):
self.assertEqual(resp.status, 204) self.assertEqual(resp.status, 204)
resp = retry(get, self.name, use_account=1) resp = retry(get, self.name, use_account=1)
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
self.assertEqual(resp.getheader('X-Container-Meta-Test'), value) self.assertEqual(resp.getheader('X-Container-Meta-Test'), value)
# cannot see metadata # cannot see metadata
resp = retry(get, self.name, use_account=3) resp = retry(get, self.name, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 403) self.assertEqual(resp.status, 403)
# grant access # grant access
acl_user = tf.swift_test_user[2] acl_user = tf.swift_test_user[2]
@ -1077,7 +1077,7 @@ class TestContainer(unittest.TestCase):
# can read container metadata # can read container metadata
resp = retry(get, self.name, use_account=3) resp = retry(get, self.name, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
self.assertEqual(resp.getheader('X-Container-Meta-Test'), value) self.assertEqual(resp.getheader('X-Container-Meta-Test'), value)
# can also write container metadata # can also write container metadata
@ -1085,20 +1085,20 @@ class TestContainer(unittest.TestCase):
headers = {'x-container-meta-test': new_value} headers = {'x-container-meta-test': new_value}
resp = retry(post, self.name, headers=headers, use_account=3) resp = retry(post, self.name, headers=headers, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
resp = retry(get, self.name, use_account=3) resp = retry(get, self.name, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
self.assertEqual(resp.getheader('X-Container-Meta-Test'), new_value) self.assertEqual(resp.getheader('X-Container-Meta-Test'), new_value)
# and remove it # and remove it
headers = {'x-remove-container-meta-test': 'true'} headers = {'x-remove-container-meta-test': 'true'}
resp = retry(post, self.name, headers=headers, use_account=3) resp = retry(post, self.name, headers=headers, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
resp = retry(get, self.name, use_account=3) resp = retry(get, self.name, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
self.assertEqual(resp.getheader('X-Container-Meta-Test'), None) self.assertEqual(resp.getheader('X-Container-Meta-Test'), None)
@requires_acls @requires_acls
@ -1132,7 +1132,7 @@ class TestContainer(unittest.TestCase):
self.assertEqual(resp.status, 204) self.assertEqual(resp.status, 204)
resp = retry(get, self.name, use_account=1) resp = retry(get, self.name, use_account=1)
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
self.assertEqual(resp.getheader('X-Container-Sync-Key'), 'secret') self.assertEqual(resp.getheader('X-Container-Sync-Key'), 'secret')
self.assertEqual(resp.getheader('X-Container-Meta-Test'), value) self.assertEqual(resp.getheader('X-Container-Meta-Test'), value)
@ -1147,7 +1147,7 @@ class TestContainer(unittest.TestCase):
# can read container metadata # can read container metadata
resp = retry(get, self.name, use_account=3) resp = retry(get, self.name, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
self.assertEqual(resp.getheader('X-Container-Meta-Test'), value) self.assertEqual(resp.getheader('X-Container-Meta-Test'), value)
# but not sync-key # but not sync-key
self.assertEqual(resp.getheader('X-Container-Sync-Key'), None) self.assertEqual(resp.getheader('X-Container-Sync-Key'), None)
@ -1169,7 +1169,7 @@ class TestContainer(unittest.TestCase):
# can read container metadata # can read container metadata
resp = retry(get, self.name, use_account=3) resp = retry(get, self.name, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
self.assertEqual(resp.getheader('X-Container-Meta-Test'), value) self.assertEqual(resp.getheader('X-Container-Meta-Test'), value)
# but not sync-key # but not sync-key
self.assertEqual(resp.getheader('X-Container-Sync-Key'), None) self.assertEqual(resp.getheader('X-Container-Sync-Key'), None)
@ -1177,7 +1177,7 @@ class TestContainer(unittest.TestCase):
# sanity check sync-key w/ account1 # sanity check sync-key w/ account1
resp = retry(get, self.name, use_account=1) resp = retry(get, self.name, use_account=1)
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
self.assertEqual(resp.getheader('X-Container-Sync-Key'), 'secret') self.assertEqual(resp.getheader('X-Container-Sync-Key'), 'secret')
# and can write # and can write
@ -1191,7 +1191,7 @@ class TestContainer(unittest.TestCase):
self.assertEqual(resp.status, 204) self.assertEqual(resp.status, 204)
resp = retry(get, self.name, use_account=1) # validate w/ account1 resp = retry(get, self.name, use_account=1) # validate w/ account1
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
self.assertEqual(resp.getheader('X-Container-Meta-Test'), new_value) self.assertEqual(resp.getheader('X-Container-Meta-Test'), new_value)
# but can not write sync-key # but can not write sync-key
self.assertEqual(resp.getheader('X-Container-Sync-Key'), 'secret') self.assertEqual(resp.getheader('X-Container-Sync-Key'), 'secret')
@ -1207,7 +1207,7 @@ class TestContainer(unittest.TestCase):
# admin can read container metadata # admin can read container metadata
resp = retry(get, self.name, use_account=3) resp = retry(get, self.name, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
self.assertEqual(resp.getheader('X-Container-Meta-Test'), new_value) self.assertEqual(resp.getheader('X-Container-Meta-Test'), new_value)
# and ALSO sync-key # and ALSO sync-key
self.assertEqual(resp.getheader('X-Container-Sync-Key'), 'secret') self.assertEqual(resp.getheader('X-Container-Sync-Key'), 'secret')
@ -1220,7 +1220,7 @@ class TestContainer(unittest.TestCase):
self.assertEqual(resp.status, 204) self.assertEqual(resp.status, 204)
resp = retry(get, self.name, use_account=3) resp = retry(get, self.name, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
self.assertEqual(resp.getheader('X-Container-Sync-Key'), new_secret) self.assertEqual(resp.getheader('X-Container-Sync-Key'), new_secret)
@requires_acls @requires_acls
@ -1255,7 +1255,7 @@ class TestContainer(unittest.TestCase):
self.assertEqual(resp.status, 204) self.assertEqual(resp.status, 204)
resp = retry(get, self.name, use_account=1) resp = retry(get, self.name, use_account=1)
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
self.assertEqual(resp.getheader('X-Container-Read'), 'jdoe') self.assertEqual(resp.getheader('X-Container-Read'), 'jdoe')
self.assertEqual(resp.getheader('X-Container-Write'), 'jdoe') self.assertEqual(resp.getheader('X-Container-Write'), 'jdoe')
self.assertEqual(resp.getheader('X-Container-Meta-Test'), value) self.assertEqual(resp.getheader('X-Container-Meta-Test'), value)
@ -1271,7 +1271,7 @@ class TestContainer(unittest.TestCase):
# can read container metadata # can read container metadata
resp = retry(get, self.name, use_account=3) resp = retry(get, self.name, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
self.assertEqual(resp.getheader('X-Container-Meta-Test'), value) self.assertEqual(resp.getheader('X-Container-Meta-Test'), value)
# but not container acl # but not container acl
self.assertEqual(resp.getheader('X-Container-Read'), None) self.assertEqual(resp.getheader('X-Container-Read'), None)
@ -1297,7 +1297,7 @@ class TestContainer(unittest.TestCase):
# can read container metadata # can read container metadata
resp = retry(get, self.name, use_account=3) resp = retry(get, self.name, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
self.assertEqual(resp.getheader('X-Container-Meta-Test'), value) self.assertEqual(resp.getheader('X-Container-Meta-Test'), value)
# but not container acl # but not container acl
self.assertEqual(resp.getheader('X-Container-Read'), None) self.assertEqual(resp.getheader('X-Container-Read'), None)
@ -1306,7 +1306,7 @@ class TestContainer(unittest.TestCase):
# sanity check container acls with account1 # sanity check container acls with account1
resp = retry(get, self.name, use_account=1) resp = retry(get, self.name, use_account=1)
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
self.assertEqual(resp.getheader('X-Container-Read'), 'jdoe') self.assertEqual(resp.getheader('X-Container-Read'), 'jdoe')
self.assertEqual(resp.getheader('X-Container-Write'), 'jdoe') self.assertEqual(resp.getheader('X-Container-Write'), 'jdoe')
@ -1322,7 +1322,7 @@ class TestContainer(unittest.TestCase):
self.assertEqual(resp.status, 204) self.assertEqual(resp.status, 204)
resp = retry(get, self.name, use_account=1) # validate w/ account1 resp = retry(get, self.name, use_account=1) # validate w/ account1
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
self.assertEqual(resp.getheader('X-Container-Meta-Test'), new_value) self.assertEqual(resp.getheader('X-Container-Meta-Test'), new_value)
# but can not write container acls # but can not write container acls
self.assertEqual(resp.getheader('X-Container-Read'), 'jdoe') self.assertEqual(resp.getheader('X-Container-Read'), 'jdoe')
@ -1339,7 +1339,7 @@ class TestContainer(unittest.TestCase):
# admin can read container metadata # admin can read container metadata
resp = retry(get, self.name, use_account=3) resp = retry(get, self.name, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
self.assertEqual(resp.getheader('X-Container-Meta-Test'), new_value) self.assertEqual(resp.getheader('X-Container-Meta-Test'), new_value)
# and ALSO container acls # and ALSO container acls
self.assertEqual(resp.getheader('X-Container-Read'), 'jdoe') self.assertEqual(resp.getheader('X-Container-Read'), 'jdoe')
@ -1355,7 +1355,7 @@ class TestContainer(unittest.TestCase):
self.assertEqual(resp.status, 204) self.assertEqual(resp.status, 204)
resp = retry(get, self.name, use_account=3) resp = retry(get, self.name, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
self.assertEqual(resp.getheader('X-Container-Read'), '.r:*') self.assertEqual(resp.getheader('X-Container-Read'), '.r:*')
def test_long_name_content_type(self): def test_long_name_content_type(self):
@ -1415,8 +1415,8 @@ class TestContainer(unittest.TestCase):
resp = retry(head) resp = retry(head)
resp.read() resp.read()
headers = dict((k.lower(), v) for k, v in resp.getheaders()) headers = dict((k.lower(), v) for k, v in resp.getheaders())
self.assertEquals(headers.get('x-storage-policy'), self.assertEqual(headers.get('x-storage-policy'),
default_policy['name']) default_policy['name'])
def test_error_invalid_storage_policy_name(self): def test_error_invalid_storage_policy_name(self):
def put(url, token, parsed, conn, headers): def put(url, token, parsed, conn, headers):
@ -1453,8 +1453,8 @@ class TestContainer(unittest.TestCase):
resp = retry(head) resp = retry(head)
resp.read() resp.read()
headers = dict((k.lower(), v) for k, v in resp.getheaders()) headers = dict((k.lower(), v) for k, v in resp.getheaders())
self.assertEquals(headers.get('x-storage-policy'), self.assertEqual(headers.get('x-storage-policy'),
policy['name']) policy['name'])
# and test recreate with-out specifying Storage Policy # and test recreate with-out specifying Storage Policy
resp = retry(put) resp = retry(put)
@ -1464,8 +1464,8 @@ class TestContainer(unittest.TestCase):
resp = retry(head) resp = retry(head)
resp.read() resp.read()
headers = dict((k.lower(), v) for k, v in resp.getheaders()) headers = dict((k.lower(), v) for k, v in resp.getheaders())
self.assertEquals(headers.get('x-storage-policy'), self.assertEqual(headers.get('x-storage-policy'),
policy['name']) policy['name'])
# delete it # delete it
def delete(url, token, parsed, conn): def delete(url, token, parsed, conn):
@ -1480,7 +1480,7 @@ class TestContainer(unittest.TestCase):
resp = retry(head) resp = retry(head)
resp.read() resp.read()
headers = dict((k.lower(), v) for k, v in resp.getheaders()) headers = dict((k.lower(), v) for k, v in resp.getheaders())
self.assertEquals(headers.get('x-storage-policy'), None) self.assertEqual(headers.get('x-storage-policy'), None)
@requires_policies @requires_policies
def test_conflict_change_storage_policy_with_put(self): def test_conflict_change_storage_policy_with_put(self):
@ -1510,8 +1510,8 @@ class TestContainer(unittest.TestCase):
resp = retry(head) resp = retry(head)
resp.read() resp.read()
headers = dict((k.lower(), v) for k, v in resp.getheaders()) headers = dict((k.lower(), v) for k, v in resp.getheaders())
self.assertEquals(headers.get('x-storage-policy'), self.assertEqual(headers.get('x-storage-policy'),
policy['name']) policy['name'])
@requires_policies @requires_policies
def test_noop_change_storage_policy_with_post(self): def test_noop_change_storage_policy_with_post(self):
@ -1547,8 +1547,8 @@ class TestContainer(unittest.TestCase):
resp = retry(head) resp = retry(head)
resp.read() resp.read()
headers = dict((k.lower(), v) for k, v in resp.getheaders()) headers = dict((k.lower(), v) for k, v in resp.getheaders())
self.assertEquals(headers.get('x-storage-policy'), self.assertEqual(headers.get('x-storage-policy'),
policy['name']) policy['name'])
class BaseTestContainerACLs(unittest.TestCase): class BaseTestContainerACLs(unittest.TestCase):

102
test/functional/test_object.py
View File

@ -119,10 +119,10 @@ class TestObject(unittest.TestCase):
return check_response(conn) return check_response(conn)
resp = retry(put) resp = retry(put)
resp.read() resp.read()
self.assertEquals(resp.status, 201) self.assertEqual(resp.status, 201)
resp = retry(put) resp = retry(put)
resp.read() resp.read()
self.assertEquals(resp.status, 412) self.assertEqual(resp.status, 412)
def put(url, token, parsed, conn): def put(url, token, parsed, conn):
conn.request('PUT', '%s/%s/%s' % ( conn.request('PUT', '%s/%s/%s' % (
@ -133,7 +133,7 @@ class TestObject(unittest.TestCase):
return check_response(conn) return check_response(conn)
resp = retry(put) resp = retry(put)
resp.read() resp.read()
self.assertEquals(resp.status, 400) self.assertEqual(resp.status, 400)
def test_non_integer_x_delete_after(self): def test_non_integer_x_delete_after(self):
def put(url, token, parsed, conn): def put(url, token, parsed, conn):
@ -145,7 +145,7 @@ class TestObject(unittest.TestCase):
return check_response(conn) return check_response(conn)
resp = retry(put) resp = retry(put)
body = resp.read() body = resp.read()
self.assertEquals(resp.status, 400) self.assertEqual(resp.status, 400)
self.assertEqual(body, 'Non-integer X-Delete-After') self.assertEqual(body, 'Non-integer X-Delete-After')
def test_non_integer_x_delete_at(self): def test_non_integer_x_delete_at(self):
@ -158,7 +158,7 @@ class TestObject(unittest.TestCase):
return check_response(conn) return check_response(conn)
resp = retry(put) resp = retry(put)
body = resp.read() body = resp.read()
self.assertEquals(resp.status, 400) self.assertEqual(resp.status, 400)
self.assertEqual(body, 'Non-integer X-Delete-At') self.assertEqual(body, 'Non-integer X-Delete-At')
def test_x_delete_at_in_the_past(self): def test_x_delete_at_in_the_past(self):
@ -171,7 +171,7 @@ class TestObject(unittest.TestCase):
return check_response(conn) return check_response(conn)
resp = retry(put) resp = retry(put)
body = resp.read() body = resp.read()
self.assertEquals(resp.status, 400) self.assertEqual(resp.status, 400)
self.assertEqual(body, 'X-Delete-At in past') self.assertEqual(body, 'X-Delete-At in past')
def test_copy_object(self): def test_copy_object(self):
@ -543,12 +543,12 @@ class TestObject(unittest.TestCase):
# cannot list objects # cannot list objects
resp = retry(get_listing, use_account=3) resp = retry(get_listing, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 403) self.assertEqual(resp.status, 403)
# cannot get object # cannot get object
resp = retry(get, self.obj, use_account=3) resp = retry(get, self.obj, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 403) self.assertEqual(resp.status, 403)
# grant read-only access # grant read-only access
acl_user = tf.swift_test_user[2] acl_user = tf.swift_test_user[2]
@ -561,30 +561,30 @@ class TestObject(unittest.TestCase):
# can list objects # can list objects
resp = retry(get_listing, use_account=3) resp = retry(get_listing, use_account=3)
listing = resp.read() listing = resp.read()
self.assertEquals(resp.status, 200) self.assertEqual(resp.status, 200)
self.assertIn(self.obj, listing) self.assertIn(self.obj, listing)
# can get object # can get object
resp = retry(get, self.obj, use_account=3) resp = retry(get, self.obj, use_account=3)
body = resp.read() body = resp.read()
self.assertEquals(resp.status, 200) self.assertEqual(resp.status, 200)
self.assertEquals(body, 'test') self.assertEqual(body, 'test')
# can not put an object # can not put an object
obj_name = str(uuid4()) obj_name = str(uuid4())
resp = retry(put, obj_name, use_account=3) resp = retry(put, obj_name, use_account=3)
body = resp.read() body = resp.read()
self.assertEquals(resp.status, 403) self.assertEqual(resp.status, 403)
# can not delete an object # can not delete an object
resp = retry(delete, self.obj, use_account=3) resp = retry(delete, self.obj, use_account=3)
body = resp.read() body = resp.read()
self.assertEquals(resp.status, 403) self.assertEqual(resp.status, 403)
# sanity with account1 # sanity with account1
resp = retry(get_listing, use_account=3) resp = retry(get_listing, use_account=3)
listing = resp.read() listing = resp.read()
self.assertEquals(resp.status, 200) self.assertEqual(resp.status, 200)
self.assertNotIn(obj_name, listing) self.assertNotIn(obj_name, listing)
self.assertIn(self.obj, listing) self.assertIn(self.obj, listing)
@ -624,12 +624,12 @@ class TestObject(unittest.TestCase):
# cannot list objects # cannot list objects
resp = retry(get_listing, use_account=3) resp = retry(get_listing, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 403) self.assertEqual(resp.status, 403)
# cannot get object # cannot get object
resp = retry(get, self.obj, use_account=3) resp = retry(get, self.obj, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 403) self.assertEqual(resp.status, 403)
# grant read-write access # grant read-write access
acl_user = tf.swift_test_user[2] acl_user = tf.swift_test_user[2]
@ -642,30 +642,30 @@ class TestObject(unittest.TestCase):
# can list objects # can list objects
resp = retry(get_listing, use_account=3) resp = retry(get_listing, use_account=3)
listing = resp.read() listing = resp.read()
self.assertEquals(resp.status, 200) self.assertEqual(resp.status, 200)
self.assertIn(self.obj, listing) self.assertIn(self.obj, listing)
# can get object # can get object
resp = retry(get, self.obj, use_account=3) resp = retry(get, self.obj, use_account=3)
body = resp.read() body = resp.read()
self.assertEquals(resp.status, 200) self.assertEqual(resp.status, 200)
self.assertEquals(body, 'test') self.assertEqual(body, 'test')
# can put an object # can put an object
obj_name = str(uuid4()) obj_name = str(uuid4())
resp = retry(put, obj_name, use_account=3) resp = retry(put, obj_name, use_account=3)
body = resp.read() body = resp.read()
self.assertEquals(resp.status, 201) self.assertEqual(resp.status, 201)
# can delete an object # can delete an object
resp = retry(delete, self.obj, use_account=3) resp = retry(delete, self.obj, use_account=3)
body = resp.read() body = resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
# sanity with account1 # sanity with account1
resp = retry(get_listing, use_account=3) resp = retry(get_listing, use_account=3)
listing = resp.read() listing = resp.read()
self.assertEquals(resp.status, 200) self.assertEqual(resp.status, 200)
self.assertIn(obj_name, listing) self.assertIn(obj_name, listing)
self.assertNotIn(self.obj, listing) self.assertNotIn(self.obj, listing)
@ -705,12 +705,12 @@ class TestObject(unittest.TestCase):
# cannot list objects # cannot list objects
resp = retry(get_listing, use_account=3) resp = retry(get_listing, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 403) self.assertEqual(resp.status, 403)
# cannot get object # cannot get object
resp = retry(get, self.obj, use_account=3) resp = retry(get, self.obj, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 403) self.assertEqual(resp.status, 403)
# grant admin access # grant admin access
acl_user = tf.swift_test_user[2] acl_user = tf.swift_test_user[2]
@ -723,30 +723,30 @@ class TestObject(unittest.TestCase):
# can list objects # can list objects
resp = retry(get_listing, use_account=3) resp = retry(get_listing, use_account=3)
listing = resp.read() listing = resp.read()
self.assertEquals(resp.status, 200) self.assertEqual(resp.status, 200)
self.assertIn(self.obj, listing) self.assertIn(self.obj, listing)
# can get object # can get object
resp = retry(get, self.obj, use_account=3) resp = retry(get, self.obj, use_account=3)
body = resp.read() body = resp.read()
self.assertEquals(resp.status, 200) self.assertEqual(resp.status, 200)
self.assertEquals(body, 'test') self.assertEqual(body, 'test')
# can put an object # can put an object
obj_name = str(uuid4()) obj_name = str(uuid4())
resp = retry(put, obj_name, use_account=3) resp = retry(put, obj_name, use_account=3)
body = resp.read() body = resp.read()
self.assertEquals(resp.status, 201) self.assertEqual(resp.status, 201)
# can delete an object # can delete an object
resp = retry(delete, self.obj, use_account=3) resp = retry(delete, self.obj, use_account=3)
body = resp.read() body = resp.read()
self.assertEquals(resp.status, 204) self.assertEqual(resp.status, 204)
# sanity with account1 # sanity with account1
resp = retry(get_listing, use_account=3) resp = retry(get_listing, use_account=3)
listing = resp.read() listing = resp.read()
self.assertEquals(resp.status, 200) self.assertEqual(resp.status, 200)
self.assertIn(obj_name, listing) self.assertIn(obj_name, listing)
self.assertNotIn(self.obj, listing) self.assertNotIn(self.obj, listing)
@ -1113,78 +1113,78 @@ class TestObject(unittest.TestCase):
resp = retry(put_cors_cont, '*') resp = retry(put_cors_cont, '*')
resp.read() resp.read()
self.assertEquals(resp.status // 100, 2) self.assertEqual(resp.status // 100, 2)
resp = retry(put_obj, 'cat') resp = retry(put_obj, 'cat')
resp.read() resp.read()
self.assertEquals(resp.status // 100, 2) self.assertEqual(resp.status // 100, 2)
resp = retry(check_cors, resp = retry(check_cors,
'OPTIONS', 'cat', {'Origin': 'http://m.com'}) 'OPTIONS', 'cat', {'Origin': 'http://m.com'})
self.assertEquals(resp.status, 401) self.assertEqual(resp.status, 401)
resp = retry(check_cors, resp = retry(check_cors,
'OPTIONS', 'cat', 'OPTIONS', 'cat',
{'Origin': 'http://m.com', {'Origin': 'http://m.com',
'Access-Control-Request-Method': 'GET'}) 'Access-Control-Request-Method': 'GET'})
self.assertEquals(resp.status, 200) self.assertEqual(resp.status, 200)
resp.read() resp.read()
headers = dict((k.lower(), v) for k, v in resp.getheaders()) headers = dict((k.lower(), v) for k, v in resp.getheaders())
self.assertEquals(headers.get('access-control-allow-origin'), self.assertEqual(headers.get('access-control-allow-origin'),
'*') '*')
resp = retry(check_cors, resp = retry(check_cors,
'GET', 'cat', {'Origin': 'http://m.com'}) 'GET', 'cat', {'Origin': 'http://m.com'})
self.assertEquals(resp.status, 200) self.assertEqual(resp.status, 200)
headers = dict((k.lower(), v) for k, v in resp.getheaders()) headers = dict((k.lower(), v) for k, v in resp.getheaders())
self.assertEquals(headers.get('access-control-allow-origin'), self.assertEqual(headers.get('access-control-allow-origin'),
'*') '*')
resp = retry(check_cors, resp = retry(check_cors,
'GET', 'cat', {'Origin': 'http://m.com', 'GET', 'cat', {'Origin': 'http://m.com',
'X-Web-Mode': 'True'}) 'X-Web-Mode': 'True'})
self.assertEquals(resp.status, 200) self.assertEqual(resp.status, 200)
headers = dict((k.lower(), v) for k, v in resp.getheaders()) headers = dict((k.lower(), v) for k, v in resp.getheaders())
self.assertEquals(headers.get('access-control-allow-origin'), self.assertEqual(headers.get('access-control-allow-origin'),
'*') '*')
#################### ####################
resp = retry(put_cors_cont, 'http://secret.com') resp = retry(put_cors_cont, 'http://secret.com')
resp.read() resp.read()
self.assertEquals(resp.status // 100, 2) self.assertEqual(resp.status // 100, 2)
resp = retry(check_cors, resp = retry(check_cors,
'OPTIONS', 'cat', 'OPTIONS', 'cat',
{'Origin': 'http://m.com', {'Origin': 'http://m.com',
'Access-Control-Request-Method': 'GET'}) 'Access-Control-Request-Method': 'GET'})
resp.read() resp.read()
self.assertEquals(resp.status, 401) self.assertEqual(resp.status, 401)
if strict_cors: if strict_cors:
resp = retry(check_cors, resp = retry(check_cors,
'GET', 'cat', {'Origin': 'http://m.com'}) 'GET', 'cat', {'Origin': 'http://m.com'})
resp.read() resp.read()
self.assertEquals(resp.status, 200) self.assertEqual(resp.status, 200)
headers = dict((k.lower(), v) for k, v in resp.getheaders()) headers = dict((k.lower(), v) for k, v in resp.getheaders())
self.assertNotIn('access-control-allow-origin', headers) self.assertNotIn('access-control-allow-origin', headers)
resp = retry(check_cors, resp = retry(check_cors,
'GET', 'cat', {'Origin': 'http://secret.com'}) 'GET', 'cat', {'Origin': 'http://secret.com'})
resp.read() resp.read()
self.assertEquals(resp.status, 200) self.assertEqual(resp.status, 200)
headers = dict((k.lower(), v) for k, v in resp.getheaders()) headers = dict((k.lower(), v) for k, v in resp.getheaders())
self.assertEquals(headers.get('access-control-allow-origin'), self.assertEqual(headers.get('access-control-allow-origin'),
'http://secret.com') 'http://secret.com')
else: else:
resp = retry(check_cors, resp = retry(check_cors,
'GET', 'cat', {'Origin': 'http://m.com'}) 'GET', 'cat', {'Origin': 'http://m.com'})
resp.read() resp.read()
self.assertEquals(resp.status, 200) self.assertEqual(resp.status, 200)
headers = dict((k.lower(), v) for k, v in resp.getheaders()) headers = dict((k.lower(), v) for k, v in resp.getheaders())
self.assertEquals(headers.get('access-control-allow-origin'), self.assertEqual(headers.get('access-control-allow-origin'),
'http://m.com') 'http://m.com')
@requires_policies @requires_policies
def test_cross_policy_copy(self): def test_cross_policy_copy(self):