Merge "Move ironic.tests.unit.base to ironic.tests.base"

ironic/tests/unit/api/v1/test_chassis.py

@@ -29,9 +29,9 @@ from wsme import types as wtypes
 from ironic.api.controllers import base as api_base
 from ironic.api.controllers import v1 as api_v1
 from ironic.api.controllers.v1 import chassis as api_chassis
+from ironic.tests import base
 from ironic.tests.unit.api import base as test_api_base
 from ironic.tests.unit.api import utils as apiutils
-from ironic.tests.unit import base
 from ironic.tests.unit.objects import utils as obj_utils
 
 

ironic/tests/unit/api/v1/test_nodes.py

@@ -37,9 +37,9 @@ from ironic.common import exception
 from ironic.common import states
 from ironic.conductor import rpcapi
 from ironic import objects
+from ironic.tests import base
 from ironic.tests.unit.api import base as test_api_base
 from ironic.tests.unit.api import utils as test_api_utils
-from ironic.tests.unit import base
 from ironic.tests.unit.objects import utils as obj_utils
 
 

ironic/tests/unit/api/v1/test_ports.py

@@ -33,9 +33,9 @@ from ironic.api.controllers.v1 import port as api_port
 from ironic.api.controllers.v1 import utils as api_utils
 from ironic.common import exception
 from ironic.conductor import rpcapi
+from ironic.tests import base
 from ironic.tests.unit.api import base as test_api_base
 from ironic.tests.unit.api import utils as apiutils
-from ironic.tests.unit import base
 from ironic.tests.unit.db import utils as dbutils
 from ironic.tests.unit.objects import utils as obj_utils
 

ironic/tests/unit/api/v1/test_root.py

@@ -16,8 +16,8 @@ import mock
 from webob import exc as webob_exc
 
 from ironic.api.controllers import v1 as v1_api
+from ironic.tests import base as test_base
 from ironic.tests.unit.api import base as api_base
-from ironic.tests.unit import base as test_base
 
 
 class TestV1Routing(api_base.BaseApiTest):

ironic/tests/unit/api/v1/test_types.py

@@ -25,7 +25,7 @@ from wsme import types as wtypes
 from ironic.api.controllers.v1 import types
 from ironic.common import exception
 from ironic.common import utils
-from ironic.tests.unit import base
+from ironic.tests import base
 
 
 class TestMacAddressType(base.TestCase):

ironic/tests/unit/api/v1/test_utils.py

@@ -25,8 +25,8 @@ import wsme
 from ironic.api.controllers.v1 import utils
 from ironic.common import exception
 from ironic import objects
+from ironic.tests import base
 from ironic.tests.unit.api import utils as test_api_utils
-from ironic.tests.unit import base
 
 CONF = cfg.CONF
 

ironic/tests/unit/api/v1/test_versions.py

@@ -18,7 +18,7 @@ Tests for the versions constants and methods.
 import re
 
 from ironic.api.controllers.v1 import versions
-from ironic.tests.unit import base
+from ironic.tests import base
 
 
 class TestVersionConstants(base.TestCase):

ironic/tests/unit/common/test_disk_partitioner.py

@@ -20,7 +20,7 @@ from testtools.matchers import HasLength
 from ironic.common import disk_partitioner
 from ironic.common import exception
 from ironic.common import utils
-from ironic.tests.unit import base
+from ironic.tests import base
 
 
 @mock.patch.object(eventlet.greenthread, 'sleep', lambda seconds: None)

ironic/tests/unit/common/test_driver_factory.py

@@ -17,7 +17,7 @@ from stevedore import dispatch
 
 from ironic.common import driver_factory
 from ironic.common import exception
-from ironic.tests.unit import base
+from ironic.tests import base
 
 
 class FakeEp(object):

ironic/tests/unit/common/test_exception.py

@@ -16,7 +16,7 @@ import mock
 import six
 
 from ironic.common import exception
-from ironic.tests.unit import base
+from ironic.tests import base
 
 
 class DeprecatedException(exception.IronicException):

ironic/tests/unit/common/test_fsm.py

@@ -15,7 +15,7 @@
 #    under the License.
 
 from ironic.common import fsm
-from ironic.tests.unit import base
+from ironic.tests import base
 
 
 class FSMTest(base.TestCase):

ironic/tests/unit/common/test_glance_service.py

@@ -29,7 +29,7 @@ from ironic.common import exception
 from ironic.common.glance_service import base_image_service
 from ironic.common.glance_service import service_utils
 from ironic.common import image_service as service
-from ironic.tests.unit import base
+from ironic.tests import base
 from ironic.tests.unit import stubs
 
 

ironic/tests/unit/common/test_hash_ring.py

@@ -22,7 +22,7 @@ from testtools import matchers
 
 from ironic.common import exception
 from ironic.common import hash_ring
