diff options
| author | Rick Harris <rconradharris@gmail.com> | 2011-12-07 07:25:18 +0000 |
|---|---|---|
| committer | Rick Harris <rconradharris@gmail.com> | 2011-12-07 18:07:08 +0000 |
| commit | 2b42968a53c70f2fd759a22e8e5aeadc18ae65f6 (patch) | |
| tree | 8a9ec2c2af312c45fda52d3153762a94abf2ff1a /nova/tests | |
| parent | 45e31ab90d22cbb84a33c051ee43f273b7a4c38b (diff) | |
Refactors periodic tasks to use a decorator.
Additional work:
1. Added support for tasks being scheduled at differing rates via the
`ticks_between_runs` argument.
2. Fixed `reclaim_queued_deletes` so that it doesn't run if
`FLAGS.reclaim_instance_interval` is 0.
Change-Id: I18c01baf07bd06301a6fe26a7b29dc2452a4fa96
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 a40a3eee4..d333b08ae 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) |