diff --git a/keystoneclient/tests/unit/test_session.py b/keystoneclient/tests/unit/test_session.py index dc8348a82..8fb364ac0 100644 --- a/keystoneclient/tests/unit/test_session.py +++ b/keystoneclient/tests/unit/test_session.py @@ -563,7 +563,7 @@ class SessionAuthTests(utils.TestCase): auth = AuthPlugin() sess = client_session.Session(auth=auth) resp = sess.get(self.TEST_URL) - self.assertDictEqual(resp.json(), self.TEST_JSON) + self.assertEqual(resp.json(), self.TEST_JSON) self.assertRequestHeaderEqual('X-Auth-Token', AuthPlugin.TEST_TOKEN) @@ -573,7 +573,7 @@ class SessionAuthTests(utils.TestCase): auth = AuthPlugin() sess = client_session.Session(auth=auth) resp = sess.get(self.TEST_URL, authenticated=False) - self.assertDictEqual(resp.json(), self.TEST_JSON) + self.assertEqual(resp.json(), self.TEST_JSON) self.assertRequestHeaderEqual('X-Auth-Token', None) diff --git a/keystoneclient/tests/unit/utils.py b/keystoneclient/tests/unit/utils.py index a18e0590e..378f912f0 100644 --- a/keystoneclient/tests/unit/utils.py +++ b/keystoneclient/tests/unit/utils.py @@ -110,24 +110,6 @@ class TestCase(testtools.TestCase): self.assertEqual(headers.get(name), val) -if tuple(sys.version_info)[0:2] < (2, 7): - - def assertDictEqual(self, d1, d2, msg=None): - # Simple version taken from 2.7 - self.assertIsInstance(d1, dict, - 'First argument is not a dictionary') - self.assertIsInstance(d2, dict, - 'Second argument is not a dictionary') - if d1 != d2: - if msg: - self.fail(msg) - else: - standardMsg = '%r != %r' % (d1, d2) - self.fail(standardMsg) - - TestCase.assertDictEqual = assertDictEqual - - def test_response(**kwargs): r = requests.Request(method='GET', url='http://localhost:5000').prepare() return requests_mock.create_response(r, **kwargs) diff --git a/keystoneclient/tests/unit/v3/test_projects.py b/keystoneclient/tests/unit/v3/test_projects.py index ac2e9062c..8bd6fd500 100644 --- a/keystoneclient/tests/unit/v3/test_projects.py +++ b/keystoneclient/tests/unit/v3/test_projects.py @@ -164,7 +164,7 @@ class ProjectTests(utils.ClientTestCase, utils.CrudTests): returned = self.manager.get(ref['id'], subtree_as_ids=True) self.assertQueryStringIs('subtree_as_ids') - self.assertDictEqual(ref['subtree'], returned.subtree) + self.assertEqual(ref['subtree'], returned.subtree) def test_get_with_parents_as_ids(self): projects = self._create_projects_hierarchy() @@ -187,7 +187,7 @@ class ProjectTests(utils.ClientTestCase, utils.CrudTests): returned = self.manager.get(ref['id'], parents_as_ids=True) self.assertQueryStringIs('parents_as_ids') - self.assertDictEqual(ref['parents'], returned.parents) + self.assertEqual(ref['parents'], returned.parents) def test_get_with_parents_as_ids_and_subtree_as_ids(self): ref = self.new_ref() @@ -209,8 +209,8 @@ class ProjectTests(utils.ClientTestCase, utils.CrudTests): parents_as_ids=True, subtree_as_ids=True) self.assertQueryStringIs('subtree_as_ids&parents_as_ids') - self.assertDictEqual(ref['parents'], returned.parents) - self.assertDictEqual(ref['subtree'], returned.subtree) + self.assertEqual(ref['parents'], returned.parents) + self.assertEqual(ref['subtree'], returned.subtree) def test_get_with_subtree_as_list(self): projects = self._create_projects_hierarchy()