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

@@ -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 = (

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)

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)