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.

The remainder was auto-generated with the following (hacky) script, with
one or two manual tweaks after the fact:

  import glob

  for path in glob.glob('watcher/tests/**/*.py', recursive=True):
      with open(path) as fh:
          lines = fh.readlines()
      if 'import mock\n' not in lines:
          continue
      import_group_found = False
      create_first_party_group = False
      for num, line in enumerate(lines):
          line = line.strip()
          if line.startswith('import ') or line.startswith('from '):
              tokens = line.split()
              for lib in (
                  'ddt', 'six', 'webob', 'fixtures', 'testtools'
                  'neutron', 'cinder', 'ironic', 'keystone', 'oslo',
              ):
                  if lib in tokens[1]:
                      create_first_party_group = True
                      break
              if create_first_party_group:
                  break
              import_group_found = True
          if not import_group_found:
              continue
          if line.startswith('import ') or line.startswith('from '):
              tokens = line.split()
              if tokens[1] > 'unittest':
                  break
              elif tokens[1] == 'unittest' and (
                  len(tokens) == 2 or tokens[4] > 'mock'
              ):
                  break
          elif not line:
              break
      if create_first_party_group:
          lines.insert(num, 'from unittest import mock\n\n')
      else:
          lines.insert(num, 'from unittest import mock\n')
      del lines[lines.index('import mock\n')]
      with open(path, 'w+') as fh:
          fh.writelines(lines)

Co-Authored-By: Sean McGinnis <sean.mcginnis@gmail.com>

Change-Id: Icf35d3a6c10c529e07d1a4edaa36f504e5bf553a

test-requirements.txt

@@ -6,7 +6,6 @@ coverage>=4.5.1 # Apache-2.0
 doc8>=0.8.0 # Apache-2.0
 freezegun>=0.3.10 # Apache-2.0
 hacking>=3.0.1,<3.1.0 # Apache-2.0
-mock>=2.0.0 # BSD
 oslotest>=3.3.0 # Apache-2.0
 os-testr>=1.0.0 # Apache-2.0
 testscenarios>=0.5.0 # Apache-2.0/BSD

watcher/tests/api/base.py

@@ -23,7 +23,7 @@
 # NOTE(deva): import auth_token so we can override a config option
 
 import copy
-import mock
+from unittest import mock
 from urllib import parse as urlparse
 
 from oslo_config import cfg

watcher/tests/api/test_hooks.py

@@ -14,7 +14,8 @@
 
 """Tests for the Pecan API hooks."""
 
-import mock
+from unittest import mock
+
 from oslo_config import cfg
 import oslo_messaging as messaging
 from oslo_serialization import jsonutils

watcher/tests/api/test_scheduling.py

@@ -15,7 +15,7 @@
 from apscheduler.schedulers import background
 import datetime
 import freezegun
-import mock
+from unittest import mock
 
 from watcher.api import scheduling
 from watcher.notifications import service

watcher/tests/api/v1/test_actions.py

@@ -12,7 +12,7 @@
 
 import datetime
 import itertools
-import mock
+from unittest import mock
 
 from oslo_config import cfg
 from oslo_serialization import jsonutils

watcher/tests/api/v1/test_actions_plans.py

@@ -12,7 +12,7 @@
 
 import datetime
 import itertools
-import mock
+from unittest import mock
 
 from oslo_config import cfg
 from oslo_serialization import jsonutils

watcher/tests/api/v1/test_audit_templates.py

@@ -12,7 +12,7 @@
 
 import datetime
 import itertools
-import mock
+from unittest import mock
 from urllib import parse as urlparse
 from webtest.app import AppError
 

watcher/tests/api/v1/test_audits.py

@@ -13,7 +13,7 @@
 import datetime
 from dateutil import tz
 import itertools
-import mock
+from unittest import mock
 from urllib import parse as urlparse
 
 from oslo_config import cfg

watcher/tests/api/v1/test_data_model.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_serialization import jsonutils
 

watcher/tests/api/v1/test_strategies.py

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

watcher/tests/api/v1/test_types.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 import webtest
 import wsme
 from wsme import types as wtypes

watcher/tests/api/v1/test_webhooks.py

@@ -10,7 +10,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-import mock
+from unittest import mock
 
 from watcher.decision_engine import rpcapi as deapi
 from watcher import objects

watcher/tests/applier/action_plan/test_default_action_handler.py

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from watcher.applier.action_plan import default
 from watcher.applier import default as ap_applier

