summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-08-31 17:35:41 +0000
committerGerrit Code Review <review@openstack.org>2012-08-31 17:35:41 +0000
commit3ada810e8894dcbfc9dbd3ab9e45103f0593f199 (patch)
tree6c53bf6f1cd931d78ba6d16cdb70bb3ab52508a5 /nova/tests
parentcf38444df801062fd370c29a7d76f1e7bb1be0f4 (diff)
parentedfec5ac77b8dab51c54dfc68ec3711de6191330 (diff)
Merge "Remove some remnants of VSA support"
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/scheduler/test_multi_scheduler.py18
1 files changed, 0 insertions, 18 deletions
diff --git a/nova/tests/scheduler/test_multi_scheduler.py b/nova/tests/scheduler/test_multi_scheduler.py
index 6fce5bc35..8220fa60d 100644
--- a/nova/tests/scheduler/test_multi_scheduler.py
+++ b/nova/tests/scheduler/test_multi_scheduler.py
@@ -46,9 +46,6 @@ class FakeVolumeScheduler(driver.Scheduler):
super(FakeVolumeScheduler, self).__init__()
self.is_update_caps_called = False
- def schedule_create_volumes(self, *args, **kwargs):
- pass
-
def schedule(self, *args, **kwargs):
pass
@@ -87,21 +84,6 @@ class MultiDriverTestCase(test_scheduler.SchedulerTestCase):
self.assertTrue(mgr.drivers['volume'].is_fake_volume)
self.assertTrue(mgr.drivers['default'].is_fake_default)
- def test_proxy_calls(self):
- mgr = self._manager
- compute_driver = mgr.drivers['compute']
- volume_driver = mgr.drivers['volume']
-
- #no compute methods are proxied at this time
- test_methods = {compute_driver: [],
- volume_driver: ['create_volumes']}
-
- for driver, methods in test_methods.iteritems():
- for method in methods:
- mgr_func = getattr(mgr, 'schedule_' + method)
- driver_func = getattr(driver, 'schedule_' + method)
- self.assertEqual(mgr_func, driver_func)
-
def test_schedule_fallback_proxy(self):
mgr = self._manager