[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v3 1/9] Acceptance tests: refactor wait_for_console_pattern
From: |
David Gibson |
Subject: |
Re: [PATCH v3 1/9] Acceptance tests: refactor wait_for_console_pattern |
Date: |
Sun, 20 Oct 2019 17:36:42 +1100 |
User-agent: |
Mutt/1.12.1 (2019-06-15) |
On Thu, Oct 17, 2019 at 06:52:31PM +0200, Philippe Mathieu-Daudé wrote:
> From: Cleber Rosa <address@hidden>
>
> 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 <address@hidden>
> Message-Id: <address@hidden>
> Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
> [PMD: rebased fixing conflicts in linux_ssh_mips_malta.py]
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: David Gibson <address@hidden>
> ---
> 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)
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
- [PATCH v3 0/9] tests/acceptance: Add tests for the PReP/40p machine, Philippe Mathieu-Daudé, 2019/10/17
- [PATCH v3 1/9] Acceptance tests: refactor wait_for_console_pattern, Philippe Mathieu-Daudé, 2019/10/17
- Re: [PATCH v3 1/9] Acceptance tests: refactor wait_for_console_pattern,
David Gibson <=
- [PATCH v3 3/9] tests/acceptance: Send <carriage return> on serial lines, Philippe Mathieu-Daudé, 2019/10/17
- [RFC PATCH v3 2/9] tests/acceptance: Fix wait_for_console_pattern() hangs, Philippe Mathieu-Daudé, 2019/10/17
- [PATCH v3 4/9] tests/acceptance: Refactor exec_command_and_wait_for_pattern(), Philippe Mathieu-Daudé, 2019/10/17
- [PATCH v3 5/9] tests/acceptance: Add test that runs NetBSD 4.0 installer on PRep/40p, Philippe Mathieu-Daudé, 2019/10/17
- [PATCH v3 6/9] tests/acceptance: Test Open Firmware on the PReP/40p, Philippe Mathieu-Daudé, 2019/10/17
- [PATCH v3 7/9] tests/acceptance: Test OpenBIOS on the PReP/40p, Philippe Mathieu-Daudé, 2019/10/17