From e5f601a35082a654f057544d582edbf1eeb44f42 Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Sat, 18 Apr 2020 12:01:49 -0500 Subject: [PATCH] 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: I89425273ad2092f5394f20c7cdecde14877b1a01 Signed-off-by: Sean McGinnis --- test-requirements.txt | 1 - zun/tests/base.py | 2 +- zun/tests/migration/test_migrations.py | 6 +++--- zun/tests/unit/api/base.py | 2 +- zun/tests/unit/api/controllers/test_base.py | 3 ++- .../unit/api/controllers/v1/test_availability_zones.py | 4 ++-- zun/tests/unit/api/controllers/v1/test_capsules.py | 5 +++-- zun/tests/unit/api/controllers/v1/test_containers.py | 6 +++--- zun/tests/unit/api/controllers/v1/test_hosts.py | 4 ++-- zun/tests/unit/api/controllers/v1/test_images.py | 6 +++--- zun/tests/unit/api/controllers/v1/test_networks.py | 3 ++- zun/tests/unit/api/controllers/v1/test_quota_classes.py | 2 +- zun/tests/unit/api/controllers/v1/test_quotas.py | 2 +- zun/tests/unit/api/controllers/v1/test_registries.py | 6 +++--- zun/tests/unit/api/controllers/v1/test_zun_service.py | 3 ++- zun/tests/unit/cmd/test_status.py | 2 +- zun/tests/unit/common/test_clients.py | 2 +- zun/tests/unit/common/test_mount.py | 2 +- zun/tests/unit/common/test_profiler.py | 2 +- zun/tests/unit/common/test_rpc.py | 3 ++- zun/tests/unit/common/test_utils.py | 2 +- zun/tests/unit/compute/test_compute_api.py | 2 +- zun/tests/unit/compute/test_compute_manager.py | 2 +- zun/tests/unit/compute/test_compute_node_tracker.py | 2 +- zun/tests/unit/compute/test_compute_rpcapi.py | 2 +- zun/tests/unit/conf/test_conf.py | 3 ++- zun/tests/unit/container/docker/test_docker_driver.py | 4 ++-- zun/tests/unit/container/docker/test_utils.py | 2 +- .../linux/os_capability_linux/test_os_capability_linux.py | 6 +++--- zun/tests/unit/image/docker/test_driver.py | 2 +- zun/tests/unit/image/glance/test_driver.py | 2 +- zun/tests/unit/network/test_kuryr_network.py | 2 +- zun/tests/unit/objects/test_capsule.py | 2 +- zun/tests/unit/objects/test_compute_node.py | 2 +- zun/tests/unit/objects/test_container.py | 2 +- zun/tests/unit/objects/test_container_action.py | 2 +- zun/tests/unit/objects/test_exec_instance.py | 2 +- zun/tests/unit/objects/test_image.py | 3 ++- zun/tests/unit/objects/test_network.py | 2 +- zun/tests/unit/objects/test_objects.py | 2 +- zun/tests/unit/objects/test_quota.py | 2 +- zun/tests/unit/objects/test_quota_class.py | 2 +- zun/tests/unit/objects/test_registry.py | 2 +- zun/tests/unit/objects/test_resource_class.py | 2 +- zun/tests/unit/objects/test_resource_provider.py | 2 +- zun/tests/unit/objects/test_volume_mapping.py | 2 +- zun/tests/unit/objects/test_zun_service.py | 3 ++- zun/tests/unit/pci/fakes.py | 2 +- zun/tests/unit/pci/test_devspec.py | 3 ++- zun/tests/unit/pci/test_manager.py | 3 +-- zun/tests/unit/pci/test_stats.py | 3 ++- zun/tests/unit/pci/test_utils.py | 2 +- zun/tests/unit/scheduler/client/test_query.py | 2 +- zun/tests/unit/scheduler/client/test_report.py | 2 +- zun/tests/unit/scheduler/filters/test_compute_filter.py | 3 ++- .../unit/scheduler/filters/test_pci_passthrough_filters.py | 2 +- zun/tests/unit/scheduler/test_base_filter.py | 2 +- zun/tests/unit/scheduler/test_chance_scheduler.py | 2 +- zun/tests/unit/scheduler/test_filter_scheduler.py | 2 +- zun/tests/unit/scheduler/test_scheduler.py | 2 +- zun/tests/unit/servicegroup/test_zun_service.py | 2 +- zun/tests/unit/test_hacking.py | 2 +- zun/tests/unit/volume/test_cinder_api.py | 2 +- zun/tests/unit/volume/test_cinder_workflow.py | 2 +- zun/tests/unit/volume/test_driver.py | 2 +- 65 files changed, 89 insertions(+), 80 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index cb64123c8..346fb1676 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,7 +6,6 @@ bandit>=1.1.0 # Apache-2.0 doc8>=0.6.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 -mock>=2.0.0 # BSD fixtures>=3.0.0 # Apache-2.0/BSD hacking>=3.0,<3.1.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 diff --git a/zun/tests/base.py b/zun/tests/base.py index 3ab6ac281..1754c4dac 100644 --- a/zun/tests/base.py +++ b/zun/tests/base.py @@ -15,9 +15,9 @@ import copy import os +from unittest import mock import fixtures -import mock from oslo_config import cfg from oslo_log import log from oslotest import base diff --git a/zun/tests/migration/test_migrations.py b/zun/tests/migration/test_migrations.py index d0f85ce42..fe515478f 100644 --- a/zun/tests/migration/test_migrations.py +++ b/zun/tests/migration/test_migrations.py @@ -35,10 +35,11 @@ For postgres on Ubuntu this can be done with the following commands: """ import contextlib -import fixtures +import os +from unittest import mock from alembic import script -import mock +import fixtures from oslo_db import exception as db_exc from oslo_db.sqlalchemy import enginefacade from oslo_db.sqlalchemy import test_base @@ -49,7 +50,6 @@ import sqlalchemy.exc from zun.db.sqlalchemy import migration from zun.tests import base -import os LOG = logging.getLogger(__name__) diff --git a/zun/tests/unit/api/base.py b/zun/tests/unit/api/base.py index 0a3e93e5b..8f9b08d3b 100644 --- a/zun/tests/unit/api/base.py +++ b/zun/tests/unit/api/base.py @@ -14,7 +14,7 @@ # ceilometer/tests/api/__init__.py). This should be oslo'ified: # https://bugs.launchpad.net/ironic/+bug/1255115. -import mock +from unittest import mock # NOTE(deva): import auth_token so we can override a config option from keystonemiddleware import auth_token # noqa diff --git a/zun/tests/unit/api/controllers/test_base.py b/zun/tests/unit/api/controllers/test_base.py index 02cae3512..c2ef85945 100644 --- a/zun/tests/unit/api/controllers/test_base.py +++ b/zun/tests/unit/api/controllers/test_base.py @@ -11,7 +11,8 @@ # limitations under the License. import collections -import mock +from unittest import mock + import six from webob import exc diff --git a/zun/tests/unit/api/controllers/v1/test_availability_zones.py b/zun/tests/unit/api/controllers/v1/test_availability_zones.py index 06dc0c54c..e6c484259 100644 --- a/zun/tests/unit/api/controllers/v1/test_availability_zones.py +++ b/zun/tests/unit/api/controllers/v1/test_availability_zones.py @@ -10,8 +10,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock -from mock import patch +from unittest import mock +from unittest.mock import patch from zun import objects from zun.tests.unit.api import base as api_base diff --git a/zun/tests/unit/api/controllers/v1/test_capsules.py b/zun/tests/unit/api/controllers/v1/test_capsules.py index eca804d03..c7e251a27 100644 --- a/zun/tests/unit/api/controllers/v1/test_capsules.py +++ b/zun/tests/unit/api/controllers/v1/test_capsules.py @@ -10,8 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. -import mock -from mock import patch +from unittest import mock +from unittest.mock import patch + from oslo_utils import uuidutils from webtest.app import AppError diff --git a/zun/tests/unit/api/controllers/v1/test_containers.py b/zun/tests/unit/api/controllers/v1/test_containers.py index e04b88b84..596f61203 100644 --- a/zun/tests/unit/api/controllers/v1/test_containers.py +++ b/zun/tests/unit/api/controllers/v1/test_containers.py @@ -10,13 +10,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock -from mock import patch -from webtest.app import AppError +from unittest import mock +from unittest.mock import patch from neutronclient.common import exceptions as n_exc from oslo_utils import uuidutils import six +from webtest.app import AppError from zun.common import exception from zun import objects diff --git a/zun/tests/unit/api/controllers/v1/test_hosts.py b/zun/tests/unit/api/controllers/v1/test_hosts.py index 37f97cda2..368127548 100644 --- a/zun/tests/unit/api/controllers/v1/test_hosts.py +++ b/zun/tests/unit/api/controllers/v1/test_hosts.py @@ -10,8 +10,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock -from mock import patch +from unittest import mock +from unittest.mock import patch from oslo_utils import uuidutils diff --git a/zun/tests/unit/api/controllers/v1/test_images.py b/zun/tests/unit/api/controllers/v1/test_images.py index 049070580..b36dceade 100644 --- a/zun/tests/unit/api/controllers/v1/test_images.py +++ b/zun/tests/unit/api/controllers/v1/test_images.py @@ -10,11 +10,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock -from mock import patch -from webtest.app import AppError +from unittest import mock +from unittest.mock import patch from oslo_utils import uuidutils +from webtest.app import AppError from zun.common import exception import zun.conf diff --git a/zun/tests/unit/api/controllers/v1/test_networks.py b/zun/tests/unit/api/controllers/v1/test_networks.py index 6aab4656b..026bce4b2 100644 --- a/zun/tests/unit/api/controllers/v1/test_networks.py +++ b/zun/tests/unit/api/controllers/v1/test_networks.py @@ -10,7 +10,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from mock import patch +from unittest.mock import patch + from zun.tests.unit.api import base as api_base from zun.tests.unit.db import utils diff --git a/zun/tests/unit/api/controllers/v1/test_quota_classes.py b/zun/tests/unit/api/controllers/v1/test_quota_classes.py index f6e8fe198..0a1e8776e 100644 --- a/zun/tests/unit/api/controllers/v1/test_quota_classes.py +++ b/zun/tests/unit/api/controllers/v1/test_quota_classes.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 zun.tests.unit.api import base as api_base diff --git a/zun/tests/unit/api/controllers/v1/test_quotas.py b/zun/tests/unit/api/controllers/v1/test_quotas.py index 7f3b7a7cb..148181ec2 100644 --- a/zun/tests/unit/api/controllers/v1/test_quotas.py +++ b/zun/tests/unit/api/controllers/v1/test_quotas.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 zun.tests.unit.api import base as api_base diff --git a/zun/tests/unit/api/controllers/v1/test_registries.py b/zun/tests/unit/api/controllers/v1/test_registries.py index 98068cf44..2345e2260 100644 --- a/zun/tests/unit/api/controllers/v1/test_registries.py +++ b/zun/tests/unit/api/controllers/v1/test_registries.py @@ -10,11 +10,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock -from mock import patch -from webtest.app import AppError +from unittest import mock +from unittest.mock import patch from oslo_utils import uuidutils +from webtest.app import AppError from zun import objects from zun.tests.unit.api import base as api_base diff --git a/zun/tests/unit/api/controllers/v1/test_zun_service.py b/zun/tests/unit/api/controllers/v1/test_zun_service.py index 1e9b9daa5..5e8d922c2 100644 --- a/zun/tests/unit/api/controllers/v1/test_zun_service.py +++ b/zun/tests/unit/api/controllers/v1/test_zun_service.py @@ -10,7 +10,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 zun.api import servicegroup diff --git a/zun/tests/unit/cmd/test_status.py b/zun/tests/unit/cmd/test_status.py index 220dc6046..814479b9a 100644 --- a/zun/tests/unit/cmd/test_status.py +++ b/zun/tests/unit/cmd/test_status.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_upgradecheck.upgradecheck import Code diff --git a/zun/tests/unit/common/test_clients.py b/zun/tests/unit/common/test_clients.py index 0d7bf2079..609e59419 100644 --- a/zun/tests/unit/common/test_clients.py +++ b/zun/tests/unit/common/test_clients.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from cinderclient import client as cinderclient from glanceclient import client as glanceclient diff --git a/zun/tests/unit/common/test_mount.py b/zun/tests/unit/common/test_mount.py index 4d11560b7..ebe867b03 100644 --- a/zun/tests/unit/common/test_mount.py +++ b/zun/tests/unit/common/test_mount.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from zun.common import exception from zun.common import mount diff --git a/zun/tests/unit/common/test_profiler.py b/zun/tests/unit/common/test_profiler.py index 59c733916..3dde0d60f 100644 --- a/zun/tests/unit/common/test_profiler.py +++ b/zun/tests/unit/common/test_profiler.py @@ -14,7 +14,7 @@ # under the License. import inspect -import mock +from unittest import mock from oslo_utils import importutils from osprofiler import initializer as profiler_init diff --git a/zun/tests/unit/common/test_rpc.py b/zun/tests/unit/common/test_rpc.py index 5feb2e681..a14c5c58c 100644 --- a/zun/tests/unit/common/test_rpc.py +++ b/zun/tests/unit/common/test_rpc.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 as json from zun.common import context diff --git a/zun/tests/unit/common/test_utils.py b/zun/tests/unit/common/test_utils.py index 8cb59ba9f..cf7733c8c 100644 --- a/zun/tests/unit/common/test_utils.py +++ b/zun/tests/unit/common/test_utils.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from zun.common import exception from zun.common import utils diff --git a/zun/tests/unit/compute/test_compute_api.py b/zun/tests/unit/compute/test_compute_api.py index 88666adc1..8c5f8fd13 100644 --- a/zun/tests/unit/compute/test_compute_api.py +++ b/zun/tests/unit/compute/test_compute_api.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from zun.common import consts from zun.common import exception diff --git a/zun/tests/unit/compute/test_compute_manager.py b/zun/tests/unit/compute/test_compute_manager.py index fadbaeb27..dfa742535 100644 --- a/zun/tests/unit/compute/test_compute_manager.py +++ b/zun/tests/unit/compute/test_compute_manager.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_utils import uuidutils from six import StringIO diff --git a/zun/tests/unit/compute/test_compute_node_tracker.py b/zun/tests/unit/compute/test_compute_node_tracker.py index 43c13f521..2ad374667 100644 --- a/zun/tests/unit/compute/test_compute_node_tracker.py +++ b/zun/tests/unit/compute/test_compute_node_tracker.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from zun.compute import claims from zun.compute import compute_node_tracker diff --git a/zun/tests/unit/compute/test_compute_rpcapi.py b/zun/tests/unit/compute/test_compute_rpcapi.py index 9b8d31185..fddf070c0 100644 --- a/zun/tests/unit/compute/test_compute_rpcapi.py +++ b/zun/tests/unit/compute/test_compute_rpcapi.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from zun.common import exception from zun.compute import rpcapi diff --git a/zun/tests/unit/conf/test_conf.py b/zun/tests/unit/conf/test_conf.py index dfcb693b7..982987514 100644 --- a/zun/tests/unit/conf/test_conf.py +++ b/zun/tests/unit/conf/test_conf.py @@ -11,7 +11,8 @@ # under the License. import collections -import mock +from unittest import mock + from oslo_config import cfg import six diff --git a/zun/tests/unit/container/docker/test_docker_driver.py b/zun/tests/unit/container/docker/test_docker_driver.py index 989500bc5..d373db585 100644 --- a/zun/tests/unit/container/docker/test_docker_driver.py +++ b/zun/tests/unit/container/docker/test_docker_driver.py @@ -11,9 +11,9 @@ # under the License. from collections import defaultdict -from docker import errors -import mock +from unittest import mock +from docker import errors from oslo_utils import units from oslo_utils import uuidutils diff --git a/zun/tests/unit/container/docker/test_utils.py b/zun/tests/unit/container/docker/test_utils.py index 622456a1e..b9891116a 100644 --- a/zun/tests/unit/container/docker/test_utils.py +++ b/zun/tests/unit/container/docker/test_utils.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_serialization import jsonutils diff --git a/zun/tests/unit/container/os_capability/linux/os_capability_linux/test_os_capability_linux.py b/zun/tests/unit/container/os_capability/linux/os_capability_linux/test_os_capability_linux.py index 31a56cb8f..e8c6d1e6f 100644 --- a/zun/tests/unit/container/os_capability/linux/os_capability_linux/test_os_capability_linux.py +++ b/zun/tests/unit/container/os_capability/linux/os_capability_linux/test_os_capability_linux.py @@ -12,11 +12,11 @@ # License for the specific language governing permissions and limitations # under the License. -import mock -import six +from unittest import mock +from unittest.mock import mock_open -from mock import mock_open from oslo_serialization import jsonutils +import six from zun.common import exception from zun.container.os_capability.linux import os_capability_linux diff --git a/zun/tests/unit/image/docker/test_driver.py b/zun/tests/unit/image/docker/test_driver.py index 80680e0da..af3ef0433 100644 --- a/zun/tests/unit/image/docker/test_driver.py +++ b/zun/tests/unit/image/docker/test_driver.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from docker import errors diff --git a/zun/tests/unit/image/glance/test_driver.py b/zun/tests/unit/image/glance/test_driver.py index ad9503493..e6807bb53 100644 --- a/zun/tests/unit/image/glance/test_driver.py +++ b/zun/tests/unit/image/glance/test_driver.py @@ -12,10 +12,10 @@ # License for the specific language governing permissions and limitations # under the License. -import mock import os import shutil import tempfile +from unittest import mock from zun.common import exception import zun.conf diff --git a/zun/tests/unit/network/test_kuryr_network.py b/zun/tests/unit/network/test_kuryr_network.py index ef29f3731..918ac0818 100644 --- a/zun/tests/unit/network/test_kuryr_network.py +++ b/zun/tests/unit/network/test_kuryr_network.py @@ -13,7 +13,7 @@ Tests For kuryr network """ import copy -import mock +from unittest import mock from neutronclient.common import exceptions as n_exc diff --git a/zun/tests/unit/objects/test_capsule.py b/zun/tests/unit/objects/test_capsule.py index 622eb8dba..c98215fc3 100644 --- a/zun/tests/unit/objects/test_capsule.py +++ b/zun/tests/unit/objects/test_capsule.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from testtools.matchers import HasLength diff --git a/zun/tests/unit/objects/test_compute_node.py b/zun/tests/unit/objects/test_compute_node.py index f556a464f..b2fabff6f 100644 --- a/zun/tests/unit/objects/test_compute_node.py +++ b/zun/tests/unit/objects/test_compute_node.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from testtools.matchers import HasLength diff --git a/zun/tests/unit/objects/test_container.py b/zun/tests/unit/objects/test_container.py index 18c5febc6..d27122f73 100644 --- a/zun/tests/unit/objects/test_container.py +++ b/zun/tests/unit/objects/test_container.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_utils import uuidutils from testtools.matchers import HasLength diff --git a/zun/tests/unit/objects/test_container_action.py b/zun/tests/unit/objects/test_container_action.py index a7a966978..27ec6ed6b 100644 --- a/zun/tests/unit/objects/test_container_action.py +++ b/zun/tests/unit/objects/test_container_action.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_utils import fixture as utils_fixture from oslo_utils import timeutils diff --git a/zun/tests/unit/objects/test_exec_instance.py b/zun/tests/unit/objects/test_exec_instance.py index 6fceae8bd..0529244d4 100644 --- a/zun/tests/unit/objects/test_exec_instance.py +++ b/zun/tests/unit/objects/test_exec_instance.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from testtools.matchers import HasLength diff --git a/zun/tests/unit/objects/test_image.py b/zun/tests/unit/objects/test_image.py index d5aae7a2f..661ae96a2 100644 --- a/zun/tests/unit/objects/test_image.py +++ b/zun/tests/unit/objects/test_image.py @@ -13,7 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from testtools.matchers import HasLength from zun import objects diff --git a/zun/tests/unit/objects/test_network.py b/zun/tests/unit/objects/test_network.py index 58ba33cd7..9f56c2e3c 100644 --- a/zun/tests/unit/objects/test_network.py +++ b/zun/tests/unit/objects/test_network.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from testtools.matchers import HasLength diff --git a/zun/tests/unit/objects/test_objects.py b/zun/tests/unit/objects/test_objects.py index f754f7ada..f56a35d93 100644 --- a/zun/tests/unit/objects/test_objects.py +++ b/zun/tests/unit/objects/test_objects.py @@ -12,8 +12,8 @@ import datetime import gettext +from unittest import mock -import mock from oslo_versionedobjects import exception as object_exception from oslo_versionedobjects import fields from oslo_versionedobjects import fixture diff --git a/zun/tests/unit/objects/test_quota.py b/zun/tests/unit/objects/test_quota.py index 342358fd0..a556aa440 100644 --- a/zun/tests/unit/objects/test_quota.py +++ b/zun/tests/unit/objects/test_quota.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from zun import objects from zun.tests.unit.db import base diff --git a/zun/tests/unit/objects/test_quota_class.py b/zun/tests/unit/objects/test_quota_class.py index d0af70c68..0c7c11fe9 100644 --- a/zun/tests/unit/objects/test_quota_class.py +++ b/zun/tests/unit/objects/test_quota_class.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from zun.common import consts from zun import objects diff --git a/zun/tests/unit/objects/test_registry.py b/zun/tests/unit/objects/test_registry.py index 50aa6c1d0..d3c8c3f37 100644 --- a/zun/tests/unit/objects/test_registry.py +++ b/zun/tests/unit/objects/test_registry.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from testtools.matchers import HasLength diff --git a/zun/tests/unit/objects/test_resource_class.py b/zun/tests/unit/objects/test_resource_class.py index ed8179715..5ebac15db 100644 --- a/zun/tests/unit/objects/test_resource_class.py +++ b/zun/tests/unit/objects/test_resource_class.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from testtools.matchers import HasLength diff --git a/zun/tests/unit/objects/test_resource_provider.py b/zun/tests/unit/objects/test_resource_provider.py index 56b3415da..c3081684a 100644 --- a/zun/tests/unit/objects/test_resource_provider.py +++ b/zun/tests/unit/objects/test_resource_provider.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_utils import uuidutils from testtools.matchers import HasLength diff --git a/zun/tests/unit/objects/test_volume_mapping.py b/zun/tests/unit/objects/test_volume_mapping.py index 3b0bcb82c..4ff2928de 100644 --- a/zun/tests/unit/objects/test_volume_mapping.py +++ b/zun/tests/unit/objects/test_volume_mapping.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_utils import uuidutils from testtools.matchers import HasLength diff --git a/zun/tests/unit/objects/test_zun_service.py b/zun/tests/unit/objects/test_zun_service.py index 061963986..59962ba86 100644 --- a/zun/tests/unit/objects/test_zun_service.py +++ b/zun/tests/unit/objects/test_zun_service.py @@ -10,7 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from testtools.matchers import HasLength from zun import objects diff --git a/zun/tests/unit/pci/fakes.py b/zun/tests/unit/pci/fakes.py index e02ba4d15..5d11bbbc9 100644 --- a/zun/tests/unit/pci/fakes.py +++ b/zun/tests/unit/pci/fakes.py @@ -14,8 +14,8 @@ # under the License. import functools +from unittest import mock -import mock from zun.pci import whitelist diff --git a/zun/tests/unit/pci/test_devspec.py b/zun/tests/unit/pci/test_devspec.py index 0d3251b21..2c12034e0 100644 --- a/zun/tests/unit/pci/test_devspec.py +++ b/zun/tests/unit/pci/test_devspec.py @@ -12,7 +12,8 @@ # under the License. -import mock +from unittest import mock + import six from zun.common import exception diff --git a/zun/tests/unit/pci/test_manager.py b/zun/tests/unit/pci/test_manager.py index ee7a9c135..d569c4991 100644 --- a/zun/tests/unit/pci/test_manager.py +++ b/zun/tests/unit/pci/test_manager.py @@ -14,8 +14,7 @@ # under the License. import copy - -import mock +from unittest import mock import zun from zun.common import context diff --git a/zun/tests/unit/pci/test_stats.py b/zun/tests/unit/pci/test_stats.py index e679097ac..787bc61d7 100644 --- a/zun/tests/unit/pci/test_stats.py +++ b/zun/tests/unit/pci/test_stats.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 zun.common import exception diff --git a/zun/tests/unit/pci/test_utils.py b/zun/tests/unit/pci/test_utils.py index 5199be1b9..3c332cd2a 100644 --- a/zun/tests/unit/pci/test_utils.py +++ b/zun/tests/unit/pci/test_utils.py @@ -16,9 +16,9 @@ import glob import os +from unittest import mock import fixtures -import mock from six.moves import builtins from zun.common import exception diff --git a/zun/tests/unit/scheduler/client/test_query.py b/zun/tests/unit/scheduler/client/test_query.py index bb895e9dc..f620c93c5 100644 --- a/zun/tests/unit/scheduler/client/test_query.py +++ b/zun/tests/unit/scheduler/client/test_query.py @@ -11,7 +11,7 @@ # under the License. import collections -import mock +from unittest import mock from oslo_config import cfg diff --git a/zun/tests/unit/scheduler/client/test_report.py b/zun/tests/unit/scheduler/client/test_report.py index 1adba3f59..d7c8bcd21 100644 --- a/zun/tests/unit/scheduler/client/test_report.py +++ b/zun/tests/unit/scheduler/client/test_report.py @@ -11,10 +11,10 @@ # under the License. import copy import time +from unittest import mock import fixtures from keystoneauth1 import exceptions as ks_exc -import mock import os_resource_classes as orc from oslo_serialization import jsonutils from oslo_utils.fixture import uuidsentinel as uuids diff --git a/zun/tests/unit/scheduler/filters/test_compute_filter.py b/zun/tests/unit/scheduler/filters/test_compute_filter.py index 6d8ec0625..e0bcba4fc 100644 --- a/zun/tests/unit/scheduler/filters/test_compute_filter.py +++ b/zun/tests/unit/scheduler/filters/test_compute_filter.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 timeutils from zun.common import context diff --git a/zun/tests/unit/scheduler/filters/test_pci_passthrough_filters.py b/zun/tests/unit/scheduler/filters/test_pci_passthrough_filters.py index 24c70177d..ae246efa5 100644 --- a/zun/tests/unit/scheduler/filters/test_pci_passthrough_filters.py +++ b/zun/tests/unit/scheduler/filters/test_pci_passthrough_filters.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from zun import objects from zun.pci import stats diff --git a/zun/tests/unit/scheduler/test_base_filter.py b/zun/tests/unit/scheduler/test_base_filter.py index bdd24fbb9..9297bbefe 100644 --- a/zun/tests/unit/scheduler/test_base_filter.py +++ b/zun/tests/unit/scheduler/test_base_filter.py @@ -13,8 +13,8 @@ Tests for base filter """ import inspect +from unittest import mock -import mock from zun.scheduler import base_filters from zun.tests import base diff --git a/zun/tests/unit/scheduler/test_chance_scheduler.py b/zun/tests/unit/scheduler/test_chance_scheduler.py index 5842a77f0..24b19fff1 100644 --- a/zun/tests/unit/scheduler/test_chance_scheduler.py +++ b/zun/tests/unit/scheduler/test_chance_scheduler.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from zun.common import exception from zun import objects diff --git a/zun/tests/unit/scheduler/test_filter_scheduler.py b/zun/tests/unit/scheduler/test_filter_scheduler.py index 5542bb8f3..0e31f187e 100644 --- a/zun/tests/unit/scheduler/test_filter_scheduler.py +++ b/zun/tests/unit/scheduler/test_filter_scheduler.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_utils import timeutils diff --git a/zun/tests/unit/scheduler/test_scheduler.py b/zun/tests/unit/scheduler/test_scheduler.py index e1dbc4fc9..c3ded9ab4 100644 --- a/zun/tests/unit/scheduler/test_scheduler.py +++ b/zun/tests/unit/scheduler/test_scheduler.py @@ -13,7 +13,7 @@ Tests For Scheduler """ -import mock +from unittest import mock from zun import objects from zun.tests import base diff --git a/zun/tests/unit/servicegroup/test_zun_service.py b/zun/tests/unit/servicegroup/test_zun_service.py index ca73ad838..c9e13c3a4 100644 --- a/zun/tests/unit/servicegroup/test_zun_service.py +++ b/zun/tests/unit/servicegroup/test_zun_service.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock import zun.conf from zun import objects diff --git a/zun/tests/unit/test_hacking.py b/zun/tests/unit/test_hacking.py index 72245c05a..a81b8405d 100644 --- a/zun/tests/unit/test_hacking.py +++ b/zun/tests/unit/test_hacking.py @@ -13,8 +13,8 @@ # under the License. import textwrap +from unittest import mock -import mock import pycodestyle from zun.hacking import checks diff --git a/zun/tests/unit/volume/test_cinder_api.py b/zun/tests/unit/volume/test_cinder_api.py index be6ed00bc..efa3b47b4 100644 --- a/zun/tests/unit/volume/test_cinder_api.py +++ b/zun/tests/unit/volume/test_cinder_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 cinderclient import exceptions as cinder_exception from oslo_utils import timeutils diff --git a/zun/tests/unit/volume/test_cinder_workflow.py b/zun/tests/unit/volume/test_cinder_workflow.py index d46e339e7..3a93cd7cc 100644 --- a/zun/tests/unit/volume/test_cinder_workflow.py +++ b/zun/tests/unit/volume/test_cinder_workflow.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from cinderclient import exceptions as cinder_exception from os_brick import exception as os_brick_exception diff --git a/zun/tests/unit/volume/test_driver.py b/zun/tests/unit/volume/test_driver.py index f1af9bc83..e001df645 100644 --- a/zun/tests/unit/volume/test_driver.py +++ b/zun/tests/unit/volume/test_driver.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_serialization import jsonutils from oslo_utils import uuidutils