openstack
/
barbican
Code Issues Proposed changes

Change assertTrue(isinstance()) by optimal assert 

Some of tests use different method of assertTrue(isinstance(A, B)) or
assertEqual(type(A), B). The correct way is to use assertIsInstance(A,
B) provided by testtools.

Change-Id: I3424d529c568f0a9570a757cc6e85155b0645d4b
Closes-bug: #1268480
This commit is contained in:
Shuquan Huang 2015-12-30 23:04:48 +08:00
parent 8b9d581d11
commit fb1e231765
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
barbican/tests/common/test_validators.py
View File

@ -169,14 +169,14 @@ class WhenTestingSecretValidator(utils.BaseTestCase):
result = self.validator.validate(self.secret_req)
self.assertIn('expiration', result)
self.assertTrue(isinstance(result['expiration'], datetime.datetime))
self.assertIsInstance(result['expiration'], datetime.datetime)
def test_should_validate_future_expiration_no_t(self):
self.secret_req['expiration'] = '2114-02-28 19:14:44.180394'
result = self.validator.validate(self.secret_req)
self.assertIn('expiration', result)
self.assertTrue(isinstance(result['expiration'], datetime.datetime))
self.assertIsInstance(result['expiration'], datetime.datetime)
def test_should_validate_expiration_with_z(self):
expiration = '2114-02-28 19:14:44.180394Z'
@ -184,7 +184,7 @@ class WhenTestingSecretValidator(utils.BaseTestCase):
result = self.validator.validate(self.secret_req)
self.assertIn('expiration', result)
self.assertTrue(isinstance(result['expiration'], datetime.datetime))
self.assertIsInstance(result['expiration'], datetime.datetime)
self.assertEqual(expiration[:-1], str(result['expiration']))
def test_should_validate_expiration_with_tz(self):
@ -193,7 +193,7 @@ class WhenTestingSecretValidator(utils.BaseTestCase):
result = self.validator.validate(self.secret_req)
self.assertIn('expiration', result)
self.assertTrue(isinstance(result['expiration'], datetime.datetime))
self.assertIsInstance(result['expiration'], datetime.datetime)
expected = expiration[:-6].replace('12', '17', 1)
self.assertEqual(expected, str(result['expiration']))
@ -203,7 +203,7 @@ class WhenTestingSecretValidator(utils.BaseTestCase):
result = self.validator.validate(self.secret_req)
self.assertIn('expiration', result)
self.assertTrue(isinstance(result['expiration'], datetime.datetime))
self.assertIsInstance(result['expiration'], datetime.datetime)
expected = expiration[:-12].replace('12', '17', 1)
self.assertEqual(expected, str(result['expiration']))
@ -1166,8 +1166,8 @@ class WhenTestingKeyTypeOrderValidator(utils.BaseTestCase):
result = self.validator.validate(self.key_order_req)
self.assertIn('expiration', result['meta'])
self.assertTrue(isinstance(result['meta']['expiration'],
datetime.datetime))
self.assertIsInstance(result['meta']['expiration'],
datetime.datetime)
def test_should_raise_with_no_type_in_order_refs(self):
del self.key_order_req['type']