From: Thomas Huth <thuth@redhat.com>
These tests use archive.lzma_uncompress() from the Avocado utils,
so provide a small helper function for this, based on the
standard lzma module from Python instead.
And while we're at it, replace the MD5 hashes in the topology test
with proper SHA256 hashes, since MD5 should not be used anymore
nowadays.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
MAINTAINERS | 4 +-
tests/functional/meson.build | 6 ++
tests/functional/qemu_test/utils.py | 14 +++
.../test_s390x_ccw_virtio.py} | 79 ++++++++---------
.../test_s390x_topology.py} | 86 ++++++++-----------
5 files changed, 94 insertions(+), 95 deletions(-)
rename tests/{avocado/machine_s390_ccw_virtio.py => functional/test_s390x_ccw_virtio.py} (85%)
mode change 100644 => 100755
rename tests/{avocado/s390_topology.py => functional/test_s390x_topology.py} (88%)
mode change 100644 => 100755
diff --git a/MAINTAINERS b/MAINTAINERS
index ff952d683b..c78edb078a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1739,7 +1739,7 @@ S: Supported
F: hw/s390x/
F: include/hw/s390x/
F: configs/devices/s390x-softmmu/default.mak
-F: tests/avocado/machine_s390_ccw_virtio.py
+F: tests/functional/test_s390x_ccw_virtio.py
T: git https://github.com/borntraeger/qemu.git s390-next
L: qemu-s390x@nongnu.org
@@ -1802,7 +1802,7 @@ F: hw/s390x/cpu-topology.c
F: target/s390x/kvm/stsi-topology.c
F: docs/devel/s390-cpu-topology.rst
F: docs/system/s390x/cpu-topology.rst
-F: tests/avocado/s390_topology.py
+F: tests/functional/test_s390x_topology.py
X86 Machines
------------
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 91bf80f0f4..ce5e5be2f3 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -12,6 +12,7 @@ endif
# Timeouts for individual tests that can be slow e.g. with debugging enabled
test_timeouts = {
'netdev_ethtool' : 180,
+ 's390x_ccw_virtio' : 180,
}
tests_generic = [
@@ -46,6 +47,11 @@ tests_ppc_thorough = [
'ppc_bamboo',
]
+tests_s390x_thorough = [
+ 's390x_ccw_virtio',
+ 's390x_topology',
+]
+
tests_sparc64_thorough = [
'sparc64_sun4u',
]
diff --git a/tests/functional/qemu_test/utils.py b/tests/functional/qemu_test/utils.py
index 4eb5e5d5e5..a12dac51b6 100644
--- a/tests/functional/qemu_test/utils.py
+++ b/tests/functional/qemu_test/utils.py
@@ -8,6 +8,9 @@
# 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 lzma
+import os
+import shutil
import tarfile
def archive_extract(archive, dest_dir, member=None):
@@ -19,3 +22,14 @@ def archive_extract(archive, dest_dir, member=None):
tf.extract(member=member, path=dest_dir)
else:
tf.extractall(path=dest_dir)
+
+def lzma_uncompress(xz_path, output_path):
+ if os.path.exists(output_path):
+ return
+ with lzma.open(xz_path, 'rb') as lzma_in:
+ try:
+ with open(output_path, 'wb') as raw_out:
+ shutil.copyfileobj(lzma_in, raw_out)
+ except:
+ os.remove(output_path)
+ raise
diff --git a/tests/avocado/machine_s390_ccw_virtio.py b/tests/functional/test_s390x_ccw_virtio.py
old mode 100644
new mode 100755
similarity index 85%
rename from tests/avocado/machine_s390_ccw_virtio.py
rename to tests/functional/test_s390x_ccw_virtio.py
index 26e938c9e9..f110f3b462
--- a/tests/avocado/machine_s390_ccw_virtio.py
+++ b/tests/functional/test_s390x_ccw_virtio.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+#
# Functional test that boots an s390x Linux guest with ccw and PCI devices
# attached and checks whether the devices are recognized by Linux
#
@@ -12,17 +14,38 @@
import os
import tempfile
-from avocado import skipUnless
-from avocado_qemu import QemuSystemTest
-from avocado_qemu import exec_command_and_wait_for_pattern
-from avocado_qemu import wait_for_console_pattern
-from avocado.utils import archive
+from qemu_test import QemuSystemTest, Asset
+from qemu_test import exec_command_and_wait_for_pattern
+from qemu_test import wait_for_console_pattern
+from qemu_test.utils import lzma_uncompress
class S390CCWVirtioMachine(QemuSystemTest):
KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
timeout = 120
+ ASSET_BUSTER_KERNEL = Asset(
+ ('https://snapshot.debian.org/archive/debian/'
+ '20201126T092837Z/dists/buster/main/installer-s390x/'
+ '20190702+deb10u6/images/generic/kernel.debian'),
+ '5821fbee57d6220a067a8b967d24595621aa1eb6')
+ ASSET_BUSTER_INITRD = Asset(
+ ('https://snapshot.debian.org/archive/debian/'
+ '20201126T092837Z/dists/buster/main/installer-s390x/'
+ '20190702+deb10u6/images/generic/initrd.debian'),
+ '81ba09c97bef46e8f4660ac25b4ac0a5be3a94d6')
+
+ ASSET_F31_KERNEL = Asset(
+ ('https://archives.fedoraproject.org/pub/archive'
+ '/fedora-secondary/releases/31/Server/s390x/os'
+ '/images/kernel.img'),
+ 'b93d1efcafcf29c1673a4ce371a1f8b43941cfeb')
+ ASSET_F31_INITRD = Asset(
+ ('https://archives.fedoraproject.org/pub/archive'
+ '/fedora-secondary/releases/31/Server/s390x/os'
+ '/images/initrd.img'),
+ '3de45d411df5624b8d8ef21cd0b44419ab59b12f')
+
def wait_for_console_pattern(self, success_message, vm=None):
wait_for_console_pattern(self, success_message,
failure_message='Kernel panic - not syncing',
@@ -41,23 +64,10 @@ def clear_guest_dmesg(self):
self.dmesg_clear_count += 1
def test_s390x_devices(self):
+ self.set_machine('s390-ccw-virtio')
- """
- :avocado: tags=arch:s390x
- :avocado: tags=machine:s390-ccw-virtio
- """
-
- kernel_url = ('https://snapshot.debian.org/archive/debian/'
- '20201126T092837Z/dists/buster/main/installer-s390x/'
- '20190702+deb10u6/images/generic/kernel.debian')
- kernel_hash = '5821fbee57d6220a067a8b967d24595621aa1eb6'
- kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
-
- initrd_url = ('https://snapshot.debian.org/archive/debian/'
- '20201126T092837Z/dists/buster/main/installer-s390x/'
- '20190702+deb10u6/images/generic/initrd.debian')
- initrd_hash = '81ba09c97bef46e8f4660ac25b4ac0a5be3a94d6'
- initrd_path = self.fetch_asset(initrd_url, asset_hash=initrd_hash)
+ kernel_path = self.ASSET_BUSTER_KERNEL.fetch()
+ initrd_path = self.ASSET_BUSTER_INITRD.fetch()
self.vm.set_console()
kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
@@ -160,29 +170,13 @@ def test_s390x_devices(self):
def test_s390x_fedora(self):
+ self.set_machine('s390-ccw-virtio')
- """
- :avocado: tags=arch:s390x
- :avocado: tags=machine:s390-ccw-virtio
- :avocado: tags=device:virtio-gpu
- :avocado: tags=device:virtio-crypto
- :avocado: tags=device:virtio-net
- :avocado: tags=flaky
- """
-
- kernel_url = ('https://archives.fedoraproject.org/pub/archive'
- '/fedora-secondary/releases/31/Server/s390x/os'
- '/images/kernel.img')
- kernel_hash = 'b93d1efcafcf29c1673a4ce371a1f8b43941cfeb'
- kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
+ kernel_path = self.ASSET_F31_KERNEL.fetch()
- initrd_url = ('https://archives.fedoraproject.org/pub/archive'
- '/fedora-secondary/releases/31/Server/s390x/os'
- '/images/initrd.img')
- initrd_hash = '3de45d411df5624b8d8ef21cd0b44419ab59b12f'
- initrd_path_xz = self.fetch_asset(initrd_url, asset_hash=initrd_hash)
+ initrd_path_xz = self.ASSET_F31_INITRD.fetch()
initrd_path = os.path.join(self.workdir, 'initrd-raw.img')
- archive.lzma_uncompress(initrd_path_xz, initrd_path)
+ lzma_uncompress(initrd_path_xz, initrd_path)
self.vm.set_console()
kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + ' audit=0 '
@@ -275,3 +269,6 @@ def test_s390x_fedora(self):
exec_command_and_wait_for_pattern(self,
'while ! (dmesg -c | grep Start.virtcrypto_remove) ; do'
' sleep 1 ; done', 'Start virtcrypto_remove.')
+
+if __name__ == '__main__':
+ QemuSystemTest.main()
diff --git a/tests/avocado/s390_topology.py b/tests/functional/test_s390x_topology.py
old mode 100644
new mode 100755
similarity index 88%
rename from tests/avocado/s390_topology.py
rename to tests/functional/test_s390x_topology.py
index 9154ac8776..20727f6bdf
--- a/tests/avocado/s390_topology.py
+++ b/tests/functional/test_s390x_topology.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+#
# Functional test that boots a Linux kernel and checks the console
#
# Copyright IBM Corp. 2023
@@ -9,16 +11,13 @@
# later. See the COPYING file in the top-level directory.
import os
-import shutil
import time
-from avocado_qemu import QemuSystemTest
-from avocado_qemu import exec_command
-from avocado_qemu import exec_command_and_wait_for_pattern
-from avocado_qemu import interrupt_interactive_console_until_pattern
-from avocado_qemu import wait_for_console_pattern
-from avocado.utils import process
-from avocado.utils import archive
+from qemu_test import QemuSystemTest, Asset
+from qemu_test import exec_command
+from qemu_test import exec_command_and_wait_for_pattern
+from qemu_test import wait_for_console_pattern
+from qemu_test.utils import lzma_uncompress
class S390CPUTopology(QemuSystemTest):
@@ -47,6 +46,17 @@ class S390CPUTopology(QemuSystemTest):
'root=/dev/ram '
'selinux=0 '
'rdinit=/bin/sh')
+ ASSET_F35_KERNEL = Asset(
+ ('https://archives.fedoraproject.org/pub/archive'
+ '/fedora-secondary/releases/35/Server/s390x/os'
+ '/images/kernel.img'),
+ '1f2dddfd11bb1393dd2eb2e784036fbf6fc11057a6d7d27f9eb12d3edc67ef73')
+
+ ASSET_F35_INITRD = Asset(
+ ('https://archives.fedoraproject.org/pub/archive'
+ '/fedora-secondary/releases/35/Server/s390x/os'
+ '/images/initrd.img'),
+ '1100145fbca00240c8c372ae4b89b48c99844bc189b3dfbc3f481dc60055ca46')
def wait_until_booted(self):
wait_for_console_pattern(self, 'no job control',
@@ -78,21 +88,10 @@ def kernel_init(self):
We need a minimal root filesystem with a shell.
"""
self.require_accelerator("kvm")
- kernel_url = ('https://archives.fedoraproject.org/pub/archive'
- '/fedora-secondary/releases/35/Server/s390x/os'
- '/images/kernel.img')
- kernel_hash = '0d1aaaf303f07cf0160c8c48e56fe638'
- kernel_path = self.fetch_asset(kernel_url, algorithm='md5',
- asset_hash=kernel_hash)
-
- initrd_url = ('https://archives.fedoraproject.org/pub/archive'
- '/fedora-secondary/releases/35/Server/s390x/os'
- '/images/initrd.img')
- initrd_hash = 'a122057d95725ac030e2ec51df46e172'
- initrd_path_xz = self.fetch_asset(initrd_url, algorithm='md5',
- asset_hash=initrd_hash)
+ kernel_path = self.ASSET_F35_KERNEL.fetch()
+ initrd_path_xz = self.ASSET_F35_INITRD.fetch()
initrd_path = os.path.join(self.workdir, 'initrd-raw.img')
- archive.lzma_uncompress(initrd_path_xz, initrd_path)
+ lzma_uncompress(initrd_path_xz, initrd_path)
self.vm.set_console()
kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE
@@ -115,10 +114,8 @@ def system_init(self):
def test_single(self):
"""
This test checks the simplest topology with a single CPU.
-
- :avocado: tags=arch:s390x
- :avocado: tags=machine:s390-ccw-virtio
"""
+ self.set_machine('s390-ccw-virtio')
self.kernel_init()
self.vm.launch()
self.wait_until_booted()
@@ -127,10 +124,8 @@ def test_single(self):
def test_default(self):
"""
This test checks the implicit topology.
-
- :avocado: tags=arch:s390x
- :avocado: tags=machine:s390-ccw-virtio
"""
+ self.set_machine('s390-ccw-virtio')
self.kernel_init()
self.vm.add_args('-smp',
'13,drawers=2,books=2,sockets=3,cores=2,maxcpus=24')
@@ -154,10 +149,8 @@ def test_move(self):
"""
This test checks the topology modification by moving a CPU
to another socket: CPU 0 is moved from socket 0 to socket 2.
-
- :avocado: tags=arch:s390x
- :avocado: tags=machine:s390-ccw-virtio
"""
+ self.set_machine('s390-ccw-virtio')
self.kernel_init()
self.vm.add_args('-smp',
'1,drawers=2,books=2,sockets=3,cores=2,maxcpus=24')
@@ -174,10 +167,8 @@ def test_dash_device(self):
"""
This test verifies that a CPU defined with the '-device'
command line option finds its right place inside the topology.
-
- :avocado: tags=arch:s390x
- :avocado: tags=machine:s390-ccw-virtio
"""
+ self.set_machine('s390-ccw-virtio')
self.kernel_init()
self.vm.add_args('-smp',
'1,drawers=2,books=2,sockets=3,cores=2,maxcpus=24')
@@ -221,10 +212,8 @@ def test_polarization(self):
"""
This test verifies that QEMU modifies the entitlement change after
several guest polarization change requests.
-
- :avocado: tags=arch:s390x
- :avocado: tags=machine:s390-ccw-virtio
"""
+ self.set_machine('s390-ccw-virtio')
self.kernel_init()
self.vm.launch()
self.wait_until_booted()
@@ -267,10 +256,8 @@ def test_entitlement(self):
"""
This test verifies that QEMU modifies the entitlement
after a guest request and that the guest sees the change.
-
- :avocado: tags=arch:s390x
- :avocado: tags=machine:s390-ccw-virtio
"""
+ self.set_machine('s390-ccw-virtio')
self.kernel_init()
self.vm.launch()
self.wait_until_booted()
@@ -313,10 +300,8 @@ def test_dedicated(self):
CPU is made dedicated.
QEMU retains the entitlement value when horizontal polarization is in effect.
For the guest, the field shows the effective value of the entitlement.
-
- :avocado: tags=arch:s390x
- :avocado: tags=machine:s390-ccw-virtio
"""
+ self.set_machine('s390-ccw-virtio')
self.kernel_init()
self.vm.launch()
self.wait_until_booted()
@@ -345,10 +330,8 @@ def test_socket_full(self):
This test verifies that QEMU does not accept to overload a socket.
The socket-id 0 on book-id 0 already contains CPUs 0 and 1 and can
not accept any new CPU while socket-id 0 on book-id 1 is free.
-
- :avocado: tags=arch:s390x
- :avocado: tags=machine:s390-ccw-virtio
"""
+ self.set_machine('s390-ccw-virtio')
self.kernel_init()
self.vm.add_args('-smp',
'3,drawers=2,books=2,sockets=3,cores=2,maxcpus=24')
@@ -369,10 +352,8 @@ def test_dedicated_error(self):
"""
This test verifies that QEMU refuses to lower the entitlement
of a dedicated CPU
-
- :avocado: tags=arch:s390x
- :avocado: tags=machine:s390-ccw-virtio
"""
+ self.set_machine('s390-ccw-virtio')
self.kernel_init()
self.vm.launch()
self.wait_until_booted()
@@ -417,10 +398,8 @@ def test_move_error(self):
"""
This test verifies that QEMU refuses to move a CPU to an
nonexistent location
-
- :avocado: tags=arch:s390x
- :avocado: tags=machine:s390-ccw-virtio
"""
+ self.set_machine('s390-ccw-virtio')
self.kernel_init()
self.vm.launch()
self.wait_until_booted()
@@ -437,3 +416,6 @@ def test_move_error(self):
self.assertEqual(res['error']['class'], 'GenericError')
self.check_topology(0, 0, 0, 0, 'medium', False)
+
+if __name__ == '__main__':
+ QemuSystemTest.main()
--
2.45.2On 30/7/24 19:03, Daniel P. Berrangé wrote:
> From: Thomas Huth <thuth@redhat.com>
>
> These tests use archive.lzma_uncompress() from the Avocado utils,
> so provide a small helper function for this, based on the
> standard lzma module from Python instead.
>
> And while we're at it, replace the MD5 hashes in the topology test
> with proper SHA256 hashes, since MD5 should not be used anymore
> nowadays.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> MAINTAINERS | 4 +-
> tests/functional/meson.build | 6 ++
> tests/functional/qemu_test/utils.py | 14 +++
> .../test_s390x_ccw_virtio.py} | 79 ++++++++---------
> .../test_s390x_topology.py} | 86 ++++++++-----------
> 5 files changed, 94 insertions(+), 95 deletions(-)
> rename tests/{avocado/machine_s390_ccw_virtio.py => functional/test_s390x_ccw_virtio.py} (85%)
> mode change 100644 => 100755
> rename tests/{avocado/s390_topology.py => functional/test_s390x_topology.py} (88%)
> mode change 100644 => 100755
Conversion LGTM, so:
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Now while testing I'm getting errors, but maybe pre-existing...
pyvenv/bin/meson test --no-rebuild -t 1 --setup thorough
--num-processes 1 --print-errorlogs --suite func-s390x --suite
func-s390x-thorough
qemu:func-thorough+func-s390x-thorough+thorough /
func-s390x-s390x_ccw_virtio time out (After 180.0 seconds)
1/5 qemu:func-thorough+func-s390x-thorough+thorough /
func-s390x-s390x_ccw_virtio TIMEOUT 180.05s killed by
signal 15 SIGTERM
▶ 2/5 test_empty_cpu_model.EmptyCPUModel.test
FAIL
2/5 qemu:func-quick+func-s390x / func-s390x-empty_cpu_model
ERROR 0.21s exit status 1
stderr:
Traceback (most recent call last):
File "/home/user/qemu/tests/functional/test_empty_cpu_model.py", line
21, in test
self.assertRegex(self.vm.get_log(), r'-cpu option cannot be empty')
AssertionError: Regex didn't match: '-cpu option cannot be empty' not
found in 'Could not access KVM kernel module: Permission
denied\nqemu-system-s390x: failed to initialize kvm: Permission denied\n'
(test program exited with status code 1)
▶ 4/5 test_version.Version.test_qmp_human_info_version
FAIL
Traceback (most recent call last):
File "/home/user/qemu/python/qemu/qmp/protocol.py", line 425, in
_session_guard
await coro
File "/home/user/qemu/python/qemu/qmp/qmp_client.py", line 250, in
_establish_session
self._greeting = await self._get_greeting()
File "/home/user/qemu/python/qemu/qmp/qmp_client.py", line 270, in
_get_greeting
msg = await self._recv()
File "/home/user/qemu/python/qemu/qmp/protocol.py", line 1009, in _recv
message = await self._do_recv()
File "/home/user/qemu/python/qemu/qmp/qmp_client.py", line 402, in
_do_recv
msg_bytes = await self._readline()
File "/home/user/qemu/python/qemu/qmp/protocol.py", line 977, in
_readline
raise EOFError
EOFError
The above exception was the direct cause of the following exception:
Traceback (most recent call last):
File "/home/user/qemu/python/qemu/machine/machine.py", line 448, in
launch
self._launch()
File "/home/user/qemu/python/qemu/machine/machine.py", line 487, in
_launch
self._post_launch()
File "/home/user/qemu/python/qemu/machine/machine.py", line 381, in
_post_launch
self._qmp.connect()
File "/home/user/qemu/python/qemu/qmp/legacy.py", line 153, in connect
self._sync(
File "/home/user/qemu/python/qemu/qmp/legacy.py", line 102, in _sync
return self._aloop.run_until_complete(
File "/usr/lib/python3.10/asyncio/base_events.py", line 649, in
run_until_complete
return future.result()
File "/usr/lib/python3.10/asyncio/tasks.py", line 408, in wait_for
return await fut
File "/home/user/qemu/python/qemu/qmp/protocol.py", line 382, in connect
await self._session_guard(
File "/home/user/qemu/python/qemu/qmp/protocol.py", line 456, in
_session_guard
raise ConnectError(emsg, err) from err
qemu.qmp.protocol.ConnectError: Failed to establish session: EOFError
The above exception was the direct cause of the following exception:
Traceback (most recent call last):
File "/home/user/qemu/tests/functional/test_version.py", line 22, in
test_qmp_human_info_version
self.vm.launch()
File "/home/user/qemu/python/qemu/machine/machine.py", line 461, in
launch
raise VMLaunchFailure(
qemu.machine.machine.VMLaunchFailure: ConnectError: Failed to establish
session: EOFError
Exit code: 1
Command: qemu-system-s390x -display none -vga none -chardev
socket,id=mon,fd=5 -mon chardev=mon,mode=control -machine none -nodefaults
Output: Could not access KVM kernel module: Permission denied
qemu-system-s390x: failed to initialize kvm: Permission denied
5/5 qemu:func-thorough+func-s390x-thorough+thorough /
func-s390x-s390x_topology SKIP 1.14s 0 subtests
passed
Summary of Failures:
1/5 qemu:func-thorough+func-s390x-thorough+thorough /
func-s390x-s390x_ccw_virtio TIMEOUT 180.05s killed by signal 15
SIGTERM
2/5 qemu:func-quick+func-s390x / func-s390x-empty_cpu_model
ERROR 0.21s exit status 1
4/5 qemu:func-quick+func-s390x / func-s390x-version
ERROR 0.25s exit status 1
I'm surprised by "Could not access KVM kernel module" because
kvm_available() checks for RW access:
def kvm_available(target_arch: Optional[str] = None,
qemu_bin: Optional[str] = None) -> bool:
if not os.access("/dev/kvm", os.R_OK | os.W_OK):
return False
Maybe missing require_accelerator() in tests?
On Thu, Aug 01, 2024 at 07:11:01PM +0200, Philippe Mathieu-Daudé wrote:
> On 30/7/24 19:03, Daniel P. Berrangé wrote:
> > From: Thomas Huth <thuth@redhat.com>
> >
> > These tests use archive.lzma_uncompress() from the Avocado utils,
> > so provide a small helper function for this, based on the
> > standard lzma module from Python instead.
> >
> > And while we're at it, replace the MD5 hashes in the topology test
> > with proper SHA256 hashes, since MD5 should not be used anymore
> > nowadays.
> >
> > Signed-off-by: Thomas Huth <thuth@redhat.com>
> > ---
> > MAINTAINERS | 4 +-
> > tests/functional/meson.build | 6 ++
> > tests/functional/qemu_test/utils.py | 14 +++
> > .../test_s390x_ccw_virtio.py} | 79 ++++++++---------
> > .../test_s390x_topology.py} | 86 ++++++++-----------
> > 5 files changed, 94 insertions(+), 95 deletions(-)
> > rename tests/{avocado/machine_s390_ccw_virtio.py => functional/test_s390x_ccw_virtio.py} (85%)
> > mode change 100644 => 100755
> > rename tests/{avocado/s390_topology.py => functional/test_s390x_topology.py} (88%)
> > mode change 100644 => 100755
>
> Conversion LGTM, so:
>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>
> Now while testing I'm getting errors, but maybe pre-existing...
What host arch / OS are you running tests from ?
I got through the full set of testing on Fedora x86_64, so
wondering if something differs.
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
On 1/8/24 19:38, Daniel P. Berrangé wrote:
> On Thu, Aug 01, 2024 at 07:11:01PM +0200, Philippe Mathieu-Daudé wrote:
>> On 30/7/24 19:03, Daniel P. Berrangé wrote:
>>> From: Thomas Huth <thuth@redhat.com>
>>>
>>> These tests use archive.lzma_uncompress() from the Avocado utils,
>>> so provide a small helper function for this, based on the
>>> standard lzma module from Python instead.
>>>
>>> And while we're at it, replace the MD5 hashes in the topology test
>>> with proper SHA256 hashes, since MD5 should not be used anymore
>>> nowadays.
>>>
>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>> ---
>>> MAINTAINERS | 4 +-
>>> tests/functional/meson.build | 6 ++
>>> tests/functional/qemu_test/utils.py | 14 +++
>>> .../test_s390x_ccw_virtio.py} | 79 ++++++++---------
>>> .../test_s390x_topology.py} | 86 ++++++++-----------
>>> 5 files changed, 94 insertions(+), 95 deletions(-)
>>> rename tests/{avocado/machine_s390_ccw_virtio.py => functional/test_s390x_ccw_virtio.py} (85%)
>>> mode change 100644 => 100755
>>> rename tests/{avocado/s390_topology.py => functional/test_s390x_topology.py} (88%)
>>> mode change 100644 => 100755
>>
>> Conversion LGTM, so:
>>
>> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>>
>> Now while testing I'm getting errors, but maybe pre-existing...
>
> What host arch / OS are you running tests from ?
>
> I got through the full set of testing on Fedora x86_64, so
> wondering if something differs.
Linux s390x but I'm not in the KVM group, I need to find
another place to run these (or ask Alex :P).
On 02/08/2024 15.25, Philippe Mathieu-Daudé wrote:
> On 1/8/24 19:38, Daniel P. Berrangé wrote:
>> On Thu, Aug 01, 2024 at 07:11:01PM +0200, Philippe Mathieu-Daudé wrote:
>>> On 30/7/24 19:03, Daniel P. Berrangé wrote:
>>>> From: Thomas Huth <thuth@redhat.com>
>>>>
>>>> These tests use archive.lzma_uncompress() from the Avocado utils,
>>>> so provide a small helper function for this, based on the
>>>> standard lzma module from Python instead.
>>>>
>>>> And while we're at it, replace the MD5 hashes in the topology test
>>>> with proper SHA256 hashes, since MD5 should not be used anymore
>>>> nowadays.
>>>>
>>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>>> ---
>>>> MAINTAINERS | 4 +-
>>>> tests/functional/meson.build | 6 ++
>>>> tests/functional/qemu_test/utils.py | 14 +++
>>>> .../test_s390x_ccw_virtio.py} | 79 ++++++++---------
>>>> .../test_s390x_topology.py} | 86 ++++++++-----------
>>>> 5 files changed, 94 insertions(+), 95 deletions(-)
>>>> rename tests/{avocado/machine_s390_ccw_virtio.py =>
>>>> functional/test_s390x_ccw_virtio.py} (85%)
>>>> mode change 100644 => 100755
>>>> rename tests/{avocado/s390_topology.py =>
>>>> functional/test_s390x_topology.py} (88%)
>>>> mode change 100644 => 100755
>>>
>>> Conversion LGTM, so:
>>>
>>> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>>>
>>> Now while testing I'm getting errors, but maybe pre-existing...
>>
>> What host arch / OS are you running tests from ?
>>
>> I got through the full set of testing on Fedora x86_64, so
>> wondering if something differs.
>
> Linux s390x but I'm not in the KVM group, I need to find
> another place to run these (or ask Alex :P).
Sounds like a pre-existing problem ... I guess the test should check whether
it can access /dev/kvm before trying to use it...?
Thomas
On 13/08/2024 14.04, Thomas Huth wrote:
> On 02/08/2024 15.25, Philippe Mathieu-Daudé wrote:
>> On 1/8/24 19:38, Daniel P. Berrangé wrote:
>>> On Thu, Aug 01, 2024 at 07:11:01PM +0200, Philippe Mathieu-Daudé wrote:
>>>> On 30/7/24 19:03, Daniel P. Berrangé wrote:
>>>>> From: Thomas Huth <thuth@redhat.com>
>>>>>
>>>>> These tests use archive.lzma_uncompress() from the Avocado utils,
>>>>> so provide a small helper function for this, based on the
>>>>> standard lzma module from Python instead.
>>>>>
>>>>> And while we're at it, replace the MD5 hashes in the topology test
>>>>> with proper SHA256 hashes, since MD5 should not be used anymore
>>>>> nowadays.
>>>>>
>>>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>>>> ---
>>>>> MAINTAINERS | 4 +-
>>>>> tests/functional/meson.build | 6 ++
>>>>> tests/functional/qemu_test/utils.py | 14 +++
>>>>> .../test_s390x_ccw_virtio.py} | 79 ++++++++---------
>>>>> .../test_s390x_topology.py} | 86 ++++++++-----------
>>>>> 5 files changed, 94 insertions(+), 95 deletions(-)
>>>>> rename tests/{avocado/machine_s390_ccw_virtio.py =>
>>>>> functional/test_s390x_ccw_virtio.py} (85%)
>>>>> mode change 100644 => 100755
>>>>> rename tests/{avocado/s390_topology.py =>
>>>>> functional/test_s390x_topology.py} (88%)
>>>>> mode change 100644 => 100755
>>>>
>>>> Conversion LGTM, so:
>>>>
>>>> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>>>>
>>>> Now while testing I'm getting errors, but maybe pre-existing...
>>>
>>> What host arch / OS are you running tests from ?
>>>
>>> I got through the full set of testing on Fedora x86_64, so
>>> wondering if something differs.
>>
>> Linux s390x but I'm not in the KVM group, I need to find
>> another place to run these (or ask Alex :P).
>
> Sounds like a pre-existing problem ... I guess the test should check whether
> it can access /dev/kvm before trying to use it...?
Ah, no, I missed your comment in your earlier patch that kvm_available()
already checks this ... so the problem must be something else?
Thomas
© 2016 - 2024 Red Hat, Inc.