From 4d8c7e058b0f158ac62efeeef2285c6e1c6c0390 Mon Sep 17 00:00:00 2001 From: gecong1973 Date: Mon, 19 Dec 2016 10:56:43 +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: I71508671b5a88640a8f337410566ca2889411c9e --- os_win/tests/unit/test_utils.py | 4 ++-- os_win/tests/unit/utils/compute/test_clusapi_utils.py | 2 +- os_win/tests/unit/utils/dns/test_dnsutils.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/os_win/tests/unit/test_utils.py b/os_win/tests/unit/test_utils.py index b6e2cc6f..f8db88c8 100644 --- a/os_win/tests/unit/test_utils.py +++ b/os_win/tests/unit/test_utils.py @@ -209,8 +209,8 @@ class UtilsTestCase(base.BaseTestCase): def fake_blocking_func(*args, **kwargs): self.assertEqual((mock.sentinel.arg, ), args) - self.assertDictEqual(dict(kwarg=mock.sentinel.kwarg), - kwargs) + self.assertEqual(dict(kwarg=mock.sentinel.kwarg), + kwargs) return mock.sentinel.ret_val fake_blocking_func_decorated = ( diff --git a/os_win/tests/unit/utils/compute/test_clusapi_utils.py b/os_win/tests/unit/utils/compute/test_clusapi_utils.py index c990380f..73ae9e74 100644 --- a/os_win/tests/unit/utils/compute/test_clusapi_utils.py +++ b/os_win/tests/unit/utils/compute/test_clusapi_utils.py @@ -266,4 +266,4 @@ class ClusApiUtilsTestCase(test_base.OsWinBaseTestCase): mock.sentinel.group_handle) expected_state_info = dict(state=mock.sentinel.group_state, owner_node=owner_node) - self.assertDictEqual(expected_state_info, state_info) + self.assertEqual(expected_state_info, state_info) diff --git a/os_win/tests/unit/utils/dns/test_dnsutils.py b/os_win/tests/unit/utils/dns/test_dnsutils.py index 8b893085..d1291cc4 100644 --- a/os_win/tests/unit/utils/dns/test_dnsutils.py +++ b/os_win/tests/unit/utils/dns/test_dnsutils.py @@ -125,7 +125,7 @@ class DNSUtilsTestCase(test_base.OsWinBaseTestCase): 'master_servers': [mock.sentinel.ip_addrs], 'data_file_name': mock.sentinel.data_file_name } - self.assertDictEqual(expected_zone_props, zone_properties) + self.assertEqual(expected_zone_props, zone_properties) mock_get_zone.assert_called_once_with(mock.sentinel.zone_name, ignore_missing=False)