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: Ie841dc9738ed029ef01add3681ed76112e2cdca3
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>

senlin/tests/unit/api/common/test_util.py

@@ -11,7 +11,8 @@
 # under the License.
 
 import jsonschema
-import mock
+from unittest import mock
+
 from webob import exc
 
 from senlin.api.common import util

senlin/tests/unit/api/common/test_wsgi.py

@@ -11,9 +11,9 @@
 # under the License.
 
 import socket
+from unittest import mock
 
 import fixtures
-import mock
 from oslo_config import cfg
 from oslo_utils import encodeutils
 import webob

senlin/tests/unit/api/middleware/test_middleware_filters.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_middleware import ssl
 
 from senlin.api import middleware as mw

senlin/tests/unit/api/middleware/test_trust.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from senlin.api.middleware import trust
 from senlin.common import context

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

@@ -10,7 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
+
 import webob
 
 from senlin.api.common import version_request as vr

senlin/tests/unit/api/middleware/test_webhook.py

@@ -10,7 +10,7 @@
 # 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_utils import uuidutils

senlin/tests/unit/api/openstack/test_versions.py

@@ -11,7 +11,8 @@
 # under the License.
 
 import http.client as http_client
-import mock
+from unittest import mock
+
 from oslo_serialization import jsonutils
 from oslo_utils import encodeutils
 import webob

senlin/tests/unit/api/openstack/v1/test_actions.py

@@ -11,7 +11,8 @@
 # under the License.
 
 import copy
-import mock
+from unittest import mock
+
 from webob import exc
 
 from oslo_serialization import jsonutils

senlin/tests/unit/api/openstack/v1/test_buildinfo.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from senlin.api.middleware import fault
 from senlin.api.openstack.v1 import build_info

senlin/tests/unit/api/openstack/v1/test_cluster_policies.py

@@ -10,7 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
+
 from webob import exc
 
 from senlin.api.common import util

senlin/tests/unit/api/openstack/v1/test_clusters.py

@@ -11,8 +11,8 @@
 # under the License.
 
 import copy
+from unittest import mock
 
-import mock
 from oslo_serialization import jsonutils
 from oslo_utils import uuidutils
 from webob import exc

senlin/tests/unit/api/openstack/v1/test_events.py

@@ -10,7 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
+
 from webob import exc
 
 from senlin.api.common import util

senlin/tests/unit/api/openstack/v1/test_nodes.py

@@ -11,7 +11,8 @@
 # under the License.
 
 import copy
-import mock
+from unittest import mock
+
 from webob import exc
 
 from oslo_serialization import jsonutils

senlin/tests/unit/api/openstack/v1/test_policies.py

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

senlin/tests/unit/api/openstack/v1/test_policy_types.py

@@ -10,7 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
+
 from webob import exc
 
 from senlin.api.common import util

senlin/tests/unit/api/openstack/v1/test_profile_types.py

@@ -10,7 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
+
 from webob import exc
 
 from senlin.api.common import util

senlin/tests/unit/api/openstack/v1/test_profiles.py

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

senlin/tests/unit/api/openstack/v1/test_receivers.py

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

senlin/tests/unit/api/openstack/v1/test_services.py

@@ -13,7 +13,7 @@
 
 import datetime
 import iso8601
-import mock
+from unittest import mock
 
 from senlin.api.openstack.v1 import services
 from senlin.common import policy

senlin/tests/unit/api/openstack/v1/test_version.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from senlin.api.common import version_request as vr
 from senlin.api.common import wsgi

senlin/tests/unit/api/openstack/v1/test_webhooks.py

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

senlin/tests/unit/cmd/test_conductor.py

@@ -9,7 +9,8 @@
 #    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 oslo_config import cfg
 
 from senlin.cmd import conductor

senlin/tests/unit/cmd/test_engine.py

@@ -9,7 +9,8 @@
 #    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 oslo_config import cfg
 
 from senlin.cmd import engine

senlin/tests/unit/cmd/test_health_manager.py

