tests/avocado: Allow running user-mode tests
PATCH 1/1 tests/avocado: Allow running user-mode tests
Commit 816d4201ea ("tests/avocado: Move LinuxTest related code into a separate file") removed the Avocado 'process' import which is used by the QemuUserTest class, restore it.
---
Unfortunately the single linux-user test is not run on CI, and I haven't ran it manually since too long...:
https://gitlab.com/qemu-project/qemu/-/issues/2525
--- tests/avocado/avocado_qemu/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/avocado/avocado_qemu/__init__.py +1 -1
@@ -17,7 +17,7 @@ import uuid import avocado -from avocado.utils import ssh +from avocado.utils import process, ssh from avocado.utils.path import find_command from qemu.machine import QEMUMachine
Signature · 1 line
2.45.2
Quoted 19 lines · Philippe Mathieu-Daudé
Commit
816d4201ea("tests/avocado: Move LinuxTest related code into a separate file") removed the Avocado 'process' import which is used by the QemuUserTest class, restore it.Fixes 816d4201ea ("tests/avocado: Move LinuxTest ...")Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
Unfortunately the single linux-user test is not run on CI, and I haven't ran it manually since too long...:
https://gitlab.com/qemu-project/qemu/-/issues/2525--- tests/avocado/avocado_qemu/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tests/avocado/avocado_qemu/__init__.py +0
-0
tests/avocado/avocado_qemu/__init__.py line 21
Quoted 6 lines
tests/avocado/avocado_qemu/__init__.py +1
-1@@ -17,7 +17,7 @@ import uuid import avocado -from avocado.utils import ssh +from avocado.utils import process, ssh from avocado.utils.path import find_command
... but is the test itself still working for you? When I run it, I get:
...
(074/281)
tests/avocado/linux_ssh_mips_malta.py:LinuxSSH.test_mips_malta64eb_kernel3_2_0: SKIP: Test might timeout
(075/281)
tests/avocado/linux_ssh_mips_malta.py:LinuxSSH.test_mips_malta64el_kernel3_2_0: SKIP: Test might timeout
(076/281) tests/avocado/load_bflt.py:LoadBFLT.test_stm32: ERROR: Command
'./qemu-arm /bin/busybox ' failed.\nstdout: b''\nstderr: b''\nadditional_info: None (0.06 s) Interrupting job (failfast).
Seem like self.workdir is not set here??
Thomas
Quoted 39 lines · Thomas Huth
Quoted 23 lines · Philippe Mathieu-Daudé
Commit
816d4201ea("tests/avocado: Move LinuxTest related code into a separate file") removed the Avocado 'process' import which is used by the QemuUserTest class, restore it.Fixes 816d4201ea ("tests/avocado: Move LinuxTest ...")Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
Unfortunately the single linux-user test is not run on CI, and I haven't ran it manually since too long...:
https://gitlab.com/qemu-project/qemu/-/issues/2525
---
tests/avocado/avocado_qemu/__init__.py| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)tests/avocado/avocado_qemu/__init__.py +0
-0@@ -17,7 +17,7 @@import uuid
import avocadotests/avocado/avocado_qemu/__init__.py +1
-1-from avocado.utils import ssh +from avocado.utils import process, sshQuoted 1 line
from avocado.utils.path import
find_commandReviewed-by Thomas Huth <[email protected]>... but is the test itself still working for you? When I run it, I get:
...
(074/281)
tests/avocado/linux_ssh_mips_malta.py:LinuxSSH.test_mips_malta64eb_kernel3_2_0: SKIP: Test might timeout
(075/281)
tests/avocado/linux_ssh_mips_malta.py:LinuxSSH.test_mips_malta64el_kernel3_2_0: SKIP: Test might timeout
(076/281) tests/avocado/load_bflt.py:LoadBFLT.test_stm32: ERROR:
Command './qemu-arm/bin/busybox' failed.\nstdout: b''\nstderr: b''\nadditional_info: None (0.06 s) Interrupting job (failfast).
Quoted 1 line
Seem like self.workdir is not set here??
No clue why... This used to work.
Why self.workdir is indeed not set, this kludge makes it work:
---
tests/avocado/load_bflt.py +0 -0
@@ -41,7 +41,7 @@ def test_stm32(self): 'Stm32_mini_rootfs.cpio.bz2') rootfs_hash = '9f065e6ba40cce7411ba757f924f30fcc57951e6' rootfs_path_bz2 = self.fetch_asset(rootfs_url,
asset_hash=rootfs_hash)
- busybox_path = os.path.join(self.workdir, "/bin/busybox")
+ busybox_path = os.path.join(self.workdir, "bin/busybox")
self.extract_cpio(rootfs_path_bz2)
---
Fetching asset from tests/avocado/load_bflt.py:LoadBFLT.test_stm32
JOB ID : 020d317281b042f46ad99013530d29df0f1d7eb7
JOB LOG : tests/results/job-2024-08-22T10.17-020d317/job.log
(1/1) tests/avocado/load_bflt.py:LoadBFLT.test_stm32: PASS (0.09 s)
RESULTS : PASS 1 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 0
JOB TIME : 0.62 s
So I'll add that and call it a day.
Thanks!