diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-07-01 07:12:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-07-01 07:12:36 +0000 |
| commit | 51b827861551215660f6c28a3601f0fcc2735366 (patch) | |
| tree | 5fbe1c8724fde84a7299fb95ef35df430c598c06 /nova/tests | |
| parent | ddc146842ddc64f698ba44c158f87e66868f9dde (diff) | |
| parent | 3d260fc94201078f27d892049b2f8e9269e837f8 (diff) | |
| download | nova-51b827861551215660f6c28a3601f0fcc2735366.tar.gz nova-51b827861551215660f6c28a3601f0fcc2735366.tar.xz nova-51b827861551215660f6c28a3601f0fcc2735366.zip | |
Merge "Fix for failure of periodic instance cleanup"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/compute/test_compute.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index 4fbf805f1..2ac8b22b8 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -5221,7 +5221,8 @@ class ComputeTestCase(BaseTestCase): self.mox.ReplayAll() - result = self.compute._get_instances_on_driver(fake_context) + result = self.compute._get_instances_on_driver(fake_context, + columns_to_join=[]) self.assertEqual(driver_instances, result) def test_get_instances_on_driver_fallback(self): @@ -5252,7 +5253,7 @@ class ComputeTestCase(BaseTestCase): [inst['name'] for inst in driver_instances]) self.compute.conductor_api.instance_get_all_by_filters( fake_context, filters, - columns_to_join=[]).AndReturn(all_instances) + columns_to_join=None).AndReturn(all_instances) self.mox.ReplayAll() |