watcher/tests/applier/actions/test_change_node_power_state.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import jsonschema
-import mock
+from unittest import mock
 
 from watcher.applier.actions import base as baction
 from watcher.applier.actions import change_node_power_state

watcher/tests/applier/actions/test_change_nova_service_state.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import jsonschema
-import mock
+from unittest import mock
 
 from watcher.applier.actions import base as baction
 from watcher.applier.actions import change_nova_service_state

watcher/tests/applier/actions/test_migration.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import jsonschema
-import mock
+from unittest import mock
 
 from watcher.applier.actions import base as baction
 from watcher.applier.actions import migration

watcher/tests/applier/actions/test_resize.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import jsonschema
-import mock
+from unittest import mock
 
 from watcher.applier.actions import base as baction
 from watcher.applier.actions import resize

watcher/tests/applier/actions/test_sleep.py

@@ -15,7 +15,7 @@
 
 
 import jsonschema
-import mock
+from unittest import mock
 
 from watcher.applier.actions import sleep
 from watcher.tests import base

watcher/tests/applier/actions/test_volume_migration.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import jsonschema
-import mock
+from unittest import mock
 
 from watcher.applier.actions import base as baction
 from watcher.applier.actions import volume_migration

watcher/tests/applier/messaging/test_trigger_action_plan_endpoint.py

@@ -18,7 +18,7 @@
 #
 
 
-import mock
+from unittest import mock
 
 from watcher.applier.messaging import trigger
 from watcher.common import utils

watcher/tests/applier/test_applier_manager.py

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-import mock
+from unittest import mock
 
 import oslo_messaging as om
 from watcher.applier import manager as applier_manager

watcher/tests/applier/test_rpcapi.py

@@ -17,7 +17,8 @@
 # limitations under the License.
 #
 
-import mock
+from unittest import mock
+
 import oslo_messaging as om
 from watcher.applier import rpcapi
 

watcher/tests/applier/test_sync.py

@@ -16,7 +16,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
 from oslo_utils import uuidutils

watcher/tests/applier/workflow_engine/test_default_workflow_engine.py

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 import abc
-import mock
+from unittest import mock
 
 from watcher.applier.actions import base as abase
 from watcher.applier.actions import factory

watcher/tests/applier/workflow_engine/test_taskflow_action_container.py

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 import eventlet
-import mock
+from unittest import mock
 
 from watcher.applier.workflow_engine import default as tflow
 from watcher.common import clients

watcher/tests/base.py

@@ -15,8 +15,8 @@
 
 import copy
 import os
+from unittest import mock
 
-import mock
 from oslo_config import cfg
 from oslo_log import log
 from oslo_messaging import conffixture

watcher/tests/cmd/test_api.py

@@ -15,8 +15,8 @@
 # limitations under the License.
 
 import types
+from unittest import mock
 
-import mock
 from oslo_config import cfg
 from oslo_service import wsgi
 from pecan.testing import load_test_app

watcher/tests/cmd/test_applier.py

@@ -15,8 +15,8 @@
 # limitations under the License.
 
 import types
+from unittest import mock
 
-import mock
 from oslo_config import cfg
 from oslo_service import service
 from watcher.applier import sync

watcher/tests/cmd/test_db_manage.py

@@ -15,8 +15,8 @@
 # limitations under the License.
 
 import sys
+from unittest import mock
 
-import mock
 from oslo_config import cfg
 
 from watcher.cmd import dbmanage

watcher/tests/cmd/test_decision_engine.py

@@ -15,8 +15,8 @@
 # limitations under the License.
 
 import types
+from unittest import mock
 
-import mock
 from oslo_config import cfg
 from oslo_service import service
 

watcher/tests/common/loader/test_loader.py

@@ -14,7 +14,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
 from stevedore import driver as drivermanager

watcher/tests/common/test_cinder_helper.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 #
 
-import mock
 import time
+from unittest import mock
 
 from cinderclient import exceptions as cinder_exception
 

watcher/tests/common/test_clients.py

@@ -12,6 +12,8 @@
 
 from ceilometerclient import client as ceclient
 import ceilometerclient.v2.client as ceclient_v2
+from unittest import mock
+
 from cinderclient import client as ciclient
 from cinderclient.v3 import client as ciclient_v3
 from glanceclient import client as glclient
