Use unittest.mock instead of third party mock

Now that we no longer support py27, we can use the standard library
unittest.mock module instead of the third party mock lib.

Change-Id: Ib83e626f51e6e01898bb7931c1660a1a548500f3
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>

test-requirements.txt

@@ -10,5 +10,4 @@ requests-mock>=1.2.0 # Apache-2.0
 stestr>=2.0.0 # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
-mock>=2.0.0 # BSD
 httplib2>=0.9.1 # MIT

troveclient/compat/tests/test_auth.py

@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import testtools
+from unittest import mock
 
 from troveclient.compat import auth
 from troveclient.compat import exceptions

troveclient/compat/tests/test_common.py

@@ -17,8 +17,8 @@ import collections
 import json
 import optparse
 import sys
+from unittest import mock
 
-import mock
 import testtools
 
 from troveclient.compat import common

troveclient/tests/osc/utils.py

@@ -12,9 +12,9 @@
 #
 
 import os
+from unittest import mock
 
 import fixtures
-import mock
 import sys
 import testtools
 

troveclient/tests/osc/v1/fakes.py

@@ -11,7 +11,7 @@
 #   under the License.
 #
 
-import mock
+from unittest import mock
 
 from troveclient.tests import fakes
 from troveclient.tests.osc import utils

troveclient/tests/osc/v1/test_database_backups.py

@@ -10,7 +10,7 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-import mock
+from unittest import mock
 
 from osc_lib import exceptions
 from osc_lib import utils

troveclient/tests/osc/v1/test_database_clusters.py

@@ -10,7 +10,7 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-import mock
+from unittest import mock
 
 from osc_lib import exceptions
 from osc_lib import utils

troveclient/tests/osc/v1/test_database_configurations.py

@@ -10,7 +10,7 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-import mock
+from unittest import mock
 
 from osc_lib import utils
 

troveclient/tests/osc/v1/test_database_instances.py

@@ -10,7 +10,7 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-import mock
+from unittest import mock
 
 from osc_lib import exceptions
 from osc_lib import utils

troveclient/tests/osc/v1/test_database_logs.py

@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from osc_lib import utils
 

troveclient/tests/osc/v1/test_database_root.py

@@ -10,7 +10,7 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-import mock
+from unittest import mock
 
 from osc_lib import exceptions
 from osc_lib import utils

troveclient/tests/osc/v1/test_database_users.py

@@ -9,7 +9,7 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-import mock
+from unittest import mock
 
 from osc_lib import exceptions
 from osc_lib import utils

troveclient/tests/osc/v1/test_databases.py

@@ -10,7 +10,7 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-import mock
+from unittest import mock
 
 from osc_lib import exceptions
 from osc_lib import utils

troveclient/tests/test_accounts.py

@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import testtools
+from unittest import mock
 
 from troveclient import base
 from troveclient.v1 import accounts

troveclient/tests/test_backups.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 from mock import patch
 import testtools
+from unittest import mock
 import uuid
 
 from troveclient.v1 import backups

troveclient/tests/test_base.py

@@ -17,8 +17,8 @@
 
 import contextlib
 import os
+from unittest import mock
 
-import mock
 import testtools
 
 from troveclient.apiclient import exceptions

troveclient/tests/test_client.py

@@ -15,10 +15,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 import fixtures
 from keystoneauth1 import adapter
 import logging
-import mock
 import requests
 import testtools
 

troveclient/tests/test_clusters.py

@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import testtools
+from unittest import mock
 
 from troveclient import base
 from troveclient.v1 import clusters

troveclient/tests/test_common.py

@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import testtools
+from unittest import mock
 
 from troveclient import common
 

troveclient/tests/test_configurations.py

@@ -15,8 +15,8 @@
 #    under the License.
 
 import json
-import mock
 import testtools
+from unittest import mock
 
 from troveclient import base
 from troveclient.v1 import configurations

troveclient/tests/test_databases.py

@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import testtools
+from unittest import mock
 
 from troveclient.v1 import databases
 

troveclient/tests/test_datastores.py

@@ -15,8 +15,8 @@
 #    under the License.
 
 
-import mock
 import testtools
+from unittest import mock
 
 from troveclient import base
 from troveclient.v1 import datastores

troveclient/tests/test_discover.py

@@ -15,8 +15,8 @@
 
 import imp
 import inspect
+from unittest import mock
 
-import mock
 import pkg_resources
 import testtools
 

troveclient/tests/test_instances.py

@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import testtools
+from unittest import mock
 
 from troveclient import base
 from troveclient.v1 import instances

troveclient/tests/test_limits.py

@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import testtools
+from unittest import mock
 
 from troveclient.v1 import limits
 

troveclient/tests/test_management.py

@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import testtools
+from unittest import mock
 
 from troveclient import base
 from troveclient.v1 import management

troveclient/tests/test_metadata.py

@@ -14,9 +14,9 @@
 #    under the License.
 
 import json
-import mock
 import testtools
 from troveclient.v1 import metadata
+from unittest import mock
 
 
 class TestMetadata(testtools.TestCase):

troveclient/tests/test_modules.py

@@ -14,9 +14,9 @@
 #    under the License.
 #
 
-import mock
 import os
 import testtools
+from unittest import mock
 
 from troveclient.v1 import modules
 

troveclient/tests/test_root.py

@@ -12,8 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import testtools
+from unittest import mock
 
 from troveclient.v1 import root
 

troveclient/tests/test_secgroups.py

@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import testtools
+from unittest import mock
 
 from troveclient.v1 import security_groups
 

troveclient/tests/test_shell.py

@@ -13,10 +13,10 @@
 
 import re
 import sys
+from unittest import mock
 
 import fixtures
 from keystoneauth1 import fixture
-import mock
 import requests_mock
 import six
 import testtools

troveclient/tests/test_users.py

@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import testtools
+from unittest import mock
 
 from troveclient.v1 import users
 

troveclient/tests/test_v1_shell.py

@@ -14,8 +14,9 @@
 #    under the License.
 
 import base64
+from unittest import mock
+
 import fixtures
-import mock
 import re
 import six
 import testtools

troveclient/tests/utils.py

@@ -13,9 +13,9 @@
 #    under the License.
 
 import os
+from unittest import mock
 
 import fixtures
-import mock
 import requests
 import testtools