diff --git a/cinderclient/tests/v1/test_availability_zone.py b/cinderclient/tests/v1/test_availability_zone.py index a2e1fc8b3..62b271723 100644 --- a/cinderclient/tests/v1/test_availability_zone.py +++ b/cinderclient/tests/v1/test_availability_zone.py @@ -36,8 +36,8 @@ class AvailabilityZoneTest(utils.TestCase): cs.assert_called('GET', '/os-availability-zone') for zone in zones: - self.assertTrue(isinstance(zone, - availability_zones.AvailabilityZone)) + self.assertIsInstance(zone, + availability_zones.AvailabilityZone) self.assertEqual(2, len(zones)) @@ -57,8 +57,8 @@ class AvailabilityZoneTest(utils.TestCase): cs.assert_called('GET', '/os-availability-zone/detail') for zone in zones: - self.assertTrue(isinstance(zone, - availability_zones.AvailabilityZone)) + self.assertIsInstance(zone, + availability_zones.AvailabilityZone) self.assertEqual(3, len(zones)) diff --git a/cinderclient/tests/v1/test_services.py b/cinderclient/tests/v1/test_services.py index de8993505..56d20034b 100644 --- a/cinderclient/tests/v1/test_services.py +++ b/cinderclient/tests/v1/test_services.py @@ -27,27 +27,27 @@ class ServicesTest(utils.TestCase): svs = cs.services.list() cs.assert_called('GET', '/os-services') self.assertEqual(len(svs), 3) - [self.assertTrue(isinstance(s, services.Service)) for s in svs] + [self.assertIsInstance(s, services.Service) for s in svs] def test_list_services_with_hostname(self): svs = cs.services.list(host='host2') cs.assert_called('GET', '/os-services?host=host2') self.assertEqual(len(svs), 2) - [self.assertTrue(isinstance(s, services.Service)) for s in svs] + [self.assertIsInstance(s, services.Service) for s in svs] [self.assertEqual(s.host, 'host2') for s in svs] def test_list_services_with_binary(self): svs = cs.services.list(binary='cinder-volume') cs.assert_called('GET', '/os-services?binary=cinder-volume') self.assertEqual(len(svs), 2) - [self.assertTrue(isinstance(s, services.Service)) for s in svs] + [self.assertIsInstance(s, services.Service) for s in svs] [self.assertEqual(s.binary, 'cinder-volume') for s in svs] def test_list_services_with_host_binary(self): svs = cs.services.list('host2', 'cinder-volume') cs.assert_called('GET', '/os-services?host=host2&binary=cinder-volume') self.assertEqual(len(svs), 1) - [self.assertTrue(isinstance(s, services.Service)) for s in svs] + [self.assertIsInstance(s, services.Service) for s in svs] [self.assertEqual(s.host, 'host2') for s in svs] [self.assertEqual(s.binary, 'cinder-volume') for s in svs] @@ -55,12 +55,12 @@ class ServicesTest(utils.TestCase): s = cs.services.enable('host1', 'cinder-volume') values = {"host": "host1", 'binary': 'cinder-volume'} cs.assert_called('PUT', '/os-services/enable', values) - self.assertTrue(isinstance(s, services.Service)) + self.assertIsInstance(s, services.Service) self.assertEqual(s.status, 'enabled') def test_services_disable(self): s = cs.services.disable('host1', 'cinder-volume') values = {"host": "host1", 'binary': 'cinder-volume'} cs.assert_called('PUT', '/os-services/disable', values) - self.assertTrue(isinstance(s, services.Service)) + self.assertIsInstance(s, services.Service) self.assertEqual(s.status, 'disabled') diff --git a/cinderclient/tests/v1/test_types.py b/cinderclient/tests/v1/test_types.py index 6212336b5..90ba77541 100644 --- a/cinderclient/tests/v1/test_types.py +++ b/cinderclient/tests/v1/test_types.py @@ -23,12 +23,12 @@ class TypesTest(utils.TestCase): tl = cs.volume_types.list() cs.assert_called('GET', '/types') for t in tl: - self.assertTrue(isinstance(t, volume_types.VolumeType)) + self.assertIsInstance(t, volume_types.VolumeType) def test_create(self): t = cs.volume_types.create('test-type-3') cs.assert_called('POST', '/types') - self.assertTrue(isinstance(t, volume_types.VolumeType)) + self.assertIsInstance(t, volume_types.VolumeType) def test_set_key(self): t = cs.volume_types.get(1) diff --git a/cinderclient/tests/v2/test_availability_zone.py b/cinderclient/tests/v2/test_availability_zone.py index a2e1fc8b3..62b271723 100644 --- a/cinderclient/tests/v2/test_availability_zone.py +++ b/cinderclient/tests/v2/test_availability_zone.py @@ -36,8 +36,8 @@ class AvailabilityZoneTest(utils.TestCase): cs.assert_called('GET', '/os-availability-zone') for zone in zones: - self.assertTrue(isinstance(zone, - availability_zones.AvailabilityZone)) + self.assertIsInstance(zone, + availability_zones.AvailabilityZone) self.assertEqual(2, len(zones)) @@ -57,8 +57,8 @@ class AvailabilityZoneTest(utils.TestCase): cs.assert_called('GET', '/os-availability-zone/detail') for zone in zones: - self.assertTrue(isinstance(zone, - availability_zones.AvailabilityZone)) + self.assertIsInstance(zone, + availability_zones.AvailabilityZone) self.assertEqual(3, len(zones)) diff --git a/cinderclient/tests/v2/test_services.py b/cinderclient/tests/v2/test_services.py index 07a238983..1636d9a52 100644 --- a/cinderclient/tests/v2/test_services.py +++ b/cinderclient/tests/v2/test_services.py @@ -27,27 +27,27 @@ class ServicesTest(utils.TestCase): svs = cs.services.list() cs.assert_called('GET', '/os-services') self.assertEqual(len(svs), 3) - [self.assertTrue(isinstance(s, services.Service)) for s in svs] + [self.assertIsInstance(s, services.Service) for s in svs] def test_list_services_with_hostname(self): svs = cs.services.list(host='host2') cs.assert_called('GET', '/os-services?host=host2') self.assertEqual(len(svs), 2) - [self.assertTrue(isinstance(s, services.Service)) for s in svs] + [self.assertIsInstance(s, services.Service) for s in svs] [self.assertEqual(s.host, 'host2') for s in svs] def test_list_services_with_binary(self): svs = cs.services.list(binary='cinder-volume') cs.assert_called('GET', '/os-services?binary=cinder-volume') self.assertEqual(len(svs), 2) - [self.assertTrue(isinstance(s, services.Service)) for s in svs] + [self.assertIsInstance(s, services.Service) for s in svs] [self.assertEqual(s.binary, 'cinder-volume') for s in svs] def test_list_services_with_host_binary(self): svs = cs.services.list('host2', 'cinder-volume') cs.assert_called('GET', '/os-services?host=host2&binary=cinder-volume') self.assertEqual(len(svs), 1) - [self.assertTrue(isinstance(s, services.Service)) for s in svs] + [self.assertIsInstance(s, services.Service) for s in svs] [self.assertEqual(s.host, 'host2') for s in svs] [self.assertEqual(s.binary, 'cinder-volume') for s in svs] @@ -55,12 +55,12 @@ class ServicesTest(utils.TestCase): s = cs.services.enable('host1', 'cinder-volume') values = {"host": "host1", 'binary': 'cinder-volume'} cs.assert_called('PUT', '/os-services/enable', values) - self.assertTrue(isinstance(s, services.Service)) + self.assertIsInstance(s, services.Service) self.assertEqual(s.status, 'enabled') def test_services_disable(self): s = cs.services.disable('host1', 'cinder-volume') values = {"host": "host1", 'binary': 'cinder-volume'} cs.assert_called('PUT', '/os-services/disable', values) - self.assertTrue(isinstance(s, services.Service)) + self.assertIsInstance(s, services.Service) self.assertEqual(s.status, 'disabled') diff --git a/cinderclient/tests/v2/test_types.py b/cinderclient/tests/v2/test_types.py index 70fbaebec..2cfcce729 100644 --- a/cinderclient/tests/v2/test_types.py +++ b/cinderclient/tests/v2/test_types.py @@ -26,12 +26,12 @@ class TypesTest(utils.TestCase): tl = cs.volume_types.list() cs.assert_called('GET', '/types') for t in tl: - self.assertTrue(isinstance(t, volume_types.VolumeType)) + self.assertIsInstance(t, volume_types.VolumeType) def test_create(self): t = cs.volume_types.create('test-type-3') cs.assert_called('POST', '/types') - self.assertTrue(isinstance(t, volume_types.VolumeType)) + self.assertIsInstance(t, volume_types.VolumeType) def test_set_key(self): t = cs.volume_types.get(1)