diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-09 05:36:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-09 05:36:48 +0000 |
| commit | 9baabd3fec8e2a4849be25d1f48903aa61176119 (patch) | |
| tree | ca8195b83685695b89c60da0f1063421b178af40 /nova/tests/conductor | |
| parent | de9991b6eb2b4c745bfeaf4ac42f5e00aa8c6e0a (diff) | |
| parent | 6ff32210772a67a1b526d9d784030afc90f3ce99 (diff) | |
| download | nova-9baabd3fec8e2a4849be25d1f48903aa61176119.tar.gz nova-9baabd3fec8e2a4849be25d1f48903aa61176119.tar.xz nova-9baabd3fec8e2a4849be25d1f48903aa61176119.zip | |
Merge "Use joined version of db.api calls"
Diffstat (limited to 'nova/tests/conductor')
| -rw-r--r-- | nova/tests/conductor/test_conductor.py | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/nova/tests/conductor/test_conductor.py b/nova/tests/conductor/test_conductor.py index 08598b756..bd73328e8 100644 --- a/nova/tests/conductor/test_conductor.py +++ b/nova/tests/conductor/test_conductor.py @@ -335,16 +335,6 @@ class _BaseTestCase(object): self.mox.ReplayAll() self.conductor.instance_get_all_hung_in_rebooting(self.context, 123) - def test_instance_get_active_by_window(self): - self.mox.StubOutWithMock(db, 'instance_get_active_by_window_joined') - db.instance_get_active_by_window(self.context, 'fake-begin', - 'fake-end', 'fake-proj', - 'fake-host') - self.mox.ReplayAll() - self.conductor.instance_get_active_by_window(self.context, - 'fake-begin', 'fake-end', - 'fake-proj', 'fake-host') - def test_instance_get_active_by_window_joined(self): self.mox.StubOutWithMock(db, 'instance_get_active_by_window_joined') db.instance_get_active_by_window_joined(self.context, 'fake-begin', |