@@ -21,7 +23,6 @@ from ironicclient import client as irclient
 from ironicclient.v1 import client as irclient_v1
 from keystoneauth1 import adapter as ka_adapter
 from keystoneauth1 import loading as ka_loading
-import mock
 from monascaclient import client as monclient
 from monascaclient.v2_0 import client as monclient_v2
 from neutronclient.neutron import client as netclient

watcher/tests/common/test_ironic_helper.py

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-import mock
+from unittest import mock
 
 from watcher.common import clients
 from watcher.common import exception

watcher/tests/common/test_nova_helper.py

@@ -18,10 +18,10 @@
 #
 
 import time
+from unittest import mock
 
 from novaclient import api_versions
 
-import mock
 
 import glanceclient.exc as glexceptions
 import novaclient.exceptions as nvexceptions

watcher/tests/common/test_placement_helper.py

@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from watcher.common import placement_helper
 from watcher.tests import base

watcher/tests/common/test_service.py

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

watcher/tests/conf/test_list_opts.py

@@ -15,7 +15,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 cfg
 from stevedore import extension
 

watcher/tests/db/test_purge.py

@@ -14,10 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from unittest import mock
+
 from oslo_utils import uuidutils
 
 import freezegun
-import mock
 
 from watcher.common import context as watcher_context
 from watcher.common import utils

watcher/tests/decision_engine/audit/test_audit_handlers.py

@@ -15,8 +15,8 @@
 # limitations under the License.
 
 import datetime
+from unittest import mock
 
-import mock
 from oslo_config import cfg
 from oslo_utils import uuidutils
 

watcher/tests/decision_engine/cluster/test_cinder_cdmc.py

@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from watcher.common import cinder_helper
 from watcher.common import exception

watcher/tests/decision_engine/cluster/test_cluster_data_model_collector.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from watcher.decision_engine.model.collector import base
 from watcher.decision_engine.model import model_root

watcher/tests/decision_engine/cluster/test_nova_cdmc.py

@@ -16,8 +16,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 import os_resource_classes as orc
+from unittest import mock
 
 from watcher.common import nova_helper
 from watcher.common import placement_helper

watcher/tests/decision_engine/datasources/grafana_translators/test_base.py

@@ -16,7 +16,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
 from oslo_log import log

watcher/tests/decision_engine/datasources/grafana_translators/test_influxdb.py

@@ -17,7 +17,7 @@
 # limitations under the License.
 
 import copy
-import mock
+from unittest import mock
 
 from oslo_config import cfg
 from oslo_log import log

watcher/tests/decision_engine/datasources/test_base.py

@@ -16,7 +16,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 cfg
 
 from watcher.decision_engine.datasources import base as datasource

watcher/tests/decision_engine/datasources/test_ceilometer_helper.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from watcher.common import clients
 from watcher.common import exception

watcher/tests/decision_engine/datasources/test_gnocchi_helper.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 cfg
 
 from watcher.common import clients

watcher/tests/decision_engine/datasources/test_grafana_helper.py

@@ -16,7 +16,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
 from oslo_log import log

watcher/tests/decision_engine/datasources/test_manager.py

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

watcher/tests/decision_engine/datasources/test_monasca_helper.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 cfg
 
 from watcher.common import clients

watcher/tests/decision_engine/loading/test_collector_loader.py

@@ -14,9 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 from stevedore import driver as drivermanager
 from stevedore import extension as stevedore_extension
+from unittest import mock
 
 from watcher.common import clients
 from watcher.common import exception

watcher/tests/decision_engine/loading/test_default_strategy_loader.py

@@ -14,8 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 from stevedore import extension
+from unittest import mock
 
 from watcher.common import exception
 from watcher.decision_engine.loading import default as default_loading

watcher/tests/decision_engine/loading/test_goal_loader.py

@@ -14,8 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 from stevedore import extension
+from unittest import mock
 
 from watcher.common import exception
 from watcher.decision_engine.goal import goals

watcher/tests/decision_engine/messaging/test_audit_endpoint.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from watcher.decision_engine.audit import continuous as continuous_handler
 from watcher.decision_engine.audit import oneshot as oneshot_handler

watcher/tests/decision_engine/messaging/test_data_model_endpoint.py

@@ -13,8 +13,9 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import mock
+
 import unittest
+from unittest import mock
 
 from watcher.common import exception
 from watcher.common import utils

watcher/tests/decision_engine/model/faker_cluster_and_metrics.py

@@ -18,8 +18,8 @@
 # limitations under the License.
 
 import os
