[Qemu-devel] [RFC 06/24] avocado_qemu: Add " " after the default prompt regexp

Eduardo Habkost posted 24 patches 7 years, 9 months ago
[Qemu-devel] [RFC 06/24] avocado_qemu: Add " " after the default prompt regexp
Posted by Eduardo Habkost 7 years, 9 months ago
From: Lukáš Doktor <ldoktor@redhat.com>

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 <ldoktor@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 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