diff --git a/os_win/tests/unit/test_base.py b/os_win/tests/unit/test_base.py index 8a58f193..2343451f 100644 --- a/os_win/tests/unit/test_base.py +++ b/os_win/tests/unit/test_base.py @@ -14,7 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from oslotest import base from oslotest import mock_fixture from six.moves import builtins diff --git a/os_win/tests/unit/test_hacking.py b/os_win/tests/unit/test_hacking.py index 443f51bc..b259ac7e 100644 --- a/os_win/tests/unit/test_hacking.py +++ b/os_win/tests/unit/test_hacking.py @@ -16,8 +16,8 @@ import os import textwrap +from unittest import mock -import mock import pycodestyle from os_win._hacking import checks diff --git a/os_win/tests/unit/test_processutils.py b/os_win/tests/unit/test_processutils.py index 2a1de7df..588a6243 100644 --- a/os_win/tests/unit/test_processutils.py +++ b/os_win/tests/unit/test_processutils.py @@ -14,8 +14,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + import ddt -import mock from os_win.tests.unit import test_base from os_win.utils import processutils diff --git a/os_win/tests/unit/test_utils.py b/os_win/tests/unit/test_utils.py index 956eef0a..db8f2722 100644 --- a/os_win/tests/unit/test_utils.py +++ b/os_win/tests/unit/test_utils.py @@ -18,8 +18,9 @@ Unit tests for the os_win._utils module. """ +from unittest import mock + import ddt -import mock from os_win import _utils from os_win import constants diff --git a/os_win/tests/unit/test_utilsfactory.py b/os_win/tests/unit/test_utilsfactory.py index 3698cc9a..2421a4ea 100644 --- a/os_win/tests/unit/test_utilsfactory.py +++ b/os_win/tests/unit/test_utilsfactory.py @@ -18,8 +18,8 @@ Unit tests for the Hyper-V utils factory. """ import inspect +from unittest import mock -import mock from oslo_config import cfg from oslo_utils import importutils diff --git a/os_win/tests/unit/utils/compute/test_clusapi_utils.py b/os_win/tests/unit/utils/compute/test_clusapi_utils.py index be996b28..67228906 100644 --- a/os_win/tests/unit/utils/compute/test_clusapi_utils.py +++ b/os_win/tests/unit/utils/compute/test_clusapi_utils.py @@ -14,9 +14,9 @@ # under the License. import ctypes +from unittest import mock import ddt -import mock from os_win import constants from os_win import exceptions diff --git a/os_win/tests/unit/utils/compute/test_clusterutils.py b/os_win/tests/unit/utils/compute/test_clusterutils.py index 99dc6c79..ed07c449 100644 --- a/os_win/tests/unit/utils/compute/test_clusterutils.py +++ b/os_win/tests/unit/utils/compute/test_clusterutils.py @@ -14,9 +14,9 @@ # under the License. import ctypes +from unittest import mock import ddt -import mock from six.moves import queue from os_win import constants diff --git a/os_win/tests/unit/utils/compute/test_livemigrationutils.py b/os_win/tests/unit/utils/compute/test_livemigrationutils.py index a9518a05..4c43fdc3 100644 --- a/os_win/tests/unit/utils/compute/test_livemigrationutils.py +++ b/os_win/tests/unit/utils/compute/test_livemigrationutils.py @@ -14,9 +14,9 @@ # under the License. import platform +from unittest import mock import ddt -import mock from os_win import exceptions from os_win.tests.unit import test_base diff --git a/os_win/tests/unit/utils/compute/test_migrationutils.py b/os_win/tests/unit/utils/compute/test_migrationutils.py index 2fbcda23..4a308a93 100644 --- a/os_win/tests/unit/utils/compute/test_migrationutils.py +++ b/os_win/tests/unit/utils/compute/test_migrationutils.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + import ddt -import mock from os_win import constants from os_win import exceptions diff --git a/os_win/tests/unit/utils/compute/test_rdpconsoleutils.py b/os_win/tests/unit/utils/compute/test_rdpconsoleutils.py index f281d138..c77166ea 100644 --- a/os_win/tests/unit/utils/compute/test_rdpconsoleutils.py +++ b/os_win/tests/unit/utils/compute/test_rdpconsoleutils.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from os_win.tests.unit import test_base from os_win.utils.compute import rdpconsoleutils diff --git a/os_win/tests/unit/utils/compute/test_vmutils.py b/os_win/tests/unit/utils/compute/test_vmutils.py index 8fe8a8c0..e71be1f5 100644 --- a/os_win/tests/unit/utils/compute/test_vmutils.py +++ b/os_win/tests/unit/utils/compute/test_vmutils.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + import ddt -import mock from six.moves import range # noqa from os_win import constants diff --git a/os_win/tests/unit/utils/compute/test_vmutils10.py b/os_win/tests/unit/utils/compute/test_vmutils10.py index 21ede96c..869bc70e 100644 --- a/os_win/tests/unit/utils/compute/test_vmutils10.py +++ b/os_win/tests/unit/utils/compute/test_vmutils10.py @@ -12,8 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + import ddt -import mock import six from os_win import constants diff --git a/os_win/tests/unit/utils/dns/test_dnsutils.py b/os_win/tests/unit/utils/dns/test_dnsutils.py index d1291cc4..b223a4a3 100644 --- a/os_win/tests/unit/utils/dns/test_dnsutils.py +++ b/os_win/tests/unit/utils/dns/test_dnsutils.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from os_win import constants from os_win import exceptions diff --git a/os_win/tests/unit/utils/io/test_ioutils.py b/os_win/tests/unit/utils/io/test_ioutils.py index a14546a9..a6053393 100644 --- a/os_win/tests/unit/utils/io/test_ioutils.py +++ b/os_win/tests/unit/utils/io/test_ioutils.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License.import mock +from unittest import mock + import ddt -import mock import six from os_win import constants diff --git a/os_win/tests/unit/utils/io/test_namedpipe.py b/os_win/tests/unit/utils/io/test_namedpipe.py index c56ab2af..73474eec 100644 --- a/os_win/tests/unit/utils/io/test_namedpipe.py +++ b/os_win/tests/unit/utils/io/test_namedpipe.py @@ -14,8 +14,8 @@ # under the License. import errno +from unittest import mock -import mock from six.moves import builtins from os_win import constants diff --git a/os_win/tests/unit/utils/metrics/test_metricsutils.py b/os_win/tests/unit/utils/metrics/test_metricsutils.py index c2a24d80..629719ad 100644 --- a/os_win/tests/unit/utils/metrics/test_metricsutils.py +++ b/os_win/tests/unit/utils/metrics/test_metricsutils.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from os_win import exceptions from os_win.tests.unit import test_base diff --git a/os_win/tests/unit/utils/network/test_networkutils.py b/os_win/tests/unit/utils/network/test_networkutils.py index 6a75389b..988f6d2b 100644 --- a/os_win/tests/unit/utils/network/test_networkutils.py +++ b/os_win/tests/unit/utils/network/test_networkutils.py @@ -12,8 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + import ddt -import mock from oslo_utils import units from os_win import constants diff --git a/os_win/tests/unit/utils/network/test_nvgreutils.py b/os_win/tests/unit/utils/network/test_nvgreutils.py index 6088659c..51c188b3 100644 --- a/os_win/tests/unit/utils/network/test_nvgreutils.py +++ b/os_win/tests/unit/utils/network/test_nvgreutils.py @@ -17,7 +17,7 @@ Unit tests for the Hyper-V NVGRE support. """ -import mock +from unittest import mock from os_win import constants from os_win import exceptions diff --git a/os_win/tests/unit/utils/storage/initiator/test_fc_utils.py b/os_win/tests/unit/utils/storage/initiator/test_fc_utils.py index fba4abf2..f4f0af2c 100644 --- a/os_win/tests/unit/utils/storage/initiator/test_fc_utils.py +++ b/os_win/tests/unit/utils/storage/initiator/test_fc_utils.py @@ -14,8 +14,8 @@ # under the License. import ctypes +from unittest import mock -import mock import six from os_win import _utils diff --git a/os_win/tests/unit/utils/storage/initiator/test_iscsi_utils.py b/os_win/tests/unit/utils/storage/initiator/test_iscsi_utils.py index b5b3e6ca..31c25146 100644 --- a/os_win/tests/unit/utils/storage/initiator/test_iscsi_utils.py +++ b/os_win/tests/unit/utils/storage/initiator/test_iscsi_utils.py @@ -16,9 +16,9 @@ import collections import ctypes +from unittest import mock import ddt -import mock import six from os_win import _utils diff --git a/os_win/tests/unit/utils/storage/target/test_iscsi_target_utils.py b/os_win/tests/unit/utils/storage/target/test_iscsi_target_utils.py index c9aa75b6..6f887df9 100644 --- a/os_win/tests/unit/utils/storage/target/test_iscsi_target_utils.py +++ b/os_win/tests/unit/utils/storage/target/test_iscsi_target_utils.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from os_win import constants from os_win import exceptions diff --git a/os_win/tests/unit/utils/storage/test_diskutils.py b/os_win/tests/unit/utils/storage/test_diskutils.py index 65867eb3..3380c71e 100644 --- a/os_win/tests/unit/utils/storage/test_diskutils.py +++ b/os_win/tests/unit/utils/storage/test_diskutils.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + import ddt -import mock from os_win import _utils from os_win import constants diff --git a/os_win/tests/unit/utils/storage/test_smbutils.py b/os_win/tests/unit/utils/storage/test_smbutils.py index 55f618e5..340a8a19 100644 --- a/os_win/tests/unit/utils/storage/test_smbutils.py +++ b/os_win/tests/unit/utils/storage/test_smbutils.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + import ddt -import mock from os_win import exceptions from os_win.tests.unit import test_base diff --git a/os_win/tests/unit/utils/storage/virtdisk/test_vhdutils.py b/os_win/tests/unit/utils/storage/virtdisk/test_vhdutils.py index d99ded02..6bb8ede7 100644 --- a/os_win/tests/unit/utils/storage/virtdisk/test_vhdutils.py +++ b/os_win/tests/unit/utils/storage/virtdisk/test_vhdutils.py @@ -14,9 +14,9 @@ import ctypes import os +from unittest import mock import ddt -import mock import six from os_win import constants diff --git a/os_win/tests/unit/utils/test_aclutils.py b/os_win/tests/unit/utils/test_aclutils.py index eb467131..32bb9e04 100644 --- a/os_win/tests/unit/utils/test_aclutils.py +++ b/os_win/tests/unit/utils/test_aclutils.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + import ddt -import mock from os_win.tests.unit import test_base from os_win.utils import _acl_utils diff --git a/os_win/tests/unit/utils/test_baseutils.py b/os_win/tests/unit/utils/test_baseutils.py index d83f669e..a281f95e 100644 --- a/os_win/tests/unit/utils/test_baseutils.py +++ b/os_win/tests/unit/utils/test_baseutils.py @@ -12,7 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + import six import imp diff --git a/os_win/tests/unit/utils/test_hostutils.py b/os_win/tests/unit/utils/test_hostutils.py index bda47313..26fa9290 100644 --- a/os_win/tests/unit/utils/test_hostutils.py +++ b/os_win/tests/unit/utils/test_hostutils.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from os_win import constants from os_win import exceptions diff --git a/os_win/tests/unit/utils/test_hostutils10.py b/os_win/tests/unit/utils/test_hostutils10.py index a5ca5e63..58281f25 100644 --- a/os_win/tests/unit/utils/test_hostutils10.py +++ b/os_win/tests/unit/utils/test_hostutils10.py @@ -14,8 +14,8 @@ # under the License. import re +from unittest import mock -import mock from os_win import exceptions from os_win.tests.unit import test_base diff --git a/os_win/tests/unit/utils/test_jobutils.py b/os_win/tests/unit/utils/test_jobutils.py index ce51dc9d..bf80168c 100755 --- a/os_win/tests/unit/utils/test_jobutils.py +++ b/os_win/tests/unit/utils/test_jobutils.py @@ -12,8 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + import ddt -import mock from os_win import constants from os_win import exceptions diff --git a/os_win/tests/unit/utils/test_pathutils.py b/os_win/tests/unit/utils/test_pathutils.py index 8f052b40..f337520a 100644 --- a/os_win/tests/unit/utils/test_pathutils.py +++ b/os_win/tests/unit/utils/test_pathutils.py @@ -15,9 +15,9 @@ import ctypes import os import shutil +from unittest import mock import ddt -import mock from os_win import constants from os_win import exceptions diff --git a/os_win/tests/unit/utils/test_win32utils.py b/os_win/tests/unit/utils/test_win32utils.py index a96ab6a4..70fac494 100644 --- a/os_win/tests/unit/utils/test_win32utils.py +++ b/os_win/tests/unit/utils/test_win32utils.py @@ -14,8 +14,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + import ddt -import mock from os_win import _utils from os_win import exceptions diff --git a/os_win/tests/unit/utils/test_wqlutils.py b/os_win/tests/unit/utils/test_wqlutils.py index 49b12374..7713909f 100644 --- a/os_win/tests/unit/utils/test_wqlutils.py +++ b/os_win/tests/unit/utils/test_wqlutils.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from os_win import exceptions from os_win.tests.unit import test_base