@@ -9,7 +9,8 @@
 #    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 oslo_config import cfg
 
 from senlin.cmd import health_manager

senlin/tests/unit/conductor/service/test_actions.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_messaging.rpc import dispatcher as rpc
 
 from senlin.common import consts

senlin/tests/unit/conductor/service/test_cluster_op.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_messaging.rpc import dispatcher as rpc
 
 from senlin.common import consts

senlin/tests/unit/conductor/service/test_cluster_policies.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_messaging.rpc import dispatcher as rpc
 
 from senlin.common import consts

senlin/tests/unit/conductor/service/test_clusters.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 oslo_messaging.rpc import dispatcher as rpc
 from oslo_utils import uuidutils

senlin/tests/unit/conductor/service/test_credentials.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from senlin.conductor import service
 from senlin.objects import credential as co

senlin/tests/unit/conductor/service/test_events.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from oslo_messaging.rpc import dispatcher as rpc
 

senlin/tests/unit/conductor/service/test_nodes.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 oslo_messaging.rpc import dispatcher as rpc
 

senlin/tests/unit/conductor/service/test_policies.py

@@ -11,7 +11,8 @@
 # under the License.
 
 import copy
-import mock
+from unittest import mock
+
 from oslo_config import cfg
 from oslo_messaging.rpc import dispatcher as rpc
 from oslo_utils import uuidutils

senlin/tests/unit/conductor/service/test_policy_types.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_messaging.rpc import dispatcher as rpc
 
 from senlin.common import exception as exc

senlin/tests/unit/conductor/service/test_profile_types.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_messaging.rpc import dispatcher as rpc
 
 from senlin.common import exception as exc

senlin/tests/unit/conductor/service/test_profiles.py

@@ -11,8 +11,8 @@
 # under the License.
 
 import copy
+from unittest import mock
 
-import mock
 from oslo_config import cfg
 from oslo_messaging.rpc import dispatcher as rpc
 from oslo_utils import uuidutils

senlin/tests/unit/conductor/service/test_receivers.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 oslo_messaging.rpc import dispatcher as rpc
 

senlin/tests/unit/conductor/service/test_webhooks.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_messaging.rpc import dispatcher as rpc
 
 from senlin.common import consts

senlin/tests/unit/conductor/test_service.py

@@ -11,9 +11,9 @@
 # under the License.
 
 import datetime
+from unittest import mock
 
 import eventlet
-import mock
 from oslo_config import cfg
 import oslo_messaging
 from oslo_utils import timeutils

senlin/tests/unit/db/test_cluster_api.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from oslo_db.sqlalchemy import utils as sa_utils
 from oslo_utils import timeutils as tu

senlin/tests/unit/db/test_cluster_policy_api.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_db.sqlalchemy import utils as sa_utils
 from oslo_utils import timeutils as tu
 

senlin/tests/unit/db/test_node_api.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_db.sqlalchemy import utils as sa_utils
 from oslo_serialization import jsonutils
 from oslo_utils import timeutils as tu

senlin/tests/unit/db/test_policy_api.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_db.sqlalchemy import utils as sa_utils
 from oslo_utils import timeutils as tu
 

senlin/tests/unit/db/test_profile_api.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_db.sqlalchemy import utils as sa_utils
 from oslo_utils import timeutils as tu
 

senlin/tests/unit/db/test_receiver_api.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_db.sqlalchemy import utils as sa_utils
 from oslo_utils import timeutils as tu
 

senlin/tests/unit/db/test_registry_api.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from senlin.db.sqlalchemy import api as db_api
 from senlin.db.sqlalchemy import utils as db_utils

senlin/tests/unit/db/test_sqlalchemy_types.py

@@ -12,7 +12,8 @@
 #    under the License.
 
 
-import mock
+from unittest import mock
+
 from oslo_utils import timeutils
 import pytz
 from sqlalchemy.dialects.mysql import base as mysql_base

senlin/tests/unit/db/test_sqlalchemy_utils.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 oslo_utils import timeutils
 

