Raise flake8-import-order version to latest

We had this library capped at a release that is a few years old. Now
that we have dropped py2 testing, we can pick up the latest version.

This uncovered a few things to clean up. Mostly the fact that mock is
now a part of the StdLib unittest since Python 3.3.

Change-Id: I27484dd4c25378413ff16e97a35a1a46062357bc
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>

openstackclient/api/api.py

@@ -13,11 +13,10 @@
 
 """Base API Library"""
 
-import simplejson as json
-
 from keystoneauth1 import exceptions as ks_exceptions
 from keystoneauth1 import session as ks_session
 from osc_lib import exceptions
+import simplejson as json
 
 from openstackclient.i18n import _
 

openstackclient/tests/unit/api/test_object_store_v1.py

@@ -13,7 +13,7 @@
 
 """Object Store v1 API Library Tests"""
 
-import mock
+from unittest import mock
 
 from keystoneauth1 import session
 from requests_mock.contrib import fixture

openstackclient/tests/unit/common/test_availability_zone.py

@@ -11,7 +11,7 @@
 #   under the License.
 #
 
-import mock
+from unittest import mock
 
 from openstackclient.common import availability_zone
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes

openstackclient/tests/unit/common/test_command.py

@@ -12,7 +12,7 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-import mock
+from unittest import mock
 
 from osc_lib.command import command
 from osc_lib import exceptions

openstackclient/tests/unit/common/test_configuration.py

@@ -11,7 +11,7 @@
 #   under the License.
 #
 
-import mock
+from unittest import mock
 
 from openstackclient.common import configuration
 from openstackclient.tests.unit import fakes

openstackclient/tests/unit/common/test_extension.py

@@ -11,7 +11,7 @@
 #   under the License.
 #
 
-import mock
+from unittest import mock
 
 from openstackclient.common import extension
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes

openstackclient/tests/unit/common/test_logs.py

@@ -15,8 +15,7 @@
 #                or Jun 2017.
 
 import logging
-
-import mock
+from unittest import mock
 
 from osc_lib import logs
 

openstackclient/tests/unit/common/test_module.py

@@ -15,7 +15,7 @@
 
 """Test module module"""
 
-import mock
+from unittest import mock
 
 from openstackclient.common import module as osc_module
 from openstackclient.tests.unit import fakes

openstackclient/tests/unit/common/test_project_purge.py

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

openstackclient/tests/unit/common/test_quota.py

@@ -11,8 +11,8 @@
 #   under the License.
 
 import copy
+from unittest import mock
 
-import mock
 from osc_lib import exceptions
 
 from openstackclient.common import quota

openstackclient/tests/unit/compute/v2/fakes.py

@@ -14,9 +14,9 @@
 #
 
 import copy
+from unittest import mock
 import uuid
 
-import mock
 from novaclient import api_versions
 
 from openstackclient.api import compute_v2

openstackclient/tests/unit/compute/v2/test_agent.py

@@ -13,8 +13,8 @@
 #   under the License.
 #
 
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from osc_lib import exceptions
 

openstackclient/tests/unit/compute/v2/test_aggregate.py

@@ -13,8 +13,8 @@
 #   under the License.
 #
 
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from osc_lib.cli import format_columns
 from osc_lib import exceptions

openstackclient/tests/unit/compute/v2/test_console.py

@@ -13,7 +13,7 @@
 #   under the License.
 #
 
-import mock
+from unittest import mock
 
 from openstackclient.compute.v2 import console
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes

openstackclient/tests/unit/compute/v2/test_flavor.py

@@ -13,8 +13,8 @@
 #   under the License.
 #
 
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 import novaclient
 from osc_lib import exceptions

openstackclient/tests/unit/compute/v2/test_host.py

@@ -13,7 +13,7 @@
 #   under the License.
 #
 
-import mock
+from unittest import mock
 
 from openstackclient.compute.v2 import host
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes

openstackclient/tests/unit/compute/v2/test_keypair.py

@@ -13,10 +13,10 @@
 #   under the License.
 #
 
+from unittest import mock
+from unittest.mock import call
 import uuid
 
-import mock
-from mock import call
 from osc_lib import exceptions
 from osc_lib import utils
 

openstackclient/tests/unit/compute/v2/test_server.py

@@ -16,9 +16,9 @@ import argparse
 import collections
 import copy
 import getpass
+from unittest import mock
+from unittest.mock import call
 
-import mock
-from mock import call
 from novaclient import api_versions
 from openstack import exceptions as sdk_exceptions
 from osc_lib import exceptions

openstackclient/tests/unit/compute/v2/test_server_backup.py

