Fix unit test mocks for new mock release

The new mock release(1.1.0) broke some of the unit tests which
were using incorrect mock methods that do not really exist.

Before mock 1.1.0 using such incorrectly mocked methods would
silently pass -- but after the upgrade these (rightly) cause
errors that need to be fixed.

Change-Id: I35fbd142a199f5e5f39b7835fee0ac888dc9784b
Closes-Bug: 1473454

6 files changed, 15 insertions, 11 deletions

diff --git a/trove/tests/unittests/cluster/test_cluster.py b/trove/tests/unittests/cluster/test_cluster.py
index dcaa3ff3..543f1300 100644
--- a/trove/tests/unittests/cluster/test_cluster.py
+++ b/trove/tests/unittests/cluster/test_cluster.py
@@ -26,6 +26,7 @@ from trove.common import exception
 from trove.common import remote
 from trove.common.strategies.cluster.experimental.mongodb import (
     api as mongodb_api)
+from trove.common import utils
 from trove.datastore import models as datastore_models
 from trove.instance import models as inst_models
 from trove.instance.models import DBInstance
@@ -169,6 +170,7 @@ class ClusterTest(TestCase):
         self.assertRaises(exception.UnprocessableEntity,
                           self.cluster.add_shard)
 
+    @patch.object(utils, 'generate_uuid', Mock(return_value='new-shard-id'))
     @patch.object(datastore_models.DatastoreVersion, 'load_by_uuid')
     @patch.object(task_api, 'load')
     @patch.object(Cluster, 'update_db')
@@ -205,6 +207,7 @@ class ClusterTest(TestCase):
         mock_task_api.mongodb_add_shard_cluster.return_value = None
         mock_task_api_load.return_value = mock_task_api
         self.cluster.add_shard()
-        mock_update_db.assert_called_with(task_status=
-                                          ClusterTasks.ADDING_SHARD)
-        mock_task_api.mongodb_add_shard_cluster.assert_called
+        mock_update_db.assert_called_with(
+            task_status=ClusterTasks.ADDING_SHARD)
+        mock_task_api.mongodb_add_shard_cluster.assert_called_with(
+            self.cluster.id, 'new-shard-id', 'rs2')
diff --git a/trove/tests/unittests/cluster/test_cluster_controller.py b/trove/tests/unittests/cluster/test_cluster_controller.py
index 1ec87b5a..9aa4ba51 100644
--- a/trove/tests/unittests/cluster/test_cluster_controller.py
+++ b/trove/tests/unittests/cluster/test_cluster_controller.py
@@ -234,7 +234,7 @@ class TestClusterController(TestCase):
         cluster = Mock()
         mock_cluster_load.return_value = cluster
         self.controller.delete(req, tenant_id, cluster_id)
-        cluster.delete.assert_called
+        cluster.delete.assert_called_with()
 
 
 class TestClusterControllerWithStrategy(TestCase):
diff --git a/trove/tests/unittests/cluster/test_cluster_vertica_controller.py b/trove/tests/unittests/cluster/test_cluster_vertica_controller.py
index 6c8daa1a..5fa247d5 100644
--- a/trove/tests/unittests/cluster/test_cluster_vertica_controller.py
+++ b/trove/tests/unittests/cluster/test_cluster_vertica_controller.py
@@ -204,7 +204,7 @@ class TestClusterController(TestCase):
         cluster = Mock()
         mock_cluster_load.return_value = cluster
         self.controller.delete(req, tenant_id, cluster_id)
-        cluster.delete.assert_called
+        cluster.delete.assert_called_with()
 
 
 class TestClusterControllerWithStrategy(TestCase):
diff --git a/trove/tests/unittests/cluster/test_vertica_cluster.py b/trove/tests/unittests/cluster/test_vertica_cluster.py
index f3d54c1c..fd808774 100644
--- a/trove/tests/unittests/cluster/test_vertica_cluster.py
+++ b/trove/tests/unittests/cluster/test_vertica_cluster.py
@@ -163,7 +163,8 @@ class ClusterTest(TestCase):
                             self.datastore,
                             self.datastore_version,
                             instances)
-        mock_task_api.create_cluster.assert_called
+        mock_task_api.return_value.create_cluster.assert_called_with(
+            mock_db_create.return_value.id)
         self.assertEqual(3, mock_ins_create.call_count)
 
     def test_delete_bad_task_status(self):
diff --git a/trove/tests/unittests/guestagent/test_dbaas.py b/trove/tests/unittests/guestagent/test_dbaas.py
index 50b03b82..4e20c4dc 100644
--- a/trove/tests/unittests/guestagent/test_dbaas.py
+++ b/trove/tests/unittests/guestagent/test_dbaas.py
@@ -1672,7 +1672,7 @@ class CassandraDBAppTest(testtools.TestCase):
         chmod.assert_called_with("sudo", "chmod", "a+r",
                                  cass_system.CASSANDRA_CONF)
 
-        mock_mkstemp.assert_called_once()
+        self.assertEqual(1, mock_mkstemp.call_count)
 
         with open(temp_config_name, 'r') as config_file:
             configuration_data = config_file.read()
@@ -2180,7 +2180,7 @@ class VerticaAppTest(testtools.TestCase):
              ) % {'source': temp_file_handle.name,
                   'target': vertica_system.VERTICA_CONF})
         arguments.assert_called_with(expected_command)
-        mock_mkstemp.assert_called_once()
+        self.assertEqual(1, mock_mkstemp.call_count)
 
         configuration_data = ConfigParser.ConfigParser()
         configuration_data.read(temp_file_handle.name)
diff --git a/trove/tests/unittests/taskmanager/test_vertica_clusters.py b/trove/tests/unittests/taskmanager/test_vertica_clusters.py
index 87f67cd7..ca13aa45 100644
--- a/trove/tests/unittests/taskmanager/test_vertica_clusters.py
+++ b/trove/tests/unittests/taskmanager/test_vertica_clusters.py
@@ -98,7 +98,7 @@ class VerticaClusterTasksTest(testtools.TestCase):
          get_status.return_value) = ServiceStatuses.RUNNING
         ret_val = self.clustertasks._all_instances_ready(["1", "2", "3", "4"],
                                                          self.cluster_id)
-        self.assertEqual(True, ret_val)
+        self.assertTrue(ret_val)
 
     @patch.object(ClusterTasks, 'reset_task')
     @patch.object(ClusterTasks, 'get_guest')
@@ -119,5 +119,5 @@ class VerticaClusterTasksTest(testtools.TestCase):
         self.clustertasks.create_cluster(Mock(), self.cluster_id)
         mock_guest.return_value.install_cluster.assert_called_with(['10.0.0.2']
                                                                    )
-        mock_reset_task.assert_called()
-        mock_guest.return_value.cluster_complete.assert_called()
+        mock_reset_task.assert_called_with()
+        mock_guest.return_value.cluster_complete.assert_called_with()