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>

34 files changed, 35 insertions, 34 deletions

diff --git a/test-requirements.txt b/test-requirements.txt
index fa47e50..689537c 100644
--- a/test-requirements.txt
+++ b/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
diff --git a/troveclient/compat/tests/test_auth.py b/troveclient/compat/tests/test_auth.py
index 134da92..b095048 100644
--- a/troveclient/compat/tests/test_auth.py
+++ b/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
diff --git a/troveclient/compat/tests/test_common.py b/troveclient/compat/tests/test_common.py
index d275d32..5a4b5a1 100644
--- a/troveclient/compat/tests/test_common.py
+++ b/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
diff --git a/troveclient/tests/osc/utils.py b/troveclient/tests/osc/utils.py
index a3a7359..e40bdd4 100644
--- a/troveclient/tests/osc/utils.py
+++ b/troveclient/tests/osc/utils.py
@@ -12,9 +12,9 @@
 #
 
 import os
+from unittest import mock
 
 import fixtures
-import mock
 import sys
 import testtools
 
diff --git a/troveclient/tests/osc/v1/fakes.py b/troveclient/tests/osc/v1/fakes.py
index caca652..fde9237 100644
--- a/troveclient/tests/osc/v1/fakes.py
+++ b/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
diff --git a/troveclient/tests/osc/v1/test_database_backups.py b/troveclient/tests/osc/v1/test_database_backups.py
index ef42e3a..a8c1966 100644
--- a/troveclient/tests/osc/v1/test_database_backups.py
+++ b/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
diff --git a/troveclient/tests/osc/v1/test_database_clusters.py b/troveclient/tests/osc/v1/test_database_clusters.py
index 9c11f65..466eea7 100644
--- a/troveclient/tests/osc/v1/test_database_clusters.py
+++ b/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
diff --git a/troveclient/tests/osc/v1/test_database_configurations.py b/troveclient/tests/osc/v1/test_database_configurations.py
index 2a2d64c..4073500 100644
--- a/troveclient/tests/osc/v1/test_database_configurations.py
+++ b/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
 
diff --git a/troveclient/tests/osc/v1/test_database_instances.py b/troveclient/tests/osc/v1/test_database_instances.py
index d195294..43b076c 100644
--- a/troveclient/tests/osc/v1/test_database_instances.py
+++ b/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
diff --git a/troveclient/tests/osc/v1/test_database_logs.py b/troveclient/tests/osc/v1/test_database_logs.py
index 9def9e8..cff7256 100644
--- a/troveclient/tests/osc/v1/test_database_logs.py
+++ b/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
 
diff --git a/troveclient/tests/osc/v1/test_database_root.py b/troveclient/tests/osc/v1/test_database_root.py
index a0e5663..9d67c9f 100644
--- a/troveclient/tests/osc/v1/test_database_root.py
+++ b/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
diff --git a/troveclient/tests/osc/v1/test_database_users.py b/troveclient/tests/osc/v1/test_database_users.py
index a33c934..3b53911 100644
--- a/troveclient/tests/osc/v1/test_database_users.py
+++ b/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
diff --git a/troveclient/tests/osc/v1/test_databases.py b/troveclient/tests/osc/v1/test_databases.py
index da53a2c..392071f 100644
--- a/troveclient/tests/osc/v1/test_databases.py
+++ b/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
diff --git a/troveclient/tests/test_accounts.py b/troveclient/tests/test_accounts.py
index 8d8be1e..58d32ff 100644
--- a/troveclient/tests/test_accounts.py
+++ b/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
diff --git a/troveclient/tests/test_backups.py b/troveclient/tests/test_backups.py
index c391030..ba0ed84 100644
--- a/troveclient/tests/test_backups.py
+++ b/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
diff --git a/troveclient/tests/test_base.py b/troveclient/tests/test_base.py
index cd8affa..00dc2c2 100644
--- a/troveclient/tests/test_base.py
+++ b/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
diff --git a/troveclient/tests/test_client.py b/troveclient/tests/test_client.py
index e3682bd..5deb7c1 100644
--- a/troveclient/tests/test_client.py
+++ b/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
 
