From d104d0ff3eb67cdf1d442f79447bb35c3337a139 Mon Sep 17 00:00:00 2001 From: Cao Xuan Hoang Date: Mon, 26 Sep 2016 09:51:02 +0700 Subject: [PATCH] Use assertEqual() instead of assertDictEqual() In unittesttools, assertDictEqual() and assertEqual() are implemented by using '!=' operator. But assertEqual() can handle dict, list, set and so on. So we just call assertEqual() to make the tests simpler. Change-Id: I051ce0a96ab0883fdb907ca24bce7e47580758d1 --- tests/unit/plugins/openstack/context/network/test_network.py | 4 ++-- .../openstack/context/neutron/test_existing_network.py | 2 +- .../unit/plugins/openstack/scenarios/ceilometer/test_utils.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/unit/plugins/openstack/context/network/test_network.py b/tests/unit/plugins/openstack/context/network/test_network.py index 45364d60..4b98d004 100644 --- a/tests/unit/plugins/openstack/context/network/test_network.py +++ b/tests/unit/plugins/openstack/context/network/test_network.py @@ -55,8 +55,8 @@ class NetworkTestCase(test.TestCase): dns_nameservers=["1.2.3.4", "5.6.7.8"])) self.assertEqual(context.config["networks_per_tenant"], 42) self.assertEqual(context.config["start_cidr"], "foo_cidr") - self.assertDictEqual(context.config["network_create_args"], - {"fakearg": "fake"}) + self.assertEqual(context.config["network_create_args"], + {"fakearg": "fake"}) self.assertEqual(context.config["dns_nameservers"], ("1.2.3.4", "5.6.7.8")) diff --git a/tests/unit/plugins/openstack/context/neutron/test_existing_network.py b/tests/unit/plugins/openstack/context/neutron/test_existing_network.py index b3a5a210..ee1da7cf 100644 --- a/tests/unit/plugins/openstack/context/neutron/test_existing_network.py +++ b/tests/unit/plugins/openstack/context/neutron/test_existing_network.py @@ -69,7 +69,7 @@ class ExistingNetworkTestCase(test.TestCase): for net_wrapper in net_wrappers.values(): net_wrapper.list_networks.assert_called_once_with() - self.assertDictEqual( + self.assertEqual( self.context["tenants"], { "tenant1": {"networks": networks[0:2]}, diff --git a/tests/unit/plugins/openstack/scenarios/ceilometer/test_utils.py b/tests/unit/plugins/openstack/scenarios/ceilometer/test_utils.py index 97798d1c..928155a5 100644 --- a/tests/unit/plugins/openstack/scenarios/ceilometer/test_utils.py +++ b/tests/unit/plugins/openstack/scenarios/ceilometer/test_utils.py @@ -122,7 +122,7 @@ class CeilometerScenarioTestCase(test.ScenarioTestCase): name=self.scenario.generate_random_name.return_value) # ensure that _create_alarm() doesn't modify the alarm dict as # a side-effect - self.assertDictEqual(alarm_dict, orig_alarm_dict) + self.assertEqual(alarm_dict, orig_alarm_dict) self._test_atomic_action_timer(self.scenario.atomic_actions(), "ceilometer.create_alarm") @@ -141,7 +141,7 @@ class CeilometerScenarioTestCase(test.ScenarioTestCase): "alarm-id", **alarm_diff) # ensure that _create_alarm() doesn't modify the alarm dict as # a side-effect - self.assertDictEqual(alarm_diff, orig_alarm_diff) + self.assertEqual(alarm_diff, orig_alarm_diff) self._test_atomic_action_timer(self.scenario.atomic_actions(), "ceilometer.update_alarm")