From 9b561506d5f995906953182f0ef9c857c3ccf18b Mon Sep 17 00:00:00 2001 From: Ji-Wei Date: Thu, 1 Sep 2016 18:26:14 +0800 Subject: [PATCH] Change assertTrue(isinstance()) with optimal assert Some of tests use different method of assertTrue(isinstance(A, B)) The correct way is to use assertIsInstance(A, B) provided by testtools Change-Id: Iaa27afbd59ed00a8254df96794f0c38bc408a239 --- os_brick/tests/initiator/connectors/test_rbd.py | 4 ++-- os_brick/tests/initiator/connectors/test_sheepdog.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/os_brick/tests/initiator/connectors/test_rbd.py b/os_brick/tests/initiator/connectors/test_rbd.py index bbb07fc22..bbda10d0e 100644 --- a/os_brick/tests/initiator/connectors/test_rbd.py +++ b/os_brick/tests/initiator/connectors/test_rbd.py @@ -89,8 +89,8 @@ class RBDConnectorTestCase(test_connector.ConnectorTestCase): snapshot=None) # Ensure expected object is returned correctly - self.assertTrue(isinstance(device_info['path'], - linuxrbd.RBDVolumeIOWrapper)) + self.assertIsInstance(device_info['path'], + linuxrbd.RBDVolumeIOWrapper) @mock.patch('os_brick.initiator.connectors.rbd.tempfile.mkstemp') def test_create_ceph_conf(self, mock_mkstemp): diff --git a/os_brick/tests/initiator/connectors/test_sheepdog.py b/os_brick/tests/initiator/connectors/test_sheepdog.py index 72bcad0a4..e2a359ec1 100644 --- a/os_brick/tests/initiator/connectors/test_sheepdog.py +++ b/os_brick/tests/initiator/connectors/test_sheepdog.py @@ -59,8 +59,8 @@ class SheepdogConnectorTestCase(test_connector.ConnectorTestCase): device_info = sd_connector.connect_volume(self.connection_properties) # Ensure expected object is returned correctly - self.assertTrue(isinstance(device_info['path'], - linuxsheepdog.SheepdogVolumeIOWrapper)) + self.assertIsInstance(device_info['path'], + linuxsheepdog.SheepdogVolumeIOWrapper) @mock.patch.object(linuxsheepdog.SheepdogVolumeIOWrapper, 'close') def test_disconnect_volume(self, volume_close):