| Message ID | 20230311144111.30468-5-strahinja.p.jankovic@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Basic Allwinner WDT emulation | expand |
Hi Strahinja, Looks good! I re-ran the tests on my machine, and they work fine: ARMBIAN_ARTIFACTS_CACHED=yes AVOCADO_ALLOW_LARGE_STORAGE=yes ./build/tests/venv/bin/avocado --show=app,console run -t machine:orangepi-pc -t machine:cubieboard tests/avocado/boot_linux_console.py ... |console: Tue Mar 14 19:56:37 UTC 2023 \console: Starting root file system check: PASS (22.45 s) RESULTS : PASS 8 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 0 JOB TIME : 189.23 s Reviewed-by: Niek Linnenbank <nieklinnenbank@gmail.com> Tested-by: Niek Linnenbank <nieklinnenbank@gmail.com> On Sat, Mar 11, 2023 at 3:42 PM Strahinja Jankovic < strahinjapjankovic@gmail.com> wrote: > Cubieboard tests end with comment "reboot not functioning; omit test". > Fix this so reboot is done at the end of each test. > > Signed-off-by: Strahinja Jankovic <strahinja.p.jankovic@gmail.com> > --- > tests/avocado/boot_linux_console.py | 15 ++++++++++++--- > 1 file changed, 12 insertions(+), 3 deletions(-) > > diff --git a/tests/avocado/boot_linux_console.py > b/tests/avocado/boot_linux_console.py > index 574609bf43..c0675809e6 100644 > --- a/tests/avocado/boot_linux_console.py > +++ b/tests/avocado/boot_linux_console.py > @@ -581,7 +581,10 @@ def test_arm_cubieboard_initrd(self): > 'Allwinner sun4i/sun5i') > exec_command_and_wait_for_pattern(self, 'cat /proc/iomem', > 'system-control@1c00000') > - # cubieboard's reboot is not functioning; omit reboot test. > + exec_command_and_wait_for_pattern(self, 'reboot', > + 'reboot: Restarting > system') > + # Wait for VM to shut down gracefully > + self.vm.wait() > > def test_arm_cubieboard_sata(self): > """ > @@ -625,7 +628,10 @@ def test_arm_cubieboard_sata(self): > 'Allwinner sun4i/sun5i') > exec_command_and_wait_for_pattern(self, 'cat /proc/partitions', > 'sda') > - # cubieboard's reboot is not functioning; omit reboot test. > + exec_command_and_wait_for_pattern(self, 'reboot', > + 'reboot: Restarting > system') > + # Wait for VM to shut down gracefully > + self.vm.wait() > > @skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage > limited') > def test_arm_cubieboard_openwrt_22_03_2(self): > @@ -672,7 +678,10 @@ def test_arm_cubieboard_openwrt_22_03_2(self): > > exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo', > 'Allwinner sun4i/sun5i') > - # cubieboard's reboot is not functioning; omit reboot test. > + exec_command_and_wait_for_pattern(self, 'reboot', > + 'reboot: Restarting > system') > + # Wait for VM to shut down gracefully > + self.vm.wait() > > @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might > timeout') > def test_arm_quanta_gsj(self): > -- > 2.30.2 > >
diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py index 574609bf43..c0675809e6 100644 --- a/tests/avocado/boot_linux_console.py +++ b/tests/avocado/boot_linux_console.py @@ -581,7 +581,10 @@ def test_arm_cubieboard_initrd(self): 'Allwinner sun4i/sun5i') exec_command_and_wait_for_pattern(self, 'cat /proc/iomem', 'system-control@1c00000') - # cubieboard's reboot is not functioning; omit reboot test. + exec_command_and_wait_for_pattern(self, 'reboot', + 'reboot: Restarting system') + # Wait for VM to shut down gracefully + self.vm.wait() def test_arm_cubieboard_sata(self): """ @@ -625,7 +628,10 @@ def test_arm_cubieboard_sata(self): 'Allwinner sun4i/sun5i') exec_command_and_wait_for_pattern(self, 'cat /proc/partitions', 'sda') - # cubieboard's reboot is not functioning; omit reboot test. + exec_command_and_wait_for_pattern(self, 'reboot', + 'reboot: Restarting system') + # Wait for VM to shut down gracefully + self.vm.wait() @skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited') def test_arm_cubieboard_openwrt_22_03_2(self): @@ -672,7 +678,10 @@ def test_arm_cubieboard_openwrt_22_03_2(self): exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo', 'Allwinner sun4i/sun5i') - # cubieboard's reboot is not functioning; omit reboot test. + exec_command_and_wait_for_pattern(self, 'reboot', + 'reboot: Restarting system') + # Wait for VM to shut down gracefully + self.vm.wait() @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout') def test_arm_quanta_gsj(self):
Cubieboard tests end with comment "reboot not functioning; omit test". Fix this so reboot is done at the end of each test. Signed-off-by: Strahinja Jankovic <strahinja.p.jankovic@gmail.com> --- tests/avocado/boot_linux_console.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)