From e2bddfcf93772f727b76af4e3d0845ec587dc88a Mon Sep 17 00:00:00 2001 From: yangyapeng Date: Mon, 4 Jan 2016 17:24:24 -0500 Subject: [PATCH] Change assertTrue(isinstance()) by 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 Closes-bug: #1268480 Change-Id: Ic52071ac03aeb7f9d5baa59208778ed75237f196 --- trove/tests/unittests/cluster/test_cluster_models.py | 2 +- trove/tests/unittests/cluster/test_cluster_views.py | 2 +- trove/tests/unittests/taskmanager/test_api.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/trove/tests/unittests/cluster/test_cluster_models.py b/trove/tests/unittests/cluster/test_cluster_models.py index fd755a2ac5..391aab25ff 100644 --- a/trove/tests/unittests/cluster/test_cluster_models.py +++ b/trove/tests/unittests/cluster/test_cluster_models.py @@ -35,4 +35,4 @@ class TestClusterModel(trove_testtools.TestCase): dsv.manager = 'mongodb' mock_load_dsv_by_uuid.return_value = dsv cluster = models.Cluster.load(context, id) - self.assertTrue(isinstance(cluster, MongoDbCluster)) + self.assertIsInstance(cluster, MongoDbCluster) diff --git a/trove/tests/unittests/cluster/test_cluster_views.py b/trove/tests/unittests/cluster/test_cluster_views.py index 939439ed0b..4455421bf3 100644 --- a/trove/tests/unittests/cluster/test_cluster_views.py +++ b/trove/tests/unittests/cluster/test_cluster_views.py @@ -73,7 +73,7 @@ class ClusterViewTest(trove_testtools.TestCase): cluster = Mock() cluster.datastore_version.manager = 'mongodb' view = load_view(cluster, Mock()) - self.assertTrue(isinstance(view, MongoDbClusterView)) + self.assertIsInstance(view, MongoDbClusterView) def test__build_instances(self, *args): cluster = Mock() diff --git a/trove/tests/unittests/taskmanager/test_api.py b/trove/tests/unittests/taskmanager/test_api.py index 463b78edbc..7e28203fbe 100644 --- a/trove/tests/unittests/taskmanager/test_api.py +++ b/trove/tests/unittests/taskmanager/test_api.py @@ -111,6 +111,6 @@ class TestAPI(trove_testtools.TestCase): context = Mock() manager = 'mongodb' - self.assertTrue(isinstance(task_api.load(context), task_api.API)) - self.assertTrue(isinstance(task_api.load(context, manager), - MongoDbTaskManagerAPI)) + self.assertIsInstance(task_api.load(context), task_api.API) + self.assertIsInstance(task_api.load(context, manager), + MongoDbTaskManagerAPI)