Added dangling mock detection to 'cluster' module

Ensured that no dangling mocks exist in the module by having each test
class extend trove_testtools.TestCase

Ran 'tox -epy27' and fixed any detected problems.

Change-Id: I2f88cd9e7effcc6389abf8537417f1b3d6f1efc7
Partial-Bug: 1448273

trove/tests/unittests/cluster/test_cluster.py

@@ -17,7 +17,6 @@ import uuid
 
 from mock import Mock
 from mock import patch
-from testtools import TestCase
 from trove.cluster.models import Cluster
 from trove.cluster.models import ClusterTasks
 from trove.cluster.models import DBCluster
@@ -32,14 +31,17 @@ from trove.instance.models import DBInstance
 from trove.instance.tasks import InstanceTasks
 from trove.quota.quota import QUOTAS
 from trove.taskmanager import api as task_api
+from trove.tests.unittests import trove_testtools
 
 CONF = cfg.CONF
 
 
-class ClusterTest(TestCase):
+class ClusterTest(trove_testtools.TestCase):
     def setUp(self):
         super(ClusterTest, self).setUp()
-        task_api.API.get_client = Mock()
+        self.get_client_patch = patch.object(task_api.API, 'get_client')
+        self.get_client_mock = self.get_client_patch.start()
+        self.addCleanup(self.get_client_patch.stop)
         self.cluster_id = str(uuid.uuid4())
         self.cluster_name = "Cluster" + self.cluster_id
         self.tenant_id = "23423432"

trove/tests/unittests/cluster/test_cluster_models.py

@@ -14,15 +14,15 @@
 #    under the License.
 
 from mock import Mock, patch
-from testtools import TestCase
 
 from trove.cluster import models
 from trove.common.strategies.cluster.experimental.mongodb.api import (
     MongoDbCluster)
 from trove.datastore import models as datastore_models
+from trove.tests.unittests import trove_testtools
 
 
-class TestClusterModel(TestCase):
+class TestClusterModel(trove_testtools.TestCase):
 
     @patch.object(datastore_models.Datastore, 'load')
     @patch.object(datastore_models.DatastoreVersion, 'load_by_uuid')

trove/tests/unittests/cluster/test_cluster_vertica_controller.py

@@ -16,7 +16,6 @@ import jsonschema
 from mock import MagicMock
 from mock import Mock
 from mock import patch
-from testtools import TestCase
 from testtools.matchers import Is, Equals
 from trove.cluster import models
 from trove.cluster.models import Cluster
@@ -27,9 +26,10 @@ from trove.common import exception
 from trove.common.strategies.cluster import strategy
 from trove.common import utils
 from trove.datastore import models as datastore_models
+from trove.tests.unittests import trove_testtools
 
 
-class TestClusterController(TestCase):
+class TestClusterController(trove_testtools.TestCase):
     def setUp(self):
         super(TestClusterController, self).setUp()
         self.controller = ClusterController()
@@ -207,7 +207,7 @@ class TestClusterController(TestCase):
         cluster.delete.assert_called
 
 
-class TestClusterControllerWithStrategy(TestCase):
+class TestClusterControllerWithStrategy(trove_testtools.TestCase):
     def setUp(self):
         super(TestClusterControllerWithStrategy, self).setUp()
         self.controller = ClusterController()

trove/tests/unittests/cluster/test_cluster_views.py

@@ -17,17 +17,18 @@
 from mock import Mock
 from mock import MagicMock
 from mock import patch
-from testtools import TestCase
 from trove.cluster.views import ClusterInstanceDetailView
 from trove.cluster.views import ClusterView
 from trove.cluster.views import load_view
 from trove.common import cfg
 from trove.common.strategies.cluster.experimental.mongodb.api import (
     MongoDbClusterView)
+from trove.tests.unittests import trove_testtools
+
 CONF = cfg.CONF
 
 
-class ClusterViewTest(TestCase):
+class ClusterViewTest(trove_testtools.TestCase):
 
     def setUp(self):
         super(ClusterViewTest, self).setUp()
@@ -108,7 +109,7 @@ class ClusterViewTest(TestCase):
         test_case(['query_router', 'member'], ['member'], 2, 1)
 
 
-class ClusterInstanceDetailViewTest(TestCase):
+class ClusterInstanceDetailViewTest(trove_testtools.TestCase):
 
     def setUp(self):
         super(ClusterInstanceDetailViewTest, self).setUp()

trove/tests/unittests/cluster/test_vertica_cluster.py

@@ -15,7 +15,6 @@ import uuid
 
 from mock import Mock
 from mock import patch
-from testtools import TestCase
 from trove.cluster.models import Cluster
 from trove.cluster.models import ClusterTasks
 from trove.cluster.models import DBCluster
@@ -27,14 +26,17 @@ from trove.common.strategies.cluster.experimental.vertica import (
 from trove.instance import models as inst_models
 from trove.quota.quota import QUOTAS
 from trove.taskmanager import api as task_api
+from trove.tests.unittests import trove_testtools
 
 CONF = cfg.CONF
 
 
-class ClusterTest(TestCase):
+class ClusterTest(trove_testtools.TestCase):
     def setUp(self):
         super(ClusterTest, self).setUp()
-        task_api.API.get_client = Mock()
+        self.get_client_patch = patch.object(task_api.API, 'get_client')
+        self.get_client_mock = self.get_client_patch.start()
+        self.addCleanup(self.get_client_patch.stop)
         self.cluster_id = str(uuid.uuid4())
         self.cluster_name = "Cluster" + self.cluster_id
         self.tenant_id = "23423432"