From 6d9a45bf16ecec3944984f6218b822c55f5e4862 Mon Sep 17 00:00:00 2001 From: "sonu.kumar" Date: Tue, 13 Oct 2015 13:20:36 +0530 Subject: [PATCH] Fixes order of argument in assertEqual Some tests in designateclient used incorrect argument order in assertEqual(observed, expected). The correct order expected by testtools is assertEqual(expected, observed). Partial-Bug: #1259292 Change-Id: Icc53b2f21e557170a61ceb52cd6f04c31e3b8425 --- .../functionaltests/v2/test_zone.py | 56 +++++++++---------- designateclient/tests/base.py | 2 +- designateclient/tests/test_v1/test_client.py | 2 +- designateclient/tests/test_v1/test_quotas.py | 2 +- designateclient/tests/v2/test_timeout.py | 20 +++---- 5 files changed, 41 insertions(+), 41 deletions(-) diff --git a/designateclient/functionaltests/v2/test_zone.py b/designateclient/functionaltests/v2/test_zone.py index 6ce8fd8..dd586aa 100644 --- a/designateclient/functionaltests/v2/test_zone.py +++ b/designateclient/functionaltests/v2/test_zone.py @@ -37,21 +37,21 @@ class TestZone(BaseDesignateTest): def test_zone_create_and_show(self): zone = self.clients.zone_show(self.zone.id) self.assertTrue(hasattr(zone, 'action')) - self.assertEqual(zone.created_at, self.zone.created_at) - self.assertEqual(zone.description, self.zone.description) - self.assertEqual(zone.email, self.zone.email) - self.assertEqual(zone.id, self.zone.id) - self.assertEqual(zone.masters, self.zone.masters) - self.assertEqual(zone.name, self.zone.name) - self.assertEqual(zone.pool_id, self.zone.pool_id) - self.assertEqual(zone.project_id, self.zone.project_id) - self.assertEqual(zone.serial, self.zone.serial) + self.assertEqual(self.zone.created_at, zone.created_at) + self.assertEqual(self.zone.description, zone.description) + self.assertEqual(self.zone.email, zone.email) + self.assertEqual(self.zone.id, zone.id) + self.assertEqual(self.zone.masters, zone.masters) + self.assertEqual(self.zone.name, zone.name) + self.assertEqual(self.zone.pool_id, zone.pool_id) + self.assertEqual(self.zone.project_id, zone.project_id) + self.assertEqual(self.zone.serial, zone.serial) self.assertTrue(hasattr(zone, 'status')) - self.assertEqual(zone.transferred_at, self.zone.transferred_at) - self.assertEqual(zone.ttl, self.zone.ttl) - self.assertEqual(zone.type, self.zone.type) - self.assertEqual(zone.updated_at, self.zone.updated_at) - self.assertEqual(zone.version, self.zone.version) + self.assertEqual(self.zone.transferred_at, zone.transferred_at) + self.assertEqual(self.zone.ttl, zone.ttl) + self.assertEqual(self.zone.type, zone.type) + self.assertEqual(self.zone.updated_at, zone.updated_at) + self.assertEqual(self.zone.version, zone.version) def test_zone_delete(self): self.clients.zone_delete(self.zone.id) @@ -64,9 +64,9 @@ class TestZone(BaseDesignateTest): zone = self.clients.zone_set(self.zone.id, ttl=ttl, email=email, description=description) - self.assertEqual(int(zone.ttl), ttl) - self.assertEqual(zone.email, email) - self.assertEqual(zone.description, description) + self.assertEqual(ttl, int(zone.ttl)) + self.assertEqual(email, zone.email) + self.assertEqual(description, zone.description) def test_invalid_option_on_zone_create(self): cmd = 'zone create %s --invalid "not a valid option"'.format( @@ -90,11 +90,11 @@ class TestsPassingZoneFlags(BaseDesignateTest): type='PRIMARY', )) zone = fixture.zone - self.assertEqual(zone.name, zone_name) - self.assertEqual(zone.email, 'primary@example.com') - self.assertEqual(zone.description, 'A primary zone') - self.assertEqual(zone.ttl, '2345') - self.assertEqual(zone.type, 'PRIMARY') + self.assertEqual(zone_name, zone.name) + self.assertEqual('primary@example.com', zone.email) + self.assertEqual('A primary zone', zone.description) + self.assertEqual('2345', zone.ttl) + self.assertEqual('PRIMARY', zone.type) def test_zone_create_secondary_with_all_args(self): zone_name = random_zone_name() @@ -105,10 +105,10 @@ class TestsPassingZoneFlags(BaseDesignateTest): masters='127.0.0.1', )) zone = fixture.zone - self.assertEqual(zone.name, zone_name) - self.assertEqual(zone.description, 'A secondary zone') - self.assertEqual(zone.type, 'SECONDARY') - self.assertEqual(zone.masters, '127.0.0.1') + self.assertEqual(zone_name, zone.name) + self.assertEqual('A secondary zone', zone.description) + self.assertEqual('SECONDARY', zone.type) + self.assertEqual('127.0.0.1', zone.masters) def test_zone_set_secondary_masters(self): fixture = self.useFixture(ZoneFixture( @@ -118,7 +118,7 @@ class TestsPassingZoneFlags(BaseDesignateTest): masters='127.0.0.1', )) zone = fixture.zone - self.assertEqual(zone.masters, '127.0.0.1') + self.assertEqual('127.0.0.1', zone.masters) zone = self.clients.zone_set(zone.id, masters='127.0.0.2') - self.assertEqual(zone.masters, '127.0.0.2') + self.assertEqual('127.0.0.2', zone.masters) diff --git a/designateclient/tests/base.py b/designateclient/tests/base.py index 0e44984..c0f923c 100644 --- a/designateclient/tests/base.py +++ b/designateclient/tests/base.py @@ -143,4 +143,4 @@ class APITestCase(TestCase): The request must have already been made. """ headers = self.requests.last_request.headers - self.assertEqual(headers.get(name), val) + self.assertEqual(val, headers.get(name)) diff --git a/designateclient/tests/test_v1/test_client.py b/designateclient/tests/test_v1/test_client.py index 015e56b..0cf45b2 100644 --- a/designateclient/tests/test_v1/test_client.py +++ b/designateclient/tests/test_v1/test_client.py @@ -121,4 +121,4 @@ class TestClient(test_v1.APIV1TestCase): session=session, timeout=2, ) - self.assertEqual(client.session.timeout, 2) + self.assertEqual(2, client.session.timeout) diff --git a/designateclient/tests/test_v1/test_quotas.py b/designateclient/tests/test_v1/test_quotas.py index f818b29..4e73940 100644 --- a/designateclient/tests/test_v1/test_quotas.py +++ b/designateclient/tests/test_v1/test_quotas.py @@ -29,7 +29,7 @@ class TestQuota(test_v1.APIV1TestCase, test_v1.CrudMixin): "domain_recordsets": 500} quota_get.return_value = QUOTA response = self.client.quotas.get("foo") - self.assertEqual(response, QUOTA) + self.assertEqual(QUOTA, response) @patch.object(quotas.QuotasController, "update") def test_update(self, quota_update): diff --git a/designateclient/tests/v2/test_timeout.py b/designateclient/tests/v2/test_timeout.py index 3bdcb1b..b1cfaa7 100644 --- a/designateclient/tests/v2/test_timeout.py +++ b/designateclient/tests/v2/test_timeout.py @@ -72,38 +72,38 @@ class TestTimeout(v2.APIV2TestCase, v2.CrudMixin): if timeout is None: self.assertFalse('timeout' in kw) else: - self.assertEqual(kw['timeout'], timeout) + self.assertEqual(timeout, kw['timeout']) def test_no_timeout(self): session = create_session(timeout=None) client = Client(session=session) - self.assertEqual(session.timeout, None) - self.assertEqual(client.session.timeout, None) + self.assertEqual(None, session.timeout) + self.assertEqual(None, client.session.timeout) self._call_request_and_check_timeout(client, None) def test_timeout_in_session(self): session = create_session(timeout=1) client = Client(session=session) - self.assertEqual(session.timeout, 1) - self.assertEqual(client.session.timeout, None) + self.assertEqual(1, session.timeout) + self.assertEqual(None, client.session.timeout) self._call_request_and_check_timeout(client, 1) def test_timeout_override_session_timeout(self): # The adapter timeout should override the session timeout session = create_session(timeout=10) - self.assertEqual(session.timeout, 10) + self.assertEqual(10, session.timeout) client = Client(session=session, timeout=2) - self.assertEqual(client.session.timeout, 2) + self.assertEqual(2, client.session.timeout) self._call_request_and_check_timeout(client, 2) def test_timeout_update(self): session = create_session(timeout=1) client = Client(session=session) - self.assertEqual(session.timeout, 1) - self.assertEqual(client.session.timeout, None) + self.assertEqual(1, session.timeout) + self.assertEqual(None, client.session.timeout) self._call_request_and_check_timeout(client, 1) session.timeout = 2 - self.assertEqual(session.timeout, 2) + self.assertEqual(2, session.timeout) self._call_request_and_check_timeout(client, 2)