diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-15 03:58:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-15 03:58:01 +0000 |
| commit | ee32b609fcf253fd0ce56fad9fbf7b140944141c (patch) | |
| tree | 6db6750eaf0098dc4003dad6ebf152b7137724da | |
| parent | 4afe75c6d5f4f233221837a9a8035cd55c5268a1 (diff) | |
| parent | da2a83562b297c019b9325023577196ec992e507 (diff) | |
| download | tempest-ee32b609fcf253fd0ce56fad9fbf7b140944141c.tar.gz | |
Merge "Orchestration use stack timeout waiting for ping response"
| -rw-r--r-- | tempest/scenario/manager.py | 7 | ||||
| -rw-r--r-- | tempest/scenario/orchestration/test_server_cfn_init.py | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py index ec6823082..8e782f5ce 100644 --- a/tempest/scenario/manager.py +++ b/tempest/scenario/manager.py @@ -442,7 +442,9 @@ class ScenarioTest(tempest.test.BaseTestCase): if wait: self.servers_client.wait_for_server_status(server_id, 'ACTIVE') - def ping_ip_address(self, ip_address, should_succeed=True): + def ping_ip_address(self, ip_address, should_succeed=True, + ping_timeout=None): + timeout = ping_timeout or CONF.compute.ping_timeout cmd = ['ping', '-c1', '-w1', ip_address] def ping(): @@ -452,8 +454,7 @@ class ScenarioTest(tempest.test.BaseTestCase): proc.communicate() return (proc.returncode == 0) == should_succeed - return tempest.test.call_until_true( - ping, CONF.compute.ping_timeout, 1) + return tempest.test.call_until_true(ping, timeout, 1) class NetworkScenarioTest(ScenarioTest): diff --git a/tempest/scenario/orchestration/test_server_cfn_init.py b/tempest/scenario/orchestration/test_server_cfn_init.py index abda1f828..791c564c2 100644 --- a/tempest/scenario/orchestration/test_server_cfn_init.py +++ b/tempest/scenario/orchestration/test_server_cfn_init.py @@ -24,7 +24,6 @@ LOG = logging.getLogger(__name__) class CfnInitScenarioTest(manager.OrchestrationScenarioTest): - @test.skip_because(bug="1374175") def setUp(self): super(CfnInitScenarioTest, self).setUp() if not CONF.orchestration.image_ref: @@ -84,7 +83,8 @@ class CfnInitScenarioTest(manager.OrchestrationScenarioTest): server_ip =\ server['addresses'][CONF.compute.network_for_ssh][0]['addr'] - if not self.ping_ip_address(server_ip): + if not self.ping_ip_address( + server_ip, ping_timeout=CONF.orchestration.build_timeout): self._log_console_output(servers=[server]) self.fail( "(CfnInitScenarioTest:test_server_cfn_init) Timed out waiting " |