openstack/barbican
Code Issues Proposed changes

enable hacking check H234

Browse Source 
assertEquals() logs a DeprecationWarning in Python 3.x,
use assertEqual() instead. The same goes for assertNotEquals().

Change-Id: Id7e6aac040a63870929cdf3267e2fc23382bf342
This commit is contained in:
Christian Berendt 2014-05-29 12:34:59 +02:00
parent 1c6cbfdeb4
commit b2e8c90d47
3 changed files with 8 additions and 7 deletions

10
barbican/tests/api/test_resources.py

@ -801,7 +801,7 @@ class WhenGettingPuttingOrDeletingSecretUsingSecretResource(FunctionalTest):
.get.assert_called_once_with(entity_id=self.secret.id,
keystone_id=self.keystone_id,
suppress_exception=True)
self.assertEquals(resp.status_int, 200)
self.assertEqual(resp.status_int, 200)
self.assertNotIn('content_encodings', resp.namespace)
self.assertIn('content_types', resp.namespace)
@ -819,7 +819,7 @@ class WhenGettingPuttingOrDeletingSecretUsingSecretResource(FunctionalTest):
.get.assert_called_once_with(entity_id=self.secret.id,
keystone_id=self.keystone_id,
suppress_exception=True)
self.assertEquals(resp.status_int, 200)
self.assertEqual(resp.status_int, 200)
self.assertIsNotNone(resp.body)
@ -1119,7 +1119,7 @@ class WhenCreatingOrdersUsingOrdersResource(FunctionalTest):
{},
expect_errors=True
)
self.assertEquals(resp.status_int, 400)
self.assertEqual(resp.status_int, 400)
def test_should_fail_add_new_order_bad_json(self):
resp = self.app.post(
@ -1127,7 +1127,7 @@ class WhenCreatingOrdersUsingOrdersResource(FunctionalTest):
'',
expect_errors=True
)
self.assertEquals(resp.status_int, 400)
self.assertEqual(resp.status_int, 400)
class WhenGettingOrdersListUsingOrdersResource(FunctionalTest):
@ -1466,7 +1466,7 @@ class WhenCreatingContainersUsingContainersResource(FunctionalTest):
'',
expect_errors=True
)
self.assertEquals(resp.status_int, 400)
self.assertEqual(resp.status_int, 400)
def test_should_throw_exception_when_secret_ref_doesnt_exist(self):
self.secret_repo.get.return_value = None

4
barbican/tests/api/test_transport_keys_resource.py

@ -225,7 +225,7 @@ class WhenCreatingTransKeysListUsingTransportKeysResource(FunctionalTest):
{},
expect_errors=True
)
self.assertEquals(resp.status_int, 400)
self.assertEqual(resp.status_int, 400)
def test_should_fail_add_new_transport_key_bad_json(self):
resp = self.app.post(
@ -233,7 +233,7 @@ class WhenCreatingTransKeysListUsingTransportKeysResource(FunctionalTest):
'',
expect_errors=True
)
self.assertEquals(resp.status_int, 400)
self.assertEqual(resp.status_int, 400)
class WhenGettingOrDeletingTransKeyUsingTransportKeyResource(FunctionalTest):

1
tox.ini

@ -20,5 +20,6 @@ commands = {toxinidir}/tools/hacking.sh {posargs}
# E711 ignored because of sqlalchemy override of == None
# H ignored because it's not H clean
ignore = E711,H
select = H234
exclude = .git,.idea,.tox,bin,dist,debian,rpmbuild,tools,*.egg-info,*openstack/common,contrib,
functionaltests,*alembic_migrations/versions