diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-06 09:41:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-06 09:41:16 +0000 |
| commit | d8d00ef30800cd9ab635d42ec54b6737fc0532b1 (patch) | |
| tree | af17790e5b3fcf68a075934523298f1fd3b1ec7f | |
| parent | 5cb2d160a4ac29aab9bcab314461ec7b7f0868be (diff) | |
| parent | 266fbc6fbac67b3bfb1736e0091c5fd59fa59e77 (diff) | |
| download | nova-d8d00ef30800cd9ab635d42ec54b6737fc0532b1.tar.gz nova-d8d00ef30800cd9ab635d42ec54b6737fc0532b1.tar.xz nova-d8d00ef30800cd9ab635d42ec54b6737fc0532b1.zip | |
Merge "Use chance scheduler in EC2 tests"
| -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') |