diff --git a/tempest/tests/api/compute/test_base.py b/tempest/tests/api/compute/test_base.py index 1593464624..74d2625d54 100644 --- a/tempest/tests/api/compute/test_base.py +++ b/tempest/tests/api/compute/test_base.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 import six diff --git a/tempest/tests/base.py b/tempest/tests/base.py index 0b53b45a66..e8b2c984ba 100644 --- a/tempest/tests/base.py +++ b/tempest/tests/base.py @@ -12,7 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from oslotest import base diff --git a/tempest/tests/cmd/test_account_generator.py b/tempest/tests/cmd/test_account_generator.py index a962e37fc3..d15cd26b78 100644 --- a/tempest/tests/cmd/test_account_generator.py +++ b/tempest/tests/cmd/test_account_generator.py @@ -12,8 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + import fixtures -import mock from oslo_config import cfg from tempest.cmd import account_generator diff --git a/tempest/tests/cmd/test_cleanup.py b/tempest/tests/cmd/test_cleanup.py index 1618df9ff1..69e735b55b 100644 --- a/tempest/tests/cmd/test_cleanup.py +++ b/tempest/tests/cmd/test_cleanup.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from tempest.cmd import cleanup from tempest.tests import base diff --git a/tempest/tests/cmd/test_run.py b/tempest/tests/cmd/test_run.py index e9bbcc2ec4..5d9ddfae14 100644 --- a/tempest/tests/cmd/test_run.py +++ b/tempest/tests/cmd/test_run.py @@ -18,9 +18,9 @@ import os import shutil import subprocess import tempfile +from unittest import mock import fixtures -import mock import six from tempest.cmd import run diff --git a/tempest/tests/cmd/test_verify_tempest_config.py b/tempest/tests/cmd/test_verify_tempest_config.py index 8dbba38665..dad31b4c61 100644 --- a/tempest/tests/cmd/test_verify_tempest_config.py +++ b/tempest/tests/cmd/test_verify_tempest_config.py @@ -13,9 +13,9 @@ # under the License. import os +from unittest import mock import fixtures -import mock from oslo_serialization import jsonutils as json from tempest import clients diff --git a/tempest/tests/common/test_compute.py b/tempest/tests/common/test_compute.py index c108be981e..45a439ce99 100644 --- a/tempest/tests/common/test_compute.py +++ b/tempest/tests/common/test_compute.py @@ -13,9 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + from six.moves.urllib import parse as urlparse -import mock from tempest.common import compute from tempest.tests import base diff --git a/tempest/tests/common/test_credentials_factory.py b/tempest/tests/common/test_credentials_factory.py index 7cf87f8e18..0ef374292d 100644 --- a/tempest/tests/common/test_credentials_factory.py +++ b/tempest/tests/common/test_credentials_factory.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 import testtools diff --git a/tempest/tests/common/test_waiters.py b/tempest/tests/common/test_waiters.py index e3bb8367ae..5f8b990863 100755 --- a/tempest/tests/common/test_waiters.py +++ b/tempest/tests/common/test_waiters.py @@ -13,8 +13,8 @@ # under the License. import time +from unittest import mock -import mock from oslo_utils.fixture import uuidsentinel as uuids from tempest.common import waiters diff --git a/tempest/tests/common/utils/test_net_utils.py b/tempest/tests/common/utils/test_net_utils.py index 83c6bcc082..51d86d14f3 100644 --- a/tempest/tests/common/utils/test_net_utils.py +++ b/tempest/tests/common/utils/test_net_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 tempest.common.utils import net_utils from tempest.lib import exceptions as lib_exc diff --git a/tempest/tests/lib/cli/test_execute.py b/tempest/tests/lib/cli/test_execute.py index c069af5156..a10e3bbbc4 100644 --- a/tempest/tests/lib/cli/test_execute.py +++ b/tempest/tests/lib/cli/test_execute.py @@ -12,8 +12,8 @@ # under the License. import subprocess +from unittest import mock -import mock from tempest.lib.cli import base as cli_base from tempest.lib import exceptions diff --git a/tempest/tests/lib/common/test_cred_client.py b/tempest/tests/lib/common/test_cred_client.py index 3dff16fba8..860a4654ce 100644 --- a/tempest/tests/lib/common/test_cred_client.py +++ b/tempest/tests/lib/common/test_cred_client.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from tempest.lib.common import cred_client from tempest.tests import base diff --git a/tempest/tests/lib/common/test_dynamic_creds.py b/tempest/tests/lib/common/test_dynamic_creds.py index 4723458467..d1d82d13d1 100644 --- a/tempest/tests/lib/common/test_dynamic_creds.py +++ b/tempest/tests/lib/common/test_dynamic_creds.py @@ -12,8 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + import fixtures -import mock from oslo_config import cfg from tempest.common import credentials_factory as credentials diff --git a/tempest/tests/lib/common/test_preprov_creds.py b/tempest/tests/lib/common/test_preprov_creds.py index 25df2a7c4f..579363ee75 100644 --- a/tempest/tests/lib/common/test_preprov_creds.py +++ b/tempest/tests/lib/common/test_preprov_creds.py @@ -15,8 +15,8 @@ import hashlib import os import shutil +from unittest import mock -import mock import six import testtools diff --git a/tempest/tests/lib/common/test_profiler.py b/tempest/tests/lib/common/test_profiler.py index 59fa036445..166d831ebb 100644 --- a/tempest/tests/lib/common/test_profiler.py +++ b/tempest/tests/lib/common/test_profiler.py @@ -10,7 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + import testtools from tempest.lib.common import profiler diff --git a/tempest/tests/lib/common/test_validation_resources.py b/tempest/tests/lib/common/test_validation_resources.py index d5139f4da4..d50fd89112 100644 --- a/tempest/tests/lib/common/test_validation_resources.py +++ b/tempest/tests/lib/common/test_validation_resources.py @@ -11,8 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +from unittest import mock + import fixtures -import mock import testtools from tempest.lib.common import validation_resources as vr diff --git a/tempest/tests/lib/common/utils/linux/test_remote_client.py b/tempest/tests/lib/common/utils/linux/test_remote_client.py index 7a21a5fa1f..df23e637ca 100644 --- a/tempest/tests/lib/common/utils/linux/test_remote_client.py +++ b/tempest/tests/lib/common/utils/linux/test_remote_client.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from tempest.lib.common import ssh from tempest.lib.common.utils.linux import remote_client diff --git a/tempest/tests/lib/common/utils/test_test_utils.py b/tempest/tests/lib/common/utils/test_test_utils.py index 865767b74f..bdc0ea4f97 100644 --- a/tempest/tests/lib/common/utils/test_test_utils.py +++ b/tempest/tests/lib/common/utils/test_test_utils.py @@ -14,8 +14,8 @@ # under the License. import time +from unittest import mock -import mock from tempest.lib.common import thread from tempest.lib.common.utils import test_utils diff --git a/tempest/tests/lib/services/compute/test_base_compute_client.py b/tempest/tests/lib/services/compute/test_base_compute_client.py index 69e8542c68..5841ae4fac 100644 --- a/tempest/tests/lib/services/compute/test_base_compute_client.py +++ b/tempest/tests/lib/services/compute/test_base_compute_client.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from tempest.lib.common import rest_client from tempest.lib import exceptions diff --git a/tempest/tests/lib/services/compute/test_servers_client.py b/tempest/tests/lib/services/compute/test_servers_client.py index 86f6ad5851..a82b255bb2 100644 --- a/tempest/tests/lib/services/compute/test_servers_client.py +++ b/tempest/tests/lib/services/compute/test_servers_client.py @@ -14,8 +14,8 @@ # under the License. import copy +from unittest import mock -import mock from tempest.lib.services.compute import base_compute_client from tempest.lib.services.compute import servers_client diff --git a/tempest/tests/lib/services/compute/test_services_client.py b/tempest/tests/lib/services/compute/test_services_client.py index ba432e39e1..0c513cc407 100644 --- a/tempest/tests/lib/services/compute/test_services_client.py +++ b/tempest/tests/lib/services/compute/test_services_client.py @@ -13,8 +13,8 @@ # under the License. import copy +from unittest import mock -import mock from tempest.lib.services.compute import base_compute_client from tempest.lib.services.compute import services_client diff --git a/tempest/tests/lib/services/identity/v2/test_token_client.py b/tempest/tests/lib/services/identity/v2/test_token_client.py index 5b4e210d4b..dc14a5002a 100644 --- a/tempest/tests/lib/services/identity/v2/test_token_client.py +++ b/tempest/tests/lib/services/identity/v2/test_token_client.py @@ -12,7 +12,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 tempest.lib.common import rest_client diff --git a/tempest/tests/lib/services/identity/v3/test_token_client.py b/tempest/tests/lib/services/identity/v3/test_token_client.py index 656e10a30e..1c2295da26 100644 --- a/tempest/tests/lib/services/identity/v3/test_token_client.py +++ b/tempest/tests/lib/services/identity/v3/test_token_client.py @@ -12,7 +12,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 tempest.lib.common import rest_client diff --git a/tempest/tests/lib/services/network/test_base_network_client.py b/tempest/tests/lib/services/network/test_base_network_client.py index e121cec9d1..a426397bf4 100644 --- a/tempest/tests/lib/services/network/test_base_network_client.py +++ b/tempest/tests/lib/services/network/test_base_network_client.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from tempest.lib.services.network import base as base_network_client from tempest.tests.lib import fake_auth_provider diff --git a/tempest/tests/lib/services/network/test_security_group_rules_client.py b/tempest/tests/lib/services/network/test_security_group_rules_client.py index b9c17a15f9..2ecc996034 100644 --- a/tempest/tests/lib/services/network/test_security_group_rules_client.py +++ b/tempest/tests/lib/services/network/test_security_group_rules_client.py @@ -14,8 +14,8 @@ # under the License. import copy +from unittest import mock -import mock from oslo_serialization import jsonutils as json from tempest.lib.services.network import base as network_base diff --git a/tempest/tests/lib/services/network/test_security_groups_client.py b/tempest/tests/lib/services/network/test_security_groups_client.py index f96805f3b2..501883b799 100644 --- a/tempest/tests/lib/services/network/test_security_groups_client.py +++ b/tempest/tests/lib/services/network/test_security_groups_client.py @@ -14,8 +14,8 @@ # under the License. import copy +from unittest import mock -import mock from oslo_serialization import jsonutils as json from tempest.lib.services.network import base as network_base diff --git a/tempest/tests/lib/services/object_storage/test_object_client.py b/tempest/tests/lib/services/object_storage/test_object_client.py index 1749b03f05..c646d618d0 100644 --- a/tempest/tests/lib/services/object_storage/test_object_client.py +++ b/tempest/tests/lib/services/object_storage/test_object_client.py @@ -14,7 +14,7 @@ # under the License. -import mock +from unittest import mock from tempest.lib import exceptions from tempest.lib.services.object_storage import object_client diff --git a/tempest/tests/lib/services/test_clients.py b/tempest/tests/lib/services/test_clients.py index 43fd88ff61..f83064a86e 100644 --- a/tempest/tests/lib/services/test_clients.py +++ b/tempest/tests/lib/services/test_clients.py @@ -13,9 +13,9 @@ # the License. import types +from unittest import mock import fixtures -import mock import six import testtools diff --git a/tempest/tests/lib/services/volume/v3/test_services_client.py b/tempest/tests/lib/services/volume/v3/test_services_client.py index f65228f231..c807bc2c92 100644 --- a/tempest/tests/lib/services/volume/v3/test_services_client.py +++ b/tempest/tests/lib/services/volume/v3/test_services_client.py @@ -14,8 +14,8 @@ # under the License. import copy +from unittest import mock -import mock from oslo_serialization import jsonutils as json from tempest.lib.services.volume.v3 import services_client diff --git a/tempest/tests/lib/services/volume/v3/test_snapshot_manage_client.py b/tempest/tests/lib/services/volume/v3/test_snapshot_manage_client.py index 1b880205ea..8309f7acb3 100644 --- a/tempest/tests/lib/services/volume/v3/test_snapshot_manage_client.py +++ b/tempest/tests/lib/services/volume/v3/test_snapshot_manage_client.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_serialization import jsonutils as json diff --git a/tempest/tests/lib/services/volume/v3/test_transfers_client.py b/tempest/tests/lib/services/volume/v3/test_transfers_client.py index d631fe7e56..1dfe2df837 100644 --- a/tempest/tests/lib/services/volume/v3/test_transfers_client.py +++ b/tempest/tests/lib/services/volume/v3/test_transfers_client.py @@ -14,8 +14,8 @@ # under the License. import copy +from unittest import mock -import mock from oslo_serialization import jsonutils as json from tempest.lib.services.volume.v3 import transfers_client diff --git a/tempest/tests/lib/services/volume/v3/test_volume_manage_client.py b/tempest/tests/lib/services/volume/v3/test_volume_manage_client.py index 902f027bec..d4313a2e43 100644 --- a/tempest/tests/lib/services/volume/v3/test_volume_manage_client.py +++ b/tempest/tests/lib/services/volume/v3/test_volume_manage_client.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_serialization import jsonutils as json diff --git a/tempest/tests/lib/test_decorators.py b/tempest/tests/lib/test_decorators.py index 9c6cac71d9..e3c17e8b9d 100644 --- a/tempest/tests/lib/test_decorators.py +++ b/tempest/tests/lib/test_decorators.py @@ -14,8 +14,8 @@ # under the License. import abc +from unittest import mock -import mock import six import testtools diff --git a/tempest/tests/lib/test_ssh.py b/tempest/tests/lib/test_ssh.py index c849231d7f..85048fba0e 100644 --- a/tempest/tests/lib/test_ssh.py +++ b/tempest/tests/lib/test_ssh.py @@ -13,8 +13,8 @@ # under the License. import socket +from unittest import mock -import mock import six from six import StringIO import testtools diff --git a/tempest/tests/test_base_test.py b/tempest/tests/test_base_test.py index 2b5a947003..b154cd5d2f 100644 --- a/tempest/tests/test_base_test.py +++ b/tempest/tests/test_base_test.py @@ -12,7 +12,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 tempest import clients diff --git a/tempest/tests/test_imports.py b/tempest/tests/test_imports.py index 6f1cfca709..ad7bebbadd 100644 --- a/tempest/tests/test_imports.py +++ b/tempest/tests/test_imports.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from tempest.tests import base diff --git a/tempest/tests/test_test.py b/tempest/tests/test_test.py index 49fd0105a9..72e8b6d271 100644 --- a/tempest/tests/test_test.py +++ b/tempest/tests/test_test.py @@ -15,8 +15,8 @@ import os import sys +from unittest import mock -import mock from oslo_config import cfg import testtools diff --git a/test-requirements.txt b/test-requirements.txt index 17a7d2ab24..17fa9f1086 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,7 +2,6 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. hacking>=3.0.1,<3.1.0;python_version>='3.5' # Apache-2.0 -mock>=2.0.0 # BSD coverage!=4.4,>=4.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 pycodestyle>=2.0.0,<2.6.0 # MIT