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: Id266a937b37507a1cef05ac34e33a80265581ad1
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
Co-Authored-By: zhurong <aaronzhu1121@gmail.com>

murano/tests/unit/api/base.py

@@ -14,9 +14,9 @@
 # limitations under the License.
 
 import logging
+from unittest import mock
 
 import fixtures
-import mock
 from oslo_utils import timeutils
 import routes
 import urllib

murano/tests/unit/api/cmd/test_test_runner.py

@@ -13,9 +13,9 @@
 from io import StringIO
 import os
 import sys
+from unittest import mock
 
 import fixtures
-import mock
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import importutils

murano/tests/unit/api/middleware/test_ext_context.py

@@ -13,7 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 import webob
 
 from keystoneauth1 import exceptions

murano/tests/unit/api/middleware/test_fault_wrapper.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from murano.api.middleware import fault
 from murano.common import wsgi

murano/tests/unit/api/middleware/test_version_negotiation.py

@@ -13,7 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 import webob
 
 from murano.api.middleware import version_negotiation

murano/tests/unit/api/v1/cloudfoundry/test_cfapi.py

@@ -14,7 +14,8 @@
 #    under the License.
 
 import json
-import mock
+from unittest import mock
+
 from oslo_serialization import base64
 from webob import response
 

murano/tests/unit/api/v1/test_actions.py

@@ -15,7 +15,8 @@
 # limitations under the License.
 
 
-import mock
+from unittest import mock
+
 from oslo_utils import timeutils
 from webob import exc
 

murano/tests/unit/api/v1/test_catalog.py

@@ -19,9 +19,9 @@ import imghdr
 from io import StringIO
 import os
 import tempfile
+from unittest import mock
 import uuid
 
-import mock
 from oslo_config import cfg
 from oslo_serialization import jsonutils
 from oslo_utils import timeutils

murano/tests/unit/api/v1/test_deployments.py

@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 import murano.tests.unit.api.base as tb
+from unittest import mock
 
 from oslo_config import fixture as config_fixture
 from oslo_serialization import jsonutils

murano/tests/unit/api/v1/test_env_templates.py

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 from datetime import datetime
-import mock
+from unittest import mock
 
 from oslo_config import fixture as config_fixture
 from oslo_db import exception as db_exc

murano/tests/unit/api/v1/test_schemas.py

@@ -13,7 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
+
 from oslo_messaging.rpc import client
 from webob import exc
 

murano/tests/unit/api/v1/test_sessions.py

@@ -14,7 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
+
 from oslo_config import fixture as config_fixture
 from oslo_serialization import jsonutils
 from webob import exc

murano/tests/unit/api/v1/test_static_actions.py

@@ -15,7 +15,8 @@
 # limitations under the License.
 
 
-import mock
+from unittest import mock
+
 from oslo_messaging.rpc import client
 from oslo_serialization import jsonutils
 from webob import exc

murano/tests/unit/cmd/test_api_workers.py

@@ -10,8 +10,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import sys
+from unittest import mock
 
 from oslo_concurrency import processutils
 from oslo_log import log as logging

murano/tests/unit/cmd/test_engine_workers.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from oslo_concurrency import processutils
 from oslo_log import log as logging

murano/tests/unit/cmd/test_manage.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_config import cfg
 
 try:

murano/tests/unit/common/messaging/test_mqclient.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_config import cfg
 from oslo_serialization import jsonutils
 import ssl as ssl_module

murano/tests/unit/common/test_app_loader.py

@@ -10,8 +10,8 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-import mock
 import os
+from unittest import mock
 
 from oslo_config import cfg
 from paste import deploy

murano/tests/unit/common/test_auth_utils.py

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

murano/tests/unit/common/test_engine.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from oslo_service import service
 

murano/tests/unit/common/test_plugin_loader.py

@@ -10,7 +10,8 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-import mock
+from unittest import mock
+
 from oslo_config import cfg
 
 from murano.common.plugins import extensions_loader

murano/tests/unit/common/test_server.py

@@ -14,7 +14,7 @@
 #    under the License.
 
 from datetime import datetime
-import mock
+from unittest import mock
 
 from murano.common import server
 from murano.services import states

murano/tests/unit/common/test_statservice.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 import datetime as dt
-import mock
 import time
+from unittest import mock
 
 from oslo_utils import timeutils
 

murano/tests/unit/common/test_wsgi.py

@@ -15,8 +15,9 @@
 
 import errno
 import eventlet
-import mock
 import socket
+from unittest import mock
+
 import webob
 
 from oslo_config import cfg

murano/tests/unit/db/services/test_core_service.py

@@ -13,7 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
+
 from webob import exc
 
 from murano.db.services import core_services

murano/tests/unit/db/services/test_environments.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 import datetime as dt
-import mock
+from unittest import mock
 import uuid
 
 from oslo_utils import timeutils

murano/tests/unit/db/services/test_instances.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_db import exception
 from oslo_utils import timeutils
 

murano/tests/unit/db/services/test_templates_service.py

@@ -13,8 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from unittest import mock
+
 import fixtures
-import mock
 
 from murano.db.services import environment_templates as env_temp
 from murano.tests.unit import base

murano/tests/unit/dsl/test_agent.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from murano.common import exceptions as exc
 from murano.dsl import constants