+from unittest import mock
 
-import mock
 
 from watcher.decision_engine.model.collector import base
 from watcher.decision_engine.model import model_root as modelroot

watcher/tests/decision_engine/model/faker_cluster_state.py

@@ -17,8 +17,8 @@
 # limitations under the License.
 
 import os
+from unittest import mock
 
-import mock
 
 from watcher.common import utils
 from watcher.decision_engine.model.collector import base

watcher/tests/decision_engine/model/notification/test_cinder_notifications.py

@@ -16,8 +16,8 @@
 
 import datetime
 import os
+from unittest import mock
 
-import mock
 from oslo_serialization import jsonutils
 
 from watcher.common import cinder_helper

watcher/tests/decision_engine/model/notification/test_notifications.py

@@ -17,8 +17,8 @@
 # limitations under the License.
 
 import os
+from unittest import mock
 
-import mock
 from oslo_serialization import jsonutils
 
 from watcher.common import context

watcher/tests/decision_engine/model/notification/test_nova_notifications.py

@@ -18,8 +18,8 @@
 
 import os
 import os_resource_classes as orc
+from unittest import mock
 
-import mock
 from oslo_serialization import jsonutils
 
 from watcher.common import context

watcher/tests/decision_engine/model/test_model.py

@@ -16,8 +16,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 import os
+from unittest import mock
 
 from oslo_utils import uuidutils
 

watcher/tests/decision_engine/planner/test_node_resource_consolidation.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from watcher.common import exception
 from watcher.common import utils

watcher/tests/decision_engine/planner/test_weight_planner.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from watcher.common import nova_helper
 from watcher.common import utils

watcher/tests/decision_engine/planner/test_workload_stabilization_planner.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from watcher.common import exception
 from watcher.common import nova_helper

watcher/tests/decision_engine/scope/test_baremetal.py

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-import mock
+from unittest import mock
 
 from watcher.decision_engine.scope import baremetal
 from watcher.tests import base

watcher/tests/decision_engine/scope/test_compute.py

@@ -16,7 +16,7 @@
 #
 
 from jsonschema import validators
-import mock
+from unittest import mock
 
 from watcher.api.controllers.v1 import audit_template
 from watcher.common import exception

watcher/tests/decision_engine/scope/test_storage.py

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-import mock
+from unittest import mock
 
 from watcher.common import cinder_helper
 from watcher.common import exception

watcher/tests/decision_engine/solution/test_default_solution.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from watcher.decision_engine.solution import default
 from watcher.decision_engine.strategy import strategies

watcher/tests/decision_engine/strategy/context/test_strategy_context.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from watcher.common import utils
 from watcher.decision_engine.model.collector import manager

watcher/tests/decision_engine/strategy/selector/test_strategy_selector.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from watcher.common import exception
 from watcher.decision_engine.loading import default as default_loader

watcher/tests/decision_engine/strategy/strategies/test_actuator.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from watcher.common import utils
 from watcher.decision_engine.strategy import strategies

watcher/tests/decision_engine/strategy/strategies/test_base.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from watcher.common import exception
 from watcher.decision_engine.datasources import manager

watcher/tests/decision_engine/strategy/strategies/test_basic_consolidation.py

@@ -18,7 +18,7 @@
 #
 import collections
 import copy
-import mock
+from unittest import mock
 
 from watcher.applier.loading import default
 from watcher.common import clients

watcher/tests/decision_engine/strategy/strategies/test_dummy_strategy.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from watcher.applier.loading import default
 from watcher.common import utils

watcher/tests/decision_engine/strategy/strategies/test_dummy_with_scorer.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from watcher.applier.loading import default
 from watcher.common import utils

watcher/tests/decision_engine/strategy/strategies/test_host_maintenance.py

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-import mock
+from unittest import mock
 
 from watcher.common import exception
 from watcher.decision_engine.model import element

watcher/tests/decision_engine/strategy/strategies/test_node_resource_consolidation.py

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-import mock
+from unittest import mock
 
 from watcher.common import exception
 from watcher.decision_engine.model import element

watcher/tests/decision_engine/strategy/strategies/test_noisy_neighbor.py

@@ -17,7 +17,7 @@
 # limitations under the License.
 
 import collections
-import mock
+from unittest import mock
 
 from watcher.applier.loading import default
 from watcher.common import utils

