From cd88db1f7eb04ebfa6528a80be13027b201e4587 Mon Sep 17 00:00:00 2001 From: Tang Chen Date: Mon, 25 Jul 2016 10:49:25 +0800 Subject: [PATCH] Use assertEqual() instead of assertDictEqual() In unittest2, assertDictEqual() is implemented by using != operator to compare two dicts. So is assertEqual() in testtools. assertEqual() in testtools is able to handle dict, list, set and so on. So we just call assertEqual() to make the unit tests simpler. Change-Id: I862fcc3665ed7efc17ce92afd8224134e0124f6e --- ironic/tests/unit/common/test_glance_service.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ironic/tests/unit/common/test_glance_service.py b/ironic/tests/unit/common/test_glance_service.py index 0490c05e26..5cdc5bb31e 100644 --- a/ironic/tests/unit/common/test_glance_service.py +++ b/ironic/tests/unit/common/test_glance_service.py @@ -167,10 +167,10 @@ class TestGlanceImageService(base.TestCase): 'owner': None, } - self.assertDictEqual(expected, image_meta) + self.assertEqual(expected, image_meta) image_metas = self.service.detail() - self.assertDictEqual(expected, image_metas[0]) + self.assertEqual(expected, image_metas[0]) def test_create_without_instance_id(self): """Test creating an image without an instance ID. @@ -201,7 +201,7 @@ class TestGlanceImageService(base.TestCase): 'owner': None, } actual = self.service.show(image_id) - self.assertDictEqual(expected, actual) + self.assertEqual(expected, actual) def test_create(self): fixture = self._make_fixture(name='test image') @@ -271,7 +271,7 @@ class TestGlanceImageService(base.TestCase): 'owner': None, } - self.assertDictEqual(expected, meta) + self.assertEqual(expected, meta) i = i + 1 def test_detail_limit(self): @@ -327,7 +327,7 @@ class TestGlanceImageService(base.TestCase): 'deleted': None, 'owner': None, } - self.assertDictEqual(expected, meta) + self.assertEqual(expected, meta) i = i + 1 def test_detail_invalid_marker(self):