diff --git a/troveclient/tests/test_backups.py b/troveclient/tests/test_backups.py index 34b2e5a1..a7dd0854 100644 --- a/troveclient/tests/test_backups.py +++ b/troveclient/tests/test_backups.py @@ -38,7 +38,7 @@ class BackupTest(testtools.TestCase): super(BackupTest, self).tearDown() def test___repr__(self): - self.assertEqual(repr(self.backup), '') + self.assertEqual('', repr(self.backup)) class BackupManagerTest(testtools.TestCase): diff --git a/troveclient/tests/test_base.py b/troveclient/tests/test_base.py index 223aa3f6..c187e566 100644 --- a/troveclient/tests/test_base.py +++ b/troveclient/tests/test_base.py @@ -296,20 +296,20 @@ class MangerPaginationTests(ManagerTest): def test_pagination(self): resp = self.manager._paginated(self.url, self.response_key) self.manager.api.client.get.assert_called_with(self.url) - self.assertEqual(resp.items[0].foo, 'p1') - self.assertEqual(resp.items[1].foo, 'p2') - self.assertEqual(resp.next, self.marker) - self.assertEqual(resp.links, self.links) + self.assertEqual('p1', resp.items[0].foo) + self.assertEqual('p2', resp.items[1].foo) + self.assertEqual(self.marker, resp.next) + self.assertEqual(self.links, resp.links) self.assertTrue(isinstance(resp, common.Paginated)) def test_pagination_next(self): resp = self.manager._paginated(self.url, self.response_key, limit=self.limit, marker=self.marker) self.manager.api.client.get.assert_called_with(self.next_url) - self.assertEqual(resp.items[0].foo, 'p3') - self.assertEqual(resp.items[1].foo, 'p4') - self.assertEqual(resp.next, None) - self.assertEqual(resp.links, []) + self.assertEqual('p3', resp.items[0].foo) + self.assertEqual('p4', resp.items[1].foo) + self.assertEqual(None, resp.next) + self.assertEqual([], resp.links) self.assertTrue(isinstance(resp, common.Paginated)) def test_pagination_error(self): @@ -364,23 +364,23 @@ class FindResourceTestCase(testtools.TestCase): def test_find_by_integer_id(self): output = utils.find_resource(self.manager, 1234) - self.assertEqual(output, self.manager.get('1234')) + self.assertEqual(self.manager.get('1234'), output) def test_find_by_str_id(self): output = utils.find_resource(self.manager, '1234') - self.assertEqual(output, self.manager.get('1234')) + self.assertEqual(self.manager.get('1234'), output) def test_find_by_uuid(self): output = utils.find_resource(self.manager, UUID) - self.assertEqual(output, self.manager.get(UUID)) + self.assertEqual(self.manager.get(UUID), output) def test_find_by_str_name(self): output = utils.find_resource(self.manager, 'entity_one') - self.assertEqual(output, self.manager.get('1234')) + self.assertEqual(self.manager.get('1234'), output) def test_find_by_str_displayname(self): output = utils.find_resource(self.manager, 'entity_three') - self.assertEqual(output, self.manager.get('4242')) + self.assertEqual(self.manager.get('4242'), output) class ResourceTest(testtools.TestCase): diff --git a/troveclient/tests/test_common.py b/troveclient/tests/test_common.py index 7739eff8..221865e8 100644 --- a/troveclient/tests/test_common.py +++ b/troveclient/tests/test_common.py @@ -44,7 +44,7 @@ class CommonTest(testtools.TestCase): self.assertTrue(result.startswith(url + '?')) self.assertIn("limit=%s" % limit, result) self.assertIn("marker=%s" % marker, result) - self.assertEqual(result.count('&'), 1) + self.assertEqual(1, result.count('&')) opts = {} self.assertEqual(url, common.append_query_strings( @@ -54,7 +54,7 @@ class CommonTest(testtools.TestCase): result = common.append_query_strings(url, limit=None, marker=marker, **opts) self.assertTrue(result.startswith(url + '?')) - self.assertEqual(result.count('&'), 1) + self.assertEqual(1, result.count('&')) self.assertNotIn("limit=%s" % limit, result) self.assertIn("marker=%s" % marker, result) self.assertIn("key1=%s" % opts['key1'], result)