From 0961c864aecc34ebfb37dc613f08084f46b0a4a3 Mon Sep 17 00:00:00 2001 From: lei-zhang-99cloud Date: Sat, 10 Oct 2015 18:41:59 +0800 Subject: [PATCH] Fix order of arguments in assertEqual MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some tests used incorrect order assertEqual(observed, expected). The correct order expected by testtools is assertEqual(expected, observed). This patch fix the issue in the modules magnum/tests/unit/db/. 、 magnum/tests/unit/object/. and magnum/tests/unit/service/. modules. Change-Id: If193d8904ac4e4637e3ad97c8050696661cd6112 Partial-Bug: #1259292 --- magnum/tests/unit/db/test_magnum_service.py | 10 ++-- magnum/tests/unit/objects/test_bay.py | 6 +-- magnum/tests/unit/objects/test_baymodel.py | 2 +- magnum/tests/unit/objects/test_container.py | 2 +- magnum/tests/unit/objects/test_node.py | 2 +- magnum/tests/unit/objects/test_objects.py | 50 +++++++++---------- magnum/tests/unit/objects/test_pod.py | 2 +- .../objects/test_replicationcontroller.py | 2 +- magnum/tests/unit/objects/test_service.py | 2 +- magnum/tests/unit/objects/test_x509keypair.py | 6 +-- magnum/tests/unit/service/test_periodic.py | 38 +++++++------- 11 files changed, 61 insertions(+), 61 deletions(-) diff --git a/magnum/tests/unit/db/test_magnum_service.py b/magnum/tests/unit/db/test_magnum_service.py index 98e82bedaa..b0cf71cc36 100644 --- a/magnum/tests/unit/db/test_magnum_service.py +++ b/magnum/tests/unit/db/test_magnum_service.py @@ -38,7 +38,7 @@ class DbMagnumServiceTestCase(base.DbTestCase): utils.create_test_magnum_service() res = self.dbapi.get_magnum_service_by_host_and_binary( self.context, 'fakehost1', 'fake-bin1') - self.assertEqual(res, None) + self.assertIsNone(res) def test_update_magnum_service(self): ms = utils.create_test_magnum_service() @@ -46,11 +46,11 @@ class DbMagnumServiceTestCase(base.DbTestCase): update = {'disabled': d2} ms1 = self.dbapi.update_magnum_service(ms['id'], update) self.assertEqual(ms['id'], ms1['id']) - self.assertEqual(ms1['disabled'], d2) + self.assertEqual(d2, ms1['disabled']) res = self.dbapi.get_magnum_service_by_host_and_binary( self.context, 'fakehost', 'fake-bin') - self.assertEqual(res['id'], ms1['id']) - self.assertEqual(res['disabled'], d2) + self.assertEqual(ms1['id'], res['id']) + self.assertEqual(d2, res['disabled']) def test_update_magnum_service_failure(self): ms = utils.create_test_magnum_service() @@ -67,7 +67,7 @@ class DbMagnumServiceTestCase(base.DbTestCase): self.dbapi.destroy_magnum_service(ms['id']) res = self.dbapi.get_magnum_service_by_host_and_binary( self.context, 'fakehost', 'fake-bin') - self.assertEqual(res, None) + self.assertIsNone(res) def test_destroy_magnum_service_failure(self): ms = utils.create_test_magnum_service() diff --git a/magnum/tests/unit/objects/test_bay.py b/magnum/tests/unit/objects/test_bay.py index c9c2a6b024..648aade302 100644 --- a/magnum/tests/unit/objects/test_bay.py +++ b/magnum/tests/unit/objects/test_bay.py @@ -65,7 +65,7 @@ class TestBayObject(base.DbTestCase): autospec=True) as mock_get_list: mock_get_list.return_value = [self.fake_bay] bays = objects.Bay.list(self.context) - self.assertEqual(mock_get_list.call_count, 1) + self.assertEqual(1, mock_get_list.call_count) self.assertThat(bays, HasLength(1)) self.assertIsInstance(bays[0], objects.Bay) self.assertEqual(self.context, bays[0]._context) @@ -79,7 +79,7 @@ class TestBayObject(base.DbTestCase): mock_get_list.assert_called_once_with( self.context, limit=None, marker=None, filters=None, sort_dir=None, sort_key=None) - self.assertEqual(mock_get_list.call_count, 1) + self.assertEqual(1, mock_get_list.call_count) self.assertThat(bays, HasLength(1)) self.assertIsInstance(bays[0], objects.Bay) self.assertEqual(self.context, bays[0]._context) @@ -95,7 +95,7 @@ class TestBayObject(base.DbTestCase): sort_dir=None, filters=filters, limit=None, marker=None) - self.assertEqual(mock_get_list.call_count, 1) + self.assertEqual(1, mock_get_list.call_count) self.assertThat(bays, HasLength(1)) self.assertIsInstance(bays[0], objects.Bay) self.assertEqual(self.context, bays[0]._context) diff --git a/magnum/tests/unit/objects/test_baymodel.py b/magnum/tests/unit/objects/test_baymodel.py index b14c320f65..8ef4af4690 100644 --- a/magnum/tests/unit/objects/test_baymodel.py +++ b/magnum/tests/unit/objects/test_baymodel.py @@ -66,7 +66,7 @@ class TestBayModelObject(base.DbTestCase): autospec=True) as mock_get_list: mock_get_list.return_value = [self.fake_baymodel] baymodels = objects.BayModel.list(self.context) - self.assertEqual(mock_get_list.call_count, 1) + self.assertEqual(1, mock_get_list.call_count) self.assertThat(baymodels, HasLength(1)) self.assertIsInstance(baymodels[0], objects.BayModel) self.assertEqual(self.context, baymodels[0]._context) diff --git a/magnum/tests/unit/objects/test_container.py b/magnum/tests/unit/objects/test_container.py index 9408363cd7..33174350d4 100644 --- a/magnum/tests/unit/objects/test_container.py +++ b/magnum/tests/unit/objects/test_container.py @@ -62,7 +62,7 @@ class TestContainerObject(base.DbTestCase): autospec=True) as mock_get_list: mock_get_list.return_value = [self.fake_container] containers = objects.Container.list(self.context) - self.assertEqual(mock_get_list.call_count, 1) + self.assertEqual(1, mock_get_list.call_count) self.assertThat(containers, HasLength(1)) self.assertIsInstance(containers[0], objects.Container) self.assertEqual(self.context, containers[0]._context) diff --git a/magnum/tests/unit/objects/test_node.py b/magnum/tests/unit/objects/test_node.py index 56732b920d..099dcc654a 100644 --- a/magnum/tests/unit/objects/test_node.py +++ b/magnum/tests/unit/objects/test_node.py @@ -51,7 +51,7 @@ class TestNodeObject(base.DbTestCase): autospec=True) as mock_get_list: mock_get_list.return_value = [self.fake_node] nodes = objects.Node.list(self.context) - self.assertEqual(mock_get_list.call_count, 1) + self.assertEqual(1, mock_get_list.call_count) self.assertThat(nodes, HasLength(1)) self.assertIsInstance(nodes[0], objects.Node) self.assertEqual(self.context, nodes[0]._context) diff --git a/magnum/tests/unit/objects/test_objects.py b/magnum/tests/unit/objects/test_objects.py index 40894a18f5..56e7523f87 100644 --- a/magnum/tests/unit/objects/test_objects.py +++ b/magnum/tests/unit/objects/test_objects.py @@ -98,39 +98,39 @@ class TestUtils(test_base.TestCase): def test_datetime_or_none(self): naive_dt = datetime.datetime.now() dt = timeutils.parse_isotime(timeutils.isotime(naive_dt)) - self.assertEqual(utils.datetime_or_none(dt), dt) - self.assertEqual(utils.datetime_or_none(dt), - naive_dt.replace(tzinfo=iso8601.iso8601.Utc(), - microsecond=0)) + self.assertEqual(dt, utils.datetime_or_none(dt)) + self.assertEqual(naive_dt.replace(tzinfo=iso8601.iso8601.Utc(), + microsecond=0), + utils.datetime_or_none(dt)) self.assertIsNone(utils.datetime_or_none(None)) self.assertRaises(ValueError, utils.datetime_or_none, 'foo') def test_datetime_or_str_or_none(self): dts = timeutils.isotime() dt = timeutils.parse_isotime(dts) - self.assertEqual(utils.datetime_or_str_or_none(dt), dt) + self.assertEqual(dt, utils.datetime_or_str_or_none(dt)) self.assertIsNone(utils.datetime_or_str_or_none(None)) - self.assertEqual(utils.datetime_or_str_or_none(dts), dt) + self.assertEqual(dt, utils.datetime_or_str_or_none(dts)) self.assertRaises(ValueError, utils.datetime_or_str_or_none, 'foo') def test_int_or_none(self): - self.assertEqual(utils.int_or_none(1), 1) - self.assertEqual(utils.int_or_none('1'), 1) + self.assertEqual(1, utils.int_or_none(1)) + self.assertEqual(1, utils.int_or_none('1')) self.assertIsNone(utils.int_or_none(None)) self.assertRaises(ValueError, utils.int_or_none, 'foo') def test_str_or_none(self): class Obj(object): pass - self.assertEqual(utils.str_or_none('foo'), 'foo') - self.assertEqual(utils.str_or_none(1), '1') + self.assertEqual('foo', utils.str_or_none('foo')) + self.assertEqual('1', utils.str_or_none(1)) self.assertIsNone(utils.str_or_none(None)) def test_ip_or_none(self): ip4 = netaddr.IPAddress('1.2.3.4', 4) ip6 = netaddr.IPAddress('1::2', 6) - self.assertEqual(utils.ip_or_none(4)('1.2.3.4'), ip4) - self.assertEqual(utils.ip_or_none(6)('1::2'), ip6) + self.assertEqual(ip4, utils.ip_or_none(4)('1.2.3.4')) + self.assertEqual(ip6, utils.ip_or_none(6)('1::2')) self.assertIsNone(utils.ip_or_none(4)(None)) self.assertIsNone(utils.ip_or_none(6)(None)) self.assertRaises(netaddr.AddrFormatError, utils.ip_or_none(4), 'foo') @@ -150,8 +150,8 @@ class TestUtils(test_base.TestCase): def test_dt_deserializer(self): dt = timeutils.parse_isotime('1955-11-05T00:00:00Z') - self.assertEqual(utils.dt_deserializer(None, timeutils.isotime(dt)), - dt) + self.assertEqual(dt, + utils.dt_deserializer(None, timeutils.isotime(dt))) self.assertIsNone(utils.dt_deserializer(None, None)) self.assertRaises(ValueError, utils.dt_deserializer, None, 'foo') @@ -360,15 +360,15 @@ class _TestObject(object): def test_get(self): obj = MyObj(self.context, foo=1) # Foo has value, should not get the default - self.assertEqual(obj.get('foo', 2), 1) + self.assertEqual(1, obj.get('foo', 2)) # Foo has value, should return the value without error - self.assertEqual(obj.get('foo'), 1) + self.assertEqual(1, obj.get('foo')) # Bar is not loaded, so we should get the default - self.assertEqual(obj.get('bar', 'not-loaded'), 'not-loaded') + self.assertEqual('not-loaded', obj.get('bar', 'not-loaded')) # Bar without a default should lazy-load - self.assertEqual(obj.get('bar'), 'loaded!') + self.assertEqual('loaded!', obj.get('bar')) # Bar now has a default, but loaded value should be returned - self.assertEqual(obj.get('bar', 'not-loaded'), 'loaded!') + self.assertEqual('loaded!', obj.get('bar', 'not-loaded')) # Invalid attribute should raise AttributeError self.assertRaises(AttributeError, obj.get, 'nothing') # ...even with a default @@ -379,12 +379,12 @@ class _TestObject(object): myobj_fields = ['foo', 'bar', 'missing'] + base_fields myobj3_fields = ['new_field'] self.assertTrue(issubclass(TestSubclassedObject, MyObj)) - self.assertEqual(len(myobj_fields), len(MyObj.fields)) - self.assertEqual(set(myobj_fields), set(MyObj.fields.keys())) - self.assertEqual(len(myobj_fields) + len(myobj3_fields), - len(TestSubclassedObject.fields)) - self.assertEqual(set(myobj_fields) | set(myobj3_fields), - set(TestSubclassedObject.fields.keys())) + self.assertEqual(len(MyObj.fields), len(myobj_fields)) + self.assertEqual(set(MyObj.fields.keys()), set(myobj_fields)) + self.assertEqual(len(TestSubclassedObject.fields), + len(myobj_fields) + len(myobj3_fields)) + self.assertEqual(set(TestSubclassedObject.fields.keys()), + set(myobj_fields) | set(myobj3_fields)) def test_get_changes(self): obj = MyObj(self.context) diff --git a/magnum/tests/unit/objects/test_pod.py b/magnum/tests/unit/objects/test_pod.py index bf82708b4c..34879de3cb 100644 --- a/magnum/tests/unit/objects/test_pod.py +++ b/magnum/tests/unit/objects/test_pod.py @@ -60,7 +60,7 @@ class TestPodObject(base.DbTestCase): autospec=True) as mock_get_list: mock_get_list.return_value = [self.fake_pod] pods = objects.Pod.list(self.context) - self.assertEqual(mock_get_list.call_count, 1) + self.assertEqual(1, mock_get_list.call_count) self.assertThat(pods, HasLength(1)) self.assertIsInstance(pods[0], objects.Pod) self.assertEqual(self.context, pods[0]._context) diff --git a/magnum/tests/unit/objects/test_replicationcontroller.py b/magnum/tests/unit/objects/test_replicationcontroller.py index 51ac3e7a78..e0ee005c2d 100644 --- a/magnum/tests/unit/objects/test_replicationcontroller.py +++ b/magnum/tests/unit/objects/test_replicationcontroller.py @@ -63,7 +63,7 @@ class TestReplicationControllerObject(base.DbTestCase): autospec=True) as mock_get_list: mock_get_list.return_value = [self.fake_rc] rcs = objects.ReplicationController.list(self.context) - self.assertEqual(mock_get_list.call_count, 1) + self.assertEqual(1, mock_get_list.call_count) self.assertThat(rcs, HasLength(1)) self.assertIsInstance(rcs[0], objects.ReplicationController) self.assertEqual(self.context, rcs[0]._context) diff --git a/magnum/tests/unit/objects/test_service.py b/magnum/tests/unit/objects/test_service.py index 9275c5b9e8..e0fc32cc23 100644 --- a/magnum/tests/unit/objects/test_service.py +++ b/magnum/tests/unit/objects/test_service.py @@ -60,7 +60,7 @@ class TestServiceObject(base.DbTestCase): autospec=True) as mock_get_list: mock_get_list.return_value = [self.fake_service] services = objects.Service.list(self.context) - self.assertEqual(mock_get_list.call_count, 1) + self.assertEqual(1, mock_get_list.call_count) self.assertThat(services, HasLength(1)) self.assertIsInstance(services[0], objects.Service) self.assertEqual(self.context, services[0]._context) diff --git a/magnum/tests/unit/objects/test_x509keypair.py b/magnum/tests/unit/objects/test_x509keypair.py index 9d8ebc56af..6f9e9d028b 100644 --- a/magnum/tests/unit/objects/test_x509keypair.py +++ b/magnum/tests/unit/objects/test_x509keypair.py @@ -66,7 +66,7 @@ class TestX509KeyPairObject(base.DbTestCase): autospec=True) as mock_get_list: mock_get_list.return_value = [self.fake_x509keypair] x509keypairs = objects.X509KeyPair.list(self.context) - self.assertEqual(mock_get_list.call_count, 1) + self.assertEqual(1, mock_get_list.call_count) self.assertThat(x509keypairs, HasLength(1)) self.assertIsInstance(x509keypairs[0], objects.X509KeyPair) self.assertEqual(self.context, x509keypairs[0]._context) @@ -80,7 +80,7 @@ class TestX509KeyPairObject(base.DbTestCase): mock_get_list.assert_called_once_with( self.context, limit=None, marker=None, filters=None, sort_dir=None, sort_key=None) - self.assertEqual(mock_get_list.call_count, 1) + self.assertEqual(1, mock_get_list.call_count) self.assertThat(x509keypairs, HasLength(1)) self.assertIsInstance(x509keypairs[0], objects.X509KeyPair) self.assertEqual(self.context, x509keypairs[0]._context) @@ -97,7 +97,7 @@ class TestX509KeyPairObject(base.DbTestCase): sort_dir=None, filters=filters, limit=None, marker=None) - self.assertEqual(mock_get_list.call_count, 1) + self.assertEqual(1, mock_get_list.call_count) self.assertThat(x509keypairs, HasLength(1)) self.assertIsInstance(x509keypairs[0], objects.X509KeyPair) self.assertEqual(self.context, x509keypairs[0]._context) diff --git a/magnum/tests/unit/service/test_periodic.py b/magnum/tests/unit/service/test_periodic.py index f12a778e7f..a720446af9 100644 --- a/magnum/tests/unit/service/test_periodic.py +++ b/magnum/tests/unit/service/test_periodic.py @@ -94,11 +94,11 @@ class PeriodicTestCase(base.TestCase): periodic.MagnumPeriodicTasks(CONF, 'fake-conductor').sync_bay_status(None) - self.assertEqual(self.bay1.status, bay_status.CREATE_COMPLETE) - self.assertEqual(self.bay1.status_reason, 'fake_reason_11') + self.assertEqual(bay_status.CREATE_COMPLETE, self.bay1.status) + self.assertEqual('fake_reason_11', self.bay1.status_reason) mock_db_destroy.assert_called_once_with(self.bay2.uuid) - self.assertEqual(self.bay3.status, bay_status.UPDATE_COMPLETE) - self.assertEqual(self.bay3.status_reason, 'fake_reason_33') + self.assertEqual(bay_status.UPDATE_COMPLETE, self.bay3.status) + self.assertEqual('fake_reason_33', self.bay3.status_reason) @mock.patch.object(objects.Bay, 'list') @mock.patch('magnum.common.clients.OpenStackClients') @@ -117,9 +117,9 @@ class PeriodicTestCase(base.TestCase): periodic.MagnumPeriodicTasks(CONF, 'fake-conductor').sync_bay_status(None) - self.assertEqual(self.bay1.status, bay_status.CREATE_IN_PROGRESS) - self.assertEqual(self.bay2.status, bay_status.DELETE_IN_PROGRESS) - self.assertEqual(self.bay3.status, bay_status.UPDATE_IN_PROGRESS) + self.assertEqual(bay_status.CREATE_IN_PROGRESS, self.bay1.status) + self.assertEqual(bay_status.DELETE_IN_PROGRESS, self.bay2.status) + self.assertEqual(bay_status.UPDATE_IN_PROGRESS, self.bay3.status) @mock.patch.object(objects.Bay, 'list') @mock.patch('magnum.common.clients.OpenStackClients') @@ -141,13 +141,13 @@ class PeriodicTestCase(base.TestCase): periodic.MagnumPeriodicTasks(CONF, 'fake-conductor').sync_bay_status(None) - self.assertEqual(self.bay1.status, bay_status.CREATE_FAILED) - self.assertEqual(self.bay1.status_reason, 'Stack with id 11 not ' - 'found in Heat.') + self.assertEqual(bay_status.CREATE_FAILED, self.bay1.status) + self.assertEqual('Stack with id 11 not found in Heat.', + self.bay1.status_reason) mock_db_destroy.assert_called_once_with(self.bay2.uuid) - self.assertEqual(self.bay3.status, bay_status.UPDATE_FAILED) - self.assertEqual(self.bay3.status_reason, 'Stack with id 33 not ' - 'found in Heat.') + self.assertEqual(bay_status.UPDATE_FAILED, self.bay3.status) + self.assertEqual('Stack with id 33 not found in Heat.', + self.bay3.status_reason) @mock.patch.object(objects.MagnumService, 'get_by_host_and_binary') @mock.patch.object(objects.MagnumService, 'create') @@ -230,7 +230,7 @@ class PeriodicTestCase(base.TestCase): 'metrics': expected_metrics } - self.assertEqual(mock_create_monitor.call_count, 1) + self.assertEqual(1, mock_create_monitor.call_count) notifier.info.assert_called_once_with( self.context, expected_event_type, expected_msg) @@ -261,7 +261,7 @@ class PeriodicTestCase(base.TestCase): 'resource_id': self.bay4.uuid, 'metrics': [] } - self.assertEqual(mock_create_monitor.call_count, 1) + self.assertEqual(1, mock_create_monitor.call_count) notifier.info.assert_called_once_with( self.context, expected_event_type, expected_msg) @@ -283,8 +283,8 @@ class PeriodicTestCase(base.TestCase): periodic.MagnumPeriodicTasks( CONF, 'fake-conductor')._send_bay_metrics(self.context) - self.assertEqual(mock_create_monitor.call_count, 1) - self.assertEqual(notifier.info.call_count, 0) + self.assertEqual(1, mock_create_monitor.call_count) + self.assertEqual(0, notifier.info.call_count) @mock.patch('magnum.conductor.monitors.create_monitor') @mock.patch('magnum.objects.Bay.list') @@ -302,5 +302,5 @@ class PeriodicTestCase(base.TestCase): periodic.MagnumPeriodicTasks( CONF, 'fake-conductor')._send_bay_metrics(self.context) - self.assertEqual(mock_create_monitor.call_count, 1) - self.assertEqual(notifier.info.call_count, 0) + self.assertEqual(1, mock_create_monitor.call_count) + self.assertEqual(0, notifier.info.call_count)