diff options
| author | Chris Behrens <cbehrens@codestud.com> | 2012-11-05 19:35:24 +0000 |
|---|---|---|
| committer | Chris Behrens <cbehrens@codestud.com> | 2012-11-05 19:35:24 +0000 |
| commit | 266fbc6fbac67b3bfb1736e0091c5fd59fa59e77 (patch) | |
| tree | 8f61b3b6f3f2a71538a7c5072d26551fa55ef662 /nova | |
| parent | 10979da33ca790b86976c1909624c1440020abe0 (diff) | |
| download | nova-266fbc6fbac67b3bfb1736e0091c5fd59fa59e77.tar.gz nova-266fbc6fbac67b3bfb1736e0091c5fd59fa59e77.tar.xz nova-266fbc6fbac67b3bfb1736e0091c5fd59fa59e77.zip | |
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
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/tests/api/ec2/test_cinder_cloud.py | 3 | ||||
| -rw-r--r-- | 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') |