[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 06/24] avocado_qemu: Add " " after the default prompt
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [RFC 06/24] avocado_qemu: Add " " after the default prompt regexp |
Date: |
Fri, 20 Apr 2018 15:19:33 -0300 |
From: Lukáš Doktor <address@hidden>
The prompt regexp is quite basic one (# or $), let's require at least
one additional space afterwards, which is the case in most modern
systems and decreases the probability of false-positives.
Signed-off-by: Lukáš Doktor <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
tests/avocado/avocado_qemu/test.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/avocado/avocado_qemu/test.py
b/tests/avocado/avocado_qemu/test.py
index e99c7e9e8d..eeb759ec65 100644
--- a/tests/avocado/avocado_qemu/test.py
+++ b/tests/avocado/avocado_qemu/test.py
@@ -270,7 +270,7 @@ class _VM(qemu.QEMUMachine):
self.password = password
super(_VM, self).__init__(qemu_bin, name=self.name, arch=arch)
- def get_console(self, console_address=None, prompt="[\#\$]"):
+ def get_console(self, console_address=None, prompt=r"[\#\$] "):
"""
:param address: Socket address, can be either a unix socket path
(string) or a tuple in the form (address, port)
@@ -297,7 +297,7 @@ class _VM(qemu.QEMUMachine):
console = aexpect.ShellSession(nc_cmd)
try:
logging.info('Console: Waiting login prompt...')
- _handle_prompts(console, self.username, self.password, "[\#\$]")
+ _handle_prompts(console, self.username, self.password, prompt)
logging.info('Console: Ready!')
except:
console.close()
--
2.14.3
- [Qemu-devel] [RFC 00/24] Avocado-based functional tests, Eduardo Habkost, 2018/04/20
- [Qemu-devel] [RFC 01/24] qemu.py: Introduce _create_console() method, Eduardo Habkost, 2018/04/20
- [Qemu-devel] [RFC 02/24] Introduce the basic framework to run Avocado tests, Eduardo Habkost, 2018/04/20
- [Qemu-devel] [RFC 03/24] avocado_qemu: Improve handle_prompts to allow login after booted vm, Eduardo Habkost, 2018/04/20
- [Qemu-devel] [RFC 04/24] avocado_qemu: Be lenient towards poluted serial console, Eduardo Habkost, 2018/04/20
- [Qemu-devel] [RFC 05/24] avocado_qemu: Increase the login timeout to 60s, Eduardo Habkost, 2018/04/20
- [Qemu-devel] [RFC 06/24] avocado_qemu: Add " " after the default prompt regexp,
Eduardo Habkost <=
- [Qemu-devel] [RFC 07/24] avocado_qemu: Store "arch" in VM, Eduardo Habkost, 2018/04/20
- [Qemu-devel] [RFC 08/24] avocado_qemu: Provide defaults for user and pass, Eduardo Habkost, 2018/04/20
- [Qemu-devel] [RFC 09/24] avocado_qemu: Ignore kernel messages on get_console, Eduardo Habkost, 2018/04/20
- [Qemu-devel] [RFC 10/24] avocado_qemu: Add support to request image for testing, Eduardo Habkost, 2018/04/20
- [Qemu-devel] [RFC 11/24] avocado_qemu: Fix exception name in caller, Eduardo Habkost, 2018/04/20
- [Qemu-devel] [RFC 12/24] avocado_qemu: Improve migration error message, Eduardo Habkost, 2018/04/20
- [Qemu-devel] [RFC 13/24] avocado_qemu: Functional test for RHBZ#1431939, Eduardo Habkost, 2018/04/20
- [Qemu-devel] [RFC 14/24] avocado_qemu: Functional test for RHBZ#1447027, Eduardo Habkost, 2018/04/20
- [Qemu-devel] [RFC 15/24] avocado_qemu: Functional test for RHBZ#1436616, Eduardo Habkost, 2018/04/20