diff --git a/ironic_inspector/test/inspector_tempest_plugin/tests/manager.py b/ironic_inspector/test/inspector_tempest_plugin/tests/manager.py index 1a451ecea..e6eb38922 100644 --- a/ironic_inspector/test/inspector_tempest_plugin/tests/manager.py +++ b/ironic_inspector/test/inspector_tempest_plugin/tests/manager.py @@ -14,6 +14,12 @@ import json import os import time +from ironic_tempest_plugin.tests.api.admin.api_microversion_fixture import \ + APIMicroversionFixture as IronicMicroversionFixture +from ironic_tempest_plugin.tests.scenario.baremetal_manager import \ + BaremetalProvisionStates +from ironic_tempest_plugin.tests.scenario.baremetal_manager import \ + BaremetalScenarioTest import six import tempest from tempest import config @@ -24,13 +30,6 @@ from tempest.lib import exceptions as lib_exc from ironic_inspector.test.inspector_tempest_plugin import exceptions from ironic_inspector.test.inspector_tempest_plugin.services import \ introspection_client -from ironic_tempest_plugin.tests.api.admin.api_microversion_fixture import \ - APIMicroversionFixture as IronicMicroversionFixture -from ironic_tempest_plugin.tests.scenario.baremetal_manager import \ - BaremetalProvisionStates -from ironic_tempest_plugin.tests.scenario.baremetal_manager import \ - BaremetalScenarioTest - CONF = config.CONF diff --git a/ironic_inspector/test/inspector_tempest_plugin/tests/test_basic.py b/ironic_inspector/test/inspector_tempest_plugin/tests/test_basic.py index bae615ebe..536b85368 100644 --- a/ironic_inspector/test/inspector_tempest_plugin/tests/test_basic.py +++ b/ironic_inspector/test/inspector_tempest_plugin/tests/test_basic.py @@ -10,12 +10,12 @@ # License for the specific language governing permissions and limitations # under the License. +from ironic_tempest_plugin.tests.scenario import baremetal_manager from tempest.config import CONF from tempest.lib import decorators from tempest import test # noqa from ironic_inspector.test.inspector_tempest_plugin.tests import manager -from ironic_tempest_plugin.tests.scenario import baremetal_manager class InspectorBasicTest(manager.InspectorScenarioTest): diff --git a/ironic_inspector/test/unit/test_main.py b/ironic_inspector/test/unit/test_main.py index 334123b63..7da31883e 100644 --- a/ironic_inspector/test/unit/test_main.py +++ b/ironic_inspector/test/unit/test_main.py @@ -16,6 +16,7 @@ import json import unittest import mock +from oslo_config import cfg from oslo_utils import uuidutils from ironic_inspector.common import ironic as ir_utils @@ -30,7 +31,6 @@ from ironic_inspector import process from ironic_inspector import rules from ironic_inspector.test import base as test_base from ironic_inspector import utils -from oslo_config import cfg CONF = cfg.CONF diff --git a/ironic_inspector/test/unit/test_utils.py b/ironic_inspector/test/unit/test_utils.py index f30f87211..41a8b4af4 100644 --- a/ironic_inspector/test/unit/test_utils.py +++ b/ironic_inspector/test/unit/test_utils.py @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +from ironicclient.v1 import node from keystonemiddleware import auth_token import mock from oslo_config import cfg @@ -18,7 +19,6 @@ from oslo_config import cfg from ironic_inspector import node_cache from ironic_inspector.test import base from ironic_inspector import utils -from ironicclient.v1 import node CONF = cfg.CONF diff --git a/tox.ini b/tox.ini index 22894d220..cf75a0a13 100644 --- a/tox.ini +++ b/tox.ini @@ -59,11 +59,12 @@ commands = {toxinidir}/tools/states_to_dot.py -f {toxinidir}/doc/source/images/s [flake8] max-complexity=15 -# [H106] Don’t put vim configuration in source files. +# [H106] Don't put vim configuration in source files. # [H203] Use assertIs(Not)None to check for None. # [H904] Delay string interpolations at logging calls. enable-extensions=H106,H203,H904 import-order-style = pep8 +application-import-names = ironic_inspector [hacking] import_exceptions = ironicclient.exceptions,ironic_inspector.common.i18n