-from ironic.tests.unit import base
+from ironic.tests import base
 from ironic.tests.unit.db import base as db_base
 
 CONF = cfg.CONF

ironic/tests/unit/common/test_image_service.py

@@ -25,7 +25,7 @@ from ironic.common import exception
 from ironic.common.glance_service.v1 import image_service as glance_v1_service
 from ironic.common import image_service
 from ironic.common import keystone
-from ironic.tests.unit import base
+from ironic.tests import base
 
 if six.PY3:
     import io

ironic/tests/unit/common/test_images.py

@@ -31,7 +31,7 @@ from ironic.common import image_service
 from ironic.common import images
 from ironic.common import utils
 from ironic.openstack.common import imageutils
-from ironic.tests.unit import base
+from ironic.tests import base
 
 if six.PY3:
     import io

ironic/tests/unit/common/test_keystone.py

@@ -17,7 +17,7 @@ import mock
 
 from ironic.common import exception
 from ironic.common import keystone
-from ironic.tests.unit import base
+from ironic.tests import base
 
 
 class FakeCatalog(object):

ironic/tests/unit/common/test_policy.py

@@ -16,7 +16,7 @@
 #    under the License.
 
 from ironic.common import policy
-from ironic.tests.unit import base
+from ironic.tests import base
 
 
 class PolicyTestCase(base.TestCase):

ironic/tests/unit/common/test_raid.py

@@ -17,7 +17,7 @@ import json
 from ironic.common import exception
 from ironic.common import raid
 from ironic.drivers import base as drivers_base
-from ironic.tests.unit import base
+from ironic.tests import base
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.objects import utils as obj_utils
 from ironic.tests.unit import raid_constants

ironic/tests/unit/common/test_states.py

@@ -17,7 +17,7 @@
 import six
 
 from ironic.common import states
-from ironic.tests.unit import base
+from ironic.tests import base
 
 
 class StatesTest(base.TestCase):

ironic/tests/unit/common/test_swift.py

@@ -24,7 +24,7 @@ from swiftclient import utils as swift_utils
 
 from ironic.common import exception
 from ironic.common import swift
-from ironic.tests.unit import base
+from ironic.tests import base
 
 CONF = cfg.CONF
 

ironic/tests/unit/common/test_utils.py

@@ -30,7 +30,7 @@ import six.moves.builtins as __builtin__
 
 from ironic.common import exception
 from ironic.common import utils
-from ironic.tests.unit import base
+from ironic.tests import base
 
 CONF = cfg.CONF
 

ironic/tests/unit/conductor/test_conductor_utils.py

@@ -19,7 +19,7 @@ from ironic.common import states
 from ironic.conductor import task_manager
 from ironic.conductor import utils as conductor_utils
 from ironic import objects
-from ironic.tests.unit import base as tests_base
+from ironic.tests import base as tests_base
 from ironic.tests.unit.conductor import utils as mgr_utils
 from ironic.tests.unit.db import base
 from ironic.tests.unit.db import utils

ironic/tests/unit/conductor/test_manager.py

@@ -44,7 +44,7 @@ from ironic.drivers import base as drivers_base
 from ironic.drivers.modules import fake
 from ironic import objects
 from ironic.objects import base as obj_base
-from ironic.tests.unit import base as tests_base
+from ironic.tests import base as tests_base
 from ironic.tests.unit.conductor import utils as mgr_utils
 from ironic.tests.unit.db import base as tests_db_base
 from ironic.tests.unit.db import utils

ironic/tests/unit/conductor/test_rpcapi.py

@@ -30,7 +30,7 @@ from ironic.common import states
 from ironic.conductor import manager as conductor_manager
 from ironic.conductor import rpcapi as conductor_rpcapi
 from ironic import objects
-from ironic.tests.unit import base as tests_base
+from ironic.tests import base as tests_base
 from ironic.tests.unit.db import base
 from ironic.tests.unit.db import utils as dbutils
 

ironic/tests/unit/conductor/test_task_manager.py

@@ -28,7 +28,7 @@ from ironic.common import fsm
 from ironic.common import states
 from ironic.conductor import task_manager
 from ironic import objects
-from ironic.tests.unit import base as tests_base
+from ironic.tests import base as tests_base
 from ironic.tests.unit.db import base as tests_db_base
 from ironic.tests.unit.objects import utils as obj_utils
 

ironic/tests/unit/conductor/test_utils.py

@@ -17,7 +17,7 @@
 
 """Tests for Ironic Manager test utils."""
 
-from ironic.tests.unit import base
+from ironic.tests import base
 from ironic.tests.unit.conductor import utils
 
 

ironic/tests/unit/db/base.py

@@ -26,7 +26,7 @@ from ironic.common import paths
 from ironic.db import api as dbapi
 from ironic.db.sqlalchemy import migration
 from ironic.db.sqlalchemy import models
