From b7f37cc79ea3c2859ae616b241800227bc769bba Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Fri, 9 May 2014 13:30:40 -0700 Subject: [PATCH] Split large-ops into three tests so each has its own timeout In the gate OS_TEST_TIMEOUT is 500 seconds, which is a per test timeout. large-ops is run one test three times, so split it out to three tests so each has its own OS_TEST_TIMEOUT. This works because the cleanup of resources is done in tearDownClass and tests inside a class are run serially (although order cannot be guaranteed). Note: the image will be re-created for each test and destroyed on tearDown from each test. Change-Id: Iefa6f0fec9b3eea587b1437b47cce81e1a9c242c --- tempest/scenario/test_large_ops.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/tempest/scenario/test_large_ops.py b/tempest/scenario/test_large_ops.py index 0210c56a22..ed5743cc32 100644 --- a/tempest/scenario/test_large_ops.py +++ b/tempest/scenario/test_large_ops.py @@ -63,11 +63,20 @@ class TestLargeOpsScenario(manager.NetworkScenarioTest): self.set_resource(server.name, server) self._wait_for_server_status('ACTIVE') - @test.services('compute', 'image') - def test_large_ops_scenario(self): + def _large_ops_scenario(self): if CONF.scenario.large_ops_number < 1: return self.glance_image_create() self.nova_boot() - self.nova_boot() - self.nova_boot() + + @test.services('compute', 'image') + def test_large_ops_scenario_1(self): + self._large_ops_scenario() + + @test.services('compute', 'image') + def test_large_ops_scenario_2(self): + self._large_ops_scenario() + + @test.services('compute', 'image') + def test_large_ops_scenario_3(self): + self._large_ops_scenario()