Small cleanups

nova/tests/scheduler/test_host_filter.py

@@ -27,10 +27,6 @@ from nova.tests.scheduler import test_zone_aware_scheduler
 FLAGS = flags.FLAGS
 
 
-class FakeZoneManager:
-    pass
-
-
 class HostFilterTestCase(test.TestCase):
     """Test case for host filter drivers."""
 
@@ -48,6 +44,9 @@ class HostFilterTestCase(test.TestCase):
                 rxtx_quota=30000,
                 rxtx_cap=200)
 
+        class FakeZoneManager:
+            pass
+
         self.zone_manager = FakeZoneManager()
 
         states = test_zone_aware_scheduler.fake_zone_manager_service_states(

nova/tests/scheduler/test_least_cost_scheduler.py

@@ -63,15 +63,13 @@ class WeightedSumTestCase(test.TestCase):
         self.assertEqual(expected, costs)
 
 
-# TODO(sirp): unify this with test_host_filter tests? possibility of sharing
-# test setup code
-class FakeZoneManager:
-    pass
-
-
 class LeastCostSchedulerTestCase(test.TestCase):
     def setUp(self):
         super(LeastCostSchedulerTestCase, self).setUp()
+
+        class FakeZoneManager:
+            pass
+
         zone_manager = FakeZoneManager()
 
         states = test_zone_aware_scheduler.fake_zone_manager_service_states(