diff --git a/placement/test.py b/placement/test.py index dcde7aade..6768f0354 100644 --- a/placement/test.py +++ b/placement/test.py @@ -57,7 +57,7 @@ from nova.network import manager as network_manager from nova.network.security_group import openstack_driver from placement import objects from nova.objects import base as objects_base -from nova.tests import fixtures as nova_fixtures +from placement.tests import fixtures as placement_fixtures from nova.tests.unit import conf_fixture from nova.tests.unit import policy_fixture from nova.tests import uuidsentinel as uuids diff --git a/placement/tests/fixtures.py b/placement/tests/fixtures.py index ebb0d93ab..5aa98039b 100644 --- a/placement/tests/fixtures.py +++ b/placement/tests/fixtures.py @@ -56,7 +56,9 @@ from placement import quota as nova_quota from placement import rpc from placement import service from nova.tests.functional.api import client -from nova.tests.functional.fixtures import placement +# TODO(cdent): It is quite like this is in the wrong place, as it is a fixture +# for other repos, not placement's. +from placement.tests.functional.fixtures import placement from nova.tests import uuidsentinel _TRUE_VALUES = ('True', 'true', '1', 'yes') diff --git a/placement/tests/functional/base.py b/placement/tests/functional/base.py index 2544fb6be..9015cb9cb 100644 --- a/placement/tests/functional/base.py +++ b/placement/tests/functional/base.py @@ -18,8 +18,8 @@ import testtools from placement import context from placement import deploy from placement.objects import resource_provider -from nova.tests import fixtures -from nova.tests.functional.fixtures import capture +from placement.tests import fixtures +from placement.tests.functional.fixtures import capture from nova.tests.unit import policy_fixture diff --git a/placement/tests/functional/db/test_allocation_candidates.py b/placement/tests/functional/db/test_allocation_candidates.py index ce4e5c2d9..b72237f19 100644 --- a/placement/tests/functional/db/test_allocation_candidates.py +++ b/placement/tests/functional/db/test_allocation_candidates.py @@ -18,7 +18,7 @@ from placement import exception from placement import lib as placement_lib from placement.objects import resource_provider as rp_obj from placement import rc_fields as fields -from nova.tests.functional.db import test_base as tb +from placement.tests.functional.db import test_base as tb from nova.tests import uuidsentinel as uuids diff --git a/placement/tests/functional/db/test_consumer.py b/placement/tests/functional/db/test_consumer.py index a4be7ff63..efc3414e4 100644 --- a/placement/tests/functional/db/test_consumer.py +++ b/placement/tests/functional/db/test_consumer.py @@ -21,7 +21,7 @@ from placement.objects import resource_provider as rp_obj from placement.objects import user as user_obj from placement import rc_fields as fields from placement.tests.functional import base -from nova.tests.functional.db import test_base as tb +from placement.tests.functional.db import test_base as tb from nova.tests import uuidsentinel as uuids CONF = cfg.CONF diff --git a/placement/tests/functional/db/test_project.py b/placement/tests/functional/db/test_project.py index 230b03882..14e64682b 100644 --- a/placement/tests/functional/db/test_project.py +++ b/placement/tests/functional/db/test_project.py @@ -12,7 +12,7 @@ from placement import exception from placement.objects import project as project_obj -from nova.tests.functional.db import test_base as tb +from placement.tests.functional.db import test_base as tb from nova.tests import uuidsentinel as uuids diff --git a/placement/tests/functional/db/test_reshape.py b/placement/tests/functional/db/test_reshape.py index 62400efaf..3b54c7dbd 100644 --- a/placement/tests/functional/db/test_reshape.py +++ b/placement/tests/functional/db/test_reshape.py @@ -13,7 +13,7 @@ from placement import exception from placement.objects import consumer as consumer_obj from placement.objects import resource_provider as rp_obj -from nova.tests.functional.db import test_base as tb +from placement.tests.functional.db import test_base as tb from nova.tests import uuidsentinel as uuids diff --git a/placement/tests/functional/db/test_resource_provider.py b/placement/tests/functional/db/test_resource_provider.py index 6a124c31e..ddb6e5618 100644 --- a/placement/tests/functional/db/test_resource_provider.py +++ b/placement/tests/functional/db/test_resource_provider.py @@ -23,7 +23,7 @@ from placement.objects import consumer as consumer_obj from placement.objects import resource_provider as rp_obj from placement.db.sqlalchemy import api_models as models from placement import rc_fields as fields -from nova.tests.functional.db import test_base as tb +from placement.tests.functional.db import test_base as tb from nova.tests import uuidsentinel diff --git a/placement/tests/functional/db/test_user.py b/placement/tests/functional/db/test_user.py index bdc6e0dee..ae4822cb4 100644 --- a/placement/tests/functional/db/test_user.py +++ b/placement/tests/functional/db/test_user.py @@ -12,7 +12,7 @@ from placement import exception from placement.objects import user as user_obj -from nova.tests.functional.db import test_base as tb +from placement.tests.functional.db import test_base as tb from nova.tests import uuidsentinel as uuids diff --git a/placement/tests/functional/fixtures/gabbits.py b/placement/tests/functional/fixtures/gabbits.py index 2a03f1c95..e796d9c2b 100644 --- a/placement/tests/functional/fixtures/gabbits.py +++ b/placement/tests/functional/fixtures/gabbits.py @@ -27,9 +27,9 @@ from placement.objects import resource_provider as rp_obj from placement.objects import user as user_obj from placement import policies from placement import rc_fields as fields -from nova.tests import fixtures -from nova.tests.functional.db import test_base as tb -from nova.tests.functional.fixtures import capture +from placement.tests import fixtures +from placement.tests.functional.db import test_base as tb +from placement.tests.functional.fixtures import capture from nova.tests.unit import policy_fixture from nova.tests import uuidsentinel as uuids diff --git a/placement/tests/functional/test_placement_api.py b/placement/tests/functional/test_placement_api.py index d4c6de899..859aea71a 100644 --- a/placement/tests/functional/test_placement_api.py +++ b/placement/tests/functional/test_placement_api.py @@ -17,10 +17,8 @@ import wsgi_intercept from gabbi import driver -from nova.tests.functional.fixtures import capture -# TODO(cdent): This whitespace blight will go away post extraction. -from nova.tests.functional.fixtures \ - import gabbits as fixtures +from placement.tests.functional.fixtures import capture +from placement.tests.functional.fixtures import gabbits as fixtures # Check that wsgi application response headers are always # native str.