@@ -11,7 +11,7 @@
 #   under the License.
 #
 
-import mock
+from unittest import mock
 
 from osc_lib.cli import format_columns
 from osc_lib import exceptions

openstackclient/tests/unit/compute/v2/test_server_group.py

@@ -13,7 +13,7 @@
 #   under the License.
 #
 
-import mock
+from unittest import mock
 
 from osc_lib import exceptions
 from osc_lib import utils

openstackclient/tests/unit/compute/v2/test_server_image.py

@@ -10,7 +10,7 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 #
-import mock
+from unittest import mock
 
 from osc_lib.cli import format_columns
 from osc_lib import exceptions

openstackclient/tests/unit/compute/v2/test_service.py

@@ -13,8 +13,9 @@
 #   under the License.
 #
 
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
+
 from novaclient import api_versions
 from osc_lib import exceptions
 import six

openstackclient/tests/unit/compute/v2/test_usage.py

@@ -12,8 +12,8 @@
 #
 
 import datetime
+from unittest import mock
 
-import mock
 from novaclient import api_versions
 
 from openstackclient.compute.v2 import usage

openstackclient/tests/unit/fakes.py

@@ -15,9 +15,9 @@
 
 import json
 import sys
+from unittest import mock
 
 from keystoneauth1 import fixture
-import mock
 import requests
 import six
 

openstackclient/tests/unit/identity/v2_0/fakes.py

@@ -14,11 +14,11 @@
 #
 
 import copy
+from unittest import mock
 import uuid
 
 from keystoneauth1 import access
 from keystoneauth1 import fixture
-import mock
 
 from openstackclient.tests.unit import fakes
 from openstackclient.tests.unit import utils

openstackclient/tests/unit/identity/v2_0/test_catalog.py

@@ -11,7 +11,7 @@
 #   under the License.
 #
 
-import mock
+from unittest import mock
 
 from openstackclient.identity.v2_0 import catalog
 from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes

openstackclient/tests/unit/identity/v2_0/test_project.py

@@ -13,7 +13,7 @@
 #   under the License.
 #
 
-import mock
+from unittest import mock
 
 from keystoneauth1 import exceptions as ks_exc
 from osc_lib.cli import format_columns

openstackclient/tests/unit/identity/v2_0/test_role.py

@@ -13,7 +13,7 @@
 #   under the License.
 #
 
-import mock
+from unittest import mock
 
 from keystoneauth1 import exceptions as ks_exc
 from osc_lib import exceptions

openstackclient/tests/unit/identity/v2_0/test_role_assignment.py

@@ -12,8 +12,8 @@
 #
 
 import copy
+from unittest import mock
 
-import mock
 from osc_lib import exceptions
 
 from openstackclient.identity.v2_0 import role_assignment

openstackclient/tests/unit/identity/v2_0/test_token.py

@@ -13,7 +13,7 @@
 #   under the License.
 #
 
-import mock
+from unittest import mock
 
 from openstackclient.identity.v2_0 import token
 from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes

openstackclient/tests/unit/identity/v2_0/test_user.py

@@ -13,7 +13,7 @@
 #   under the License.
 #
 
-import mock
+from unittest import mock
 
 from keystoneauth1 import exceptions as ks_exc
 from osc_lib import exceptions

openstackclient/tests/unit/identity/v3/fakes.py

@@ -15,11 +15,11 @@
 
 import copy
 import datetime
+from unittest import mock
 import uuid
 
 from keystoneauth1 import access
 from keystoneauth1 import fixture
-import mock
 from osc_lib.cli import format_columns
 
 from openstackclient.tests.unit import fakes

openstackclient/tests/unit/identity/v3/test_application_credential.py

@@ -14,8 +14,8 @@
 #
 
 import copy
+from unittest import mock
 
-import mock
 from osc_lib import exceptions
 from osc_lib import utils
 

openstackclient/tests/unit/identity/v3/test_catalog.py

@@ -11,7 +11,7 @@
 #   under the License.
 #
 
-import mock
+from unittest import mock
 
 from openstackclient.identity.v3 import catalog
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes

openstackclient/tests/unit/identity/v3/test_credential.py

@@ -10,8 +10,8 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from osc_lib import exceptions
 

openstackclient/tests/unit/identity/v3/test_endpoint_group.py

@@ -11,7 +11,7 @@
 #   under the License.
 #
 
-import mock
+from unittest import mock
 
 from openstackclient.identity.v3 import endpoint_group
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes

openstackclient/tests/unit/identity/v3/test_group.py

@@ -11,8 +11,8 @@
 #   under the License.
 #
 
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from keystoneauth1 import exceptions as ks_exc
 from osc_lib import exceptions

