openstack
/
barbican
Code Issues Proposed changes

Use more specific asserts in tests 

Instead of assertTrue and assertFalse use more specific asserts.
They are compatible with Python 2.7[1] and 3.4[2]

[1]: https://docs.python.org/2.7/library/unittest.html
[2]: https://docs.python.org/3.4/library/unittest.html

Change-Id: I75263c1cf81c8dfc98f055331c9323e7bbb13707
This commit is contained in:
Béla Vancsics 2016-08-25 10:37:26 +02:00
parent 6f46088a65
commit 986824123b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
functionaltests/api/v1/functional/test_acls_rbac.py
View File

@ -150,7 +150,7 @@ class RBACAclsTestCase(base.TestCase):
if expected_return == 200:
self.assertIn('reader1', resp.model.read['users'])
else:
self.assertTrue(resp.model is None)
self.assertIsNone(resp.model)
@utils.parameterized_dataset(test_data_update_secret_acl)
def test_update_secret_acl(self, user, expected_return):
@ -164,11 +164,11 @@ class RBACAclsTestCase(base.TestCase):
get_resp = self.acl_behaviors.get_acl(secret_ref + '/acl',
user_name=admin_a)
if expected_return == 200:
self.assertTrue(model.acl_ref is not None)
self.assertIsNotNone(model.acl_ref)
# verify update happened
self.assertIn('reader2', get_resp.model.read['users'])
else:
self.assertTrue(model is None)
self.assertIsNone(model)
# verify no update happened
self.assertIn('reader1', get_resp.model.read['users'])
@ -207,7 +207,7 @@ class RBACAclsTestCase(base.TestCase):
if expected_return == 200:
self.assertIn('reader1', resp.model.read['users'])
else:
self.assertTrue(resp.model is None)
self.assertIsNone(resp.model)
@utils.parameterized_dataset(test_data_update_container_acl)
def test_update_container_acl(self, user, expected_return):
@ -221,11 +221,11 @@ class RBACAclsTestCase(base.TestCase):
get_resp = self.acl_behaviors.get_acl(container_ref + '/acl',
user_name=admin_a)
if expected_return == 200:
self.assertTrue(model.acl_ref is not None)
self.assertIsNotNone(model.acl_ref)
# verify update happened
self.assertIn('reader2', get_resp.model.read['users'])
else:
self.assertTrue(model is None)
self.assertIsNone(model)
# verify no update happened
self.assertIn('reader1', get_resp.model.read['users'])