tests/functional: Convert mips fuloong2e avocado test
PATCH 1/1 tests/functional: Convert mips fuloong2e avocado test
Straight forward conversion. Update the SHA1 hashes to SHA256 hashes since SHA1 should not be used anymore nowadays.
Since the asset is expected locally and the test is guarded with QEMU_TEST_ALLOW_UNTRUSTED_CODE, keep it under the 'quick' category.
$ RESCUE_YL_PATH=/path/to/rescue-yl QEMU_TEST_ALLOW_UNTRUSTED_CODE=1 \
make check-functional-mips64el
1/4 qemu:func-quick+func-mips64el / func-mips64el-empty_cpu_model OK 0.12s 1 subtests passed
2/4 qemu:func-quick+func-mips64el / func-mips64el-version OK 0.13s 1 subtests passed
3/4 qemu:func-quick+func-mips64el / func-mips64el-info_usernet OK 0.15s 1 subtests passed
4/4 qemu:func-quick+func-mips64el / func-mips64el-mips64el_fuloong2e OK 0.19s 1 subtests passed---
Based-on: <[email protected]>
---
MAINTAINERS | 2 +-
tests/functional/meson.build | 4 +++
.../test_mips64el_fuloong2e.py} | 32 +++++++++----------
3 files changed, 21 insertions(+), 17 deletions(-)
rename tests/{avocado/machine_mips_fuloong2e.py => functional/test_mips64el_fuloong2e.py} (56%)
mode change 100644 => 100755MAINTAINERS +1 -1
@@ -1384,7 +1384,7 @@ S: Odd Fixes F: hw/mips/fuloong2e.c F: hw/pci-host/bonito.c F: include/hw/pci-host/bonito.h -F: tests/avocado/machine_mips_fuloong2e.py +F: tests/functional/test_mips64el_fuloong2e.py Loongson-3 virtual platforms M: Huacai Chen <[email protected]>
tests/functional/meson.build +4 -0
@@ -51,6 +51,10 @@ tests_microblazeel_thorough = [ 'microblazeel_s3adsp1800' ] +tests_mips64el_quick = [ + 'mips64el_fuloong2e', +] + tests_mips64el_thorough = [ 'mips64el_loongson3v', ]
tests/functional/test_mips64el_fuloong2e.py renamed from tests/avocado/machine_mips_fuloong2e.py +16 -16
@@ -1,3 +1,5 @@ +#!/usr/bin/env python3 +# # Functional tests for the Lemote Fuloong-2E machine. # # Copyright (c) 2019 Philippe Mathieu-Daudé <[email protected]>
@@ -9,34 +11,32 @@ import os -from avocado import skipUnless -from avocado_qemu import QemuSystemTest -from avocado_qemu import wait_for_console_pattern +from qemu_test import QemuSystemTest, Asset +from qemu_test import wait_for_console_pattern +from unittest import skipUnless class MipsFuloong2e(QemuSystemTest): timeout = 60 - @skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code') - @skipUnless(os.getenv('RESCUE_YL_PATH'), 'RESCUE_YL_PATH not available') + ASSET_KERNEL = Asset( + # http://dev.lemote.com/files/resource/download/rescue/rescue-yl + ('file://' + os.getenv('RESCUE_YL_PATH')), + 'ab588d3316777c62cc81baa20ac92e98b01955c244dff3794b711bc34e26e51d') + + @skipUnless(os.getenv('QEMU_TEST_ALLOW_UNTRUSTED_CODE'), 'untrusted code') def test_linux_kernel_isa_serial(self): - """ - :avocado: tags=arch:mips64el - :avocado: tags=machine:fuloong2e - :avocado: tags=endian:little - :avocado: tags=device:bonito64 - :avocado: tags=device:via686b - """ # Recovery system for the Yeeloong laptop # (enough to test the fuloong2e southbridge, accessing its ISA bus) - # http://dev.lemote.com/files/resource/download/rescue/rescue-yl - kernel_hash = 'ec4d1bd89a8439c41033ca63db60160cc6d6f09a' - kernel_path = self.fetch_asset('file://' + os.getenv('RESCUE_YL_PATH'), - asset_hash=kernel_hash) + kernel_path = self.ASSET_KERNEL.fetch() + self.set_machine('fuloong2e') self.vm.set_console() self.vm.add_args('-kernel', kernel_path) self.vm.launch() wait_for_console_pattern(self, 'Linux version 2.6.27.7lemote') cpu_revision = 'CPU revision is: 00006302 (ICT Loongson-2)' wait_for_console_pattern(self, cpu_revision) + +if __name__ == '__main__': + QemuSystemTest.main()
Signature · 1 line
2.45.2
Quoted 75 lines · Philippe Mathieu-Daudé
Straight forward conversion. Update the SHA1 hashes to SHA256 hashes since SHA1 should not be used anymore nowadays.
Since the asset is expected locally and the test is guarded with
QEMU_TEST_ALLOW_UNTRUSTED_CODE, keep it under the 'quick' category.$ RESCUE_YL_PATH=/path/to/rescue-yl QEMU_TEST_ALLOW_UNTRUSTED_CODE=1 \ make check-functional-mips64el 1/4 qemu:func-quick+func-mips64el / func-mips64el-empty_cpu_model OK 0.12s 1 subtests passed 2/4 qemu:func-quick+func-mips64el / func-mips64el-version OK 0.13s 1 subtests passed 3/4 qemu:func-quick+func-mips64el / func-mips64el-info_usernet OK 0.15s 1 subtests passed 4/4 qemu:func-quick+func-mips64el / func-mips64el-mips64el_fuloong2e OK 0.19s 1 subtests passedSigned-off-by Philippe Mathieu-Daudé <[email protected]>---
Based-on: <[email protected]>--- MAINTAINERS | 2 +- tests/functional/meson.build | 4 +++ .../test_mips64el_fuloong2e.py} | 32 +++++++++---------- 3 files changed, 21 insertions(+), 17 deletions(-)rename
tests/{avocado/machine_mips_fuloong2e.py=>functional/test_mips64el_fuloong2e.py} (56%) mode change 100644 => 100755MAINTAINERS +1
-1@@ -1384,7 +1384,7 @@ S: Odd Fixes F: hw/mips/fuloong2e.c F: hw/pci-host/bonito.c F: include/hw/pci-host/bonito.h -F: tests/avocado/machine_mips_fuloong2e.py +F: tests/functional/test_mips64el_fuloong2e.py Loongson-3 virtual platforms M: Huacai Chen <[email protected]>tests/functional/meson.build +4
-0@@ -51,6 +51,10 @@ tests_microblazeel_thorough = [ 'microblazeel_s3adsp1800' ] +tests_mips64el_quick = [ + 'mips64el_fuloong2e', +] + tests_mips64el_thorough = [ 'mips64el_loongson3v', ]tests/functional/test_mips64el_fuloong2e.py renamed from tests/avocado/machine_mips_fuloong2e.py +2
-3@@ -1,3 +1,5 @@ +#!/usr/bin/env python3 +# # Functional tests for the Lemote Fuloong-2E machine. # # Copyright (c) 2019 Philippe Mathieu-Daudé <[email protected]>@@ -9,34 +11,32 @@ import os -from avocado import skipUnless -from avocado_qemu import QemuSystemTest -from avocado_qemu import wait_for_console_pattern
tests/functional/test_mips64el_fuloong2e.py line 21
Quoted 10 lines
tests/functional/test_mips64el_fuloong2e.py renamed from tests/avocado/machine_mips_fuloong2e.py +3
-2+from qemu_test import QemuSystemTest, Asset +from qemu_test import wait_for_console_pattern +from unittest import skipUnless class MipsFuloong2e(QemuSystemTest): timeout = 60 - @skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code') - @skipUnless(os.getenv('RESCUE_YL_PATH'), 'RESCUE_YL_PATH not available')
Wouldn't it be better to keep the RESCUE_YL_PATH decorator?
tests/functional/test_mips64el_fuloong2e.py line 24
Quoted 3 lines
tests/functional/test_mips64el_fuloong2e.py renamed from tests/avocado/machine_mips_fuloong2e.py +3
-0+ ASSET_KERNEL = Asset( + # http://dev.lemote.com/files/resource/download/rescue/rescue-yl + ('file://' + os.getenv('RESCUE_YL_PATH')),
The precaching is now failing if this environment variable has not been set:
Traceback (most recent call last):
File
"/home/thuth/devel/qemu/tests/functional/test_mips64el_fuloong2e.py", line 18, in <module>
class MipsFuloong2e(QemuSystemTest):
File
"/home/thuth/devel/qemu/tests/functional/test_mips64el_fuloong2e.py", line 24, in MipsFuloong2e
('file://' + os.getenv('RESCUE_YL_PATH')),
~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~TypeError: can only concatenate str (not "NoneType") to str
Since we don't really need precaching in this case, maybe you could move the asset definition into the function itself, or do this test without the asset framework?
Thomas
Quoted 29 lines
tests/functional/test_mips64el_fuloong2e.py renamed from tests/avocado/machine_mips_fuloong2e.py +8
-11+ 'ab588d3316777c62cc81baa20ac92e98b01955c244dff3794b711bc34e26e51d') + + @skipUnless(os.getenv('QEMU_TEST_ALLOW_UNTRUSTED_CODE'), 'untrusted code') def test_linux_kernel_isa_serial(self): - """ - :avocado: tags=arch:mips64el - :avocado: tags=machine:fuloong2e - :avocado: tags=endian:little - :avocado: tags=device:bonito64 - :avocado: tags=device:via686b - """ # Recovery system for the Yeeloong laptop # (enough to test the fuloong2e southbridge, accessing its ISA bus) - # http://dev.lemote.com/files/resource/download/rescue/rescue-yl - kernel_hash = 'ec4d1bd89a8439c41033ca63db60160cc6d6f09a' - kernel_path = self.fetch_asset('file://' + os.getenv('RESCUE_YL_PATH'), - asset_hash=kernel_hash) + kernel_path = self.ASSET_KERNEL.fetch() + self.set_machine('fuloong2e') self.vm.set_console() self.vm.add_args('-kernel', kernel_path) self.vm.launch() wait_for_console_pattern(self, 'Linux version 2.6.27.7lemote') cpu_revision = 'CPU revision is: 00006302 (ICT Loongson-2)' wait_for_console_pattern(self, cpu_revision) + +if __name__ == '__main__': + QemuSystemTest.main()
Quoted 75 lines · Thomas Huth
Quoted 74 lines · Philippe Mathieu-Daudé
Straight forward conversion. Update the SHA1 hashes to SHA256 hashes since SHA1 should not be used anymore nowadays.
Since the asset is expected locally and the test is guarded with
QEMU_TEST_ALLOW_UNTRUSTED_CODE, keep it under the 'quick' category.$ RESCUE_YL_PATH=/path/to/rescue-yl QEMU_TEST_ALLOW_UNTRUSTED_CODE=1 \ make check-functional-mips64el 1/4 qemu:func-quick+func-mips64el / func-mips64el-empty_cpu_model OK 0.12s 1 subtests passed 2/4 qemu:func-quick+func-mips64el / func-mips64el-version OK 0.13s 1 subtests passed 3/4 qemu:func-quick+func-mips64el / func-mips64el-info_usernet OK 0.15s 1 subtests passed 4/4 qemu:func-quick+func-mips64el / func-mips64el-mips64el_fuloong2e OK 0.19s 1 subtests passedSigned-off-by Philippe Mathieu-Daudé <[email protected]>---
Based-on: <[email protected]>
---
MAINTAINERS | 2 +- tests/functional/meson.build | 4 +++ .../test_mips64el_fuloong2e.py} | 32 +++++++++----------3 files changed, 21 insertions(+), 17 deletions(-)rename
tests/{avocado/machine_mips_fuloong2e.py=>functional/test_mips64el_fuloong2e.py} (56%) mode change 100644 => 100755MAINTAINERS +0
-0@@ -1384,7 +1384,7 @@ S: Odd FixesF:
hw/mips/fuloong2e.c
F:hw/pci-host/bonito.c
F:include/hw/pci-host/bonito.hMAINTAINERS +1
-1-F: tests/avocado/machine_mips_fuloong2e.py +F: tests/functional/test_mips64el_fuloong2e.pyLoongson-3 virtual platforms
M: Huacai Chen <[email protected]>tests/functional/meson.build +0
-0@@ -51,6 +51,10 @@ tests_microblazeel_thorough = ['
microblazeel_s3adsp1800'
]tests/functional/meson.build +4
-0+tests_mips64el_quick = [ + 'mips64el_fuloong2e', +] +
tests_mips64el_thorough= [
'mips64el_loongson3v',
]tests/functional/test_mips64el_fuloong2e.py renamed from tests/avocado/machine_mips_fuloong2e.py +2
-0@@ -1,3 +1,5 @@ +#!/usr/bin/env python3 +# # Functional tests for the Lemote Fuloong-2E machine. # # Copyright (c) 2019 Philippe Mathieu-Daudé <[email protected]>@@ -9,34 +11,32 @@import os
tests/functional/test_mips64el_fuloong2e.py renamed from tests/avocado/machine_mips_fuloong2e.py +3
-3-from avocado import skipUnless -from avocado_qemu import QemuSystemTest -from avocado_qemu import wait_for_console_pattern +from qemu_test import QemuSystemTest, Asset +from qemu_test import wait_for_console_pattern +from unittest import skipUnless
Quoted 8 lines
Quoted 6 lines
class MipsFuloong2e(QemuSystemTest):
timeout = 60
- @skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code')
- @skipUnless(os.getenv('RESCUE_YL_PATH'), 'RESCUE_YL_PATHnot available')Wouldn't it be better to keep the
RESCUE_YL_PATHdecorator?
Oops yes, no clue how I removed that.
Quoted 17 lines
Quoted 4 lines
+
ASSET_KERNEL= Asset(
+ # http://dev.lemote.com/files/resource/download/rescue/rescue-yl
+ ('file://' +os.getenv('RESCUE_YL_PATH')),The precaching is now failing if this environment variable has not been set:
Traceback (most recent call last):
File
"/home/thuth/devel/qemu/tests/functional/test_mips64el_fuloong2e.py", line 18, in <module>
class MipsFuloong2e(QemuSystemTest):
File
"/home/thuth/devel/qemu/tests/functional/test_mips64el_fuloong2e.py", line 24, in MipsFuloong2e
('file://' +os.getenv('RESCUE_YL_PATH')), ~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
TypeError: can only concatenate str (not "NoneType") to str
Quoted 1 line
Since we don't really need precaching in this case, maybe you could move the asset definition into the function itself, or do this test without the asset framework?
Good idea.