diff options
| author | Rick Harris <rick.harris@rackspace.com> | 2010-12-30 11:26:21 -0600 |
|---|---|---|
| committer | Rick Harris <rick.harris@rackspace.com> | 2010-12-30 11:26:21 -0600 |
| commit | 2a08bed775aef2574d362cee6b7883469bbd2e09 (patch) | |
| tree | 89d43a89758150efccca52900d0829dc48653a55 /nova/tests | |
| parent | cc906e48c13012da552cc346146d9586afc6092e (diff) | |
| parent | 0880026253d0de67afd7c80415b332f72764457d (diff) | |
Merging trunk
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_scheduler.py | 1 | ||||
| -rw-r--r-- | nova/tests/test_virt.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/nova/tests/test_scheduler.py b/nova/tests/test_scheduler.py index 91517cc5d..78e4a1c77 100644 --- a/nova/tests/test_scheduler.py +++ b/nova/tests/test_scheduler.py @@ -33,6 +33,7 @@ from nova.scheduler import driver FLAGS = flags.FLAGS flags.DECLARE('max_cores', 'nova.scheduler.simple') +flags.DECLARE('stub_network', 'nova.compute.manager') class TestDriver(driver.Scheduler): diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py index 1c155abe4..4aa489d08 100644 --- a/nova/tests/test_virt.py +++ b/nova/tests/test_virt.py @@ -33,6 +33,7 @@ flags.DECLARE('instances_path', 'nova.compute.manager') class LibvirtConnTestCase(test.TestCase): def setUp(self): super(LibvirtConnTestCase, self).setUp() + libvirt_conn._late_load_cheetah() self.flags(fake_call=True) self.manager = manager.AuthManager() self.user = self.manager.create_user('fake', 'fake', 'fake', |