On 24/7/24 19:52, Thomas Huth wrote:
Now that we've got a working fetch_asset() function, we can convert
some Avocado tests that use this function for downloading their
required files.
Reviewed-by: Daniel P. Berrangé <berra...@redhat.com>
Signed-off-by: Thomas Huth <th...@redhat.com>
---
MAINTAINERS | 12 +++----
tests/functional/meson.build | 22 +++++++++++++
.../test_arm_n8x0.py} | 25 +++++++--------
.../test_avr_mega2560.py} | 11 ++++---
.../test_loongarch64_virt.py} | 16 ++++++----
.../test_mips64el_loongson3v.py} | 26 +++++++--------
.../test_netdev_ethtool.py} | 32 ++++++-------------
.../ppc_405.py => functional/test_ppc_405.py} | 19 ++++++-----
8 files changed, 86 insertions(+), 77 deletions(-)
rename tests/{avocado/machine_arm_n8x0.py => functional/test_arm_n8x0.py}
(71%)
mode change 100644 => 100755
rename tests/{avocado/machine_avr6.py => functional/test_avr_mega2560.py}
(90%)
mode change 100644 => 100755
rename tests/{avocado/machine_loongarch.py =>
functional/test_loongarch64_virt.py} (89%)
mode change 100644 => 100755
rename tests/{avocado/machine_mips_loongson3v.py =>
functional/test_mips64el_loongson3v.py} (55%)
mode change 100644 => 100755
rename tests/{avocado/netdev-ethtool.py => functional/test_netdev_ethtool.py}
(81%)
mode change 100644 => 100755
rename tests/{avocado/ppc_405.py => functional/test_ppc_405.py} (73%)
mode change 100644 => 100755
diff --git a/tests/avocado/machine_arm_n8x0.py
b/tests/functional/test_arm_n8x0.py
old mode 100644
new mode 100755
similarity index 71%
rename from tests/avocado/machine_arm_n8x0.py
rename to tests/functional/test_arm_n8x0.py
index 12e9a6803b..d451c80a73
--- a/tests/avocado/machine_arm_n8x0.py
+++ b/tests/functional/test_arm_n8x0.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+#
# Functional test that boots a Linux kernel and checks the console
#
# Copyright (c) 2020 Red Hat, Inc.
@@ -10,9 +12,9 @@
import os
-from avocado import skipUnless
-from avocado_qemu import QemuSystemTest
-from avocado_qemu import wait_for_console_pattern
+from unittest import skipUnless
+from qemu_test import QemuSystemTest
+from qemu_test import wait_for_console_pattern
class N8x0Machine(QemuSystemTest):
"""Boots the Linux kernel and checks that the console is operational"""
@@ -32,18 +34,15 @@ def __do_test_n8x0(self):
self.vm.launch()
wait_for_console_pattern(self, 'TSC2005 driver initializing')
- @skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code')
+ @skipUnless(os.getenv('QEMU_TEST_ALLOW_UNTRUSTED_CODE'), 'untrusted code')
We need to update docs/devel/testing.rst which lists the "most used
[test] variables". But the functional testing chapter need to be
completely revamped, so meanwhile:
Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org>