openstackclient/tests/unit/identity/v3/test_identity_provider.py

@@ -13,8 +13,7 @@
 #   under the License.
 
 import copy
-
-import mock
+from unittest import mock
 
 from openstackclient.identity.v3 import identity_provider
 from openstackclient.tests.unit import fakes

openstackclient/tests/unit/identity/v3/test_mappings.py

@@ -13,8 +13,8 @@
 #   under the License.
 
 import copy
+from unittest import mock
 
-import mock
 from osc_lib import exceptions
 
 from openstackclient.identity.v3 import mapping

openstackclient/tests/unit/identity/v3/test_project.py

@@ -13,8 +13,8 @@
 #   under the License.
 #
 
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from osc_lib import exceptions
 from osc_lib import utils

openstackclient/tests/unit/identity/v3/test_role.py

@@ -14,8 +14,8 @@
 #
 
 import copy
+from unittest import mock
 
-import mock
 from osc_lib import exceptions
 from osc_lib import utils
 

openstackclient/tests/unit/identity/v3/test_role_assignment.py

@@ -12,8 +12,7 @@
 #
 
 import copy
-
-import mock
+from unittest import mock
 
 from openstackclient.identity.v3 import role_assignment
 from openstackclient.tests.unit import fakes

openstackclient/tests/unit/identity/v3/test_token.py

@@ -13,7 +13,7 @@
 #   under the License.
 #
 
-import mock
+from unittest import mock
 
 from openstackclient.identity.v3 import token
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes

openstackclient/tests/unit/identity/v3/test_trust.py

@@ -12,8 +12,8 @@
 #
 
 import copy
+from unittest import mock
 
-import mock
 from osc_lib import exceptions
 from osc_lib import utils
 

openstackclient/tests/unit/identity/v3/test_user.py

@@ -14,8 +14,8 @@
 #
 
 import contextlib
+from unittest import mock
 
-import mock
 from osc_lib import exceptions
 from osc_lib import utils
 

openstackclient/tests/unit/image/v1/fakes.py

@@ -14,10 +14,9 @@
 #
 
 import copy
+from unittest import mock
 import uuid
 
-import mock
-
 from openstackclient.tests.unit import fakes
 from openstackclient.tests.unit import utils
 from openstackclient.tests.unit.volume.v1 import fakes as volume_fakes

openstackclient/tests/unit/image/v1/test_image.py

@@ -14,8 +14,7 @@
 #
 
 import copy
-
-import mock
+from unittest import mock
 
 from osc_lib.cli import format_columns
 from osc_lib import exceptions

openstackclient/tests/unit/image/v2/fakes.py

@@ -15,10 +15,10 @@
 
 import copy
 import random
+from unittest import mock
 import uuid
 
 from glanceclient.v2 import schemas
-import mock
 from osc_lib.cli import format_columns
 import warlock
 

openstackclient/tests/unit/image/v2/test_image.py

@@ -14,10 +14,10 @@
 #
 
 import copy
+from unittest import mock
 
 from glanceclient.common import utils as glanceclient_utils
 from glanceclient.v2 import schemas
-import mock
 from osc_lib.cli import format_columns
 from osc_lib import exceptions
 import warlock

openstackclient/tests/unit/integ/cli/test_shell.py

@@ -11,9 +11,9 @@
 #   under the License.
 
 import copy
+from unittest import mock
 
 import fixtures
-import mock
 from osc_lib.tests import utils as osc_lib_utils
 
 from openstackclient import shell

openstackclient/tests/unit/network/test_common.py

@@ -12,8 +12,8 @@
 #
 
 import argparse
+from unittest import mock
 
-import mock
 import openstack
 from osc_lib import exceptions
 

openstackclient/tests/unit/network/v2/fakes.py

@@ -15,10 +15,9 @@ import argparse
 import copy
 from random import choice
 from random import randint
+from unittest import mock
 import uuid
 
-import mock
-
 from openstackclient.tests.unit import fakes
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes_v3
 from openstackclient.tests.unit import utils

openstackclient/tests/unit/network/v2/test_address_scope.py

@@ -11,8 +11,8 @@
 #   under the License.
 #
 
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from osc_lib import exceptions
 

openstackclient/tests/unit/network/v2/test_floating_ip_compute.py

@@ -11,8 +11,8 @@
 #   under the License.
 #
 
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from osc_lib import exceptions
 

openstackclient/tests/unit/network/v2/test_floating_ip_network.py

@@ -11,8 +11,8 @@
 #   under the License.
 #
 
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from osc_lib import exceptions
 

openstackclient/tests/unit/network/v2/test_floating_ip_pool_compute.py

