* [PULL 01/21] tests/acceptance: add replay kernel test for s390x
2021-09-27 17:02 [PULL 00/21] Integration testing patches for 2021-09-27 Philippe Mathieu-Daudé
@ 2021-09-27 17:02 ` Philippe Mathieu-Daudé
2021-09-27 17:02 ` [PULL 02/21] tests/acceptance: add replay kernel test for openrisc Philippe Mathieu-Daudé
` (20 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-09-27 17:02 UTC (permalink / raw)
To: qemu-devel
Cc: Willian Rampazzo, Philippe Mathieu-Daudé,
Thomas Huth, Pavel Dovgalyuk
From: Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru>
This patch adds record/replay test which boots Linux
kernel on s390x platform. The test uses kernel binaries
taken from boot_linux_console test.
Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Acked-by: Thomas Huth <thuth@redhat.com>
[PMD: Drop default '-smp 1' as suggested by Thomas]
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <162737551785.1735673.6775108576116333386.stgit@pasha-ThinkPad-X280>
---
tests/acceptance/replay_kernel.py | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/tests/acceptance/replay_kernel.py b/tests/acceptance/replay_kernel.py
index bb32b312402..06a09d66791 100644
--- a/tests/acceptance/replay_kernel.py
+++ b/tests/acceptance/replay_kernel.py
@@ -207,6 +207,21 @@ def test_arm_cubieboard_initrd(self):
'-initrd', initrd_path,
'-no-reboot'))
+ def test_s390x_s390_ccw_virtio(self):
+ """
+ :avocado: tags=arch:s390x
+ :avocado: tags=machine:s390-ccw-virtio
+ """
+ kernel_url = ('https://archives.fedoraproject.org/pub/archive'
+ '/fedora-secondary/releases/29/Everything/s390x/os/images'
+ '/kernel.img')
+ kernel_hash = 'e8e8439103ef8053418ef062644ffd46a7919313'
+ kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
+
+ kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=sclp0'
+ console_pattern = 'Kernel command line: %s' % kernel_command_line
+ self.run_rr(kernel_path, kernel_command_line, console_pattern, shift=9)
+
def test_ppc64_pseries(self):
"""
:avocado: tags=arch:ppc64
--
2.31.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PULL 02/21] tests/acceptance: add replay kernel test for openrisc
2021-09-27 17:02 [PULL 00/21] Integration testing patches for 2021-09-27 Philippe Mathieu-Daudé
2021-09-27 17:02 ` [PULL 01/21] tests/acceptance: add replay kernel test for s390x Philippe Mathieu-Daudé
@ 2021-09-27 17:02 ` Philippe Mathieu-Daudé
2021-09-27 17:02 ` [PULL 03/21] tests/acceptance: add replay kernel test for nios2 Philippe Mathieu-Daudé
` (19 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-09-27 17:02 UTC (permalink / raw)
To: qemu-devel; +Cc: Willian Rampazzo, Philippe Mathieu-Daudé, Pavel Dovgalyuk
From: Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru>
This patch adds record/replay test which boots Linux
kernel on openrisc platform. The test uses kernel binaries
taken from boot_linux_console test.
Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <162737552350.1735673.14603125561530143423.stgit@pasha-ThinkPad-X280>
---
tests/acceptance/replay_kernel.py | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/tests/acceptance/replay_kernel.py b/tests/acceptance/replay_kernel.py
index 06a09d66791..1bf7e997fe3 100644
--- a/tests/acceptance/replay_kernel.py
+++ b/tests/acceptance/replay_kernel.py
@@ -317,6 +317,17 @@ def test_ppc64_e500(self):
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
self.do_test_advcal_2018(file_path, 'uImage')
+ def test_or1k_sim(self):
+ """
+ :avocado: tags=arch:or1k
+ :avocado: tags=machine:or1k-sim
+ """
+ tar_hash = '20334cdaf386108c530ff0badaecc955693027dd'
+ tar_url = ('https://www.qemu-advent-calendar.org'
+ '/2018/download/day20.tar.xz')
+ file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
+ self.do_test_advcal_2018(file_path, 'vmlinux')
+
def test_ppc_g3beige(self):
"""
:avocado: tags=arch:ppc
--
2.31.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PULL 03/21] tests/acceptance: add replay kernel test for nios2
2021-09-27 17:02 [PULL 00/21] Integration testing patches for 2021-09-27 Philippe Mathieu-Daudé
2021-09-27 17:02 ` [PULL 01/21] tests/acceptance: add replay kernel test for s390x Philippe Mathieu-Daudé
2021-09-27 17:02 ` [PULL 02/21] tests/acceptance: add replay kernel test for openrisc Philippe Mathieu-Daudé
@ 2021-09-27 17:02 ` Philippe Mathieu-Daudé
2021-09-27 17:02 ` [PULL 04/21] tests/acceptance: add replay kernel test for alpha Philippe Mathieu-Daudé
` (18 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-09-27 17:02 UTC (permalink / raw)
To: qemu-devel; +Cc: Willian Rampazzo, Philippe Mathieu-Daudé, Pavel Dovgalyuk
From: Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru>
This patch adds record/replay test which boots Linux
kernel on nios2 platform. The test uses kernel binaries
taken from boot_linux_console test.
Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <162737552919.1735673.12493523185952280539.stgit@pasha-ThinkPad-X280>
---
tests/acceptance/replay_kernel.py | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/tests/acceptance/replay_kernel.py b/tests/acceptance/replay_kernel.py
index 1bf7e997fe3..93251819927 100644
--- a/tests/acceptance/replay_kernel.py
+++ b/tests/acceptance/replay_kernel.py
@@ -328,6 +328,17 @@ def test_or1k_sim(self):
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
self.do_test_advcal_2018(file_path, 'vmlinux')
+ def test_nios2_10m50(self):
+ """
+ :avocado: tags=arch:nios2
+ :avocado: tags=machine:10m50-ghrd
+ """
+ tar_hash = 'e4251141726c412ac0407c5a6bceefbbff018918'
+ tar_url = ('https://www.qemu-advent-calendar.org'
+ '/2018/download/day14.tar.xz')
+ file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
+ self.do_test_advcal_2018(file_path, 'vmlinux.elf')
+
def test_ppc_g3beige(self):
"""
:avocado: tags=arch:ppc
--
2.31.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PULL 04/21] tests/acceptance: add replay kernel test for alpha
2021-09-27 17:02 [PULL 00/21] Integration testing patches for 2021-09-27 Philippe Mathieu-Daudé
` (2 preceding siblings ...)
2021-09-27 17:02 ` [PULL 03/21] tests/acceptance: add replay kernel test for nios2 Philippe Mathieu-Daudé
@ 2021-09-27 17:02 ` Philippe Mathieu-Daudé
2021-09-27 17:02 ` [PULL 05/21] tests/acceptance: Linux boot test for record/replay Philippe Mathieu-Daudé
` (17 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-09-27 17:02 UTC (permalink / raw)
To: qemu-devel; +Cc: Willian Rampazzo, Philippe Mathieu-Daudé, Pavel Dovgalyuk
From: Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru>
This patch adds record/replay test which boots Linux
kernel on alpha platform. The test uses kernel binaries
taken from boot_linux_console test.
Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <162737553482.1735673.10021851966976933952.stgit@pasha-ThinkPad-X280>
---
tests/acceptance/replay_kernel.py | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/tests/acceptance/replay_kernel.py b/tests/acceptance/replay_kernel.py
index 93251819927..c68a9537301 100644
--- a/tests/acceptance/replay_kernel.py
+++ b/tests/acceptance/replay_kernel.py
@@ -222,6 +222,23 @@ def test_s390x_s390_ccw_virtio(self):
console_pattern = 'Kernel command line: %s' % kernel_command_line
self.run_rr(kernel_path, kernel_command_line, console_pattern, shift=9)
+ def test_alpha_clipper(self):
+ """
+ :avocado: tags=arch:alpha
+ :avocado: tags=machine:clipper
+ """
+ kernel_url = ('http://archive.debian.org/debian/dists/lenny/main/'
+ 'installer-alpha/20090123lenny10/images/cdrom/vmlinuz')
+ kernel_hash = '3a943149335529e2ed3e74d0d787b85fb5671ba3'
+ kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
+
+ uncompressed_kernel = archive.uncompress(kernel_path, self.workdir)
+
+ kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=ttyS0'
+ console_pattern = 'Kernel command line: %s' % kernel_command_line
+ self.run_rr(uncompressed_kernel, kernel_command_line, console_pattern, shift=9,
+ args=('-nodefaults', ))
+
def test_ppc64_pseries(self):
"""
:avocado: tags=arch:ppc64
--
2.31.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PULL 05/21] tests/acceptance: Linux boot test for record/replay
2021-09-27 17:02 [PULL 00/21] Integration testing patches for 2021-09-27 Philippe Mathieu-Daudé
` (3 preceding siblings ...)
2021-09-27 17:02 ` [PULL 04/21] tests/acceptance: add replay kernel test for alpha Philippe Mathieu-Daudé
@ 2021-09-27 17:02 ` Philippe Mathieu-Daudé
2021-09-27 17:02 ` [PULL 06/21] Acceptance tests: add myself as a reviewer for the acceptance tests Philippe Mathieu-Daudé
` (16 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-09-27 17:02 UTC (permalink / raw)
To: qemu-devel
Cc: Willian Rampazzo, Philippe Mathieu-Daudé,
Pavel Dovgalyuk, Pavel Dovgalyuk
From: Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru>
This patch adds a test for record/replay, which boots Linux
image from the disk and interacts with the network.
The idea and code of this test is borrowed from boot_linux.py
This test includes only x86_64 platform. Other platforms and
machines will be added later after testing and improving
record/replay to completely support them.
Each test consists of the following phases:
- downloading the disk image
- recording the execution
- replaying the execution
Replay does not validates the output, but waits until QEMU
finishes the execution. This is reasonable, because
QEMU usually hangs when replay goes wrong.
Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <162737554047.1735673.13133593401566029378.stgit@pasha-ThinkPad-X280>
---
MAINTAINERS | 1 +
tests/acceptance/replay_linux.py | 116 +++++++++++++++++++++++++++++++
2 files changed, 117 insertions(+)
create mode 100644 tests/acceptance/replay_linux.py
diff --git a/MAINTAINERS b/MAINTAINERS
index d7915ec128e..069db6d2995 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2973,6 +2973,7 @@ F: include/sysemu/replay.h
F: docs/replay.txt
F: stubs/replay.c
F: tests/acceptance/replay_kernel.py
+F: tests/acceptance/replay_linux.py
F: tests/acceptance/reverse_debugging.py
F: qapi/replay.json
diff --git a/tests/acceptance/replay_linux.py b/tests/acceptance/replay_linux.py
new file mode 100644
index 00000000000..15953f9e496
--- /dev/null
+++ b/tests/acceptance/replay_linux.py
@@ -0,0 +1,116 @@
+# Record/replay test that boots a complete Linux system via a cloud image
+#
+# Copyright (c) 2020 ISP RAS
+#
+# Author:
+# Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
+#
+# 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 os
+import logging
+import time
+
+from avocado import skipUnless
+from avocado.utils import cloudinit
+from avocado.utils import network
+from avocado.utils import vmimage
+from avocado.utils import datadrainer
+from avocado.utils.path import find_command
+from avocado_qemu import LinuxTest
+
+class ReplayLinux(LinuxTest):
+ """
+ Boots a Linux system, checking for a successful initialization
+ """
+
+ timeout = 1800
+ chksum = None
+ hdd = 'ide-hd'
+ cd = 'ide-cd'
+ bus = 'ide'
+
+ def setUp(self):
+ super(ReplayLinux, self).setUp()
+ self.boot_path = self.download_boot()
+ self.cloudinit_path = self.prepare_cloudinit()
+
+ def vm_add_disk(self, vm, path, id, device):
+ bus_string = ''
+ if self.bus:
+ bus_string = ',bus=%s.%d' % (self.bus, id,)
+ vm.add_args('-drive', 'file=%s,snapshot,id=disk%s,if=none' % (path, id))
+ vm.add_args('-drive',
+ 'driver=blkreplay,id=disk%s-rr,if=none,image=disk%s' % (id, id))
+ vm.add_args('-device',
+ '%s,drive=disk%s-rr%s' % (device, id, bus_string))
+
+ def launch_and_wait(self, record, args, shift):
+ vm = self.get_vm()
+ vm.add_args('-smp', '1')
+ vm.add_args('-m', '1024')
+ vm.add_args('-object', 'filter-replay,id=replay,netdev=hub0port0')
+ if args:
+ vm.add_args(*args)
+ self.vm_add_disk(vm, self.boot_path, 0, self.hdd)
+ self.vm_add_disk(vm, self.cloudinit_path, 1, self.cd)
+ logger = logging.getLogger('replay')
+ if record:
+ logger.info('recording the execution...')
+ mode = 'record'
+ else:
+ logger.info('replaying the execution...')
+ mode = 'replay'
+ replay_path = os.path.join(self.workdir, 'replay.bin')
+ vm.add_args('-icount', 'shift=%s,rr=%s,rrfile=%s' %
+ (shift, mode, replay_path))
+
+ start_time = time.time()
+
+ vm.set_console()
+ vm.launch()
+ console_drainer = datadrainer.LineLogger(vm.console_socket.fileno(),
+ logger=self.log.getChild('console'),
+ stop_check=(lambda : not vm.is_running()))
+ console_drainer.start()
+ if record:
+ cloudinit.wait_for_phone_home(('0.0.0.0', self.phone_home_port),
+ self.name)
+ vm.shutdown()
+ logger.info('finished the recording with log size %s bytes'
+ % os.path.getsize(replay_path))
+ else:
+ vm.event_wait('SHUTDOWN', self.timeout)
+ vm.shutdown(True)
+ logger.info('successfully fihished the replay')
+ elapsed = time.time() - start_time
+ logger.info('elapsed time %.2f sec' % elapsed)
+ return elapsed
+
+ def run_rr(self, args=None, shift=7):
+ t1 = self.launch_and_wait(True, args, shift)
+ t2 = self.launch_and_wait(False, args, shift)
+ logger = logging.getLogger('replay')
+ logger.info('replay overhead {:.2%}'.format(t2 / t1 - 1))
+
+@skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout')
+class ReplayLinuxX8664(ReplayLinux):
+ """
+ :avocado: tags=arch:x86_64
+ :avocado: tags=accel:tcg
+ """
+
+ chksum = 'e3c1b309d9203604922d6e255c2c5d098a309c2d46215d8fc026954f3c5c27a0'
+
+ def test_pc_i440fx(self):
+ """
+ :avocado: tags=machine:pc
+ """
+ self.run_rr(shift=1)
+
+ def test_pc_q35(self):
+ """
+ :avocado: tags=machine:q35
+ """
+ self.run_rr(shift=3)
--
2.31.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PULL 06/21] Acceptance tests: add myself as a reviewer for the acceptance tests
2021-09-27 17:02 [PULL 00/21] Integration testing patches for 2021-09-27 Philippe Mathieu-Daudé
` (4 preceding siblings ...)
2021-09-27 17:02 ` [PULL 05/21] tests/acceptance: Linux boot test for record/replay Philippe Mathieu-Daudé
@ 2021-09-27 17:02 ` Philippe Mathieu-Daudé
2021-09-27 17:02 ` [PULL 07/21] Acceptance Tests: add standard clean up at test tearDown() Philippe Mathieu-Daudé
` (15 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-09-27 17:02 UTC (permalink / raw)
To: qemu-devel
Cc: Willian Rampazzo, Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta
From: Willian Rampazzo <willianr@redhat.com>
Signed-off-by: Willian Rampazzo <willianr@redhat.com>
Acked-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210809192907.42138-1-willianr@redhat.com>
---
MAINTAINERS | 1 +
1 file changed, 1 insertion(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 069db6d2995..f98523cfe0f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3485,6 +3485,7 @@ W: https://trello.com/b/6Qi1pxVn/avocado-qemu
R: Cleber Rosa <crosa@redhat.com>
R: Philippe Mathieu-Daudé <philmd@redhat.com>
R: Wainer dos Santos Moschetta <wainersm@redhat.com>
+R: Willian Rampazzo <willianr@redhat.com>
S: Odd Fixes
F: tests/acceptance/
--
2.31.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PULL 07/21] Acceptance Tests: add standard clean up at test tearDown()
2021-09-27 17:02 [PULL 00/21] Integration testing patches for 2021-09-27 Philippe Mathieu-Daudé
` (5 preceding siblings ...)
2021-09-27 17:02 ` [PULL 06/21] Acceptance tests: add myself as a reviewer for the acceptance tests Philippe Mathieu-Daudé
@ 2021-09-27 17:02 ` Philippe Mathieu-Daudé
2021-09-27 17:02 ` [PULL 08/21] avocado_qemu: standardize super() call following PEP3135 Philippe Mathieu-Daudé
` (14 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-09-27 17:02 UTC (permalink / raw)
To: qemu-devel
Cc: Willian Rampazzo, Peter Maydell, Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, Cleber Rosa
From: Cleber Rosa <crosa@redhat.com>
The avocado.Test class, used as the basis of the avocado_qemu.Test
class, performs a clean of temporary directories up as part of its own
tearDown() implementation.
But the avocado_qemu.Test class is currently missing the same clean
up, as it implemented its own tearDown() method without resorting to
the upper class behavior.
This brings avocado_qemu.Test behavior in sync with the standard
avocado.Test behavior and prevents temporary directories from
cluttering the test results directory (unless instructed to do so with
Avocado's "--keep-tmp" option).
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Cleber Rosa <crosa@redhat.com>
[willianr: respin to new Python super format]
Signed-off-by: Willian Rampazzo <willianr@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210920204932.94132-2-willianr@redhat.com>
---
tests/acceptance/avocado_qemu/__init__.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py
index 2c4fef3e149..d9e1b32aa16 100644
--- a/tests/acceptance/avocado_qemu/__init__.py
+++ b/tests/acceptance/avocado_qemu/__init__.py
@@ -276,6 +276,7 @@ def tearDown(self):
for vm in self._vms.values():
vm.shutdown()
self._sd = None
+ super().tearDown()
def fetch_asset(self, name,
asset_hash=None, algorithm=None,
--
2.31.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PULL 08/21] avocado_qemu: standardize super() call following PEP3135
2021-09-27 17:02 [PULL 00/21] Integration testing patches for 2021-09-27 Philippe Mathieu-Daudé
` (6 preceding siblings ...)
2021-09-27 17:02 ` [PULL 07/21] Acceptance Tests: add standard clean up at test tearDown() Philippe Mathieu-Daudé
@ 2021-09-27 17:02 ` Philippe Mathieu-Daudé
2021-09-27 17:02 ` [PULL 09/21] avocado_qemu: fix import module based on isort Philippe Mathieu-Daudé
` (13 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-09-27 17:02 UTC (permalink / raw)
To: qemu-devel; +Cc: Willian Rampazzo, Philippe Mathieu-Daudé
From: Willian Rampazzo <willianr@redhat.com>
PEP3135 states when calling super(), there is no need to use arguments.
This changes the calls on avocado_qemu to standardize according to
PEP3135 and avoid warnings from linters.
Signed-off-by: Willian Rampazzo <willianr@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210920204932.94132-3-willianr@redhat.com>
---
tests/acceptance/avocado_qemu/__init__.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py
index d9e1b32aa16..d2077d63cda 100644
--- a/tests/acceptance/avocado_qemu/__init__.py
+++ b/tests/acceptance/avocado_qemu/__init__.py
@@ -282,7 +282,7 @@ def fetch_asset(self, name,
asset_hash=None, algorithm=None,
locations=None, expire=None,
find_only=False, cancel_on_missing=True):
- return super(Test, self).fetch_asset(name,
+ return super().fetch_asset(name,
asset_hash=asset_hash,
algorithm=algorithm,
locations=locations,
@@ -470,7 +470,7 @@ def _set_distro(self):
self.distro.checksum = distro_checksum
def setUp(self, ssh_pubkey=None, network_device_type='virtio-net'):
- super(LinuxTest, self).setUp()
+ super().setUp()
self._set_distro()
self.vm.add_args('-smp', '2')
self.vm.add_args('-m', '1024')
--
2.31.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PULL 09/21] avocado_qemu: fix import module based on isort
2021-09-27 17:02 [PULL 00/21] Integration testing patches for 2021-09-27 Philippe Mathieu-Daudé
` (7 preceding siblings ...)
2021-09-27 17:02 ` [PULL 08/21] avocado_qemu: standardize super() call following PEP3135 Philippe Mathieu-Daudé
@ 2021-09-27 17:02 ` Philippe Mathieu-Daudé
2021-09-27 17:02 ` [PULL 10/21] avocado_qemu: tweak ssh connect method Philippe Mathieu-Daudé
` (12 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-09-27 17:02 UTC (permalink / raw)
To: qemu-devel; +Cc: Willian Rampazzo, Philippe Mathieu-Daudé
From: Willian Rampazzo <willianr@redhat.com>
Signed-off-by: Willian Rampazzo <willianr@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210920204932.94132-4-willianr@redhat.com>
---
tests/acceptance/avocado_qemu/__init__.py | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py
index d2077d63cda..edb9ed74852 100644
--- a/tests/acceptance/avocado_qemu/__init__.py
+++ b/tests/acceptance/avocado_qemu/__init__.py
@@ -12,19 +12,13 @@
import os
import shutil
import sys
-import uuid
import tempfile
+import uuid
import avocado
-
-from avocado.utils import cloudinit
-from avocado.utils import datadrainer
-from avocado.utils import network
-from avocado.utils import ssh
-from avocado.utils import vmimage
+from avocado.utils import cloudinit, datadrainer, network, ssh, vmimage
from avocado.utils.path import find_command
-
#: The QEMU build root directory. It may also be the source directory
#: if building from the source dir, but it's safer to use BUILD_DIR for
#: that purpose. Be aware that if this code is moved outside of a source
@@ -42,11 +36,9 @@
sys.path.append(os.path.join(SOURCE_DIR, 'python'))
from qemu.machine import QEMUMachine
-from qemu.utils import (
- get_info_usernet_hostfwd_port,
- kvm_available,
- tcg_available,
-)
+from qemu.utils import (get_info_usernet_hostfwd_port, kvm_available,
+ tcg_available)
+
def is_readable_executable_file(path):
return os.path.isfile(path) and os.access(path, os.R_OK | os.X_OK)
--
2.31.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PULL 10/21] avocado_qemu: tweak ssh connect method
2021-09-27 17:02 [PULL 00/21] Integration testing patches for 2021-09-27 Philippe Mathieu-Daudé
` (8 preceding siblings ...)
2021-09-27 17:02 ` [PULL 09/21] avocado_qemu: fix import module based on isort Philippe Mathieu-Daudé
@ 2021-09-27 17:02 ` Philippe Mathieu-Daudé
2021-09-27 17:02 ` [PULL 11/21] avocado_qemu: explicitly return None to avoid R1710 Philippe Mathieu-Daudé
` (11 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-09-27 17:02 UTC (permalink / raw)
To: qemu-devel; +Cc: Willian Rampazzo, Philippe Mathieu-Daudé
From: Willian Rampazzo <willianr@redhat.com>
The current implementation will crash if the connection fails as the
`time` module is not imported. Fix the import problem. While here,
tweaks the connection to wait progressively when the connection fails.
Signed-off-by: Willian Rampazzo <willianr@redhat.com>
[PMD: Reworded description]
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210920204932.94132-5-willianr@redhat.com>
---
tests/acceptance/avocado_qemu/__init__.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py
index edb9ed74852..c3613f92620 100644
--- a/tests/acceptance/avocado_qemu/__init__.py
+++ b/tests/acceptance/avocado_qemu/__init__.py
@@ -13,6 +13,7 @@
import shutil
import sys
import tempfile
+import time
import uuid
import avocado
@@ -305,8 +306,7 @@ def ssh_connect(self, username, credential, credential_is_key=True):
self.ssh_session.connect()
return
except:
- time.sleep(4)
- pass
+ time.sleep(i)
self.fail('ssh connection timeout')
def ssh_command(self, command):
--
2.31.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PULL 11/21] avocado_qemu: explicitly return None to avoid R1710
2021-09-27 17:02 [PULL 00/21] Integration testing patches for 2021-09-27 Philippe Mathieu-Daudé
` (9 preceding siblings ...)
2021-09-27 17:02 ` [PULL 10/21] avocado_qemu: tweak ssh connect method Philippe Mathieu-Daudé
@ 2021-09-27 17:02 ` Philippe Mathieu-Daudé
2021-09-27 17:02 ` [PULL 12/21] avocado_qemu: fix inheritance order on LinuxTest class Philippe Mathieu-Daudé
` (10 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-09-27 17:02 UTC (permalink / raw)
To: qemu-devel; +Cc: Willian Rampazzo, Philippe Mathieu-Daudé
From: Willian Rampazzo <willianr@redhat.com>
The linter is complaining the `pick_default_qemu_bin` is not explicitly
returning None. Fix it to explicitly return None and avoid R1710
inconsistent-return-statements.
Signed-off-by: Willian Rampazzo <willianr@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210920204932.94132-6-willianr@redhat.com>
---
tests/acceptance/avocado_qemu/__init__.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py
index c3613f92620..35318ce2a9c 100644
--- a/tests/acceptance/avocado_qemu/__init__.py
+++ b/tests/acceptance/avocado_qemu/__init__.py
@@ -72,6 +72,7 @@ def pick_default_qemu_bin(arch=None):
qemu_bin_relative_path)
if is_readable_executable_file(qemu_bin_from_bld_dir_path):
return qemu_bin_from_bld_dir_path
+ return None
def _console_interaction(test, success_message, failure_message,
--
2.31.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PULL 12/21] avocado_qemu: fix inheritance order on LinuxTest class
2021-09-27 17:02 [PULL 00/21] Integration testing patches for 2021-09-27 Philippe Mathieu-Daudé
` (10 preceding siblings ...)
2021-09-27 17:02 ` [PULL 11/21] avocado_qemu: explicitly return None to avoid R1710 Philippe Mathieu-Daudé
@ 2021-09-27 17:02 ` Philippe Mathieu-Daudé
2021-09-27 17:02 ` [PULL 13/21] tests/Makefile: allow control over tags during check-acceptance Philippe Mathieu-Daudé
` (9 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-09-27 17:02 UTC (permalink / raw)
To: qemu-devel; +Cc: Willian Rampazzo, Philippe Mathieu-Daudé
From: Willian Rampazzo <willianr@redhat.com>
Class hierarchy on Python is defined from right to left. Although the
current code is not harmful, let's fix it to avoid problems in the future.
Signed-off-by: Willian Rampazzo <willianr@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210920204932.94132-7-willianr@redhat.com>
---
tests/acceptance/avocado_qemu/__init__.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py
index 35318ce2a9c..1841053e2c1 100644
--- a/tests/acceptance/avocado_qemu/__init__.py
+++ b/tests/acceptance/avocado_qemu/__init__.py
@@ -424,7 +424,7 @@ def default_kernel_params(self):
return self._info.get('kernel_params', None)
-class LinuxTest(Test, LinuxSSHMixIn):
+class LinuxTest(LinuxSSHMixIn, Test):
"""Facilitates having a cloud-image Linux based available.
For tests that indend to interact with guests, this is a better choice
--
2.31.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PULL 13/21] tests/Makefile: allow control over tags during check-acceptance
2021-09-27 17:02 [PULL 00/21] Integration testing patches for 2021-09-27 Philippe Mathieu-Daudé
` (11 preceding siblings ...)
2021-09-27 17:02 ` [PULL 12/21] avocado_qemu: fix inheritance order on LinuxTest class Philippe Mathieu-Daudé
@ 2021-09-27 17:02 ` Philippe Mathieu-Daudé
2021-09-27 17:02 ` [PULL 14/21] docs/devel/testing: add instruction to run a single acceptance test Philippe Mathieu-Daudé
` (8 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-09-27 17:02 UTC (permalink / raw)
To: qemu-devel
Cc: Willian Rampazzo, Thomas Huth, Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta
From: Willian Rampazzo <willianr@redhat.com>
Although it is possible to run a specific test using the avocado
command-line, a user may want to use a specific tag while running the
``make check-acceptance`` during the development or debugging.
This allows using the AVOCADO_TAGS environment variable where the user
takes total control of which tests should run based on the tags defined.
This also makes the check-acceptance command flexible to restrict tests
based on tags while running on CI.
e.g.:
AVOCADO_TAGS="foo bar baz" make check-acceptance
Signed-off-by: Willian Rampazzo <willianr@redhat.com>
Tested-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210923161141.232208-2-willianr@redhat.com>
---
docs/devel/testing.rst | 14 ++++++++++++++
tests/Makefile.include | 12 +++++++++---
2 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst
index 4a0abbf23d3..d1841e35d57 100644
--- a/docs/devel/testing.rst
+++ b/docs/devel/testing.rst
@@ -732,6 +732,20 @@ available. On Debian and Ubuntu based systems, depending on the
specific version, they may be on packages named ``python3-venv`` and
``python3-pip``.
+It is also possible to run tests based on tags using the
+``make check-acceptance`` command and the ``AVOCADO_TAGS`` environment
+variable:
+
+.. code::
+
+ make check-acceptance AVOCADO_TAGS=quick
+
+Note that tags separated with commas have an AND behavior, while tags
+separated by spaces have an OR behavior. For more information on Avocado
+tags, see:
+
+ https://avocado-framework.readthedocs.io/en/latest/guides/user/chapters/tags.html
+
The scripts installed inside the virtual environment may be used
without an "activation". For instance, the Avocado test runner
may be invoked by running:
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 6e16c05f10b..f6484e5b31d 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -92,7 +92,12 @@ TESTS_RESULTS_DIR=$(BUILD_DIR)/tests/results
# Any number of command separated loggers are accepted. For more
# information please refer to "avocado --help".
AVOCADO_SHOW=app
-AVOCADO_TAGS=$(patsubst %-softmmu,-t arch:%, $(filter %-softmmu,$(TARGETS)))
+ifndef AVOCADO_TAGS
+ AVOCADO_CMDLINE_TAGS=$(patsubst %-softmmu,-t arch:%, \
+ $(filter %-softmmu,$(TARGETS)))
+else
+ AVOCADO_CMDLINE_TAGS=$(addprefix -t , $(AVOCADO_TAGS))
+endif
$(TESTS_VENV_DIR): $(TESTS_VENV_REQ)
$(call quiet-command, \
@@ -128,8 +133,9 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) get-vm-images
$(call quiet-command, \
$(TESTS_VENV_DIR)/bin/python -m avocado \
--show=$(AVOCADO_SHOW) run --job-results-dir=$(TESTS_RESULTS_DIR) \
- --filter-by-tags-include-empty --filter-by-tags-include-empty-key \
- $(AVOCADO_TAGS) \
+ $(if $(AVOCADO_TAGS),, --filter-by-tags-include-empty \
+ --filter-by-tags-include-empty-key) \
+ $(AVOCADO_CMDLINE_TAGS) \
$(if $(GITLAB_CI),,--failfast) tests/acceptance, \
"AVOCADO", "tests/acceptance")
--
2.31.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PULL 14/21] docs/devel/testing: add instruction to run a single acceptance test
2021-09-27 17:02 [PULL 00/21] Integration testing patches for 2021-09-27 Philippe Mathieu-Daudé
` (12 preceding siblings ...)
2021-09-27 17:02 ` [PULL 13/21] tests/Makefile: allow control over tags during check-acceptance Philippe Mathieu-Daudé
@ 2021-09-27 17:02 ` Philippe Mathieu-Daudé
2021-09-27 17:02 ` [PULL 15/21] tests/Makefile: add AVOCADO_TESTS option to make check-acceptance Philippe Mathieu-Daudé
` (7 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-09-27 17:02 UTC (permalink / raw)
To: qemu-devel; +Cc: Willian Rampazzo, Philippe Mathieu-Daudé
From: Willian Rampazzo <willianr@redhat.com>
Add instructions to the Acceptance tests section about running a
single test file or a test within the test file.
Signed-off-by: Willian Rampazzo <willianr@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210923161141.232208-3-willianr@redhat.com>
---
docs/devel/testing.rst | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst
index d1841e35d57..c9f6b97f876 100644
--- a/docs/devel/testing.rst
+++ b/docs/devel/testing.rst
@@ -754,6 +754,34 @@ may be invoked by running:
tests/venv/bin/avocado run $OPTION1 $OPTION2 tests/acceptance/
+Note that if ``make check-acceptance`` was not executed before, it is
+possible to create the Python virtual environment with the dependencies
+needed running:
+
+ .. code::
+
+ make check-venv
+
+It is also possible to run tests from a single file or a single test within
+a test file. To run tests from a single file within the build tree, use:
+
+ .. code::
+
+ tests/venv/bin/avocado run tests/acceptance/$TESTFILE
+
+To run a single test within a test file, use:
+
+ .. code::
+
+ tests/venv/bin/avocado run tests/acceptance/$TESTFILE:$TESTCLASS.$TESTNAME
+
+Valid test names are visible in the output from any previous execution
+of Avocado or ``make check-acceptance``, and can also be queried using:
+
+ .. code::
+
+ tests/venv/bin/avocado list tests/acceptance
+
Manual Installation
-------------------
--
2.31.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PULL 15/21] tests/Makefile: add AVOCADO_TESTS option to make check-acceptance
2021-09-27 17:02 [PULL 00/21] Integration testing patches for 2021-09-27 Philippe Mathieu-Daudé
` (13 preceding siblings ...)
2021-09-27 17:02 ` [PULL 14/21] docs/devel/testing: add instruction to run a single acceptance test Philippe Mathieu-Daudé
@ 2021-09-27 17:02 ` Philippe Mathieu-Daudé
2021-09-27 17:02 ` [PULL 16/21] qemu: Split machine_ppc.py acceptance tests Philippe Mathieu-Daudé
` (6 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-09-27 17:02 UTC (permalink / raw)
To: qemu-devel
Cc: Willian Rampazzo, Philippe Mathieu-Daudé, Daniel P . Berrangé
From: Willian Rampazzo <willianr@redhat.com>
Add the possibility of running all the tests from a single file, or
multiple files, running a single test within a file or multiple tests
within multiple files using `make check-acceptance` and the
AVOCADO_TESTS environment variable.
Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Willian Rampazzo <willianr@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210923161141.232208-4-willianr@redhat.com>
---
docs/devel/testing.rst | 27 +++++++++++++++++++++++++++
tests/Makefile.include | 5 ++++-
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst
index c9f6b97f876..64c97447956 100644
--- a/docs/devel/testing.rst
+++ b/docs/devel/testing.rst
@@ -746,6 +746,33 @@ tags, see:
https://avocado-framework.readthedocs.io/en/latest/guides/user/chapters/tags.html
+To run a single test file, a couple of them, or a test within a file
+using the ``make check-acceptance`` command, set the ``AVOCADO_TESTS``
+environment variable with the test files or test names. To run all
+tests from a single file, use:
+
+ .. code::
+
+ make check-acceptance AVOCADO_TESTS=$FILEPATH
+
+The same is valid to run tests from multiple test files:
+
+ .. code::
+
+ make check-acceptance AVOCADO_TESTS='$FILEPATH1 $FILEPATH2'
+
+To run a single test within a file, use:
+
+ .. code::
+
+ make check-acceptance AVOCADO_TESTS=$FILEPATH:$TESTCLASS.$TESTNAME
+
+The same is valid to run single tests from multiple test files:
+
+ .. code::
+
+ make check-acceptance AVOCADO_TESTS='$FILEPATH1:$TESTCLASS1.$TESTNAME1 $FILEPATH2:$TESTCLASS2.$TESTNAME2'
+
The scripts installed inside the virtual environment may be used
without an "activation". For instance, the Avocado test runner
may be invoked by running:
diff --git a/tests/Makefile.include b/tests/Makefile.include
index f6484e5b31d..e69c4fae53e 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -88,6 +88,9 @@ clean-tcg: $(CLEAN_TCG_TARGET_RULES)
TESTS_VENV_DIR=$(BUILD_DIR)/tests/venv
TESTS_VENV_REQ=$(SRC_PATH)/tests/requirements.txt
TESTS_RESULTS_DIR=$(BUILD_DIR)/tests/results
+ifndef AVOCADO_TESTS
+ AVOCADO_TESTS=tests/acceptance
+endif
# Controls the output generated by Avocado when running tests.
# Any number of command separated loggers are accepted. For more
# information please refer to "avocado --help".
@@ -136,7 +139,7 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) get-vm-images
$(if $(AVOCADO_TAGS),, --filter-by-tags-include-empty \
--filter-by-tags-include-empty-key) \
$(AVOCADO_CMDLINE_TAGS) \
- $(if $(GITLAB_CI),,--failfast) tests/acceptance, \
+ $(if $(GITLAB_CI),,--failfast) $(AVOCADO_TESTS), \
"AVOCADO", "tests/acceptance")
# Consolidated targets
--
2.31.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PULL 16/21] qemu: Split machine_ppc.py acceptance tests
2021-09-27 17:02 [PULL 00/21] Integration testing patches for 2021-09-27 Philippe Mathieu-Daudé
` (14 preceding siblings ...)
2021-09-27 17:02 ` [PULL 15/21] tests/Makefile: add AVOCADO_TESTS option to make check-acceptance Philippe Mathieu-Daudé
@ 2021-09-27 17:02 ` Philippe Mathieu-Daudé
2021-09-27 17:02 ` [PULL 17/21] Acceptance Tests: improve check-acceptance description Philippe Mathieu-Daudé
` (5 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-09-27 17:02 UTC (permalink / raw)
To: qemu-devel
Cc: Philippe Mathieu-Daudé, Philippe Mathieu-Daudé, David Gibson
From: David Gibson <david@gibson.dropbear.id.au>
machine_ppc.py contains tests for 3 different ppc based machine types. It
is listed in MAINTAINERS along with the PPC TCG cpu code. That's not
really accurate though, since it's really more about testing those machines
than the CPUs.
Therefore, split it up into separate files for the separate machine types,
and list those along with their machine types in MAINTAINERS.
Suggested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210927044808.73391-2-david@gibson.dropbear.id.au>
---
MAINTAINERS | 4 +-
tests/acceptance/machine_ppc.py | 69 ----------------------------
tests/acceptance/ppc_mpc8544ds.py | 32 +++++++++++++
tests/acceptance/ppc_pseries.py | 35 ++++++++++++++
tests/acceptance/ppc_virtex_ml507.py | 34 ++++++++++++++
5 files changed, 104 insertions(+), 70 deletions(-)
delete mode 100644 tests/acceptance/machine_ppc.py
create mode 100644 tests/acceptance/ppc_mpc8544ds.py
create mode 100644 tests/acceptance/ppc_pseries.py
create mode 100644 tests/acceptance/ppc_virtex_ml507.py
diff --git a/MAINTAINERS b/MAINTAINERS
index f98523cfe0f..bf1fc5b21e8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -274,7 +274,6 @@ F: target/ppc/
F: hw/ppc/
F: include/hw/ppc/
F: disas/ppc.c
-F: tests/acceptance/machine_ppc.py
RISC-V TCG CPUs
M: Palmer Dabbelt <palmer@dabbelt.com>
@@ -1270,6 +1269,7 @@ L: qemu-ppc@nongnu.org
S: Odd Fixes
F: hw/ppc/mpc8544ds.c
F: hw/ppc/mpc8544_guts.c
+F: tests/acceptance/ppc_mpc8544ds.py
New World (mac99)
M: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
@@ -1340,6 +1340,7 @@ F: tests/qtest/spapr*
F: tests/qtest/libqos/*spapr*
F: tests/qtest/rtas*
F: tests/qtest/libqos/rtas*
+F: tests/acceptance/ppc_pseries.py
PowerNV (Non-Virtualized)
M: Cédric Le Goater <clg@kaod.org>
@@ -1361,6 +1362,7 @@ M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
L: qemu-ppc@nongnu.org
S: Odd Fixes
F: hw/ppc/virtex_ml507.c
+F: tests/acceptance/ppc_virtex_ml507.py
sam460ex
M: BALATON Zoltan <balaton@eik.bme.hu>
diff --git a/tests/acceptance/machine_ppc.py b/tests/acceptance/machine_ppc.py
deleted file mode 100644
index a836e2496f1..00000000000
--- a/tests/acceptance/machine_ppc.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# Test that Linux kernel boots on ppc machines and check the console
-#
-# Copyright (c) 2018, 2020 Red Hat, Inc.
-#
-# This work is licensed under the terms of the GNU GPL, version 2 or
-# later. See the COPYING file in the top-level directory.
-
-from avocado.utils import archive
-from avocado_qemu import Test
-from avocado_qemu import wait_for_console_pattern
-
-class PpcMachine(Test):
-
- timeout = 90
- KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
- panic_message = 'Kernel panic - not syncing'
-
- def test_ppc64_pseries(self):
- """
- :avocado: tags=arch:ppc64
- :avocado: tags=machine:pseries
- """
- kernel_url = ('https://archives.fedoraproject.org/pub/archive'
- '/fedora-secondary/releases/29/Everything/ppc64le/os'
- '/ppc/ppc64/vmlinuz')
- kernel_hash = '3fe04abfc852b66653b8c3c897a59a689270bc77'
- kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
-
- self.vm.set_console()
- kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=hvc0'
- self.vm.add_args('-kernel', kernel_path,
- '-append', kernel_command_line)
- self.vm.launch()
- console_pattern = 'Kernel command line: %s' % kernel_command_line
- wait_for_console_pattern(self, console_pattern, self.panic_message)
-
- def test_ppc_mpc8544ds(self):
- """
- :avocado: tags=arch:ppc
- :avocado: tags=machine:mpc8544ds
- """
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2020/download/day17.tar.gz')
- tar_hash = '7a5239542a7c4257aa4d3b7f6ddf08fb6775c494'
- file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
- archive.extract(file_path, self.workdir)
- self.vm.set_console()
- self.vm.add_args('-kernel', self.workdir + '/creek/creek.bin')
- self.vm.launch()
- wait_for_console_pattern(self, 'QEMU advent calendar 2020',
- self.panic_message)
-
- def test_ppc_virtex_ml507(self):
- """
- :avocado: tags=arch:ppc
- :avocado: tags=machine:virtex-ml507
- """
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2020/download/hippo.tar.gz')
- tar_hash = '306b95bfe7d147f125aa176a877e266db8ef914a'
- file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
- archive.extract(file_path, self.workdir)
- self.vm.set_console()
- self.vm.add_args('-kernel', self.workdir + '/hippo/hippo.linux',
- '-dtb', self.workdir + '/hippo/virtex440-ml507.dtb',
- '-m', '512')
- self.vm.launch()
- wait_for_console_pattern(self, 'QEMU advent calendar 2020',
- self.panic_message)
diff --git a/tests/acceptance/ppc_mpc8544ds.py b/tests/acceptance/ppc_mpc8544ds.py
new file mode 100644
index 00000000000..ce840600c1c
--- /dev/null
+++ b/tests/acceptance/ppc_mpc8544ds.py
@@ -0,0 +1,32 @@
+# Test that Linux kernel boots on ppc machines and check the console
+#
+# Copyright (c) 2018, 2020 Red Hat, Inc.
+#
+# This work is licensed under the terms of the GNU GPL, version 2 or
+# later. See the COPYING file in the top-level directory.
+
+from avocado.utils import archive
+from avocado_qemu import Test
+from avocado_qemu import wait_for_console_pattern
+
+class Mpc8544dsMachine(Test):
+
+ timeout = 90
+ KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
+ panic_message = 'Kernel panic - not syncing'
+
+ def test_ppc_mpc8544ds(self):
+ """
+ :avocado: tags=arch:ppc
+ :avocado: tags=machine:mpc8544ds
+ """
+ tar_url = ('https://www.qemu-advent-calendar.org'
+ '/2020/download/day17.tar.gz')
+ tar_hash = '7a5239542a7c4257aa4d3b7f6ddf08fb6775c494'
+ file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
+ archive.extract(file_path, self.workdir)
+ self.vm.set_console()
+ self.vm.add_args('-kernel', self.workdir + '/creek/creek.bin')
+ self.vm.launch()
+ wait_for_console_pattern(self, 'QEMU advent calendar 2020',
+ self.panic_message)
diff --git a/tests/acceptance/ppc_pseries.py b/tests/acceptance/ppc_pseries.py
new file mode 100644
index 00000000000..f14a884ee16
--- /dev/null
+++ b/tests/acceptance/ppc_pseries.py
@@ -0,0 +1,35 @@
+# Test that Linux kernel boots on ppc machines and check the console
+#
+# Copyright (c) 2018, 2020 Red Hat, Inc.
+#
+# This work is licensed under the terms of the GNU GPL, version 2 or
+# later. See the COPYING file in the top-level directory.
+
+from avocado.utils import archive
+from avocado_qemu import Test
+from avocado_qemu import wait_for_console_pattern
+
+class pseriesMachine(Test):
+
+ timeout = 90
+ KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
+ panic_message = 'Kernel panic - not syncing'
+
+ def test_ppc64_pseries(self):
+ """
+ :avocado: tags=arch:ppc64
+ :avocado: tags=machine:pseries
+ """
+ kernel_url = ('https://archives.fedoraproject.org/pub/archive'
+ '/fedora-secondary/releases/29/Everything/ppc64le/os'
+ '/ppc/ppc64/vmlinuz')
+ kernel_hash = '3fe04abfc852b66653b8c3c897a59a689270bc77'
+ kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
+
+ self.vm.set_console()
+ kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=hvc0'
+ self.vm.add_args('-kernel', kernel_path,
+ '-append', kernel_command_line)
+ self.vm.launch()
+ console_pattern = 'Kernel command line: %s' % kernel_command_line
+ wait_for_console_pattern(self, console_pattern, self.panic_message)
diff --git a/tests/acceptance/ppc_virtex_ml507.py b/tests/acceptance/ppc_virtex_ml507.py
new file mode 100644
index 00000000000..27f7bf2d492
--- /dev/null
+++ b/tests/acceptance/ppc_virtex_ml507.py
@@ -0,0 +1,34 @@
+# Test that Linux kernel boots on ppc machines and check the console
+#
+# Copyright (c) 2018, 2020 Red Hat, Inc.
+#
+# This work is licensed under the terms of the GNU GPL, version 2 or
+# later. See the COPYING file in the top-level directory.
+
+from avocado.utils import archive
+from avocado_qemu import Test
+from avocado_qemu import wait_for_console_pattern
+
+class VirtexMl507Machine(Test):
+
+ timeout = 90
+ KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
+ panic_message = 'Kernel panic - not syncing'
+
+ def test_ppc_virtex_ml507(self):
+ """
+ :avocado: tags=arch:ppc
+ :avocado: tags=machine:virtex-ml507
+ """
+ tar_url = ('https://www.qemu-advent-calendar.org'
+ '/2020/download/hippo.tar.gz')
+ tar_hash = '306b95bfe7d147f125aa176a877e266db8ef914a'
+ file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
+ archive.extract(file_path, self.workdir)
+ self.vm.set_console()
+ self.vm.add_args('-kernel', self.workdir + '/hippo/hippo.linux',
+ '-dtb', self.workdir + '/hippo/virtex440-ml507.dtb',
+ '-m', '512')
+ self.vm.launch()
+ wait_for_console_pattern(self, 'QEMU advent calendar 2020',
+ self.panic_message)
--
2.31.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PULL 17/21] Acceptance Tests: improve check-acceptance description
2021-09-27 17:02 [PULL 00/21] Integration testing patches for 2021-09-27 Philippe Mathieu-Daudé
` (15 preceding siblings ...)
2021-09-27 17:02 ` [PULL 16/21] qemu: Split machine_ppc.py acceptance tests Philippe Mathieu-Daudé
@ 2021-09-27 17:02 ` Philippe Mathieu-Daudé
2021-09-27 17:02 ` [PULL 18/21] acceptance/tests/vnc.py: use explicit syntax for enabling passwords Philippe Mathieu-Daudé
` (4 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-09-27 17:02 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé, Cleber Rosa
From: Cleber Rosa <crosa@redhat.com>
The "check-acceptance" make rule won't necessarily run *all* available
tests, because it employs a filter based on the currently configured
targets. This change in the description of the rule makes that
behavior extra clear.
Signed-off-by: Cleber Rosa <crosa@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210924185506.2542588-3-crosa@redhat.com>
---
tests/Makefile.include | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index e69c4fae53e..7426522bbed 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -16,7 +16,7 @@ ifneq ($(filter $(all-check-targets), check-softfloat),)
@echo " $(MAKE) check-tcg Run TCG tests"
@echo " $(MAKE) check-softfloat Run FPU emulation tests"
endif
- @echo " $(MAKE) check-acceptance Run all acceptance (functional) tests"
+ @echo " $(MAKE) check-acceptance Run acceptance (functional) tests for currently configured targets"
@echo
@echo " $(MAKE) check-report.tap Generates an aggregated TAP test report"
@echo " $(MAKE) check-venv Creates a Python venv for tests"
--
2.31.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PULL 18/21] acceptance/tests/vnc.py: use explicit syntax for enabling passwords
2021-09-27 17:02 [PULL 00/21] Integration testing patches for 2021-09-27 Philippe Mathieu-Daudé
` (16 preceding siblings ...)
2021-09-27 17:02 ` [PULL 17/21] Acceptance Tests: improve check-acceptance description Philippe Mathieu-Daudé
@ 2021-09-27 17:02 ` Philippe Mathieu-Daudé
2021-09-27 17:02 ` [PULL 19/21] tests/acceptance/boot_xen.py: removed unused import Philippe Mathieu-Daudé
` (3 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-09-27 17:02 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé, Cleber Rosa
From: Cleber Rosa <crosa@redhat.com>
This matches the command line on 82a17d1d67, where the "on" or "off"
should be explicitly given.
Signed-off-by: Cleber Rosa <crosa@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210924185506.2542588-9-crosa@redhat.com>
---
tests/acceptance/vnc.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/acceptance/vnc.py b/tests/acceptance/vnc.py
index 22656bbcc2b..f301fbb4f56 100644
--- a/tests/acceptance/vnc.py
+++ b/tests/acceptance/vnc.py
@@ -45,7 +45,7 @@ def test_change_password_requires_a_password(self):
'Could not set password')
def test_change_password(self):
- self.vm.add_args('-nodefaults', '-S', '-vnc', ':0,password')
+ self.vm.add_args('-nodefaults', '-S', '-vnc', ':0,password=on')
self.vm.launch()
self.assertTrue(self.vm.qmp('query-vnc')['return']['enabled'])
set_password_response = self.vm.qmp('change-vnc-password',
--
2.31.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PULL 19/21] tests/acceptance/boot_xen.py: removed unused import
2021-09-27 17:02 [PULL 00/21] Integration testing patches for 2021-09-27 Philippe Mathieu-Daudé
` (17 preceding siblings ...)
2021-09-27 17:02 ` [PULL 18/21] acceptance/tests/vnc.py: use explicit syntax for enabling passwords Philippe Mathieu-Daudé
@ 2021-09-27 17:02 ` Philippe Mathieu-Daudé
2021-09-27 17:02 ` [PULL 20/21] tests/acceptance/ppc_prep_40p.py: NetBSD 7.1.2 location update Philippe Mathieu-Daudé
` (2 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-09-27 17:02 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé, Cleber Rosa
From: Cleber Rosa <crosa@redhat.com>
Just a clean up for an unused import.
Signed-off-by: Cleber Rosa <crosa@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210924185506.2542588-13-crosa@redhat.com>
---
tests/acceptance/boot_xen.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/tests/acceptance/boot_xen.py b/tests/acceptance/boot_xen.py
index 3479b5233b8..fc2faeedb55 100644
--- a/tests/acceptance/boot_xen.py
+++ b/tests/acceptance/boot_xen.py
@@ -13,7 +13,6 @@
import os
-from avocado import skipIf
from avocado_qemu import wait_for_console_pattern
from boot_linux_console import LinuxKernelTest
--
2.31.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PULL 20/21] tests/acceptance/ppc_prep_40p.py: NetBSD 7.1.2 location update
2021-09-27 17:02 [PULL 00/21] Integration testing patches for 2021-09-27 Philippe Mathieu-Daudé
` (18 preceding siblings ...)
2021-09-27 17:02 ` [PULL 19/21] tests/acceptance/boot_xen.py: removed unused import Philippe Mathieu-Daudé
@ 2021-09-27 17:02 ` Philippe Mathieu-Daudé
2021-09-27 17:02 ` [PULL 21/21] tests/acceptance/ppc_prep_40p.py: clean up unused import Philippe Mathieu-Daudé
2021-09-27 17:56 ` [PULL 00/21] Integration testing patches for 2021-09-27 Philippe Mathieu-Daudé
21 siblings, 0 replies; 23+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-09-27 17:02 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé, Cleber Rosa
From: Cleber Rosa <crosa@redhat.com>
The NetBSD-7.1.2-prep.iso is no longer available on the CDN, but it's
still available in the archive.
Let's update its location so that users without the file on cache can
still fetch it and run the test.
Signed-off-by: Cleber Rosa <crosa@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210924185506.2542588-15-crosa@redhat.com>
---
tests/acceptance/ppc_prep_40p.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/acceptance/ppc_prep_40p.py b/tests/acceptance/ppc_prep_40p.py
index 2993ee3b078..6b28a69ea59 100644
--- a/tests/acceptance/ppc_prep_40p.py
+++ b/tests/acceptance/ppc_prep_40p.py
@@ -67,8 +67,8 @@ def test_openbios_and_netbsd(self):
:avocado: tags=machine:40p
:avocado: tags=os:netbsd
"""
- drive_url = ('https://cdn.netbsd.org/pub/NetBSD/iso/7.1.2/'
- 'NetBSD-7.1.2-prep.iso')
+ drive_url = ('https://archive.netbsd.org/pub/NetBSD-archive/'
+ 'NetBSD-7.1.2/iso/NetBSD-7.1.2-prep.iso')
drive_hash = 'ac6fa2707d888b36d6fa64de6e7fe48e'
drive_path = self.fetch_asset(drive_url, asset_hash=drive_hash,
algorithm='md5')
--
2.31.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PULL 21/21] tests/acceptance/ppc_prep_40p.py: clean up unused import
2021-09-27 17:02 [PULL 00/21] Integration testing patches for 2021-09-27 Philippe Mathieu-Daudé
` (19 preceding siblings ...)
2021-09-27 17:02 ` [PULL 20/21] tests/acceptance/ppc_prep_40p.py: NetBSD 7.1.2 location update Philippe Mathieu-Daudé
@ 2021-09-27 17:02 ` Philippe Mathieu-Daudé
2021-09-27 17:56 ` [PULL 00/21] Integration testing patches for 2021-09-27 Philippe Mathieu-Daudé
21 siblings, 0 replies; 23+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-09-27 17:02 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé, Cleber Rosa
From: Cleber Rosa <crosa@redhat.com>
Just a removal of an unused imported symbol.
Signed-off-by: Cleber Rosa <crosa@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210924185506.2542588-16-crosa@redhat.com>
---
tests/acceptance/ppc_prep_40p.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/tests/acceptance/ppc_prep_40p.py b/tests/acceptance/ppc_prep_40p.py
index 6b28a69ea59..5e61e686bd0 100644
--- a/tests/acceptance/ppc_prep_40p.py
+++ b/tests/acceptance/ppc_prep_40p.py
@@ -7,7 +7,6 @@
import os
-from avocado import skipIf
from avocado import skipUnless
from avocado_qemu import Test
from avocado_qemu import wait_for_console_pattern
--
2.31.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [PULL 00/21] Integration testing patches for 2021-09-27
2021-09-27 17:02 [PULL 00/21] Integration testing patches for 2021-09-27 Philippe Mathieu-Daudé
` (20 preceding siblings ...)
2021-09-27 17:02 ` [PULL 21/21] tests/acceptance/ppc_prep_40p.py: clean up unused import Philippe Mathieu-Daudé
@ 2021-09-27 17:56 ` Philippe Mathieu-Daudé
21 siblings, 0 replies; 23+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-09-27 17:56 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell
Hi Peter,
On 9/27/21 19:02, Philippe Mathieu-Daudé wrote:
> The following changes since commit de8ed1055c2ce18c95f597eb10df360dcb534f99:
>
> Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2021-09-25-v2' into staging (2021-09-27 15:03:42 +0100)
>
> are available in the Git repository at:
>
> https://github.com/philmd/qemu.git tags/integration-testing-20210927
>
> for you to fetch changes up to 6fdd5530d12c5b21cc05e7f44db95f6544bc3c17:
>
> tests/acceptance/ppc_prep_40p.py: clean up unused import (2021-09-27 18:55:46 +0200)
>
> ----------------------------------------------------------------
> Integration testing patches
>
> - More Linux kernel record/replay tests (Pavel Dovgalyuk)
> - Various fixes (Willian Rampazzo, Cleber Rosa)
> - Split machine_ppc.py per machine (David Gibson)
> - Add AVOCADO_TESTS command line environment variable (Willian Rampazzo)
>
> ----------------------------------------------------------------
FYI I sent a v2 shortly after:
https://lists.gnu.org/archive/html/qemu-devel/2021-09/msg07010.html
^ permalink raw reply [flat|nested] 23+ messages in thread