diff --git a/troveclient/tests/test_clusters.py b/troveclient/tests/test_clusters.py
index 2545083..7cdde3d 100644
--- a/troveclient/tests/test_clusters.py
+++ b/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
diff --git a/troveclient/tests/test_common.py b/troveclient/tests/test_common.py
index 0b6518a..abe95ad 100644
--- a/troveclient/tests/test_common.py
+++ b/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
 
diff --git a/troveclient/tests/test_configurations.py b/troveclient/tests/test_configurations.py
index e9d3bd9..e3d0af2 100644
--- a/troveclient/tests/test_configurations.py
+++ b/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
diff --git a/troveclient/tests/test_databases.py b/troveclient/tests/test_databases.py
index 68b66da..d8b30ea 100644
--- a/troveclient/tests/test_databases.py
+++ b/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
 
diff --git a/troveclient/tests/test_datastores.py b/troveclient/tests/test_datastores.py
index 100a2fb..0f0eaa3 100644
--- a/troveclient/tests/test_datastores.py
+++ b/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
diff --git a/troveclient/tests/test_discover.py b/troveclient/tests/test_discover.py
index 09f1ad1..4f5edd7 100644
--- a/troveclient/tests/test_discover.py
+++ b/troveclient/tests/test_discover.py
@@ -15,8 +15,8 @@
 
 import imp
 import inspect
+from unittest import mock
 
-import mock
 import pkg_resources
 import testtools
 
diff --git a/troveclient/tests/test_instances.py b/troveclient/tests/test_instances.py
index 59a9dcf..24912d0 100644
--- a/troveclient/tests/test_instances.py
+++ b/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
diff --git a/troveclient/tests/test_limits.py b/troveclient/tests/test_limits.py
index a4b1271..7779d5c 100644
--- a/troveclient/tests/test_limits.py
+++ b/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
 
diff --git a/troveclient/tests/test_management.py b/troveclient/tests/test_management.py
index e51b641..73d0a7c 100644
--- a/troveclient/tests/test_management.py
+++ b/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
diff --git a/troveclient/tests/test_metadata.py b/troveclient/tests/test_metadata.py
index 49e9d13..65fc481 100644
--- a/troveclient/tests/test_metadata.py
+++ b/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):
diff --git a/troveclient/tests/test_modules.py b/troveclient/tests/test_modules.py
index 9dec416..e0c4886 100644
--- a/troveclient/tests/test_modules.py
+++ b/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
 
diff --git a/troveclient/tests/test_root.py b/troveclient/tests/test_root.py
index a4e9f38..58d0e67 100644
--- a/troveclient/tests/test_root.py
+++ b/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
 
diff --git a/troveclient/tests/test_secgroups.py b/troveclient/tests/test_secgroups.py
index 63d421d..3645aa6 100644
--- a/troveclient/tests/test_secgroups.py
+++ b/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
 
diff --git a/troveclient/tests/test_shell.py b/troveclient/tests/test_shell.py
index 3cd3ea2..543d6ad 100644
--- a/troveclient/tests/test_shell.py
+++ b/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
diff --git a/troveclient/tests/test_users.py b/troveclient/tests/test_users.py
index c8915c7..6fb688f 100644
--- a/troveclient/tests/test_users.py
+++ b/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
 
diff --git a/troveclient/tests/test_v1_shell.py b/troveclient/tests/test_v1_shell.py
index 07b709e..6bb1e23 100644
--- a/troveclient/tests/test_v1_shell.py
+++ b/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
diff --git a/troveclient/tests/utils.py b/troveclient/tests/utils.py
index b24358b..311ac8d 100644
--- a/troveclient/tests/utils.py
+++ b/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