murano/tests/unit/dsl/test_attribute_store.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 murano.dsl import attribute_store
 from murano.dsl import dsl

murano/tests/unit/dsl/test_context_manager.py

@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from murano.dsl import context_manager
 from murano.dsl import yaql_integration

murano/tests/unit/dsl/test_engine_yaql_functions.py

@@ -12,8 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 from testtools import matchers
+from unittest import mock
 from yaql.language import exceptions as yaql_exceptions
 
 from murano.tests.unit.dsl.foundation import object_model as om

murano/tests/unit/dsl/test_helpers.py

@@ -12,8 +12,8 @@
 # limitations under the License.
 
 import copy
-import mock
 import semantic_version
+from unittest import mock
 import weakref
 
 from oslo_utils.uuidutils import generate_uuid

murano/tests/unit/dsl/test_logger.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from murano.dsl import helpers
 from murano.engine.system import logger

murano/tests/unit/dsl/test_session_local_storage.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 murano.dsl import helpers
 from murano.dsl import session_local_storage

murano/tests/unit/dsl/test_versioning.py

@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 import semantic_version
+from unittest import mock
 
 from murano.tests.unit.dsl.foundation import object_model as om
 from murano.tests.unit.dsl.foundation import test_case

murano/tests/unit/engine/system/test_agent.py

@@ -18,8 +18,8 @@ import datetime
 import json
 import os
 import tempfile
+from unittest import mock
 
-import mock
 from oslo_serialization import base64
 import yaml as yamllib
 

murano/tests/unit/engine/system/test_agent_listener.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from murano.engine.system import agent_listener
 from murano.tests.unit import base

murano/tests/unit/engine/system/test_garbage_collector.py

@@ -12,9 +12,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
 import weakref
 
-import mock
 from testtools import matchers
 
 from murano.dsl import exceptions

murano/tests/unit/engine/system/test_instance_reporter.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from murano.db import models
 from murano.engine.system import instance_reporter

murano/tests/unit/engine/system/test_metadef_browser.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from murano.dsl import murano_object
 from murano.engine.system import metadef_browser

murano/tests/unit/engine/system/test_net_explorer.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from oslo_config import cfg
 

murano/tests/unit/engine/system/test_test_fixture.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 murano.dsl import murano_method
 from murano.dsl import murano_type

murano/tests/unit/engine/system/test_workflowclient.py

@@ -15,13 +15,13 @@
 # limitations under the License.
 
 import random
+from unittest import mock
 
 try:
     from mistralclient.api import client as mistralcli
 except ImportError:
     mistralcli = None
 
-import mock
 from oslo_config import cfg
 
 from murano.dsl import murano_method

murano/tests/unit/engine/test_mock_context_manager.py

@@ -10,7 +10,8 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-import mock
+from unittest import mock
+
 from yaql import contexts
 from yaql import specs
 

murano/tests/unit/engine/test_package_loader.py

@@ -18,8 +18,8 @@ from muranoclient.common import exceptions as muranoclient_exc
 import os
 import shutil
 import tempfile
+from unittest import mock
 
-import mock
 import semantic_version
 import testtools
 

murano/tests/unit/packages/test_load_utils.py

@@ -13,12 +13,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import os
 import random
 import shutil
 import string
 import tempfile
+from unittest import mock
 import yaml
 import zipfile
 

murano/tests/unit/packages/test_package_base.py

@@ -13,13 +13,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import os
 import random
 import semantic_version
 import shutil
 import string
 import tempfile
+from unittest import mock
 
 from murano.packages import exceptions
 from murano.packages import package_base

murano/tests/unit/policy/modify/actions/test_action_manager.py

@@ -12,7 +12,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
 
 import murano.policy.modify.actions.action_manager as am
 from murano.policy.modify.actions import default_actions as da

murano/tests/unit/policy/test_model_policy_enforcer.py

@@ -14,7 +14,8 @@
 #    under the License.
 
 import congressclient
-import mock
+from unittest import mock
+
 from oslo_config import cfg
 
 from murano.common import engine

murano/tests/unit/services/test_actions.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from murano.services import actions
 from murano.services import states

murano/tests/unit/test_engine.py

@@ -14,8 +14,8 @@
 # limitations under the License.
 
 import re
+from unittest import mock
 
-import mock
 import semantic_version
 import yaql
 from yaql.language import exceptions

murano/tests/unit/test_hacking.py

@@ -12,9 +12,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import pycodestyle
 import textwrap
+from unittest import mock
 
 from murano.hacking import checks
 from murano.tests.unit import base

murano/tests/unit/test_heat_stack.py

@@ -15,7 +15,8 @@
 # limitations under the License.
 
 from heatclient.v1 import stacks
-import mock
+from unittest import mock
+
 from oslo_config import cfg
 
 from murano.engine.system import heat_stack

murano/tests/unit/test_utils.py

@@ -13,7 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from webob import exc
 
 from murano.services import states

test-requirements.txt

@@ -5,7 +5,6 @@ hacking>=3.0,<4.0.0 # Apache-2.0
 
 coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
-mock>=2.0.0 # BSD
 nose>=1.3.7 # LGPL
 oslotest>=3.2.0 # Apache-2.0
 sqlalchemy-migrate>=0.11.0 # Apache-2.0