diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-09 07:58:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-09 07:58:16 +0000 |
| commit | 32cf601fc16d2de0a9e227bebebcbabc9fef5fb1 (patch) | |
| tree | e273106d777032b098089582b1f8bab713446b27 /nova/tests | |
| parent | 579c5860ab167a80e31ac1b64464b664f9d9cfcb (diff) | |
| parent | b4af87863485b1dd074ba9f639f5cf5c78fa8fa1 (diff) | |
Merge "Move scheduler_topic into nova.scheduler.rpcapi"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/api/openstack/compute/test_servers.py | 2 | ||||
| -rw-r--r-- | nova/tests/scheduler/test_rpcapi.py | 1 | ||||
| -rw-r--r-- | nova/tests/test_quota.py | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/api/openstack/compute/test_servers.py index 938783be7..a85efcc0b 100644 --- a/nova/tests/api/openstack/compute/test_servers.py +++ b/nova/tests/api/openstack/compute/test_servers.py @@ -55,7 +55,7 @@ from nova.tests import matchers CONF = cfg.CONF CONF.import_opt('password_length', 'nova.utils') -CONF.import_opt('scheduler_topic', 'nova.config') +CONF.import_opt('scheduler_topic', 'nova.scheduler.rpcapi') FAKE_UUID = fakes.FAKE_UUID NS = "{http://docs.openstack.org/compute/api/v1.1}" diff --git a/nova/tests/scheduler/test_rpcapi.py b/nova/tests/scheduler/test_rpcapi.py index da7652a50..e9a1680a8 100644 --- a/nova/tests/scheduler/test_rpcapi.py +++ b/nova/tests/scheduler/test_rpcapi.py @@ -25,7 +25,6 @@ from nova.scheduler import rpcapi as scheduler_rpcapi from nova import test CONF = cfg.CONF -CONF.import_opt('scheduler_topic', 'nova.config') class SchedulerRpcAPITestCase(test.TestCase): diff --git a/nova/tests/test_quota.py b/nova/tests/test_quota.py index 28e9ccfda..2eec1574a 100644 --- a/nova/tests/test_quota.py +++ b/nova/tests/test_quota.py @@ -34,7 +34,7 @@ from nova import test import nova.tests.image.fake CONF = cfg.CONF -CONF.import_opt('scheduler_topic', 'nova.config') +CONF.import_opt('scheduler_topic', 'nova.scheduler.rpcapi') CONF.import_opt('compute_driver', 'nova.virt.driver') |