openstack
/
python-troveclient
Code Issues Proposed changes

Merge "Change assertTrue(isinstance()) by optimal assert"

This commit is contained in:
Jenkins 2016-01-08 20:28:16 +00:00 committed by Gerrit Code Review
parent 4e937833c8 6b02886348
commit 1fc1bb2dcb
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
troveclient/tests/test_accounts.py
View File

@ -77,7 +77,7 @@ class AccountsTest(testtools.TestCase):
self.accounts.api.client.get = mock.Mock(return_value=(resp, body))
self.assertRaises(Exception, self.accounts.index)
resp.status_code = 200
self.assertTrue(isinstance(self.accounts.index(), base.Resource))
self.assertIsInstance(self.accounts.index(), base.Resource)
self.accounts.api.client.get = mock.Mock(return_value=(resp, None))
self.assertRaises(Exception, self.accounts.index)

4
troveclient/tests/test_base.py
View File

@ -293,7 +293,7 @@ class MangerPaginationTests(ManagerTest):
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))
self.assertIsInstance(resp, common.Paginated)
def test_pagination_next(self):
resp = self.manager._paginated(self.url, self.response_key,
@ -303,7 +303,7 @@ class MangerPaginationTests(ManagerTest):
self.assertEqual('p4', resp.items[1].foo)
self.assertIsNone(resp.next)
self.assertEqual([], resp.links)
self.assertTrue(isinstance(resp, common.Paginated))
self.assertIsInstance(resp, common.Paginated)
def test_pagination_error(self):
self.manager.api.client.get = mock.Mock(return_value=(None, None))

2
troveclient/tests/test_management.py
View File

@ -94,7 +94,7 @@ class ManagementTest(testtools.TestCase):
self.management.api.client.get = mock.Mock(return_value=('resp', body))
management.RootHistory.__init__ = mock.Mock(return_value=None)
rh = self.management.root_enabled_history("instance")
self.assertTrue(isinstance(rh, management.RootHistory))
self.assertIsInstance(rh, management.RootHistory)
def test__action(self):
resp = mock.Mock()