From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Aleksandar Rikalo" <arikalo@wavecomp.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Kamil Rytarowski" <kamil@netbsd.org>,
qemu-ppc@nongnu.org, "Artyom Tarasenko" <atar4qemu@gmail.com>,
"Cleber Rosa" <crosa@redhat.com>,
"Hervé Poussineau" <hpoussin@reactos.org>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Aurelien Jarno" <aurelien@aurel32.net>,
"David Gibson" <david@gibson.dropbear.id.au>
Subject: [PATCH v3 1/9] Acceptance tests: refactor wait_for_console_pattern
Date: Thu, 17 Oct 2019 18:52:31 +0200 [thread overview]
Message-ID: <20191017165239.30159-2-f4bug@amsat.org> (raw)
In-Reply-To: <20191017165239.30159-1-f4bug@amsat.org>
From: Cleber Rosa <crosa@redhat.com>
The same utility method is already present in two different test
files, so let's consolidate it into a single utility function.
Signed-off-by: Cleber Rosa <crosa@redhat.com>
Message-Id: <20190916164011.7653-1-crosa@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
[PMD: rebased fixing conflicts in linux_ssh_mips_malta.py]
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
tests/acceptance/avocado_qemu/__init__.py | 26 +++++++++++++
tests/acceptance/boot_linux_console.py | 47 +++++++----------------
tests/acceptance/linux_ssh_mips_malta.py | 18 ++-------
3 files changed, 42 insertions(+), 49 deletions(-)
diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py
index bd41e0443c..a0fe16e47f 100644
--- a/tests/acceptance/avocado_qemu/__init__.py
+++ b/tests/acceptance/avocado_qemu/__init__.py
@@ -8,6 +8,7 @@
# This work is licensed under the terms of the GNU GPL, version 2 or
# later. See the COPYING file in the top-level directory.
+import logging
import os
import sys
import uuid
@@ -53,6 +54,31 @@ def pick_default_qemu_bin(arch=None):
return qemu_bin_from_src_dir_path
+def wait_for_console_pattern(test, success_message,
+ failure_message='Kernel panic - not syncing'):
+ """
+ Waits for messages to appear on the console, while logging the content
+
+ :param test: an Avocado test containing a VM that will have its console
+ read and probed for a success or failure message
+ :type test: :class:`avocado_qemu.Test`
+ :param success_message: if this message appears, test succeeds
+ :param failure_message: if this message appears, test fails
+ """
+ console = test.vm.console_socket.makefile()
+ console_logger = logging.getLogger('console')
+ while True:
+ msg = console.readline().strip()
+ if not msg:
+ continue
+ console_logger.debug(msg)
+ if success_message in msg:
+ break
+ if failure_message in msg:
+ fail = 'Failure message found in console: %s' % failure_message
+ test.fail(fail)
+
+
class Test(avocado.Test):
def setUp(self):
self._vms = {}
diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py
index 8a9a314ab4..9ff2213874 100644
--- a/tests/acceptance/boot_linux_console.py
+++ b/tests/acceptance/boot_linux_console.py
@@ -9,12 +9,12 @@
# later. See the COPYING file in the top-level directory.
import os
-import logging
import lzma
import gzip
import shutil
from avocado_qemu import Test
+from avocado_qemu import wait_for_console_pattern
from avocado.utils import process
from avocado.utils import archive
@@ -29,31 +29,10 @@ class BootLinuxConsole(Test):
KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
- def wait_for_console_pattern(self, success_message,
- failure_message='Kernel panic - not syncing'):
- """
- Waits for messages to appear on the console, while logging the content
-
- :param success_message: if this message appears, test succeeds
- :param failure_message: if this message appears, test fails
- """
- console = self.vm.console_socket.makefile()
- console_logger = logging.getLogger('console')
- while True:
- msg = console.readline().strip()
- if not msg:
- continue
- console_logger.debug(msg)
- if success_message in msg:
- break
- if failure_message in msg:
- fail = 'Failure message found in console: %s' % failure_message
- self.fail(fail)
-
def exec_command_and_wait_for_pattern(self, command, success_message):
command += '\n'
self.vm.console_socket.sendall(command.encode())
- self.wait_for_console_pattern(success_message)
+ wait_for_console_pattern(self, success_message)
def extract_from_deb(self, deb, path):
"""
@@ -89,7 +68,7 @@ class BootLinuxConsole(Test):
'-append', kernel_command_line)
self.vm.launch()
console_pattern = 'Kernel command line: %s' % kernel_command_line
- self.wait_for_console_pattern(console_pattern)
+ wait_for_console_pattern(self, console_pattern)
def test_mips_malta(self):
"""
@@ -112,7 +91,7 @@ class BootLinuxConsole(Test):
'-append', kernel_command_line)
self.vm.launch()
console_pattern = 'Kernel command line: %s' % kernel_command_line
- self.wait_for_console_pattern(console_pattern)
+ wait_for_console_pattern(self, console_pattern)
def test_mips64el_malta(self):
"""
@@ -145,7 +124,7 @@ class BootLinuxConsole(Test):
'-append', kernel_command_line)
self.vm.launch()
console_pattern = 'Kernel command line: %s' % kernel_command_line
- self.wait_for_console_pattern(console_pattern)
+ wait_for_console_pattern(self, console_pattern)
def test_mips_malta_cpio(self):
"""
@@ -181,7 +160,7 @@ class BootLinuxConsole(Test):
'-append', kernel_command_line,
'-no-reboot')
self.vm.launch()
- self.wait_for_console_pattern('Boot successful.')
+ wait_for_console_pattern(self, 'Boot successful.')
self.exec_command_and_wait_for_pattern('cat /proc/cpuinfo',
'BogoMIPS')
@@ -208,7 +187,7 @@ class BootLinuxConsole(Test):
'-append', kernel_command_line)
self.vm.launch()
console_pattern = 'Kernel command line: %s' % kernel_command_line
- self.wait_for_console_pattern(console_pattern)
+ wait_for_console_pattern(self, console_pattern)
def test_mips_malta32el_nanomips_4k(self):
"""
@@ -266,7 +245,7 @@ class BootLinuxConsole(Test):
'-append', kernel_command_line)
self.vm.launch()
console_pattern = 'Kernel command line: %s' % kernel_command_line
- self.wait_for_console_pattern(console_pattern)
+ wait_for_console_pattern(self, console_pattern)
def test_arm_virt(self):
"""
@@ -287,7 +266,7 @@ class BootLinuxConsole(Test):
'-append', kernel_command_line)
self.vm.launch()
console_pattern = 'Kernel command line: %s' % kernel_command_line
- self.wait_for_console_pattern(console_pattern)
+ wait_for_console_pattern(self, console_pattern)
def test_arm_emcraft_sf2(self):
"""
@@ -314,7 +293,7 @@ class BootLinuxConsole(Test):
'-drive', 'file=' + spi_path + ',if=mtd,format=raw',
'-no-reboot')
self.vm.launch()
- self.wait_for_console_pattern('init started: BusyBox')
+ wait_for_console_pattern(self, 'init started: BusyBox')
def test_s390x_s390_ccw_virtio(self):
"""
@@ -335,7 +314,7 @@ class BootLinuxConsole(Test):
'-append', kernel_command_line)
self.vm.launch()
console_pattern = 'Kernel command line: %s' % kernel_command_line
- self.wait_for_console_pattern(console_pattern)
+ wait_for_console_pattern(self, console_pattern)
def test_alpha_clipper(self):
"""
@@ -357,7 +336,7 @@ class BootLinuxConsole(Test):
'-append', kernel_command_line)
self.vm.launch()
console_pattern = 'Kernel command line: %s' % kernel_command_line
- self.wait_for_console_pattern(console_pattern)
+ wait_for_console_pattern(self, console_pattern)
def test_ppc64_pseries(self):
"""
@@ -377,4 +356,4 @@ class BootLinuxConsole(Test):
'-append', kernel_command_line)
self.vm.launch()
console_pattern = 'Kernel command line: %s' % kernel_command_line
- self.wait_for_console_pattern(console_pattern)
+ wait_for_console_pattern(self, console_pattern)
diff --git a/tests/acceptance/linux_ssh_mips_malta.py b/tests/acceptance/linux_ssh_mips_malta.py
index 25a1df5098..ffbb06f846 100644
--- a/tests/acceptance/linux_ssh_mips_malta.py
+++ b/tests/acceptance/linux_ssh_mips_malta.py
@@ -13,6 +13,7 @@ import time
from avocado import skipUnless
from avocado_qemu import Test
+from avocado_qemu import wait_for_console_pattern
from avocado.utils import process
from avocado.utils import archive
from avocado.utils import ssh
@@ -40,19 +41,6 @@ class LinuxSSH(Test):
def setUp(self):
super(LinuxSSH, self).setUp()
- def wait_for_console_pattern(self, success_message,
- failure_message='Oops'):
- console = self.vm.console_socket.makefile()
- console_logger = logging.getLogger('console')
- while True:
- msg = console.readline()
- console_logger.debug(msg.strip())
- if success_message in msg:
- break
- if failure_message in msg:
- fail = 'Failure message found in console: %s' % failure_message
- self.fail(fail)
-
def get_portfwd(self):
res = self.vm.command('human-monitor-command',
command_line='info usernet')
@@ -109,7 +97,7 @@ class LinuxSSH(Test):
self.log.info('VM launched, waiting for sshd')
console_pattern = 'Starting OpenBSD Secure Shell server: sshd'
- self.wait_for_console_pattern(console_pattern)
+ wait_for_console_pattern(self, console_pattern, 'Oops')
self.log.info('sshd ready')
self.ssh_connect('root', 'root')
@@ -117,7 +105,7 @@ class LinuxSSH(Test):
def shutdown_via_ssh(self):
self.ssh_command('poweroff')
self.ssh_disconnect_vm()
- self.wait_for_console_pattern('Power down')
+ wait_for_console_pattern(self, 'Power down', 'Oops')
def ssh_command_output_contains(self, cmd, exp):
stdout, _ = self.ssh_command(cmd)
--
2.21.0
next prev parent reply other threads:[~2019-10-17 17:37 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-17 16:52 [PATCH v3 0/9] tests/acceptance: Add tests for the PReP/40p machine Philippe Mathieu-Daudé
2019-10-17 16:52 ` Philippe Mathieu-Daudé [this message]
2019-10-20 6:36 ` [PATCH v3 1/9] Acceptance tests: refactor wait_for_console_pattern David Gibson
2019-10-17 16:52 ` [RFC PATCH v3 2/9] tests/acceptance: Fix wait_for_console_pattern() hangs Philippe Mathieu-Daudé
2019-10-17 16:52 ` [PATCH v3 3/9] tests/acceptance: Send <carriage return> on serial lines Philippe Mathieu-Daudé
2019-10-20 10:09 ` David Gibson
2019-10-20 14:11 ` Philippe Mathieu-Daudé
2019-10-17 16:52 ` [PATCH v3 4/9] tests/acceptance: Refactor exec_command_and_wait_for_pattern() Philippe Mathieu-Daudé
2019-10-20 10:10 ` David Gibson
2019-10-23 15:54 ` Philippe Mathieu-Daudé
2019-10-17 16:52 ` [PATCH v3 5/9] tests/acceptance: Add test that runs NetBSD 4.0 installer on PRep/40p Philippe Mathieu-Daudé
2019-10-17 16:52 ` [PATCH v3 6/9] tests/acceptance: Test Open Firmware on the PReP/40p Philippe Mathieu-Daudé
2019-10-17 16:52 ` [PATCH v3 7/9] tests/acceptance: Test OpenBIOS " Philippe Mathieu-Daudé
2019-10-17 16:52 ` [PATCH v3 8/9] tests/acceptance: Test Sandalfoot initrd " Philippe Mathieu-Daudé
2019-10-17 16:52 ` [PATCH v3 9/9] .travis.yml: Let the avocado job run the 40p tests Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191017165239.30159-2-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=alex.bennee@linaro.org \
--cc=arikalo@wavecomp.com \
--cc=atar4qemu@gmail.com \
--cc=aurelien@aurel32.net \
--cc=crosa@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=ehabkost@redhat.com \
--cc=fam@euphon.net \
--cc=hpoussin@reactos.org \
--cc=kamil@netbsd.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).