diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-03-28 09:52:24 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-03-28 10:14:46 +0100 |
| commit | ebca0e28b3c11f18332c328c64d2d9c839b71aa5 (patch) | |
| tree | 4598fa8865990b0433b74c3f3684b7bf38988338 | |
| parent | 4e603950720aa2eb724e0f909b17399a37142515 (diff) | |
Increase Shaker timeout before init message in console
It failed in parallel of rally_full [1].
[1] https://build.opnfv.org/ci/job/functest-opnfv-functest-benchmarking-hunter-shaker-run/397/console
[2] https://build.opnfv.org/ci/job/functest-opnfv-functest-benchmarking-hunter-shaker-run/395/console
Change-Id: I0eab7374c5962d45405c5f4147798067526f6e70
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 14268b0e9f73a057c16f1a3ea0be0246dedaf4db)
| -rw-r--r-- | functest/core/singlevm.py | 6 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/shaker/shaker.py | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/functest/core/singlevm.py b/functest/core/singlevm.py index c307c8a09..af2fb6194 100644 --- a/functest/core/singlevm.py +++ b/functest/core/singlevm.py @@ -367,6 +367,8 @@ class SingleVm1(VmReady1): ssh_connect_timeout = 1 ssh_connect_loops = 6 create_floating_ip_timeout = 120 + check_console_loop = 6 + check_console_regex = ' login: ' def __init__(self, **kwargs): if "case_name" not in kwargs: @@ -480,7 +482,9 @@ class SingleVm1(VmReady1): self.prepare() self.sshvm = self.boot_vm( key_name=self.keypair.id, security_groups=[self.sec.id]) - if self.check_regex_in_console(self.sshvm.name): + if self.check_regex_in_console( + self.sshvm.name, regex=self.check_console_regex, + loop=self.check_console_loop): (self.fip, self.ssh) = self.connect(self.sshvm) if not self.execute(): self.result = 100 diff --git a/functest/opnfv_tests/openstack/shaker/shaker.py b/functest/opnfv_tests/openstack/shaker/shaker.py index fe52100e0..57e033e8e 100644 --- a/functest/opnfv_tests/openstack/shaker/shaker.py +++ b/functest/opnfv_tests/openstack/shaker/shaker.py @@ -43,6 +43,7 @@ class Shaker(singlevm.SingleVm2): shaker_timeout = '3600' quota_instances = -1 quota_cores = -1 + check_console_loop = 12 def __init__(self, **kwargs): super(Shaker, self).__init__(**kwargs) |