Use unittest.mock instead of mock

The mock third party library was needed for mock support in py2
runtimes. Since we now only support py36 and later, we can use the
standard lib unittest.mock module instead.

Change-Id: I7b97fab683e45118327b93c776f8c487feab7374

lower-constraints.txt

@@ -56,7 +56,6 @@ lxml==3.4.1
 Mako==1.0.7
 MarkupSafe==1.0
 mccabe==0.4.0
-mock==2.0.0
 monotonic==1.4
 mox3==0.25.0
 msgpack==0.5.6

trove/tests/fakes/swift.py

@@ -14,7 +14,7 @@
 #    under the License.
 
 from hashlib import md5
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
 import json
 import os
 import socket

trove/tests/unittests/api/common/test_limits.py

@@ -18,7 +18,7 @@ Tests dealing with HTTP rate-limiting.
 """
 
 
-from mock import Mock, MagicMock, patch
+from unittest.mock import Mock, MagicMock, patch
 from oslo_serialization import jsonutils
 import six
 from six.moves import http_client

trove/tests/unittests/api/test_versions.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from mock import Mock
+from unittest.mock import Mock
 import webob
 
 from trove.common import cfg

trove/tests/unittests/backup/test_backup_models.py

@@ -13,9 +13,9 @@
 
 
 import datetime
-from mock import DEFAULT
+from unittest.mock import DEFAULT
-from mock import MagicMock
+from unittest.mock import MagicMock
-from mock import patch
+from unittest.mock import patch
 from swiftclient.client import ClientException
 
 from trove.backup import models

trove/tests/unittests/cluster/test_cassandra_cluster.py

@@ -13,10 +13,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from mock import ANY
+from unittest.mock import ANY
-from mock import MagicMock
+from unittest.mock import MagicMock
-from mock import Mock
+from unittest.mock import Mock
-from mock import patch
+from unittest.mock import patch
 
 from trove.cluster import models
 from trove.common.strategies.cluster.experimental.cassandra.api \

trove/tests/unittests/cluster/test_cluster.py

@@ -15,8 +15,8 @@
 
 import uuid
 
-from mock import Mock
+from unittest.mock import Mock
-from mock import patch
+from unittest.mock import patch
 from trove.cluster.models import Cluster
 from trove.cluster.models import ClusterTasks
 from trove.cluster.models import DBCluster

trove/tests/unittests/cluster/test_cluster_controller.py

@@ -15,9 +15,9 @@
 #
 import jsonschema
 
-from mock import MagicMock
+from unittest.mock import MagicMock
-from mock import Mock
+from unittest.mock import Mock
-from mock import patch
+from unittest.mock import patch
 from testtools.matchers import Is, Equals
 from trove.cluster import models
 from trove.cluster.models import Cluster, DBCluster

trove/tests/unittests/cluster/test_cluster_models.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 from trove.cluster import models
 from trove.common.strategies.cluster.experimental.mongodb.api import (

trove/tests/unittests/cluster/test_cluster_pxc_controller.py

@@ -13,9 +13,9 @@
 
 import jsonschema
 
-from mock import MagicMock
+from unittest.mock import MagicMock
-from mock import Mock
+from unittest.mock import Mock
-from mock import patch
+from unittest.mock import patch
 from testtools.matchers import Is, Equals
 from trove.cluster import models
 from trove.cluster.models import Cluster

trove/tests/unittests/cluster/test_cluster_redis_controller.py

@@ -13,9 +13,9 @@
 
 import jsonschema
 
-from mock import MagicMock
+from unittest.mock import MagicMock
-from mock import Mock
+from unittest.mock import Mock
-from mock import patch
+from unittest.mock import patch
 from testtools.matchers import Is, Equals
 from trove.cluster import models
 from trove.cluster.models import Cluster

trove/tests/unittests/cluster/test_cluster_vertica_controller.py

@@ -13,9 +13,9 @@
 
 import jsonschema
 
-from mock import MagicMock
+from unittest.mock import MagicMock
-from mock import Mock
+from unittest.mock import Mock
-from mock import patch
+from unittest.mock import patch
 from testtools.matchers import Is, Equals
 from trove.cluster import models
 from trove.cluster.models import Cluster

trove/tests/unittests/cluster/test_cluster_views.py

@@ -14,9 +14,9 @@
 #    under the License.
 #
 
-from mock import MagicMock
+from unittest.mock import MagicMock
-from mock import Mock
+from unittest.mock import Mock
-from mock import patch
+from unittest.mock import patch
 
 from trove.cluster.views import ClusterInstanceDetailView
 from trove.cluster.views import ClusterView

trove/tests/unittests/cluster/test_galera_cluster.py

@@ -13,8 +13,8 @@
 
 import uuid
 
-from mock import Mock
+from unittest.mock import Mock
-from mock import patch
+from unittest.mock import patch
 
 from novaclient import exceptions as nova_exceptions
 

trove/tests/unittests/cluster/test_models.py

@@ -13,13 +13,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from mock import ANY
+from unittest.mock import ANY
-from mock import call
+from unittest.mock import call
-from mock import DEFAULT
+from unittest.mock import DEFAULT
-from mock import MagicMock
+from unittest.mock import MagicMock
-from mock import Mock
+from unittest.mock import Mock
-from mock import patch
+from unittest.mock import patch
-from mock import PropertyMock
+from unittest.mock import PropertyMock
 
 from neutronclient.common import exceptions as neutron_exceptions
 

trove/tests/unittests/cluster/test_redis_cluster.py

@@ -13,8 +13,8 @@
 
 import uuid
 
-from mock import Mock
+from unittest.mock import Mock
-from mock import patch
+from unittest.mock import patch
 from novaclient import exceptions as nova_exceptions
 from trove.cluster.models import Cluster
 from trove.cluster.models import ClusterTasks

trove/tests/unittests/cluster/test_vertica_cluster.py

@@ -13,8 +13,8 @@
 
 import uuid
 
-from mock import Mock
+from unittest.mock import Mock
-from mock import patch
+from unittest.mock import patch
 from novaclient import exceptions as nova_exceptions
 from trove.cluster.models import Cluster
 from trove.cluster.models import ClusterTasks

trove/tests/unittests/cmd/test_status.py

@@ -12,8 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from mock import Mock
+from unittest.mock import Mock
-from mock import patch
+from unittest.mock import patch
 from oslo_upgradecheck.upgradecheck import Code
 
 from trove.cmd import status

trove/tests/unittests/common/test_context.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-from mock import Mock
+from unittest.mock import Mock
 
 from testtools.matchers import Equals, Is
 from trove.common import context

trove/tests/unittests/common/test_notification.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 from oslo_utils import timeutils
 

trove/tests/unittests/common/test_pagination.py

@@ -16,7 +16,7 @@
 #    under the License.
 #
 
-from mock import Mock
+from unittest.mock import Mock
 
 from trove.common import pagination
 from trove.tests.unittests import trove_testtools

trove/tests/unittests/common/test_policy.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from mock import MagicMock
+from unittest.mock import MagicMock
-from mock import NonCallableMock
+from unittest.mock import NonCallableMock
-from mock import patch
+from unittest.mock import patch
 
 from trove.common import exception as trove_exceptions
 from trove.common import policy as trove_policy

trove/tests/unittests/common/test_server_group.py

@@ -15,7 +15,7 @@
 #
 
 import copy
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 from trove.common import server_group as srv_grp
 from trove.tests.unittests import trove_testtools

trove/tests/unittests/common/test_template.py

@@ -11,7 +11,7 @@
 # limitations under the License.
 import re
 
-from mock import Mock
+from unittest.mock import Mock
 
 from trove.common import template
 from trove.datastore.models import DatastoreVersion

trove/tests/unittests/common/test_utils.py

@@ -14,8 +14,8 @@
 #    under the License.
 #
 
-from mock import Mock
+from unittest.mock import Mock
-from mock import patch
+from unittest.mock import patch
 
 from testtools import ExpectedException
 from trove.common import exception

trove/tests/unittests/common/test_wsgi.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 from testtools.matchers import Equals, Is, Not
 import webob.exc
 

trove/tests/unittests/conductor/test_conf.py

@@ -12,8 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from mock import MagicMock
+from unittest.mock import MagicMock
-from mock import patch
+from unittest.mock import patch
 from oslo_service import service as os_service
 
 from trove.cmd import common as common_cmd

trove/tests/unittests/conductor/test_methods.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from mock import patch
+from unittest.mock import patch
 from oslo_utils import timeutils
 
 from trove.backup import models as bkup_models

trove/tests/unittests/configuration/test_configuration_controller.py

@@ -14,7 +14,7 @@
 #    under the License.
 #
 import jsonschema
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 from trove.common import configurations
 from trove.common.exception import UnprocessableEntity

trove/tests/unittests/datastore/test_datastore.py

@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from mock import Mock
+from unittest.mock import Mock
-from mock import patch
+from unittest.mock import patch
 
 from trove.common import exception
 from trove.datastore import models as datastore_models

trove/tests/unittests/db/test_migration_utils.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-from mock import call
+from unittest.mock import call
-from mock import Mock
+from unittest.mock import Mock
-from mock import patch
+from unittest.mock import patch
 from sqlalchemy.engine import reflection
 from sqlalchemy.schema import Column
 

trove/tests/unittests/domain-name-service/test_designate_driver.py

@@ -14,8 +14,8 @@
 import base64
 import hashlib
 
-from mock import MagicMock
+from unittest.mock import MagicMock
-from mock import patch
+from unittest.mock import patch
 import six
 
 from trove.common import exception

trove/tests/unittests/extensions/common/test_service.py

@@ -14,8 +14,8 @@
 #    under the License.
 #
 
-from mock import Mock
+from unittest.mock import Mock
-from mock import patch
+from unittest.mock import patch
 from oslo_config.cfg import NoSuchOptError
 
 from trove.common import exception

trove/tests/unittests/extensions/redis/test_service.py

@@ -15,7 +15,7 @@
 #
 import uuid
 
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 from trove.common import exception
 from trove.datastore import models as datastore_models

trove/tests/unittests/flavor/test_flavor_views.py

@@ -14,7 +14,7 @@
 #    under the License.
 #
 
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 from trove.flavor.views import FlavorView
 from trove.tests.unittests import trove_testtools
 

trove/tests/unittests/instance/test_instance_controller.py

@@ -14,10 +14,10 @@
 #    under the License.
 #
 import copy
+from unittest.mock import Mock
 import uuid
 
 import jsonschema
-from mock import Mock
 from testtools.matchers import Equals
 from testtools.matchers import Is
 from testtools.testcase import skip

trove/tests/unittests/instance/test_instance_models.py

@@ -11,8 +11,8 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-from mock import Mock
+from unittest.mock import Mock
-from mock import patch
+from unittest.mock import patch
 import uuid
 
 from trove.backup import models as backup_models

trove/tests/unittests/instance/test_instance_views.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-from mock import Mock
+from unittest.mock import Mock
 from trove.common import cfg
 from trove.instance.views import InstanceDetailView
 from trove.instance.views import InstanceView

trove/tests/unittests/mgmt/test_clusters.py

@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 from trove.common import exception
 from trove.extensions.mgmt.clusters.models import MgmtCluster

trove/tests/unittests/mgmt/test_datastore_controller.py

@@ -14,7 +14,7 @@
 
 import jsonschema
 
-from mock import Mock, patch, MagicMock, PropertyMock
+from unittest.mock import Mock, patch, MagicMock, PropertyMock
 from testtools.matchers import Is, Equals
 
 from trove.common import clients

trove/tests/unittests/mgmt/test_datastores.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 from glanceclient import exc as glance_exceptions
 
 from trove.common import clients

trove/tests/unittests/mgmt/test_models.py

@@ -18,9 +18,9 @@ from testtools.matchers import Is
 from testtools.matchers import Not
 import uuid
 
-from mock import ANY
+from unittest.mock import ANY
-from mock import MagicMock
+from unittest.mock import MagicMock
-from mock import patch
+from unittest.mock import patch
 from novaclient.client import Client
 from novaclient.v2.flavors import Flavor
 from novaclient.v2.flavors import FlavorManager

trove/tests/unittests/module/test_module_models.py

@@ -15,7 +15,7 @@
 #
 
 import copy
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 from trove.common import crypto_utils
 from trove.common import exception

trove/tests/unittests/module/test_module_views.py

@@ -14,7 +14,7 @@
 #    under the License.
 #
 
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 from trove.datastore import models
 from trove.module.views import DetailedModuleView
 from trove.tests.unittests import trove_testtools

trove/tests/unittests/quota/test_quota.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from mock import Mock, MagicMock, patch
+from unittest.mock import Mock, MagicMock, patch
 from testtools import skipIf
 
 from trove.common import cfg

trove/tests/unittests/taskmanager/test_api.py

@@ -14,8 +14,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from mock import Mock
+from unittest.mock import Mock
-from mock import patch
+from unittest.mock import patch
 from unittest import mock
 
 from trove.common import context

trove/tests/unittests/taskmanager/test_clusters.py

@@ -15,9 +15,9 @@
 
 import datetime
 
-from mock import MagicMock
+from unittest.mock import MagicMock
-from mock import Mock
+from unittest.mock import Mock
-from mock import patch
+from unittest.mock import patch
 
 from trove.cluster.models import ClusterTasks as ClusterTaskStatus
 from trove.cluster.models import DBCluster

trove/tests/unittests/taskmanager/test_galera_clusters.py

@@ -13,8 +13,8 @@
 
 import datetime
 
-from mock import Mock
+from unittest.mock import Mock
-from mock import patch
+from unittest.mock import patch
 
 from trove.cluster.models import ClusterTasks as ClusterTaskStatus
 from trove.cluster.models import DBCluster

trove/tests/unittests/taskmanager/test_manager.py

@@ -14,7 +14,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from mock import MagicMock, Mock, patch, PropertyMock
+from unittest.mock import MagicMock, Mock, patch, PropertyMock
 from proboscis.asserts import assert_equal
 
 from trove.backup.models import Backup

trove/tests/unittests/taskmanager/test_models.py

@@ -18,11 +18,11 @@ from unittest import mock
 from cinderclient import exceptions as cinder_exceptions
 from cinderclient.v2 import volumes as cinderclient_volumes
 import cinderclient.v2.client as cinderclient
-from mock import call
+from unittest.mock import call
-from mock import MagicMock
+from unittest.mock import MagicMock
-from mock import Mock
+from unittest.mock import Mock
-from mock import patch
+from unittest.mock import patch
-from mock import PropertyMock
+from unittest.mock import PropertyMock
 import neutronclient.v2_0.client as neutronclient
 from novaclient import exceptions as nova_exceptions
 import novaclient.v2.flavors

trove/tests/unittests/taskmanager/test_vertica_clusters.py

@@ -13,8 +13,8 @@
 
 import datetime
 
-from mock import Mock
+from unittest.mock import Mock
-from mock import patch
+from unittest.mock import patch
 
 from trove import rpc
 from trove.cluster.models import ClusterTasks as ClusterTaskStatus

trove/tests/unittests/upgrade/test_controller.py

@@ -14,7 +14,7 @@
 #    under the License.
 #
 import jsonschema
-from mock import Mock, MagicMock, patch
+from unittest.mock import Mock, MagicMock, patch
 
 from trove.extensions.mgmt.upgrade.models import UpgradeMessageSender
 from trove.extensions.mgmt.upgrade.service import UpgradeController

trove/tests/unittests/upgrade/test_models.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-from mock import patch
+from unittest.mock import patch
 from trove.extensions.mgmt.upgrade.models import UpgradeMessageSender
 from trove import rpc
 from trove.tests.unittests import trove_testtools