diff options
| author | Hans Lindgren <hanlind@kth.se> | 2013-03-05 11:02:46 +0100 |
|---|---|---|
| committer | Hans Lindgren <hanlind@kth.se> | 2013-03-05 11:02:46 +0100 |
| commit | f98012174005faa4a88cb694ee900396f50f0f75 (patch) | |
| tree | 5365257f594997fa383a48abbe1a1636bbfcf21c | |
| parent | bf1f758958b21f8757910c1ee71c05bf83c13b24 (diff) | |
Adjusts reclaim instance interval of deferred delete tests
All deferred delete tests set reclaim_instance_interval to 1. This is
fine for the test_deferred_delete test that depends on the periodic
task _reclaim_queued_deletes to run.
For the other tests however, in the unlikely event that the periodic
task do run before the tests are done, it will interfere with the tests
by terminating the instance in the middle of it.
By setting the interval longer than the actual test run, this can be
avoided.
Resolves bug 1146510.
Change-Id: I606cd9f3277cc86cf4f9811da2a10efc7433b9d0
| -rw-r--r-- | nova/tests/integrated/test_servers.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/tests/integrated/test_servers.py b/nova/tests/integrated/test_servers.py index 95c2da2a1..b45bd88f7 100644 --- a/nova/tests/integrated/test_servers.py +++ b/nova/tests/integrated/test_servers.py @@ -185,7 +185,7 @@ class ServersTest(integrated_helpers._IntegratedTestBase): def test_deferred_delete_restore(self): # Creates, deletes and restores a server. - self.flags(reclaim_instance_interval=1) + self.flags(reclaim_instance_interval=3600) fake_network.set_stub_network_methods(self.stubs) # Create server @@ -218,7 +218,7 @@ class ServersTest(integrated_helpers._IntegratedTestBase): def test_deferred_delete_force(self): # Creates, deletes and force deletes a server. - self.flags(reclaim_instance_interval=1) + self.flags(reclaim_instance_interval=3600) fake_network.set_stub_network_methods(self.stubs) # Create server |