From 266fbc6fbac67b3bfb1736e0091c5fd59fa59e77 Mon Sep 17 00:00:00 2001 From: Chris Behrens Date: Mon, 5 Nov 2012 19:35:24 +0000 Subject: Use chance scheduler in EC2 tests The default scheduler switched to the filter scheduler, and apparently the EC2 tests are meant to use the chance scheduler for testing. Also, compute_scheduler_driver is not recognized when these tests are run individually. Fixes bug 1075293 Change-Id: I4a7cae4b3dbd18b8779c44e4c30718a872a82b0a --- nova/tests/api/ec2/test_cinder_cloud.py | 3 +-- nova/tests/api/ec2/test_cloud.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/nova/tests/api/ec2/test_cinder_cloud.py b/nova/tests/api/ec2/test_cinder_cloud.py index 49ee9c152..13e854077 100644 --- a/nova/tests/api/ec2/test_cinder_cloud.py +++ b/nova/tests/api/ec2/test_cinder_cloud.py @@ -114,8 +114,7 @@ class CinderCloudTestCase(test.TestCase): # set up our cloud self.cloud = cloud.CloudController() - self.flags(compute_scheduler_driver='nova.scheduler.' - 'chance.ChanceScheduler') + self.flags(scheduler_driver='nova.scheduler.chance.ChanceScheduler') # set up services self.compute = self.start_service('compute') diff --git a/nova/tests/api/ec2/test_cloud.py b/nova/tests/api/ec2/test_cloud.py index a6995945b..95003ee87 100644 --- a/nova/tests/api/ec2/test_cloud.py +++ b/nova/tests/api/ec2/test_cloud.py @@ -127,8 +127,7 @@ class CloudTestCase(test.TestCase): # set up our cloud self.cloud = cloud.CloudController() - self.flags(compute_scheduler_driver='nova.scheduler.' - 'chance.ChanceScheduler') + self.flags(scheduler_driver='nova.scheduler.chance.ChanceScheduler') # set up services self.compute = self.start_service('compute') -- cgit