[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 04/11] tests/acceptance: Refactor exec_command_and_wait_for_patte
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 04/11] tests/acceptance: Refactor exec_command_and_wait_for_pattern() |
Date: |
Sat, 19 Oct 2019 17:10:51 +0200 |
From: Philippe Mathieu-Daudé <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: Philippe Mathieu-Daudé <address@hidden>
---
v2: fix self -> test, failure_message is optional, added doc
---
tests/acceptance/avocado_qemu/__init__.py | 19 +++++++++++++++++++
tests/acceptance/boot_linux_console.py | 18 +++++++-----------
2 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/tests/acceptance/avocado_qemu/__init__.py
b/tests/acceptance/avocado_qemu/__init__.py
index a0450e5263..7bc77118dd 100644
--- a/tests/acceptance/avocado_qemu/__init__.py
+++ b/tests/acceptance/avocado_qemu/__init__.py
@@ -79,6 +79,25 @@ def wait_for_console_pattern(test, success_message,
failure_message=None):
test.fail(fail)
+def exec_command_and_wait_for_pattern(test, command,
+ success_message, failure_message=None):
+ """
+ Send a command to a console (appending CRLF characters), then wait
+ for success_message to appear on the console, while logging the.
+ content. Mark the test as failed if failure_message is found instead.
+
+ :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 command: the command to send
+ :param success_message: if this message appears, test succeeds
+ :param failure_message: if this message appears, test fails
+ """
+ command += '\r\n'
+ test.vm.console_socket.sendall(command.encode())
+ wait_for_console_pattern(test, success_message, failure_message)
+
+
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 497faa4f7f..4b419b0559 100644
--- a/tests/acceptance/boot_linux_console.py
+++ b/tests/acceptance/boot_linux_console.py
@@ -14,6 +14,7 @@ import gzip
import shutil
from avocado_qemu import Test
+from avocado_qemu import exec_command_and_wait_for_pattern
from avocado_qemu import wait_for_console_pattern
from avocado.utils import process
from avocado.utils import archive
@@ -33,11 +34,6 @@ class BootLinuxConsole(Test):
wait_for_console_pattern(self, success_message,
failure_message='Kernel panic - not syncing')
- def exec_command_and_wait_for_pattern(self, command, success_message):
- command += '\r\n'
- self.vm.console_socket.sendall(command.encode())
- wait_for_console_pattern(self, success_message)
-
def extract_from_deb(self, deb, path):
"""
Extracts a file from a deb package into the test workdir
@@ -166,12 +162,12 @@ class BootLinuxConsole(Test):
self.vm.launch()
self.wait_for_console_pattern('Boot successful.')
- self.exec_command_and_wait_for_pattern('cat /proc/cpuinfo',
- 'BogoMIPS')
- self.exec_command_and_wait_for_pattern('uname -a',
- 'Debian')
- self.exec_command_and_wait_for_pattern('reboot',
- 'reboot: Restarting system')
+ exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo',
+ 'BogoMIPS')
+ exec_command_and_wait_for_pattern(self, 'uname -a',
+ 'Debian')
+ exec_command_and_wait_for_pattern(self, 'reboot',
+ 'reboot: Restarting system')
def do_test_mips_malta32el_nanomips(self, kernel_url, kernel_hash):
kernel_path_xz = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
--
2.21.0
- [PATCH 00/11] tests/acceptance: Fix 64-bit MIPS target tests, Philippe Mathieu-Daudé, 2019/10/19
- [PATCH 02/11] tests/acceptance: Fixe wait_for_console_pattern() hangs, Philippe Mathieu-Daudé, 2019/10/19
- [PATCH 03/11] tests/acceptance: Send <carriage return> on serial lines, Philippe Mathieu-Daudé, 2019/10/19
- [PATCH 01/11] Acceptance tests: refactor wait_for_console_pattern, Philippe Mathieu-Daudé, 2019/10/19
- [PATCH 04/11] tests/acceptance: Refactor exec_command_and_wait_for_pattern(),
Philippe Mathieu-Daudé <=
- [PATCH 05/11] tests/boot_linux_console: Use Avocado archive::gzip_uncompress(), Philippe Mathieu-Daudé, 2019/10/19
- [PATCH 07/11] tests/ssh_linux_malta: Run tests using a snapshot image, Philippe Mathieu-Daudé, 2019/10/19
- [PATCH 10/11] tests/ssh_linux_malta: Refactor how to get image/kernel info, Philippe Mathieu-Daudé, 2019/10/19
- [PATCH 09/11] tests/ssh_linux_malta: Match stricter console output, Philippe Mathieu-Daudé, 2019/10/19
- [PATCH 06/11] tests/boot_linux_console: Run BusyBox on 5KEc 64-bit cpu, Philippe Mathieu-Daudé, 2019/10/19
- [PATCH 08/11] tests/ssh_linux_malta: Remove duplicated test, Philippe Mathieu-Daudé, 2019/10/19
- [PATCH 11/11] tests/ssh_linux_malta: Fix 64-bit target tests, Philippe Mathieu-Daudé, 2019/10/19
- Re: [PATCH 00/11] tests/acceptance: Fix 64-bit MIPS target tests, Philippe Mathieu-Daudé, 2019/10/19