openstack/swift
Code Issues Proposed changes

pep8 fix: assertEquals -> assertEqual

Browse Source 
assertEquals is deprecated in py3 in the following dir:
test/probe/*

Change-Id: Ie08dd7a8a6c48e3452dfe4f2b41676330ce455d5
This commit is contained in:
Bill Huber 2015-08-06 09:28:51 -05:00
parent d166dcee64
commit 239e94e625
7 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
test/probe/test_account_failures.py
View File

@ -35,20 +35,20 @@ class TestAccountFailures(ReplProbeTest):
# Assert account level sees them # Assert account level sees them
headers, containers = client.get_account(self.url, self.token) headers, containers = client.get_account(self.url, self.token)
self.assertEquals(headers['x-account-container-count'], '2') self.assertEqual(headers['x-account-container-count'], '2')
self.assertEquals(headers['x-account-object-count'], '0') self.assertEqual(headers['x-account-object-count'], '0')
self.assertEquals(headers['x-account-bytes-used'], '0') self.assertEqual(headers['x-account-bytes-used'], '0')
found1 = False found1 = False
found2 = False found2 = False
for container in containers: for container in containers:
if container['name'] == container1: if container['name'] == container1:
found1 = True found1 = True
self.assertEquals(container['count'], 0) self.assertEqual(container['count'], 0)
self.assertEquals(container['bytes'], 0) self.assertEqual(container['bytes'], 0)
elif container['name'] == container2: elif container['name'] == container2:
found2 = True found2 = True
self.assertEquals(container['count'], 0) self.assertEqual(container['count'], 0)
self.assertEquals(container['bytes'], 0) self.assertEqual(container['bytes'], 0)
self.assertTrue(found1) self.assertTrue(found1)
self.assertTrue(found2) self.assertTrue(found2)
@ -57,20 +57,20 @@ class TestAccountFailures(ReplProbeTest):
# Assert account level doesn't see it yet # Assert account level doesn't see it yet
headers, containers = client.get_account(self.url, self.token) headers, containers = client.get_account(self.url, self.token)
self.assertEquals(headers['x-account-container-count'], '2') self.assertEqual(headers['x-account-container-count'], '2')
self.assertEquals(headers['x-account-object-count'], '0') self.assertEqual(headers['x-account-object-count'], '0')
self.assertEquals(headers['x-account-bytes-used'], '0') self.assertEqual(headers['x-account-bytes-used'], '0')
found1 = False found1 = False
found2 = False found2 = False
for container in containers: for container in containers:
if container['name'] == container1: if container['name'] == container1:
found1 = True found1 = True
self.assertEquals(container['count'], 0) self.assertEqual(container['count'], 0)
self.assertEquals(container['bytes'], 0) self.assertEqual(container['bytes'], 0)
elif container['name'] == container2: elif container['name'] == container2:
found2 = True found2 = True
self.assertEquals(container['count'], 0) self.assertEqual(container['count'], 0)
self.assertEquals(container['bytes'], 0) self.assertEqual(container['bytes'], 0)
self.assertTrue(found1) self.assertTrue(found1)
self.assertTrue(found2) self.assertTrue(found2)
@ -79,20 +79,20 @@ class TestAccountFailures(ReplProbeTest):
# Assert account level now sees the container2/object1 # Assert account level now sees the container2/object1
headers, containers = client.get_account(self.url, self.token) headers, containers = client.get_account(self.url, self.token)
self.assertEquals(headers['x-account-container-count'], '2') self.assertEqual(headers['x-account-container-count'], '2')
self.assertEquals(headers['x-account-object-count'], '1') self.assertEqual(headers['x-account-object-count'], '1')
self.assertEquals(headers['x-account-bytes-used'], '4') self.assertEqual(headers['x-account-bytes-used'], '4')
found1 = False found1 = False
found2 = False found2 = False
for container in containers: for container in containers:
if container['name'] == container1: if container['name'] == container1:
found1 = True found1 = True
self.assertEquals(container['count'], 0) self.assertEqual(container['count'], 0)
self.assertEquals(container['bytes'], 0) self.assertEqual(container['bytes'], 0)
elif container['name'] == container2: elif container['name'] == container2:
found2 = True found2 = True
self.assertEquals(container['count'], 1) self.assertEqual(container['count'], 1)
self.assertEquals(container['bytes'], 4) self.assertEqual(container['bytes'], 4)
self.assertTrue(found1) self.assertTrue(found1)
self.assertTrue(found2) self.assertTrue(found2)
@ -111,9 +111,9 @@ class TestAccountFailures(ReplProbeTest):
# Assert account level knows container1 is gone but doesn't know about # Assert account level knows container1 is gone but doesn't know about
# container2/object2 yet # container2/object2 yet
headers, containers = client.get_account(self.url, self.token) headers, containers = client.get_account(self.url, self.token)
self.assertEquals(headers['x-account-container-count'], '1') self.assertEqual(headers['x-account-container-count'], '1')
self.assertEquals(headers['x-account-object-count'], '1') self.assertEqual(headers['x-account-object-count'], '1')
self.assertEquals(headers['x-account-bytes-used'], '4') self.assertEqual(headers['x-account-bytes-used'], '4')
found1 = False found1 = False
found2 = False found2 = False
for container in containers: for container in containers:
@ -121,8 +121,8 @@ class TestAccountFailures(ReplProbeTest):
found1 = True found1 = True
elif container['name'] == container2: elif container['name'] == container2:
found2 = True found2 = True
self.assertEquals(container['count'], 1) self.assertEqual(container['count'], 1)
self.assertEquals(container['bytes'], 4) self.assertEqual(container['bytes'], 4)
self.assertTrue(not found1) self.assertTrue(not found1)
self.assertTrue(found2) self.assertTrue(found2)
@ -131,9 +131,9 @@ class TestAccountFailures(ReplProbeTest):
# Assert account level now knows about container2/object2 # Assert account level now knows about container2/object2
headers, containers = client.get_account(self.url, self.token) headers, containers = client.get_account(self.url, self.token)
self.assertEquals(headers['x-account-container-count'], '1') self.assertEqual(headers['x-account-container-count'], '1')
self.assertEquals(headers['x-account-object-count'], '2') self.assertEqual(headers['x-account-object-count'], '2')
self.assertEquals(headers['x-account-bytes-used'], '9') self.assertEqual(headers['x-account-bytes-used'], '9')
found1 = False found1 = False
found2 = False found2 = False
for container in containers: for container in containers:
@ -141,8 +141,8 @@ class TestAccountFailures(ReplProbeTest):
found1 = True found1 = True
elif container['name'] == container2: elif container['name'] == container2:
found2 = True found2 = True
self.assertEquals(container['count'], 2) self.assertEqual(container['count'], 2)
self.assertEquals(container['bytes'], 9) self.assertEqual(container['bytes'], 9)
self.assertTrue(not found1) self.assertTrue(not found1)
self.assertTrue(found2) self.assertTrue(found2)
@ -154,9 +154,9 @@ class TestAccountFailures(ReplProbeTest):
# new container2/object2 yet # new container2/object2 yet
headers, containers = \ headers, containers = \
direct_client.direct_get_account(anodes[0], apart, self.account) direct_client.direct_get_account(anodes[0], apart, self.account)
self.assertEquals(headers['x-account-container-count'], '2') self.assertEqual(headers['x-account-container-count'], '2')
self.assertEquals(headers['x-account-object-count'], '1') self.assertEqual(headers['x-account-object-count'], '1')
self.assertEquals(headers['x-account-bytes-used'], '4') self.assertEqual(headers['x-account-bytes-used'], '4')
found1 = False found1 = False
found2 = False found2 = False
for container in containers: for container in containers:
@ -164,8 +164,8 @@ class TestAccountFailures(ReplProbeTest):
found1 = True found1 = True
elif container['name'] == container2: elif container['name'] == container2:
found2 = True found2 = True
self.assertEquals(container['count'], 1) self.assertEqual(container['count'], 1)
self.assertEquals(container['bytes'], 4) self.assertEqual(container['bytes'], 4)
self.assertTrue(found1) self.assertTrue(found1)
self.assertTrue(found2) self.assertTrue(found2)
@ -175,9 +175,9 @@ class TestAccountFailures(ReplProbeTest):
# Assert that server is now up to date # Assert that server is now up to date
headers, containers = \ headers, containers = \
direct_client.direct_get_account(anodes[0], apart, self.account) direct_client.direct_get_account(anodes[0], apart, self.account)
self.assertEquals(headers['x-account-container-count'], '1') self.assertEqual(headers['x-account-container-count'], '1')
self.assertEquals(headers['x-account-object-count'], '2') self.assertEqual(headers['x-account-object-count'], '2')
self.assertEquals(headers['x-account-bytes-used'], '9') self.assertEqual(headers['x-account-bytes-used'], '9')
found1 = False found1 = False
found2 = False found2 = False
for container in containers: for container in containers:
@ -185,8 +185,8 @@ class TestAccountFailures(ReplProbeTest):
found1 = True found1 = True
elif container['name'] == container2: elif container['name'] == container2:
found2 = True found2 = True
self.assertEquals(container['count'], 2) self.assertEqual(container['count'], 2)
self.assertEquals(container['bytes'], 9) self.assertEqual(container['bytes'], 9)
self.assertTrue(not found1) self.assertTrue(not found1)
self.assertTrue(found2) self.assertTrue(found2)

8
test/probe/test_account_reaper.py
View File

@ -66,7 +66,7 @@ class TestAccountReaper(ReplProbeTest):
direct_head_container(cnode, cpart, self.account, direct_head_container(cnode, cpart, self.account,
container) container)
except ClientException as err: except ClientException as err:
self.assertEquals(err.http_status, 404) self.assertEqual(err.http_status, 404)
delete_time = err.http_headers.get( delete_time = err.http_headers.get(
'X-Backend-DELETE-Timestamp') 'X-Backend-DELETE-Timestamp')
# 'X-Backend-DELETE-Timestamp' confirms it was deleted # 'X-Backend-DELETE-Timestamp' confirms it was deleted
@ -91,7 +91,7 @@ class TestAccountReaper(ReplProbeTest):
direct_get_object(node, part, self.account, direct_get_object(node, part, self.account,
container, obj, headers=headers) container, obj, headers=headers)
except ClientException as err: except ClientException as err:
self.assertEquals(err.http_status, 404) self.assertEqual(err.http_status, 404)
delete_time = err.http_headers.get('X-Backend-Timestamp') delete_time = err.http_headers.get('X-Backend-Timestamp')
# 'X-Backend-Timestamp' confirms obj was deleted # 'X-Backend-Timestamp' confirms obj was deleted
self.assertTrue(delete_time) self.assertTrue(delete_time)
@ -114,7 +114,7 @@ class TestAccountReaper(ReplProbeTest):
direct_head_container(cnode, cpart, self.account, direct_head_container(cnode, cpart, self.account,
container) container)
except ClientException as err: except ClientException as err:
self.assertEquals(err.http_status, 404) self.assertEqual(err.http_status, 404)
delete_time = err.http_headers.get( delete_time = err.http_headers.get(
'X-Backend-DELETE-Timestamp') 'X-Backend-DELETE-Timestamp')
# 'X-Backend-DELETE-Timestamp' confirms it was deleted # 'X-Backend-DELETE-Timestamp' confirms it was deleted
@ -134,7 +134,7 @@ class TestAccountReaper(ReplProbeTest):
direct_get_object(node, part, self.account, direct_get_object(node, part, self.account,
container, obj, headers=headers) container, obj, headers=headers)
except ClientException as err: except ClientException as err:
self.assertEquals(err.http_status, 404) self.assertEqual(err.http_status, 404)
delete_time = err.http_headers.get('X-Backend-Timestamp') delete_time = err.http_headers.get('X-Backend-Timestamp')
# 'X-Backend-Timestamp' confirms obj was deleted # 'X-Backend-Timestamp' confirms obj was deleted
self.assertTrue(delete_time) self.assertTrue(delete_time)

18
test/probe/test_container_failures.py
View File

@ -70,7 +70,7 @@ class TestContainerFailures(ReplProbeTest):
# Assert all container1 servers indicate container1 is alive and # Assert all container1 servers indicate container1 is alive and
# well with object1 # well with object1
for cnode in cnodes: for cnode in cnodes:
self.assertEquals( self.assertEqual(
[o['name'] for o in direct_client.direct_get_container( [o['name'] for o in direct_client.direct_get_container(
cnode, cpart, self.account, container1)[1]], cnode, cpart, self.account, container1)[1]],
['object1']) ['object1'])
@ -78,9 +78,9 @@ class TestContainerFailures(ReplProbeTest):
# Assert account level also indicates container1 is alive and # Assert account level also indicates container1 is alive and
# well with object1 # well with object1
headers, containers = client.get_account(self.url, self.token) headers, containers = client.get_account(self.url, self.token)
self.assertEquals(headers['x-account-container-count'], '1') self.assertEqual(headers['x-account-container-count'], '1')
self.assertEquals(headers['x-account-object-count'], '1') self.assertEqual(headers['x-account-object-count'], '1')
self.assertEquals(headers['x-account-bytes-used'], '3') self.assertEqual(headers['x-account-bytes-used'], '3')
def test_two_nodes_fail(self): def test_two_nodes_fail(self):
# Create container1 # Create container1
@ -118,15 +118,15 @@ class TestContainerFailures(ReplProbeTest):
direct_client.direct_get_container(cnode, cpart, self.account, direct_client.direct_get_container(cnode, cpart, self.account,
container1) container1)
except ClientException as err: except ClientException as err:
self.assertEquals(err.http_status, 404) self.assertEqual(err.http_status, 404)
else: else:
self.fail("Expected ClientException but didn't get it") self.fail("Expected ClientException but didn't get it")
# Assert account level also indicates container1 is gone # Assert account level also indicates container1 is gone
headers, containers = client.get_account(self.url, self.token) headers, containers = client.get_account(self.url, self.token)
self.assertEquals(headers['x-account-container-count'], '0') self.assertEqual(headers['x-account-container-count'], '0')
self.assertEquals(headers['x-account-object-count'], '0') self.assertEqual(headers['x-account-object-count'], '0')
self.assertEquals(headers['x-account-bytes-used'], '0') self.assertEqual(headers['x-account-bytes-used'], '0')
def _get_container_db_files(self, container): def _get_container_db_files(self, container):
opart, onodes = self.container_ring.get_nodes(self.account, container) opart, onodes = self.container_ring.get_nodes(self.account, container)
@ -160,7 +160,7 @@ class TestContainerFailures(ReplProbeTest):
try: try:
client.delete_container(self.url, self.token, container) client.delete_container(self.url, self.token, container)
except client.ClientException as err: except client.ClientException as err:
self.assertEquals(err.http_status, 503) self.assertEqual(err.http_status, 503)
else: else:
self.fail("Expected ClientException but didn't get it") self.fail("Expected ClientException but didn't get it")
else: else:

2
test/probe/test_container_merge_policy_index.py
View File

@ -336,7 +336,7 @@ class TestContainerMergePolicyIndex(ReplProbeTest):
self.assertEqual(metadata['x-static-large-object'].lower(), 'true') self.assertEqual(metadata['x-static-large-object'].lower(), 'true')
for i, entry in enumerate(utils.json.loads(body)): for i, entry in enumerate(utils.json.loads(body)):
for key in ('hash', 'bytes', 'name'): for key in ('hash', 'bytes', 'name'):
self.assertEquals(entry[key], direct_manifest_data[i][key]) self.assertEqual(entry[key], direct_manifest_data[i][key])
metadata, body = client.get_object( metadata, body = client.get_object(
self.url, self.token, self.container_name, direct_manifest_name) self.url, self.token, self.container_name, direct_manifest_name)
self.assertEqual(metadata['x-static-large-object'].lower(), 'true') self.assertEqual(metadata['x-static-large-object'].lower(), 'true')

4
test/probe/test_empty_device_handoff.py
View File

@ -137,7 +137,7 @@ class TestEmptyDevice(ReplProbeTest):
onode, opart, self.account, container, obj, headers={ onode, opart, self.account, container, obj, headers={
'X-Backend-Storage-Policy-Index': self.policy.idx}) 'X-Backend-Storage-Policy-Index': self.policy.idx})
except ClientException as err: except ClientException as err:
self.assertEquals(err.http_status, 404) self.assertEqual(err.http_status, 404)
self.assertFalse(os.path.exists(obj_dir)) self.assertFalse(os.path.exists(obj_dir))
else: else:
self.fail("Expected ClientException but didn't get it") self.fail("Expected ClientException but didn't get it")
@ -169,7 +169,7 @@ class TestEmptyDevice(ReplProbeTest):
another_onode, opart, self.account, container, obj, headers={ another_onode, opart, self.account, container, obj, headers={
'X-Backend-Storage-Policy-Index': self.policy.idx}) 'X-Backend-Storage-Policy-Index': self.policy.idx})
except ClientException as err: except ClientException as err:
self.assertEquals(err.http_status, 404) self.assertEqual(err.http_status, 404)
else: else:
self.fail("Expected ClientException but didn't get it") self.fail("Expected ClientException but didn't get it")

16
test/probe/test_object_failures.py
View File

@ -57,7 +57,7 @@ class TestObjectFailures(ReplProbeTest):
self.policy.name}) self.policy.name})
client.put_object(self.url, self.token, container, obj, data) client.put_object(self.url, self.token, container, obj, data)
odata = client.get_object(self.url, self.token, container, obj)[-1] odata = client.get_object(self.url, self.token, container, obj)[-1]
self.assertEquals(odata, data) self.assertEqual(odata, data)
opart, onodes = self.object_ring.get_nodes( opart, onodes = self.object_ring.get_nodes(
self.account, container, obj) self.account, container, obj)
onode = onodes[0] onode = onodes[0]
@ -84,14 +84,14 @@ class TestObjectFailures(ReplProbeTest):
odata = direct_client.direct_get_object( odata = direct_client.direct_get_object(
onode, opart, self.account, container, obj, headers={ onode, opart, self.account, container, obj, headers={
'X-Backend-Storage-Policy-Index': self.policy.idx})[-1] 'X-Backend-Storage-Policy-Index': self.policy.idx})[-1]
self.assertEquals(odata, 'VERIFY') self.assertEqual(odata, 'VERIFY')
try: try:
direct_client.direct_get_object( direct_client.direct_get_object(
onode, opart, self.account, container, obj, headers={ onode, opart, self.account, container, obj, headers={
'X-Backend-Storage-Policy-Index': self.policy.idx}) 'X-Backend-Storage-Policy-Index': self.policy.idx})
raise Exception("Did not quarantine object") raise Exception("Did not quarantine object")
except ClientException as err: except ClientException as err:
self.assertEquals(err.http_status, 404) self.assertEqual(err.http_status, 404)
def run_quarantine_range_etag(self): def run_quarantine_range_etag(self):
container = 'container-range-%s' % uuid4() container = 'container-range-%s' % uuid4()
@ -111,7 +111,7 @@ class TestObjectFailures(ReplProbeTest):
odata = direct_client.direct_get_object( odata = direct_client.direct_get_object(
onode, opart, self.account, container, obj, onode, opart, self.account, container, obj,
headers=req_headers)[-1] headers=req_headers)[-1]
self.assertEquals(odata, result) self.assertEqual(odata, result)
try: try:
direct_client.direct_get_object( direct_client.direct_get_object(
@ -119,7 +119,7 @@ class TestObjectFailures(ReplProbeTest):
'X-Backend-Storage-Policy-Index': self.policy.idx}) 'X-Backend-Storage-Policy-Index': self.policy.idx})
raise Exception("Did not quarantine object") raise Exception("Did not quarantine object")
except ClientException as err: except ClientException as err:
self.assertEquals(err.http_status, 404) self.assertEqual(err.http_status, 404)
def run_quarantine_zero_byte_get(self): def run_quarantine_zero_byte_get(self):
container = 'container-zbyte-%s' % uuid4() container = 'container-zbyte-%s' % uuid4()
@ -137,7 +137,7 @@ class TestObjectFailures(ReplProbeTest):
self.policy.idx}) self.policy.idx})
raise Exception("Did not quarantine object") raise Exception("Did not quarantine object")
except ClientException as err: except ClientException as err:
self.assertEquals(err.http_status, 404) self.assertEqual(err.http_status, 404)
def run_quarantine_zero_byte_head(self): def run_quarantine_zero_byte_head(self):
container = 'container-zbyte-%s' % uuid4() container = 'container-zbyte-%s' % uuid4()
@ -155,7 +155,7 @@ class TestObjectFailures(ReplProbeTest):
self.policy.idx}) self.policy.idx})
raise Exception("Did not quarantine object") raise Exception("Did not quarantine object")
except ClientException as err: except ClientException as err:
self.assertEquals(err.http_status, 404) self.assertEqual(err.http_status, 404)
def run_quarantine_zero_byte_post(self): def run_quarantine_zero_byte_post(self):
container = 'container-zbyte-%s' % uuid4() container = 'container-zbyte-%s' % uuid4()
@ -177,7 +177,7 @@ class TestObjectFailures(ReplProbeTest):
response_timeout=1) response_timeout=1)
raise Exception("Did not quarantine object") raise Exception("Did not quarantine object")
except ClientException as err: except ClientException as err:
self.assertEquals(err.http_status, 404) self.assertEqual(err.http_status, 404)
def test_runner(self): def test_runner(self):
self.run_quarantine() self.run_quarantine()

8
test/probe/test_object_handoff.py
View File

@ -102,7 +102,7 @@ class TestObjectHandoff(ReplProbeTest):
onode, opart, self.account, container, obj, headers={ onode, opart, self.account, container, obj, headers={
'X-Backend-Storage-Policy-Index': self.policy.idx}) 'X-Backend-Storage-Policy-Index': self.policy.idx})
except ClientException as err: except ClientException as err:
self.assertEquals(err.http_status, 404) self.assertEqual(err.http_status, 404)
else: else:
self.fail("Expected ClientException but didn't get it") self.fail("Expected ClientException but didn't get it")
@ -136,7 +136,7 @@ class TestObjectHandoff(ReplProbeTest):
another_onode, opart, self.account, container, obj, headers={ another_onode, opart, self.account, container, obj, headers={
'X-Backend-Storage-Policy-Index': self.policy.idx}) 'X-Backend-Storage-Policy-Index': self.policy.idx})
except ClientException as err: except ClientException as err:
self.assertEquals(err.http_status, 404) self.assertEqual(err.http_status, 404)
else: else:
self.fail("Expected ClientException but didn't get it") self.fail("Expected ClientException but didn't get it")
@ -160,7 +160,7 @@ class TestObjectHandoff(ReplProbeTest):
try: try:
client.head_object(self.url, self.token, container, obj) client.head_object(self.url, self.token, container, obj)
except client.ClientException as err: except client.ClientException as err:
self.assertEquals(err.http_status, 404) self.assertEqual(err.http_status, 404)
else: else:
self.fail("Expected ClientException but didn't get it") self.fail("Expected ClientException but didn't get it")
@ -206,7 +206,7 @@ class TestObjectHandoff(ReplProbeTest):
another_onode, opart, self.account, container, obj, headers={ another_onode, opart, self.account, container, obj, headers={
'X-Backend-Storage-Policy-Index': self.policy.idx}) 'X-Backend-Storage-Policy-Index': self.policy.idx})
except ClientException as err: except ClientException as err:
self.assertEquals(err.http_status, 404) self.assertEqual(err.http_status, 404)
else: else:
self.fail("Expected ClientException but didn't get it") self.fail("Expected ClientException but didn't get it")