senlin/tests/unit/drivers/test_cinder_v2.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from senlin.drivers.os import cinder_v2
 from senlin.drivers import sdk

senlin/tests/unit/drivers/test_docker_v1.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from senlin.drivers.container import docker_v1
 from senlin.tests.unit.common import base

senlin/tests/unit/drivers/test_driver.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 senlin.drivers import base as driver_base

senlin/tests/unit/drivers/test_glance_v2.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from senlin.drivers.os import glance_v2
 from senlin.drivers import sdk

senlin/tests/unit/drivers/test_heat_v1.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 senlin.drivers.os import heat_v1

senlin/tests/unit/drivers/test_keystone_v3.py

@@ -11,8 +11,8 @@
 # under the License.
 
 import copy
+from unittest import mock
 
-import mock
 from oslo_config import cfg
 
 from senlin.drivers.os import keystone_v3 as kv3

senlin/tests/unit/drivers/test_lbaas.py

@@ -11,7 +11,7 @@
 # under the License.
 
 import eventlet
-import mock
+from unittest import mock
 
 from oslo_context import context as oslo_context
 

senlin/tests/unit/drivers/test_mistral_v2.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from senlin.drivers.os import mistral_v2
 from senlin.drivers import sdk

senlin/tests/unit/drivers/test_neutron_v2.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_utils import uuidutils
 
 from senlin.drivers.os import neutron_v2

senlin/tests/unit/drivers/test_nova_v2.py

@@ -10,8 +10,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
 from openstack import exceptions as sdk_exc
+from unittest import mock
+
 from oslo_config import cfg
 
 from senlin.drivers.os import nova_v2

senlin/tests/unit/drivers/test_octavia_v2.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from senlin.drivers.os import octavia_v2
 from senlin.drivers import sdk

senlin/tests/unit/drivers/test_sdk.py

@@ -11,8 +11,8 @@
 # under the License.
 
 import types
+from unittest import mock
 
-import mock
 from openstack import connection
 from oslo_serialization import jsonutils
 from requests import exceptions as req_exc

senlin/tests/unit/drivers/test_zaqar_v2.py

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

senlin/tests/unit/engine/actions/test_action_base.py

@@ -12,8 +12,8 @@
 
 import copy
 import eventlet
+from unittest import mock
 
-import mock
 from oslo_config import cfg
 from oslo_utils import timeutils
 from oslo_utils import uuidutils

senlin/tests/unit/engine/actions/test_add_nodes.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from senlin.common import consts
 from senlin.engine.actions import base as ab

senlin/tests/unit/engine/actions/test_attach_policy.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from senlin.engine.actions import cluster_action as ca
 from senlin.engine import cluster as cm

senlin/tests/unit/engine/actions/test_check.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from senlin.common import consts
 from senlin.engine.actions import base as ab

senlin/tests/unit/engine/actions/test_cluster_action.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from senlin.common import consts
 from senlin.common import exception as exc

senlin/tests/unit/engine/actions/test_create.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from senlin.common import consts
 from senlin.engine.actions import base as ab

senlin/tests/unit/engine/actions/test_del_nodes.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from senlin.common import consts
 from senlin.engine.actions import cluster_action as ca

senlin/tests/unit/engine/actions/test_delete.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from senlin.common import consts
 from senlin.engine.actions import base as ab

senlin/tests/unit/engine/actions/test_node_action.py

@@ -11,7 +11,7 @@
 # under the License.
 
 import eventlet
-import mock
+from unittest import mock
 
 from senlin.common import consts
 from senlin.common import scaleutils

senlin/tests/unit/engine/actions/test_operation.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from senlin.common import consts
 from senlin.engine.actions import base as ab

senlin/tests/unit/engine/actions/test_recover.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from senlin.common import consts
 from senlin.common import scaleutils as su

senlin/tests/unit/engine/actions/test_replace_nodes.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from senlin.common import consts
 from senlin.engine.actions import base as ab

senlin/tests/unit/engine/actions/test_resize.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from senlin.common import consts
 from senlin.common import scaleutils