@@ -11,7 +11,7 @@
 #   under the License.
 #
 
-import mock
+from unittest import mock
 
 from openstackclient.network.v2 import floating_ip_pool
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes

openstackclient/tests/unit/network/v2/test_floating_ip_port_forwarding.py

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

openstackclient/tests/unit/network/v2/test_ip_availability.py

@@ -11,7 +11,7 @@
 #   under the License.
 #
 
-import mock
+from unittest import mock
 
 from osc_lib.cli import format_columns
 

openstackclient/tests/unit/network/v2/test_network.py

@@ -12,9 +12,8 @@
 #
 
 import random
-
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from osc_lib.cli import format_columns
 from osc_lib import exceptions

openstackclient/tests/unit/network/v2/test_network_agent.py

@@ -11,8 +11,8 @@
 #   under the License.
 #
 
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from osc_lib.cli import format_columns
 from osc_lib import exceptions

openstackclient/tests/unit/network/v2/test_network_auto_allocated_topology.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from openstackclient.network.v2 import network_auto_allocated_topology
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes

openstackclient/tests/unit/network/v2/test_network_compute.py

@@ -11,8 +11,8 @@
 #   under the License.
 #
 
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from osc_lib import exceptions
 

openstackclient/tests/unit/network/v2/test_network_flavor.py

@@ -14,7 +14,7 @@
 #   under the License.
 #
 
-import mock
+from unittest import mock
 
 from osc_lib import exceptions
 

openstackclient/tests/unit/network/v2/test_network_flavor_profile.py

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

openstackclient/tests/unit/network/v2/test_network_meter.py

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

openstackclient/tests/unit/network/v2/test_network_meter_rule.py

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

openstackclient/tests/unit/network/v2/test_network_qos_policy.py

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

openstackclient/tests/unit/network/v2/test_network_qos_rule.py

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

openstackclient/tests/unit/network/v2/test_network_qos_rule_type.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from openstackclient.network.v2 import network_qos_rule_type as _qos_rule_type
 from openstackclient.tests.unit.network.v2 import fakes as network_fakes

openstackclient/tests/unit/network/v2/test_network_rbac.py

@@ -11,8 +11,8 @@
 #   under the License.
 #
 
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from osc_lib import exceptions
 

openstackclient/tests/unit/network/v2/test_network_segment.py

@@ -11,8 +11,8 @@
 #   under the License.
 #
 
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from osc_lib import exceptions
 

openstackclient/tests/unit/network/v2/test_network_segment_range.py

@@ -14,8 +14,8 @@
 #   under the License.
 #
 
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from osc_lib import exceptions
 

openstackclient/tests/unit/network/v2/test_network_service_provider.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from openstackclient.network.v2 import network_service_provider \
     as service_provider

openstackclient/tests/unit/network/v2/test_port.py

@@ -12,9 +12,9 @@
 #
 
 import argparse
+from unittest import mock
+from unittest.mock import call
 
-import mock
-from mock import call
 from osc_lib.cli import format_columns
 from osc_lib import exceptions
 from osc_lib import utils

openstackclient/tests/unit/network/v2/test_router.py

@@ -11,8 +11,8 @@
 #   under the License.
 #
 
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from osc_lib.cli import format_columns
 from osc_lib import exceptions

openstackclient/tests/unit/network/v2/test_security_group_compute.py

@@ -11,8 +11,8 @@
 #   under the License.
 #
 
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from osc_lib import exceptions
 

openstackclient/tests/unit/network/v2/test_security_group_network.py

@@ -11,8 +11,8 @@
 #   under the License.
 #
 
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from osc_lib import exceptions
 

openstackclient/tests/unit/network/v2/test_security_group_rule_compute.py

@@ -11,8 +11,8 @@
 #   under the License.
 #
 
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from osc_lib import exceptions
 

openstackclient/tests/unit/network/v2/test_security_group_rule_network.py

@@ -11,8 +11,8 @@
 #   under the License.
 #
 
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from osc_lib import exceptions
 

openstackclient/tests/unit/network/v2/test_subnet.py

@@ -11,8 +11,8 @@
 #   under the License.
 #
 
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from osc_lib.cli import format_columns
 from osc_lib import exceptions

openstackclient/tests/unit/network/v2/test_subnet_pool.py

@@ -12,9 +12,8 @@
 #
 
 import argparse
-
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from osc_lib.cli import format_columns
 from osc_lib import exceptions

openstackclient/tests/unit/object/v1/fakes.py

@@ -13,9 +13,8 @@
 #   under the License.
 #
 
-import six
-
 from keystoneauth1 import session
