diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-12-07 18:29:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-12-07 18:29:57 +0000 |
| commit | 8a8dd22aea07dcbbfa80ea5519dcb7bfb92b0217 (patch) | |
| tree | 85c6042044fda83c3b7954a6cf5fab3c69615e22 /nova/tests | |
| parent | 42b571181b5f2793e03a4958071ef4c8067578e5 (diff) | |
| parent | 2b42968a53c70f2fd759a22e8e5aeadc18ae65f6 (diff) | |
Merge "Refactors periodic tasks to use a decorator."
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_compute.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py index 7a3fceef1..6c4540094 100644 --- a/nova/tests/test_compute.py +++ b/nova/tests/test_compute.py @@ -1054,8 +1054,8 @@ class ComputeTestCase(BaseTestCase): self.compute.driver.test_remove_vm(instance_name) # Force the compute manager to do its periodic poll - error_list = self.compute.periodic_tasks(context.get_admin_context()) - self.assertFalse(error_list) + ctxt = context.get_admin_context() + self.compute.periodic_tasks(ctxt, raise_on_error=True) instances = db.instance_get_all(context.get_admin_context()) LOG.info(_("After force-killing instances: %s"), instances) |