watcher/tests/decision_engine/strategy/strategies/test_outlet_temp_control.py

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 import collections
-import mock
+from unittest import mock
 
 from watcher.applier.loading import default
 from watcher.common import utils

watcher/tests/decision_engine/strategy/strategies/test_saving_energy.py

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-import mock
+from unittest import mock
 
 from watcher.common import clients
 from watcher.common import utils

watcher/tests/decision_engine/strategy/strategies/test_storage_capacity_balance.py

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-import mock
+from unittest import mock
 
 
 from watcher.common import cinder_helper

watcher/tests/decision_engine/strategy/strategies/test_strategy_endpoint.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from watcher.decision_engine.strategy.strategies import base as strategy_base
 from watcher.tests import base

watcher/tests/decision_engine/strategy/strategies/test_uniform_airflow.py

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 import collections
-import mock
+from unittest import mock
 
 from watcher.applier.loading import default
 from watcher.common import utils

watcher/tests/decision_engine/strategy/strategies/test_vm_workload_consolidation.py

@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-import mock
+from unittest import mock
 
 from watcher.decision_engine.model import element
 from watcher.decision_engine.solution.base import BaseSolution

watcher/tests/decision_engine/strategy/strategies/test_workload_balance.py

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 import collections
-import mock
+from unittest import mock
 
 from watcher.applier.loading import default
 from watcher.common import utils

watcher/tests/decision_engine/strategy/strategies/test_workload_stabilization.py

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-import mock
+from unittest import mock
 
 from watcher.common import clients
 from watcher.common import utils

watcher/tests/decision_engine/strategy/strategies/test_zone_migration.py

@@ -12,7 +12,7 @@
 # limitations under the License.
 
 import collections
-import mock
+from unittest import mock
 
 import cinderclient
 import novaclient

watcher/tests/decision_engine/test_gmr.py

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from watcher.decision_engine import gmr
 from watcher.decision_engine.model.collector import manager

watcher/tests/decision_engine/test_rpcapi.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
+
 import oslo_messaging as om
 from watcher.common import exception
 from watcher.common import utils

watcher/tests/decision_engine/test_scheduling.py

@@ -19,7 +19,7 @@
 from apscheduler.schedulers import background
 from apscheduler.triggers import interval as interval_trigger
 import eventlet
-import mock
+from unittest import mock
 
 from oslo_config import cfg
 from oslo_utils import uuidutils

watcher/tests/decision_engine/test_sync.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from oslo_serialization import jsonutils
 

watcher/tests/fakes.py

@@ -10,8 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
 import requests
+from unittest import mock
 
 fakeAuthTokenHeaders = {'X-User-Id': u'773a902f022949619b5c2f32cd89d419',
                         'X-Roles': u'admin, ResellerAdmin, _member_',

watcher/tests/notifications/test_action_notification.py

@@ -13,7 +13,8 @@
 #    under the License.
 
 import freezegun
-import mock
+from unittest import mock
+
 import oslo_messaging as om
 
 from watcher.common import exception

watcher/tests/notifications/test_action_plan_notification.py

@@ -13,7 +13,8 @@
 #    under the License.
 
 import freezegun
-import mock
+from unittest import mock
+
 import oslo_messaging as om
 
 from watcher.common import exception

watcher/tests/notifications/test_audit_notification.py

@@ -13,7 +13,8 @@
 #    under the License.
 
 import freezegun
-import mock
+from unittest import mock
+
 import oslo_messaging as om
 
 from watcher.common import exception

watcher/tests/notifications/test_notification.py

@@ -13,8 +13,8 @@
 #    under the License.
 
 import collections
+from unittest import mock
 
-import mock
 from oslo_versionedobjects import fixture
 
 from watcher.common import exception

watcher/tests/notifications/test_service_notifications.py

@@ -15,9 +15,9 @@
 # limitations under the License.
 
 import datetime
+from unittest import mock
 
 import freezegun
-import mock
 import oslo_messaging as om
 
 from watcher.common import rpc

watcher/tests/objects/test_action.py

@@ -14,9 +14,9 @@
 #    under the License.
 
 import datetime
+from unittest import mock
 
 import iso8601
-import mock
 
 from watcher.common import exception
 from watcher.common import utils as c_utils

watcher/tests/objects/test_action_description.py

@@ -15,9 +15,9 @@
 #    under the License.
 
 import datetime
+from unittest import mock
 
 import iso8601
-import mock
 
 from watcher.db.sqlalchemy import api as db_api
 from watcher import objects