+import six
 
 from openstackclient.api import object_store_v1 as object_store
 from openstackclient.tests.unit import utils

openstackclient/tests/unit/object/v1/test_container.py

@@ -14,8 +14,7 @@
 #
 
 import copy
-
-import mock
+from unittest import mock
 
 from openstackclient.api import object_store_v1 as object_store
 from openstackclient.object.v1 import container

openstackclient/tests/unit/object/v1/test_object.py

@@ -14,8 +14,7 @@
 #
 
 import copy
-
-import mock
+from unittest import mock
 
 from openstackclient.api import object_store_v1 as object_store
 from openstackclient.object.v1 import object as obj

openstackclient/tests/unit/object/v1/test_object_all.py

@@ -12,8 +12,8 @@
 #
 
 import copy
+from unittest import mock
 
-import mock
 from osc_lib import exceptions
 from requests_mock.contrib import fixture
 import six

openstackclient/tests/unit/test_shell.py

@@ -15,8 +15,8 @@
 
 import os
 import sys
+from unittest import mock
 
-import mock
 from osc_lib.tests import utils as osc_lib_test_utils
 from oslo_utils import importutils
 import wrapt

openstackclient/tests/unit/utils.py

@@ -16,12 +16,11 @@
 
 import os
 
+from cliff import columns as cliff_columns
 import fixtures
 from six.moves import StringIO
 import testtools
 
-from cliff import columns as cliff_columns
-
 from openstackclient.tests.unit import fakes
 
 

openstackclient/tests/unit/volume/test_find_resource.py

@@ -13,7 +13,7 @@
 #   under the License.
 #
 
-import mock
+from unittest import mock
 
 from cinderclient.v3 import volume_snapshots
 from cinderclient.v3 import volumes

openstackclient/tests/unit/volume/v1/fakes.py

@@ -15,10 +15,9 @@
 
 import copy
 import random
+from unittest import mock
 import uuid
 
-import mock
-
 from openstackclient.tests.unit import fakes
 from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
 from openstackclient.tests.unit import utils

openstackclient/tests/unit/volume/v1/test_qos_specs.py

@@ -14,9 +14,8 @@
 #
 
 import copy
-
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from osc_lib.cli import format_columns
 from osc_lib import exceptions

openstackclient/tests/unit/volume/v1/test_transfer_request.py

@@ -12,8 +12,8 @@
 #   under the License.
 #
 
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from osc_lib import exceptions
 from osc_lib import utils

openstackclient/tests/unit/volume/v1/test_type.py

@@ -12,8 +12,8 @@
 #   under the License.
 #
 
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from osc_lib.cli import format_columns
 from osc_lib import exceptions

openstackclient/tests/unit/volume/v1/test_volume.py

@@ -14,9 +14,8 @@
 #
 
 import argparse
-
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from osc_lib.cli import format_columns
 from osc_lib import exceptions

openstackclient/tests/unit/volume/v1/test_volume_backup.py

@@ -12,8 +12,8 @@
 #   under the License.
 #
 
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from osc_lib import exceptions
 from osc_lib import utils

openstackclient/tests/unit/volume/v2/fakes.py

@@ -14,10 +14,9 @@
 
 import copy
 import random
+from unittest import mock
 import uuid
 
-import mock
-
 from osc_lib.cli import format_columns
 
 from openstackclient.tests.unit import fakes

openstackclient/tests/unit/volume/v2/test_consistency_group.py

@@ -12,8 +12,8 @@
 #   under the License.
 #
 
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from osc_lib.cli import format_columns
 from osc_lib import exceptions

openstackclient/tests/unit/volume/v2/test_consistency_group_snapshot.py

@@ -12,7 +12,7 @@
 #   under the License.
 #
 
-from mock import call
+from unittest.mock import call
 
 from openstackclient.tests.unit.volume.v2 import fakes as volume_fakes
 from openstackclient.volume.v2 import consistency_group_snapshot

openstackclient/tests/unit/volume/v2/test_qos_specs.py

@@ -14,9 +14,8 @@
 #
 
 import copy
-
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from osc_lib.cli import format_columns
 from osc_lib import exceptions

openstackclient/tests/unit/volume/v2/test_transfer_request.py

@@ -12,8 +12,8 @@
 #   under the License.
 #
 
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from osc_lib import exceptions
 from osc_lib import utils

openstackclient/tests/unit/volume/v2/test_type.py

@@ -12,8 +12,8 @@
 #   under the License.
 #
 
-import mock
-from mock import call
+from unittest import mock
+from unittest.mock import call
 
 from osc_lib.cli import format_columns
 from osc_lib import exceptions