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

lower-constraints.txt

@@ -31,7 +31,6 @@ keystoneauth1==3.4.0
 linecache2==1.0.0
 MarkupSafe==1.0
 mccabe==0.2.1
-mock==2.0.0
 monotonic==1.4
 mox3==0.20.0
 msgpack-python==0.4.0

test-requirements.txt

@@ -5,7 +5,6 @@
 coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 hacking>=3.0,<3.1.0 # Apache-2.0
-mock>=2.0.0 # BSD
 oslotest>=3.2.0 # Apache-2.0
 python-subunit>=1.0.0 # Apache-2.0/BSD
 stestr>=2.0.0 # Apache-2.0

watcherclient/tests/unit/common/test_api_versioning.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from watcherclient.common import api_versioning
 from watcherclient import exceptions

watcherclient/tests/unit/test_client.py

@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from keystoneauth1 import loading as kaloading
 

watcherclient/tests/unit/test_utils.py

@@ -14,7 +14,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from watcherclient.common.apiclient import exceptions as exc
 from watcherclient.common import utils

watcherclient/tests/unit/utils.py

@@ -15,9 +15,9 @@
 
 import copy
 import os
+from unittest import mock
 
 import fixtures
-import mock
 from oslo_utils import strutils
 import six
 import testtools

watcherclient/tests/unit/v1/base.py

@@ -14,8 +14,8 @@
 # limitations under the License.
 
 import shlex
+from unittest import mock
 
-import mock
 from osc_lib import utils as oscutils
 from oslo_serialization import jsonutils
 

watcherclient/tests/unit/v1/test_action_plan.py

@@ -14,7 +14,7 @@
 #    under the License.
 
 import copy
-import mock
+from unittest import mock
 
 import testtools
 from testtools import matchers

watcherclient/tests/unit/v1/test_action_plan_shell.py

@@ -14,10 +14,11 @@
 # limitations under the License.
 
 import datetime
-import mock
-import six
+from unittest import mock
 
 from oslo_utils.uuidutils import generate_uuid
+import six
+
 from watcherclient import exceptions
 from watcherclient import shell
 from watcherclient.tests.unit.v1 import base

watcherclient/tests/unit/v1/test_action_shell.py

@@ -14,7 +14,8 @@
 #   under the License.
 
 import datetime
-import mock
+from unittest import mock
+
 import six
 
 from watcherclient import exceptions

watcherclient/tests/unit/v1/test_audit_shell.py

@@ -14,7 +14,8 @@
 #   under the License.
 
 import datetime
-import mock
+from unittest import mock
+
 import six
 
 from watcherclient import shell

watcherclient/tests/unit/v1/test_audit_template_shell.py

@@ -14,7 +14,8 @@
 #   under the License.
 
 import datetime
-import mock
+from unittest import mock
+
 import six
 
 from watcherclient import shell

watcherclient/tests/unit/v1/test_data_model_shell.py

@@ -12,7 +12,9 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import mock
+
+from unittest import mock
+
 import six
 
 from watcherclient import shell

watcherclient/tests/unit/v1/test_goal_shell.py

@@ -14,7 +14,8 @@
 # limitations under the License.
 
 import datetime
-import mock
+from unittest import mock
+
 import six
 
 from watcherclient import shell

watcherclient/tests/unit/v1/test_scoring_engine_shell.py

@@ -14,7 +14,8 @@
 # limitations under the License.
 
 import datetime
-import mock
+from unittest import mock
+
 import six
 
 from watcherclient import shell

watcherclient/tests/unit/v1/test_service_shell.py

@@ -14,7 +14,8 @@
 # limitations under the License.
 
 import datetime
-import mock
+from unittest import mock
+
 import six
 
 from watcherclient import shell

watcherclient/tests/unit/v1/test_strategy_shell.py

@@ -14,10 +14,10 @@
 # limitations under the License.
 
 import datetime
-import mock
-import six
+from unittest import mock
 
 from oslo_serialization import jsonutils
+import six
 
 from watcherclient import shell
 from watcherclient.tests.unit.v1 import base