diff --git a/tests/benchmark/scenarios/cinder/test_volumes.py b/tests/benchmark/scenarios/cinder/test_volumes.py index 676c5f4137..6f49d27ac5 100644 --- a/tests/benchmark/scenarios/cinder/test_volumes.py +++ b/tests/benchmark/scenarios/cinder/test_volumes.py @@ -16,7 +16,7 @@ import mock from rally.benchmark.scenarios.cinder import volumes -from rally import test +from tests import test CINDER_VOLUMES = "rally.benchmark.scenarios.cinder.volumes.CinderVolumes" diff --git a/tests/benchmark/scenarios/keystone/test_basic.py b/tests/benchmark/scenarios/keystone/test_basic.py index b6eb176c6d..f9dadda7e3 100644 --- a/tests/benchmark/scenarios/keystone/test_basic.py +++ b/tests/benchmark/scenarios/keystone/test_basic.py @@ -16,7 +16,7 @@ import mock from rally.benchmark.scenarios.keystone import basic -from rally import test +from tests import test KEYSTONE_BASE = "rally.benchmark.scenarios.keystone." diff --git a/tests/benchmark/scenarios/keystone/test_utils.py b/tests/benchmark/scenarios/keystone/test_utils.py index 0944c7f1d7..cd3303d61e 100644 --- a/tests/benchmark/scenarios/keystone/test_utils.py +++ b/tests/benchmark/scenarios/keystone/test_utils.py @@ -16,7 +16,7 @@ import mock from rally.benchmark.scenarios.keystone import utils -from rally import test +from tests import test from tests import fakes diff --git a/tests/benchmark/scenarios/nova/test_servers.py b/tests/benchmark/scenarios/nova/test_servers.py index bebb3b2fa2..edde9377a9 100644 --- a/tests/benchmark/scenarios/nova/test_servers.py +++ b/tests/benchmark/scenarios/nova/test_servers.py @@ -18,8 +18,8 @@ import mock from rally.benchmark.scenarios.nova import servers from rally.benchmark import utils as butils from rally import exceptions as rally_exceptions -from rally import test from tests import fakes +from tests import test NOVA_SERVERS = "rally.benchmark.scenarios.nova.servers.NovaServers" diff --git a/tests/benchmark/scenarios/nova/test_utils.py b/tests/benchmark/scenarios/nova/test_utils.py index 09a3355c56..7163af5b89 100644 --- a/tests/benchmark/scenarios/nova/test_utils.py +++ b/tests/benchmark/scenarios/nova/test_utils.py @@ -18,8 +18,8 @@ import mock from rally.benchmark.scenarios.nova import utils from rally.benchmark import utils as butils from rally import exceptions as rally_exceptions -from rally import test from tests import fakes +from tests import test class NovaScenarioTestCase(test.TestCase): diff --git a/tests/benchmark/scenarios/test_utils.py b/tests/benchmark/scenarios/test_utils.py index 133566be1e..d799035cfb 100644 --- a/tests/benchmark/scenarios/test_utils.py +++ b/tests/benchmark/scenarios/test_utils.py @@ -18,7 +18,7 @@ import mock from jsonschema import exceptions as schema_exceptions from rally.benchmark.scenarios import utils -from rally import test +from tests import test def action_one(self, *args, **kwargs): diff --git a/tests/benchmark/test_base.py b/tests/benchmark/test_base.py index 8eede34195..91092deff2 100644 --- a/tests/benchmark/test_base.py +++ b/tests/benchmark/test_base.py @@ -17,7 +17,7 @@ import mock from rally.benchmark import base from rally import exceptions -from rally import test +from tests import test class ScenarioTestCase(test.TestCase): diff --git a/tests/benchmark/test_engine.py b/tests/benchmark/test_engine.py index df65b6b22b..31caa5521d 100644 --- a/tests/benchmark/test_engine.py +++ b/tests/benchmark/test_engine.py @@ -20,8 +20,8 @@ import mock from rally.benchmark import engine from rally import consts from rally import exceptions -from rally import test from tests import fakes +from tests import test class TestEngineTestCase(test.TestCase): diff --git a/tests/benchmark/test_runner.py b/tests/benchmark/test_runner.py index fdba56b15a..f31ee1b1ee 100644 --- a/tests/benchmark/test_runner.py +++ b/tests/benchmark/test_runner.py @@ -18,8 +18,8 @@ import mock import multiprocessing from rally.benchmark import runner -from rally import test from tests import fakes +from tests import test class MockedPool(object): diff --git a/tests/cmd/test_manage.py b/tests/cmd/test_manage.py index 961c1f8961..89c6ac4e5c 100644 --- a/tests/cmd/test_manage.py +++ b/tests/cmd/test_manage.py @@ -17,7 +17,7 @@ import mock import sys from rally.cmd import manage -from rally import test +from tests import test class CmdManageTestCase(test.TestCase): diff --git a/tests/db/test_api.py b/tests/db/test_api.py index abd3b6dce9..931758e018 100644 --- a/tests/db/test_api.py +++ b/tests/db/test_api.py @@ -20,7 +20,7 @@ import uuid from rally import consts from rally import db from rally import exceptions -from rally import test +from tests import test class TasksTestCase(test.DBTestCase): diff --git a/tests/deploy/engines/test_dummy.py b/tests/deploy/engines/test_dummy.py index b84a49b3a3..0bacefb166 100644 --- a/tests/deploy/engines/test_dummy.py +++ b/tests/deploy/engines/test_dummy.py @@ -19,7 +19,7 @@ import jsonschema from rally import deploy from rally.deploy.engines import dummy -from rally import test +from tests import test class TestDummyDeployEngine(test.TestCase): diff --git a/tests/deploy/test_engine.py b/tests/deploy/test_engine.py index 0cc0f39715..e64073361d 100644 --- a/tests/deploy/test_engine.py +++ b/tests/deploy/test_engine.py @@ -21,7 +21,7 @@ import uuid from rally import consts from rally import deploy from rally import exceptions -from rally import test +from tests import test def make_fake_deployment(**kwargs): diff --git a/tests/objects/test_deploy.py b/tests/objects/test_deploy.py index 18212d4fab..73b852cfbd 100644 --- a/tests/objects/test_deploy.py +++ b/tests/objects/test_deploy.py @@ -20,7 +20,7 @@ import uuid from rally import consts from rally import objects -from rally import test +from tests import test class DeploymentTestCase(test.TestCase): diff --git a/tests/objects/test_task.py b/tests/objects/test_task.py index 83c58f9835..a33e59e8de 100644 --- a/tests/objects/test_task.py +++ b/tests/objects/test_task.py @@ -20,7 +20,7 @@ import uuid from rally import consts from rally import objects -from rally import test +from tests import test class TaskTestCase(test.TestCase): diff --git a/tests/orchestrator/test_api.py b/tests/orchestrator/test_api.py index 1680a477ca..79f855557e 100644 --- a/tests/orchestrator/test_api.py +++ b/tests/orchestrator/test_api.py @@ -21,7 +21,7 @@ import uuid from rally.benchmark import base from rally import consts from rally.orchestrator import api -from rally import test +from tests import test FAKE_DEPLOY_CONFIG = { diff --git a/tests/serverprovider/providers/test_dummy.py b/tests/serverprovider/providers/test_dummy.py index f4100573a1..1b9c3d27d2 100644 --- a/tests/serverprovider/providers/test_dummy.py +++ b/tests/serverprovider/providers/test_dummy.py @@ -17,7 +17,7 @@ import jsonschema from rally import serverprovider from rally.serverprovider.providers import dummy -from rally import test +from tests import test ProviderFactory = serverprovider.ProviderFactory diff --git a/tests/serverprovider/providers/test_openstack.py b/tests/serverprovider/providers/test_openstack.py index 41d93e5e4d..c33b76439e 100644 --- a/tests/serverprovider/providers/test_openstack.py +++ b/tests/serverprovider/providers/test_openstack.py @@ -20,7 +20,7 @@ import mock from rally.openstack.common.fixture import mockpatch from rally.serverprovider.providers import openstack as provider -from rally import test +from tests import test MOD_NAME = 'rally.serverprovider.providers.openstack' diff --git a/tests/serverprovider/test_provider.py b/tests/serverprovider/test_provider.py index 8bafc0fa42..a92e10b703 100644 --- a/tests/serverprovider/test_provider.py +++ b/tests/serverprovider/test_provider.py @@ -19,7 +19,7 @@ import mock from rally import exceptions from rally import serverprovider from rally import sshutils -from rally import test +from tests import test ProviderFactory = serverprovider.ProviderFactory diff --git a/rally/test.py b/tests/test.py similarity index 100% rename from rally/test.py rename to tests/test.py diff --git a/tests/test_osclients.py b/tests/test_osclients.py index fe66ace81f..cc05b8d11f 100644 --- a/tests/test_osclients.py +++ b/tests/test_osclients.py @@ -16,8 +16,8 @@ import mock from rally import osclients -from rally import test from tests import fakes +from tests import test class OSClientsTestCase(test.TestCase): diff --git a/tests/test_processing.py b/tests/test_processing.py index 55d9a46c6f..7a588658df 100644 --- a/tests/test_processing.py +++ b/tests/test_processing.py @@ -17,7 +17,7 @@ import mock from rally import exceptions from rally import processing -from rally import test +from tests import test class ProcessingTestCase(test.TestCase): diff --git a/tests/test_sshutils.py b/tests/test_sshutils.py index a19b0d570e..ee49328b31 100644 --- a/tests/test_sshutils.py +++ b/tests/test_sshutils.py @@ -18,7 +18,7 @@ import os from rally import exceptions from rally import sshutils -from rally import test +from tests import test class SSHTestCase(test.TestCase): diff --git a/tests/test_utils.py b/tests/test_utils.py index 5291d1bd8a..96ca2b5643 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -24,8 +24,8 @@ import time from rally import exceptions from rally.openstack.common.gettextutils import _ -from rally import test from rally import utils +from tests import test class ImmutableMixinTestCase(test.TestCase):