This commit is contained in:
Sandy Walsh
2011-06-21 12:19:01 -07:00
parent 5ca1f68069
commit 43e1f7dece
3 changed files with 4 additions and 3 deletions

View File

@@ -114,7 +114,8 @@ def _process(func, zone):
def call_zone_method(context, method_name, errors_to_ignore=None,
novaclient_collection_name='zones', zones=None, *args, **kwargs):
novaclient_collection_name='zones', zones=None,
*args, **kwargs):
"""Returns a list of (zone, call_result) objects."""
if not isinstance(errors_to_ignore, (list, tuple)):
# This will also handle the default None

View File

@@ -181,7 +181,7 @@ class ZoneAwareScheduler(driver.Scheduler):
for zone, result in child_results:
if not result:
continue
for zone_rec in zones:
if zone_rec['api_url'] != zone:
continue

View File

@@ -173,7 +173,7 @@ class ZoneAwareSchedulerTestCase(test.TestCase):
def setUp(self):
super(ZoneAwareSchedulerTestCase, self).setUp()
self.stubs = stubout.StubOutForTesting()
def tearDown(self):
self.stubs.UnsetAll()
super(ZoneAwareSchedulerTestCase, self).tearDown()