Merge "Remove tests for non-existing SimpleScheduler"

1 files changed, 0 insertions, 33 deletions

diff --git a/nova/tests/scheduler/test_multi_scheduler.py b/nova/tests/scheduler/test_multi_scheduler.py
index 5642c4e17..17e3331ed 100644
--- a/nova/tests/scheduler/test_multi_scheduler.py
+++ b/nova/tests/scheduler/test_multi_scheduler.py
@@ -75,36 +75,3 @@ class MultiDriverTestCase(test_scheduler.SchedulerTestCase):
         self.assertFalse(mgr.drivers['compute'].is_update_caps_called)
         mgr.update_service_capabilities('foo_svc', 'foo_host', 'foo_caps')
         self.assertTrue(mgr.drivers['compute'].is_update_caps_called)
-
-
-class SimpleSchedulerTestCase(MultiDriverTestCase):
-    """Test case for simple driver."""
-
-    driver_cls = multi.MultiScheduler
-
-    def setUp(self):
-        super(SimpleSchedulerTestCase, self).setUp()
-        base_name = 'nova.tests.scheduler.test_multi_scheduler.%s'
-        compute_cls_name = base_name % 'FakeComputeScheduler'
-        default_cls_name = base_name % 'FakeDefaultScheduler'
-        self.flags(compute_scheduler_driver=compute_cls_name,
-                default_scheduler_driver=default_cls_name)
-        self._manager = multi.MultiScheduler()
-
-    def test_update_service_capabilities(self):
-        def fake_update_service_capabilities(self, service, host, caps):
-            self.is_update_caps_called = True
-
-        mgr = self._manager
-        self.stubs.Set(driver.Scheduler,
-                       'update_service_capabilities',
-                       fake_update_service_capabilities)
-        self.assertFalse(mgr.drivers['compute'].is_update_caps_called)
-        mgr.update_service_capabilities('foo_svc', 'foo_host', 'foo_caps')
-        self.assertTrue(mgr.drivers['compute'].is_update_caps_called)
-
-    def test_drivers_inited(self):
-        mgr = self._manager
-        self.assertEqual(len(mgr.drivers), 2)
-        self.assertTrue(mgr.drivers['compute'].is_fake_compute)
-        self.assertTrue(mgr.drivers['default'].is_fake_default)