Merge "Change assertTrue(isinstance()) by optimal assert"
This commit is contained in:
commit
1fc1bb2dcb
|
@ -77,7 +77,7 @@ class AccountsTest(testtools.TestCase):
|
||||||
self.accounts.api.client.get = mock.Mock(return_value=(resp, body))
|
self.accounts.api.client.get = mock.Mock(return_value=(resp, body))
|
||||||
self.assertRaises(Exception, self.accounts.index)
|
self.assertRaises(Exception, self.accounts.index)
|
||||||
resp.status_code = 200
|
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.accounts.api.client.get = mock.Mock(return_value=(resp, None))
|
||||||
self.assertRaises(Exception, self.accounts.index)
|
self.assertRaises(Exception, self.accounts.index)
|
||||||
|
|
||||||
|
|
|
@ -293,7 +293,7 @@ class MangerPaginationTests(ManagerTest):
|
||||||
self.assertEqual('p2', resp.items[1].foo)
|
self.assertEqual('p2', resp.items[1].foo)
|
||||||
self.assertEqual(self.marker, resp.next)
|
self.assertEqual(self.marker, resp.next)
|
||||||
self.assertEqual(self.links, resp.links)
|
self.assertEqual(self.links, resp.links)
|
||||||
self.assertTrue(isinstance(resp, common.Paginated))
|
self.assertIsInstance(resp, common.Paginated)
|
||||||
|
|
||||||
def test_pagination_next(self):
|
def test_pagination_next(self):
|
||||||
resp = self.manager._paginated(self.url, self.response_key,
|
resp = self.manager._paginated(self.url, self.response_key,
|
||||||
|
@ -303,7 +303,7 @@ class MangerPaginationTests(ManagerTest):
|
||||||
self.assertEqual('p4', resp.items[1].foo)
|
self.assertEqual('p4', resp.items[1].foo)
|
||||||
self.assertIsNone(resp.next)
|
self.assertIsNone(resp.next)
|
||||||
self.assertEqual([], resp.links)
|
self.assertEqual([], resp.links)
|
||||||
self.assertTrue(isinstance(resp, common.Paginated))
|
self.assertIsInstance(resp, common.Paginated)
|
||||||
|
|
||||||
def test_pagination_error(self):
|
def test_pagination_error(self):
|
||||||
self.manager.api.client.get = mock.Mock(return_value=(None, None))
|
self.manager.api.client.get = mock.Mock(return_value=(None, None))
|
||||||
|
|
|
@ -94,7 +94,7 @@ class ManagementTest(testtools.TestCase):
|
||||||
self.management.api.client.get = mock.Mock(return_value=('resp', body))
|
self.management.api.client.get = mock.Mock(return_value=('resp', body))
|
||||||
management.RootHistory.__init__ = mock.Mock(return_value=None)
|
management.RootHistory.__init__ = mock.Mock(return_value=None)
|
||||||
rh = self.management.root_enabled_history("instance")
|
rh = self.management.root_enabled_history("instance")
|
||||||
self.assertTrue(isinstance(rh, management.RootHistory))
|
self.assertIsInstance(rh, management.RootHistory)
|
||||||
|
|
||||||
def test__action(self):
|
def test__action(self):
|
||||||
resp = mock.Mock()
|
resp = mock.Mock()
|
||||||
|
|
Loading…
Reference in New Issue