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 <sean.mcginnis@gmail.com>

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

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

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__)
 

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

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
 

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 unittest import mock
-from mock import patch
+from unittest.mock import patch
 
 from zun import objects
 from zun.tests.unit.api import base as api_base

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 unittest import mock
-from mock import patch
+from unittest.mock import patch
+
 from oslo_utils import uuidutils
 from webtest.app import AppError
 

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 unittest import mock
-from mock import patch
+from unittest.mock import patch
-from webtest.app import AppError
 
 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

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 unittest import mock
-from mock import patch
+from unittest.mock import patch
 
 from oslo_utils import uuidutils
 

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 unittest import mock
-from mock import patch
+from unittest.mock import patch
-from webtest.app import AppError
 
 from oslo_utils import uuidutils
+from webtest.app import AppError
 
 from zun.common import exception
 import zun.conf

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
 

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
 

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
 

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 unittest import mock
-from mock import patch
+from unittest.mock import patch
-from webtest.app import AppError
 
 from oslo_utils import uuidutils
+from webtest.app import AppError
 
 from zun import objects
 from zun.tests.unit.api import base as api_base

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

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
 

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

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

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

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

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

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

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

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

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

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
 

zun/tests/unit/container/docker/test_docker_driver.py

@@ -11,9 +11,9 @@
 # under the License.
 
 from collections import defaultdict
-from docker import errors
+from unittest import mock
-import mock
 
+from docker import errors
 from oslo_utils import units
 from oslo_utils import uuidutils
 

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
 

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
+from unittest import mock
-import six
+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

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
 

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

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
 

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
 

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
 

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

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

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
 

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

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
 

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

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

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

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
 

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
 

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

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

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

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
 

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

zun/tests/unit/pci/test_manager.py

@@ -14,8 +14,7 @@
 #    under the License.
 
 import copy
-
+from unittest import mock
-import mock
 
 import zun
 from zun.common import context

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

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

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
 

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

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

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

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

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

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
 

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

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

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

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

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

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