diff options
Diffstat (limited to 'ironic/tests')
-rw-r--r-- | ironic/tests/unit/db/sqlalchemy/test_migrations.py | 2 | ||||
-rw-r--r-- | ironic/tests/unit/drivers/modules/oneview/test_deploy.py | 2 | ||||
-rw-r--r-- | ironic/tests/unit/drivers/modules/test_console_utils.py | 2 | ||||
-rw-r--r-- | ironic/tests/unit/objects/test_chassis.py | 1 | ||||
-rw-r--r-- | ironic/tests/unit/objects/test_node.py | 1 | ||||
-rw-r--r-- | ironic/tests/unit/objects/test_objects.py | 2 | ||||
-rw-r--r-- | ironic/tests/unit/objects/test_port.py | 1 | ||||
-rw-r--r-- | ironic/tests/unit/objects/test_portgroup.py | 1 |
8 files changed, 8 insertions, 4 deletions
diff --git a/ironic/tests/unit/db/sqlalchemy/test_migrations.py b/ironic/tests/unit/db/sqlalchemy/test_migrations.py index 167d0283c..ffbed7aa9 100644 --- a/ironic/tests/unit/db/sqlalchemy/test_migrations.py +++ b/ironic/tests/unit/db/sqlalchemy/test_migrations.py @@ -36,9 +36,9 @@ For postgres on Ubuntu this can be done with the following commands: import collections import contextlib -import fixtures from alembic import script +import fixtures import mock from oslo_db import exception as db_exc from oslo_db.sqlalchemy import enginefacade diff --git a/ironic/tests/unit/drivers/modules/oneview/test_deploy.py b/ironic/tests/unit/drivers/modules/oneview/test_deploy.py index db9098f2b..127860059 100644 --- a/ironic/tests/unit/drivers/modules/oneview/test_deploy.py +++ b/ironic/tests/unit/drivers/modules/oneview/test_deploy.py @@ -14,10 +14,10 @@ # License for the specific language governing permissions and limitations # under the License. -import mock import time import types +import mock from oslo_utils import importutils from ironic.common import driver_factory diff --git a/ironic/tests/unit/drivers/modules/test_console_utils.py b/ironic/tests/unit/drivers/modules/test_console_utils.py index 893df722f..d4e9a1323 100644 --- a/ironic/tests/unit/drivers/modules/test_console_utils.py +++ b/ironic/tests/unit/drivers/modules/test_console_utils.py @@ -19,7 +19,6 @@ import errno import os -import psutil import random import signal import string @@ -30,6 +29,7 @@ from ironic_lib import utils as ironic_utils import mock from oslo_config import cfg from oslo_utils import netutils +import psutil from ironic.common import exception from ironic.drivers.modules import console_utils diff --git a/ironic/tests/unit/objects/test_chassis.py b/ironic/tests/unit/objects/test_chassis.py index 199f92a63..626c9ec59 100644 --- a/ironic/tests/unit/objects/test_chassis.py +++ b/ironic/tests/unit/objects/test_chassis.py @@ -14,6 +14,7 @@ # under the License. import datetime + import mock from oslo_utils import uuidutils from testtools import matchers diff --git a/ironic/tests/unit/objects/test_node.py b/ironic/tests/unit/objects/test_node.py index 0a0dc0924..072777813 100644 --- a/ironic/tests/unit/objects/test_node.py +++ b/ironic/tests/unit/objects/test_node.py @@ -14,6 +14,7 @@ # under the License. import datetime + import mock from testtools import matchers diff --git a/ironic/tests/unit/objects/test_objects.py b/ironic/tests/unit/objects/test_objects.py index af5edcde6..09ce53d07 100644 --- a/ironic/tests/unit/objects/test_objects.py +++ b/ironic/tests/unit/objects/test_objects.py @@ -15,8 +15,8 @@ import contextlib import datetime import gettext -import iso8601 +import iso8601 import mock from oslo_versionedobjects import base as object_base from oslo_versionedobjects import exception as object_exception diff --git a/ironic/tests/unit/objects/test_port.py b/ironic/tests/unit/objects/test_port.py index de5adb162..546193915 100644 --- a/ironic/tests/unit/objects/test_port.py +++ b/ironic/tests/unit/objects/test_port.py @@ -14,6 +14,7 @@ # under the License. import datetime + import mock from testtools import matchers diff --git a/ironic/tests/unit/objects/test_portgroup.py b/ironic/tests/unit/objects/test_portgroup.py index b1b65e7ab..42e8c0a55 100644 --- a/ironic/tests/unit/objects/test_portgroup.py +++ b/ironic/tests/unit/objects/test_portgroup.py @@ -11,6 +11,7 @@ # under the License. import datetime + import mock from testtools import matchers |