From b93d543d179f14b08aaa63429287780313744f70 Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Wed, 20 Feb 2013 00:35:30 +0000 Subject: Make ComputeTestCase.test_state_revert faster Reuse instance instead of creating a new one every time. Before: nova.tests.compute.test_compute.ComputeTestCase.test_state_revert 11.032 seconds After: nova.tests.compute.test_compute.ComputeTestCase.test_state_revert 6.415 seconds Change-Id: I67a5a971c3898d4fffed9e6b4640c6c0f3c62a56 --- nova/tests/compute/test_compute.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index c372eef02..a26e7a40f 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -1786,13 +1786,11 @@ class ComputeTestCase(BaseTestCase): self.compute.terminate_instance(self.context, instance=jsonutils.to_primitive(instance)) - def _test_state_revert(self, operation, pre_task_state, + def _test_state_revert(self, instance, operation, pre_task_state, post_task_state=None, kwargs=None): if kwargs is None: kwargs = {} - instance = self._create_fake_instance() - # The API would have set task_state, so do that here to test # that the state gets reverted on failure db.instance_update(self.context, instance['uuid'], @@ -1862,8 +1860,9 @@ class ComputeTestCase(BaseTestCase): ("resume_instance", task_states.RESUMING), ] + instance = self._create_fake_instance() for operation in actions: - self._test_state_revert(*operation) + self._test_state_revert(instance, *operation) def _ensure_quota_reservations_committed(self): """Mock up commit of quota reservations.""" -- cgit