From 02da1ce99e2c11e44a689ee525f483a0fca6991c Mon Sep 17 00:00:00 2001 From: Marcos Lobo Date: Mon, 13 Jan 2014 13:31:27 +0100 Subject: [PATCH] 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: I8426ee1f6387602660f2d768883d18ab2f04c6f0 Closes-bug: #1268480 --- keystone/tests/core.py | 4 ++-- keystone/tests/test_backend.py | 4 ++-- keystone/tests/test_content_types.py | 2 +- keystone/tests/test_v3.py | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/keystone/tests/core.py b/keystone/tests/core.py index 02f3e6bc6e..2f5e1907c9 100644 --- a/keystone/tests/core.py +++ b/keystone/tests/core.py @@ -467,8 +467,8 @@ class TestCase(testtools.TestCase): self.assertTrue(len(l)) def assertDictEqual(self, d1, d2, msg=None): - self.assertTrue(isinstance(d1, dict), 'First argument is not a dict') - self.assertTrue(isinstance(d2, dict), 'Second argument is not a dict') + self.assertIsInstance(d1, dict) + self.assertIsInstance(d2, dict) self.assertEqual(d1, d2, msg) def assertRaisesRegexp(self, expected_exception, expected_regexp, diff --git a/keystone/tests/test_backend.py b/keystone/tests/test_backend.py index 27b00421d6..016a37848b 100644 --- a/keystone/tests/test_backend.py +++ b/keystone/tests/test_backend.py @@ -2895,14 +2895,14 @@ class TokenTests(object): data_ref = self.token_api.create_token(token_id, data) expires = data_ref.pop('expires') data_ref.pop('user_id') - self.assertTrue(isinstance(expires, datetime.datetime)) + self.assertIsInstance(expires, datetime.datetime) data_ref.pop('id') data.pop('id') self.assertDictEqual(data_ref, data) new_data_ref = self.token_api.get_token(token_id) expires = new_data_ref.pop('expires') - self.assertTrue(isinstance(expires, datetime.datetime)) + self.assertIsInstance(expires, datetime.datetime) new_data_ref.pop('user_id') new_data_ref.pop('id') diff --git a/keystone/tests/test_content_types.py b/keystone/tests/test_content_types.py index 73dbb56cdc..263e762ead 100644 --- a/keystone/tests/test_content_types.py +++ b/keystone/tests/test_content_types.py @@ -1042,7 +1042,7 @@ class JsonTestCase(RestfulTestCase, CoreApiTests, LegacyV2UsernameTests): if require_service_catalog: self.assertIsNotNone(serviceCatalog) if serviceCatalog is not None: - self.assertTrue(isinstance(serviceCatalog, list)) + self.assertIsInstance(serviceCatalog, list) if require_service_catalog: self.assertNotEmpty(serviceCatalog) for service in r.result['access']['serviceCatalog']: diff --git a/keystone/tests/test_v3.py b/keystone/tests/test_v3.py index d6eafa0a0d..728623f267 100644 --- a/keystone/tests/test_v3.py +++ b/keystone/tests/test_v3.py @@ -492,7 +492,7 @@ class RestfulTestCase(rest.RestfulTestCase): except Exception: msg = '%s is not a valid ISO 8601 extended format date time.' % dt raise AssertionError(msg) - self.assertTrue(isinstance(dt, datetime.datetime)) + self.assertIsInstance(dt, datetime.datetime) def assertValidTokenResponse(self, r, user=None): self.assertTrue(r.headers.get('X-Subject-Token')) @@ -573,7 +573,7 @@ class RestfulTestCase(rest.RestfulTestCase): trust = token.get('OS-TRUST:trust') self.assertIsNotNone(trust) self.assertIsNotNone(trust.get('id')) - self.assertTrue(isinstance(trust.get('impersonation'), bool)) + self.assertIsInstance(trust.get('impersonation'), bool) self.assertIsNotNone(trust.get('trustor_user')) self.assertIsNotNone(trust.get('trustee_user')) self.assertIsNotNone(trust['trustor_user'].get('id'))