diff --git a/manila/test.py b/manila/test.py index 216dba1b88..2ceb6fdfab 100644 --- a/manila/test.py +++ b/manila/test.py @@ -328,7 +328,7 @@ class TestCase(base_test.BaseTestCase): try: f = super(TestCase, self).assertIsInstance except AttributeError: - self.assertTrue(isinstance(a, b)) + self.assertIsInstance(a, b) else: f(a, b, *args, **kwargs) diff --git a/manila/tests/api/v1/test_scheduler_stats.py b/manila/tests/api/v1/test_scheduler_stats.py index a38dd263c1..89aaa313e5 100644 --- a/manila/tests/api/v1/test_scheduler_stats.py +++ b/manila/tests/api/v1/test_scheduler_stats.py @@ -193,5 +193,5 @@ class SchedulerStatsTestCase(test.TestCase): def test_create_resource(self): result = scheduler_stats.create_resource() - self.assertTrue(isinstance(result.controller, - scheduler_stats.SchedulerStatsController)) \ No newline at end of file + self.assertIsInstance(result.controller, + scheduler_stats.SchedulerStatsController) diff --git a/manila/tests/api/v2/test_availability_zones.py b/manila/tests/api/v2/test_availability_zones.py index b0721833f3..60f1441a38 100644 --- a/manila/tests/api/v2/test_availability_zones.py +++ b/manila/tests/api/v2/test_availability_zones.py @@ -76,9 +76,9 @@ class AvailabilityZonesAPITest(test.TestCase): assert_called_once_with(ctxt) mock_policy_check.assert_called_once_with( ctxt, controller.resource_name, 'index') - self.assertTrue(isinstance(result, dict)) + self.assertIsInstance(result, dict) self.assertEqual(["availability_zones"], list(result.keys())) - self.assertTrue(isinstance(result["availability_zones"], list)) + self.assertIsInstance(result["availability_zones"], list) self.assertEqual(2, len(result["availability_zones"])) self.assertTrue(azs[0] in result["availability_zones"]) azs[1].pop("deleted") diff --git a/manila/tests/compute/test_nova.py b/manila/tests/compute/test_nova.py index 6059f93a79..ee2fa0c08e 100644 --- a/manila/tests/compute/test_nova.py +++ b/manila/tests/compute/test_nova.py @@ -243,7 +243,7 @@ class NovaApiTestCase(test.TestCase): def test_fixed_ip_get(self): fixed_ip = 'fake_fixed_ip' result = self.api.fixed_ip_get(self.ctx, fixed_ip) - self.assertTrue(isinstance(result, dict)) + self.assertIsInstance(result, dict) self.assertEqual(fixed_ip, result['address']) def test_fixed_ip_reserve(self): @@ -259,7 +259,7 @@ class NovaApiTestCase(test.TestCase): def test_network_get(self): net_id = 'fake_net_id' net = self.api.network_get(self.ctx, net_id) - self.assertTrue(isinstance(net, dict)) + self.assertIsInstance(net, dict) self.assertEqual(net_id, net['id']) diff --git a/manila/tests/scheduler/test_host_manager.py b/manila/tests/scheduler/test_host_manager.py index fcb1ada6f5..5042c4e1e6 100644 --- a/manila/tests/scheduler/test_host_manager.py +++ b/manila/tests/scheduler/test_host_manager.py @@ -248,7 +248,7 @@ class HostManagerTestCase(test.TestCase): }, }, ] - self.assertTrue(isinstance(res, list)) + self.assertIsInstance(res, list) self.assertEqual(len(expected), len(res)) for pool in expected: self.assertIn(pool, res) @@ -389,8 +389,8 @@ class HostManagerTestCase(test.TestCase): }, }, ] - self.assertTrue(isinstance(res, list)) - self.assertTrue(isinstance(self.host_manager.host_state_map, dict)) + self.assertIsInstance(res, list) + self.assertIsInstance(self.host_manager.host_state_map, dict) self.assertEqual(len(expected), len(res)) for pool in expected: self.assertIn(pool, res) @@ -469,8 +469,8 @@ class HostManagerTestCase(test.TestCase): }, }, ] - self.assertTrue(isinstance(res, list)) - self.assertTrue(isinstance(self.host_manager.host_state_map, dict)) + self.assertIsInstance(res, list) + self.assertIsInstance(self.host_manager.host_state_map, dict) self.assertEqual(len(expected), len(res)) self.assertEqual(len(expected), len(self.host_manager.host_state_map)) diff --git a/manila/tests/scheduler/test_manager.py b/manila/tests/scheduler/test_manager.py index 71c853fb24..d65e0c8737 100644 --- a/manila/tests/scheduler/test_manager.py +++ b/manila/tests/scheduler/test_manager.py @@ -54,8 +54,7 @@ class SchedulerManagerTestCase(test.TestCase): def test_1_correct_init(self): # Correct scheduler driver manager = self.manager - self.assertTrue(isinstance(manager.driver, - self.driver_cls)) + self.assertIsInstance(manager.driver, self.driver_cls) @ddt.data('manila.scheduler.filter_scheduler.FilterScheduler', 'manila.scheduler.drivers.filter.FilterScheduler') @@ -63,8 +62,7 @@ class SchedulerManagerTestCase(test.TestCase): test_manager = manager.SchedulerManager(scheduler_driver=driver_class) - self.assertTrue(isinstance(test_manager.driver, - filter.FilterScheduler)) + self.assertIsInstance(test_manager.driver, filter.FilterScheduler) def test_init_host(self): diff --git a/manila/tests/test_quota.py b/manila/tests/test_quota.py index 694a28d4de..368551d673 100644 --- a/manila/tests/test_quota.py +++ b/manila/tests/test_quota.py @@ -257,14 +257,14 @@ class QuotaEngineTestCase(test.TestCase): quota_obj = quota.QuotaEngine() self.assertEqual({}, quota_obj._resources) - self.assertTrue(isinstance(quota_obj._driver, quota.DbQuotaDriver)) + self.assertIsInstance(quota_obj._driver, quota.DbQuotaDriver) def test_init_override_string(self): quota_obj = quota.QuotaEngine( quota_driver_class='manila.tests.test_quota.FakeDriver') self.assertEqual({}, quota_obj._resources) - self.assertTrue(isinstance(quota_obj._driver, FakeDriver)) + self.assertIsInstance(quota_obj._driver, FakeDriver) def test_init_override_obj(self): quota_obj = quota.QuotaEngine(quota_driver_class=FakeDriver) diff --git a/manila_tempest_tests/tests/api/admin/test_share_servers.py b/manila_tempest_tests/tests/api/admin/test_share_servers.py index 7cd67f8220..c7eccb1e62 100644 --- a/manila_tempest_tests/tests/api/admin/test_share_servers.py +++ b/manila_tempest_tests/tests/api/admin/test_share_servers.py @@ -196,7 +196,7 @@ class ShareServersAdminTest(base.BaseSharesAdminTest): # share_network_name is not empty self.assertTrue(len(server["share_network_name"]) > 0) # backend_details should be a dict - self.assertTrue(isinstance(server["backend_details"], dict)) + self.assertIsInstance(server["backend_details"], dict) @test.attr(type=["gate", "smoke", ]) def test_show_share_server_details(self): @@ -205,8 +205,8 @@ class ShareServersAdminTest(base.BaseSharesAdminTest): servers[0]["id"]) # If details are present they and their values should be only strings for k, v in details.iteritems(): - self.assertTrue(isinstance(k, six.string_types)) - self.assertTrue(isinstance(v, six.string_types)) + self.assertIsInstance(k, six.string_types) + self.assertIsInstance(v, six.string_types) @test.attr(type=["gate", "smoke", ]) def _delete_share_server(self, delete_share_network):