diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-03-26 13:56:17 +0100 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-03-27 10:41:08 +0100 |
commit | c4206f485163d0fd75acf98683aea1268aa1205d (patch) | |
tree | 5689f9d36d1860b29bfd18f5144f3572f73418b0 /functest/core | |
parent | fa573a5c0aae16aecb4bc521b34b71af4a263a6f (diff) |
Check the login prompt in console in SingleVm1
It also checks the second vm2 console log in case of vping_ssh.
Change-Id: I13a5edfb3e19449a38d2f0478d549bd8fcc5cfa7
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/core')
-rw-r--r-- | functest/core/singlevm.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/functest/core/singlevm.py b/functest/core/singlevm.py index 5ecd482ac..c307c8a09 100644 --- a/functest/core/singlevm.py +++ b/functest/core/singlevm.py @@ -217,7 +217,7 @@ class VmReady1(tenantnetwork.TenantNetwork1): self.__logger.debug("vm: %s", vm1) return vm1 - def check_regex_in_console(self, name, regex=' login: ', loop=1): + def check_regex_in_console(self, name, regex=' login: ', loop=6): """Wait for specific message in console Returns: True or False on errors @@ -480,10 +480,11 @@ class SingleVm1(VmReady1): self.prepare() self.sshvm = self.boot_vm( key_name=self.keypair.id, security_groups=[self.sec.id]) - (self.fip, self.ssh) = self.connect(self.sshvm) - if not self.execute(): - self.result = 100 - status = testcase.TestCase.EX_OK + if self.check_regex_in_console(self.sshvm.name): + (self.fip, self.ssh) = self.connect(self.sshvm) + if not self.execute(): + self.result = 100 + status = testcase.TestCase.EX_OK except Exception: # pylint: disable=broad-except self.__logger.exception('Cannot run %s', self.case_name) finally: |