diff --git a/ironic_staging_drivers/tests/unit/amt/pywsman_mocks.py b/ironic_staging_drivers/tests/unit/amt/pywsman_mocks.py index eb0cb9a..fcf371a 100644 --- a/ironic_staging_drivers/tests/unit/amt/pywsman_mocks.py +++ b/ironic_staging_drivers/tests/unit/amt/pywsman_mocks.py @@ -23,8 +23,8 @@ respective external libraries' actually being present. import importlib import sys +from unittest import mock -import mock from oslo_utils import importutils from ironic_staging_drivers.tests.unit.amt import pywsman_mocks_specs diff --git a/ironic_staging_drivers/tests/unit/amt/test_common.py b/ironic_staging_drivers/tests/unit/amt/test_common.py index 7916c68..8d87b32 100644 --- a/ironic_staging_drivers/tests/unit/amt/test_common.py +++ b/ironic_staging_drivers/tests/unit/amt/test_common.py @@ -14,12 +14,13 @@ """ Test class for AMT Common """ + import time +from unittest import mock from ironic.common import exception as ironic_exception from ironic.common import utils from ironic.tests import base -import mock from oslo_concurrency import processutils from oslo_config import cfg diff --git a/ironic_staging_drivers/tests/unit/amt/test_deploy.py b/ironic_staging_drivers/tests/unit/amt/test_deploy.py index a97c82a..392294c 100644 --- a/ironic_staging_drivers/tests/unit/amt/test_deploy.py +++ b/ironic_staging_drivers/tests/unit/amt/test_deploy.py @@ -13,11 +13,12 @@ """Test class for AMT Deploy methods.""" +from unittest import mock + from ironic.common import boot_devices from ironic.common import states from ironic.conductor import task_manager from ironic.drivers.modules import iscsi_deploy -import mock from ironic_staging_drivers.amt import management as amt_mgmt from ironic_staging_drivers.tests.unit.amt import utils as test_utils diff --git a/ironic_staging_drivers/tests/unit/amt/test_management.py b/ironic_staging_drivers/tests/unit/amt/test_management.py index 78e98d6..0fa53ab 100644 --- a/ironic_staging_drivers/tests/unit/amt/test_management.py +++ b/ironic_staging_drivers/tests/unit/amt/test_management.py @@ -15,10 +15,11 @@ Test class for AMT ManagementInterface """ +from unittest import mock + from ironic.common import boot_devices from ironic.common import exception as ironic_exception from ironic.conductor import task_manager -import mock from oslo_config import cfg from ironic_staging_drivers.amt import common as amt_common diff --git a/ironic_staging_drivers/tests/unit/amt/test_power.py b/ironic_staging_drivers/tests/unit/amt/test_power.py index 080eafc..3be15b1 100644 --- a/ironic_staging_drivers/tests/unit/amt/test_power.py +++ b/ironic_staging_drivers/tests/unit/amt/test_power.py @@ -15,11 +15,12 @@ Test class for AMT ManagementInterface """ +from unittest import mock + from ironic.common import boot_devices from ironic.common import exception as ironic_exception from ironic.common import states from ironic.conductor import task_manager -import mock from oslo_config import cfg diff --git a/ironic_staging_drivers/tests/unit/amt/utils.py b/ironic_staging_drivers/tests/unit/amt/utils.py index 5040a9b..b947388 100644 --- a/ironic_staging_drivers/tests/unit/amt/utils.py +++ b/ironic_staging_drivers/tests/unit/amt/utils.py @@ -13,11 +13,11 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock from xml.etree import ElementTree from ironic.tests.unit.db import base as db_base from ironic.tests.unit.objects import utils as obj_utils -import mock def get_test_amt_info(): diff --git a/ironic_staging_drivers/tests/unit/iboot/test_power.py b/ironic_staging_drivers/tests/unit/iboot/test_power.py index 352e38e..180106a 100644 --- a/ironic_staging_drivers/tests/unit/iboot/test_power.py +++ b/ironic_staging_drivers/tests/unit/iboot/test_power.py @@ -16,7 +16,7 @@ """Test class for iBoot PDU driver module.""" import types - +from unittest import mock from ironic.common import exception as ironic_exception from ironic.common import states @@ -24,7 +24,6 @@ from ironic.conductor import task_manager from ironic.drivers.modules import fake from ironic.tests.unit.db import base as db_base from ironic.tests.unit.objects import utils as obj_utils -import mock from ironic_staging_drivers.iboot import power as iboot_power diff --git a/ironic_staging_drivers/tests/unit/intel_nm/test_vendor.py b/ironic_staging_drivers/tests/unit/intel_nm/test_vendor.py index bf08b85..56f433e 100644 --- a/ironic_staging_drivers/tests/unit/intel_nm/test_vendor.py +++ b/ironic_staging_drivers/tests/unit/intel_nm/test_vendor.py @@ -15,6 +15,7 @@ Tests for Intel NM vendor interface """ import os +from unittest import mock from ironic.common import exception from ironic.conductor import task_manager @@ -22,7 +23,6 @@ from ironic.drivers.modules import ipmitool from ironic.tests.unit.db import base as db_base from ironic.tests.unit.objects import utils as obj_utils from ironic_lib import utils as ironic_utils -import mock from oslo_config import cfg from ironic_staging_drivers.intel_nm import nm_commands diff --git a/ironic_staging_drivers/tests/unit/libvirt/test_power.py b/ironic_staging_drivers/tests/unit/libvirt/test_power.py index 67d7a77..591f060 100644 --- a/ironic_staging_drivers/tests/unit/libvirt/test_power.py +++ b/ironic_staging_drivers/tests/unit/libvirt/test_power.py @@ -16,6 +16,7 @@ """Test class for Ironic libvirt driver.""" import tempfile +from unittest import mock from ironic.common import boot_devices from ironic.common import exception @@ -24,7 +25,6 @@ from ironic.conductor import task_manager from ironic.drivers import utils as driver_utils from ironic.tests.unit.db import base as db_base from ironic.tests.unit.objects import utils as obj_utils -import mock from ironic_staging_drivers.common import exception as isd_exc from ironic_staging_drivers.libvirt import power diff --git a/ironic_staging_drivers/tests/unit/ovirt/test_ovirt.py b/ironic_staging_drivers/tests/unit/ovirt/test_ovirt.py index 014feba..bc6cbd2 100644 --- a/ironic_staging_drivers/tests/unit/ovirt/test_ovirt.py +++ b/ironic_staging_drivers/tests/unit/ovirt/test_ovirt.py @@ -14,13 +14,13 @@ """Test class for oVirt driver module.""" import time +from unittest import mock from ironic.common import boot_devices from ironic.common import states from ironic.conductor import task_manager from ironic.tests.unit.db import base as db_base from ironic.tests.unit.objects import utils as obj_utils -import mock from ironic_staging_drivers.ovirt import ovirt as ovirt_power diff --git a/ironic_staging_drivers/tests/unit/third_party_driver_mocks.py b/ironic_staging_drivers/tests/unit/third_party_driver_mocks.py index 5bedea6..65162a1 100644 --- a/ironic_staging_drivers/tests/unit/third_party_driver_mocks.py +++ b/ironic_staging_drivers/tests/unit/third_party_driver_mocks.py @@ -27,8 +27,8 @@ Current list of mocked libraries: import importlib import sys +from unittest import mock -import mock from oslo_utils import importutils from ironic_staging_drivers.tests.unit import third_party_driver_mock_specs \ diff --git a/ironic_staging_drivers/tests/unit/wol/test_power.py b/ironic_staging_drivers/tests/unit/wol/test_power.py index 9f518d0..1cd2541 100644 --- a/ironic_staging_drivers/tests/unit/wol/test_power.py +++ b/ironic_staging_drivers/tests/unit/wol/test_power.py @@ -17,6 +17,7 @@ import socket import time +from unittest import mock from ironic.common import exception as ironic_exception from ironic.common import states @@ -24,7 +25,6 @@ from ironic.conductor import task_manager from ironic.drivers.modules import fake from ironic.tests.unit.db import base as db_base from ironic.tests.unit.objects import utils as obj_utils -import mock from oslo_utils import uuidutils from ironic_staging_drivers.common import exception diff --git a/lower-constraints.txt b/lower-constraints.txt index 34621e2..f1b7eb7 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -48,7 +48,6 @@ logutils==0.3.5 Mako==1.1.2 MarkupSafe==1.0 mccabe==0.6.0 -mock==2.0.0 monotonic==1.4 mox3==0.25.0 msgpack==0.5.6 diff --git a/test-requirements.txt b/test-requirements.txt index d7dbfee..5fba73e 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -12,6 +12,5 @@ testscenarios>=0.4 # Apache-2.0/BSD testtools>=2.2.0 # MIT os-testr>=1.0.0 # Apache-2.0 reno>=2.5.0 # Apache-2.0 -mock>=2.0.0 # BSD flake8-import-order>=0.17.1 # LGPLv3