Merge "Use unittest.mock instead of third party mock"

magnumclient/tests/osc/unit/osc_fakes.py

@@ -13,7 +13,8 @@
 #   under the License.
 #
 
-import mock
+from unittest import mock
+
 from oslo_serialization import jsonutils
 import sys
 

magnumclient/tests/osc/unit/v1/test_certificates.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from magnumclient.osc.v1 import certificates as osc_certificates
 from magnumclient.tests.osc.unit.v1 import fakes as magnum_fakes

magnumclient/tests/osc/unit/v1/test_cluster_templates.py

@@ -14,8 +14,8 @@
 #
 
 import copy
-import mock
 from mock import call
+from unittest import mock
 
 from magnumclient.exceptions import InvalidAttribute
 from magnumclient.osc.v1 import cluster_templates as osc_ct

magnumclient/tests/osc/unit/v1/test_clusters.py

@@ -14,10 +14,10 @@
 #
 
 import copy
-import mock
 import os
 import sys
 import tempfile
+from unittest import mock
 
 from contextlib import contextmanager
 try:

magnumclient/tests/osc/unit/v1/test_mservices.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 magnumclient.osc.v1 import mservices
 from magnumclient.tests.osc.unit.v1 import fakes

magnumclient/tests/osc/unit/v1/test_nodegroups.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 import copy
-import mock
 from mock import call
+from unittest import mock
 
 from magnumclient.osc.v1 import nodegroups as osc_nodegroups
 from magnumclient.tests.osc.unit.v1 import fakes as magnum_fakes

magnumclient/tests/osc/unit/v1/test_quotas.py

@@ -11,7 +11,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 magnumclient.osc.v1 import quotas as osc_quotas
 from magnumclient.tests.osc.unit.v1 import fakes as magnum_fakes

magnumclient/tests/osc/unit/v1/test_stats.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from magnumclient.osc.v1 import stats as osc_stats
 from magnumclient.tests.osc.unit.v1 import fakes as magnum_fakes

magnumclient/tests/test_client.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 magnumclient import client
 

magnumclient/tests/test_httpclient.py

@@ -13,7 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from oslo_serialization import jsonutils
 import six
 import socket

magnumclient/tests/test_shell.py

@@ -14,11 +14,11 @@
 
 import re
 import sys
+from unittest import mock
 
 import argparse
 import fixtures
 from keystoneauth1 import fixture
-import mock
 import six
 from testtools import matchers
 

magnumclient/tests/test_utils.py

@@ -16,7 +16,8 @@
 #    under the License.
 
 import collections
-import mock
+from unittest import mock
+
 from oslo_serialization import jsonutils
 import six
 import six.moves.builtins as __builtin__

magnumclient/tests/v1/shell_test_base.py

@@ -13,8 +13,8 @@
 #    under the License.
 
 import re
+from unittest import mock
 
-import mock
 from testtools import matchers
 
 from magnumclient.tests import utils

magnumclient/tests/v1/test_baymodels_shell.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from magnumclient.common.apiclient import exceptions
 from magnumclient.tests.v1 import shell_test_base

magnumclient/tests/v1/test_bays_shell.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from magnumclient import exceptions
 from magnumclient.tests.v1 import shell_test_base

magnumclient/tests/v1/test_certificates_shell.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from magnumclient.common import cliutils
 from magnumclient.tests.v1 import shell_test_base

magnumclient/tests/v1/test_client.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 keystoneauth1.exceptions import catalog
 

magnumclient/tests/v1/test_clusters_shell.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from magnumclient.common import cliutils
 from magnumclient import exceptions

magnumclient/tests/v1/test_clustertemplates_shell.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from magnumclient.common.apiclient import exceptions
 from magnumclient.tests.v1 import shell_test_base

magnumclient/tests/v1/test_mservices_shell.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from magnumclient.tests.v1 import shell_test_base
 

magnumclient/tests/v1/test_quotas_shell.py

@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from magnumclient.tests.v1 import shell_test_base
 

magnumclient/tests/v1/test_stats_shell.py

@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from magnumclient.tests.v1 import shell_test_base
 from magnumclient.v1.stats import Stats

test-requirements.txt

@@ -11,4 +11,3 @@ osprofiler>=1.4.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