-from ironic.tests.unit import base
+from ironic.tests import base
 
 
 CONF = cfg.CONF

ironic/tests/unit/db/sqlalchemy/test_migrations.py

@@ -51,7 +51,7 @@ import sqlalchemy.exc
 from ironic.common.i18n import _LE
 from ironic.db.sqlalchemy import migration
 from ironic.db.sqlalchemy import models
-from ironic.tests.unit import base
+from ironic.tests import base
 
 LOG = logging.getLogger(__name__)
 

ironic/tests/unit/dhcp/test_factory.py

@@ -23,7 +23,7 @@ from ironic.common import exception
 from ironic.dhcp import base as base_class
 from ironic.dhcp import neutron
 from ironic.dhcp import none
-from ironic.tests.unit import base
+from ironic.tests import base
 
 
 class TestDHCPFactory(base.TestCase):

ironic/tests/unit/drivers/modules/amt/test_common.py

@@ -21,7 +21,7 @@ from oslo_config import cfg
 from ironic.common import exception
 from ironic.drivers.modules.amt import common as amt_common
 from ironic.drivers.modules.amt import resource_uris
-from ironic.tests.unit import base
+from ironic.tests import base
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.drivers.modules.drac import utils as test_utils

ironic/tests/unit/drivers/modules/drac/test_client.py

@@ -22,7 +22,7 @@ import mock
 
 from ironic.common import exception
 from ironic.drivers.modules.drac import client as drac_client
-from ironic.tests.unit import base
+from ironic.tests import base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.drivers.modules.drac import utils as test_utils
 from ironic.tests.unit.drivers import third_party_driver_mock_specs \

ironic/tests/unit/drivers/modules/msftocs/test_msftocsclient.py

@@ -23,7 +23,7 @@ from requests import exceptions as requests_exceptions
 
 from ironic.common import exception
 from ironic.drivers.modules.msftocs import msftocsclient
-from ironic.tests.unit import base
+from ironic.tests import base
 
 
 FAKE_BOOT_RESPONSE = (

ironic/tests/unit/drivers/modules/test_agent_client.py

@@ -20,7 +20,7 @@ import six
 
 from ironic.common import exception
 from ironic.drivers.modules import agent_client
-from ironic.tests.unit import base
+from ironic.tests import base
 
 
 class MockResponse(object):

ironic/tests/unit/drivers/modules/test_deploy_utils.py

@@ -46,7 +46,7 @@ from ironic.drivers.modules import deploy_utils as utils
 from ironic.drivers.modules import image_cache
 from ironic.drivers.modules import iscsi_deploy
 from ironic.drivers.modules import pxe
-from ironic.tests.unit import base as tests_base
+from ironic.tests import base as tests_base
 from ironic.tests.unit.conductor import utils as mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils

ironic/tests/unit/drivers/modules/test_image_cache.py

@@ -31,7 +31,7 @@ from ironic.common import image_service
 from ironic.common import images
 from ironic.common import utils
 from ironic.drivers.modules import image_cache
-from ironic.tests.unit import base
+from ironic.tests import base
 
 
 def touch(filename):

ironic/tests/unit/drivers/modules/test_ipmitool.py

@@ -42,7 +42,7 @@ from ironic.conductor import task_manager
 from ironic.drivers.modules import console_utils
 from ironic.drivers.modules import ipmitool as ipmi
 from ironic.drivers import utils as driver_utils
-from ironic.tests.unit import base
+from ironic.tests import base
 from ironic.tests.unit.conductor import utils as mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils

ironic/tests/unit/drivers/modules/test_snmp.py

@@ -31,7 +31,7 @@ from ironic.common import exception
 from ironic.common import states
 from ironic.conductor import task_manager
 from ironic.drivers.modules import snmp as snmp
-from ironic.tests.unit import base
+from ironic.tests import base
 from ironic.tests.unit.conductor import utils as mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils

ironic/tests/unit/drivers/test_base.py

@@ -21,7 +21,7 @@ import mock
 from ironic.common import exception
 from ironic.common import raid
 from ironic.drivers import base as driver_base
-from ironic.tests.unit import base
+from ironic.tests import base
 
 
 class FakeVendorInterface(driver_base.VendorInterface):

ironic/tests/unit/objects/test_fields.py

@@ -16,7 +16,7 @@
 
 from ironic.common import exception
 from ironic.objects import fields
-from ironic.tests.unit import base as test_base
+from ironic.tests import base as test_base
 
 
 class TestMacAddressField(test_base.TestCase):

ironic/tests/unit/objects/test_objects.py

@@ -25,7 +25,7 @@ import six
 
 from ironic.objects import base
 from ironic.objects import fields
-from ironic.tests.unit import base as test_base
+from ironic.tests import base as test_base
 
 gettext.install('ironic')