diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-06 01:04:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-06 01:04:46 +0000 |
| commit | 6ac76afa895783186b00a7d1d077121a4139bddc (patch) | |
| tree | 950c9834cb80ffdc2487c74c101d32cb4003976b | |
| parent | a04c7bb65e3cedd5ffc0dfda700a895ebdf2c137 (diff) | |
| parent | f98012174005faa4a88cb694ee900396f50f0f75 (diff) | |
| download | nova-6ac76afa895783186b00a7d1d077121a4139bddc.tar.gz nova-6ac76afa895783186b00a7d1d077121a4139bddc.tar.xz nova-6ac76afa895783186b00a7d1d077121a4139bddc.zip | |
Merge "Adjusts reclaim instance interval of deferred delete tests"
| -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 |