summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-01-12 09:11:45 +0000
committerGerrit Code Review <review@openstack.org>2013-01-12 09:11:45 +0000
commit4f9d721de3fa0851497afb92c99aa06fce2ce453 (patch)
tree932ae83ad6e76f923eeea81bb6b46330a6d51d83 /nova/tests
parentc6eb8914db4551edd9a105873f79c00b4ca53d00 (diff)
parentb09dabae177d4eb1dc5ba19d0c7962c7fec9faad (diff)
Merge "Allow forcing local conductor."
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/conductor/test_conductor.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/nova/tests/conductor/test_conductor.py b/nova/tests/conductor/test_conductor.py
index 7986fc583..909174fa9 100644
--- a/nova/tests/conductor/test_conductor.py
+++ b/nova/tests/conductor/test_conductor.py
@@ -700,6 +700,11 @@ class ConductorImportTest(test.TestCase):
self.assertTrue(isinstance(conductor.API(),
conductor_api.API))
+ def test_import_conductor_override_to_local(self):
+ self.flags(use_local=False, group='conductor')
+ self.assertTrue(isinstance(conductor.API(use_local=True),
+ conductor_api.LocalAPI))
+
class ConductorPolicyTest(test.TestCase):
def test_all_allowed_keys(self):