senlin/tests/unit/engine/actions/test_scale_in.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from senlin.common import consts
 from senlin.common import scaleutils

senlin/tests/unit/engine/actions/test_scale_out.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from senlin.common import consts
 from senlin.engine.actions import cluster_action as ca

senlin/tests/unit/engine/actions/test_update.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from senlin.common import consts
 from senlin.engine.actions import base as ab

senlin/tests/unit/engine/actions/test_update_policy.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from senlin.engine.actions import cluster_action as ca
 from senlin.engine import cluster as cm

senlin/tests/unit/engine/actions/test_wait.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import eventlet
-import mock
+from unittest import mock
 
 from senlin.engine.actions import base as ab
 from senlin.engine.actions import cluster_action as ca

senlin/tests/unit/engine/notifications/test_heat_endpoint.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from senlin.common import context
 from senlin.engine.notifications import heat_endpoint

senlin/tests/unit/engine/notifications/test_message.py

@@ -11,7 +11,7 @@
 # under the License.
 
 
-import mock
+from unittest import mock
 
 from oslo_config import cfg
 

senlin/tests/unit/engine/notifications/test_nova_endpoint.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from senlin.common import context
 from senlin.engine.notifications import nova_endpoint

senlin/tests/unit/engine/receivers/test_message.py

@@ -11,8 +11,8 @@
 # under the License.
 
 
-import mock
 import socket
+from unittest import mock
 
 from keystoneauth1 import loading as ks_loading
 from oslo_config import cfg

senlin/tests/unit/engine/receivers/test_receiver.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 oslo_context import context as oslo_ctx
 from oslo_utils import timeutils

senlin/tests/unit/engine/receivers/test_webhook.py

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

senlin/tests/unit/engine/test_cluster.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 senlin.common import consts

senlin/tests/unit/engine/test_engine_parser.py

@@ -12,9 +12,9 @@
 
 import io
 import os
+from unittest import mock
 import urllib
 
-import mock
 
 from senlin.engine import parser
 from senlin.tests.unit.common import base

senlin/tests/unit/engine/test_environment.py

@@ -11,7 +11,7 @@
 # under the License.
 
 import glob
-import mock
+from unittest import mock
 
 from senlin.common import exception
 from senlin.engine import environment

senlin/tests/unit/engine/test_event.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 oslo_log import log as logging
 import testtools

senlin/tests/unit/engine/test_health_manager.py

@@ -12,8 +12,8 @@
 
 import re
 import time
+from unittest import mock
 
-import mock
 from oslo_config import cfg
 from oslo_utils import timeutils as tu
 

senlin/tests/unit/engine/test_node.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_serialization import jsonutils
 from oslo_utils import uuidutils
 

senlin/tests/unit/engine/test_registry.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from senlin.engine import registry
 from senlin.tests.unit.common import base

senlin/tests/unit/engine/test_senlin_lock.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from senlin.common import utils as common_utils
 from senlin.engine import senlin_lock as lockm

senlin/tests/unit/engine/test_service.py

@@ -11,7 +11,8 @@
 # under the License.
 
 import eventlet
-import mock
+from unittest import mock
+
 from oslo_config import cfg
 from oslo_context import context as oslo_context
 import oslo_messaging

senlin/tests/unit/events/test_base.py

@@ -10,8 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
 import testtools
+from unittest import mock
 
 from senlin.common import consts
 from senlin.events import base

senlin/tests/unit/events/test_database.py

@@ -10,8 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
 import testtools
+from unittest import mock
 
 from senlin.common import consts
 from senlin.events import base

senlin/tests/unit/events/test_message.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 oslo_log import log as logging
 from oslo_utils import timeutils

senlin/tests/unit/health_manager/test_service.py

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

senlin/tests/unit/objects/test_action.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_utils import uuidutils
 import testtools
 

senlin/tests/unit/objects/test_base.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_versionedobjects import base as ovo_base
 from oslo_versionedobjects import exception as exc
 

senlin/tests/unit/objects/test_cluster.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 oslo_utils import timeutils
 from oslo_utils import uuidutils