Skip to content

Commit fdb87f0

Browse files
jnsnowphilmd
authored andcommitted
tests/acceptance: Don't test reboot on cubieboard
cubieboard does not have a functioning reboot, it halts and QEMU does not exit. vm.shutdown() is modified in a forthcoming patch that makes it less tolerant of race conditions on shutdown; tests should consciously decide to WAIT or to SHUTDOWN qemu. So long as this test is attempting to reboot, the correct choice would be to WAIT for the VM to exit. However, since that's broken, we should SHUTDOWN instead. SHUTDOWN is indeed what already happens when the test performs teardown, however, if anyone fixes cubieboard reboot in the future, this test will develop a new race condition that might be hard to debug. Therefore: remove the reboot test and make it obvious that the VM is still running when the test concludes, where the test teardown will do the right thing. Signed-off-by: John Snow <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Reviewed-by: Cleber Rosa <[email protected]> Tested-by: Cleber Rosa <[email protected]> Message-Id: <[email protected]> Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
1 parent a0690c3 commit fdb87f0

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

tests/acceptance/boot_linux_console.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -508,9 +508,7 @@ def test_arm_cubieboard_initrd(self):
508508
'Allwinner sun4i/sun5i')
509509
exec_command_and_wait_for_pattern(self, 'cat /proc/iomem',
510510
'system-control@1c00000')
511-
exec_command_and_wait_for_pattern(self, 'reboot',
512-
'reboot: Restarting system')
513-
# NB: Do not issue vm.wait() here, cubieboard's reboot does not exit!
511+
# cubieboard's reboot is not functioning; omit reboot test.
514512

515513
def test_arm_cubieboard_sata(self):
516514
"""
@@ -553,9 +551,7 @@ def test_arm_cubieboard_sata(self):
553551
'Allwinner sun4i/sun5i')
554552
exec_command_and_wait_for_pattern(self, 'cat /proc/partitions',
555553
'sda')
556-
exec_command_and_wait_for_pattern(self, 'reboot',
557-
'reboot: Restarting system')
558-
# NB: Do not issue vm.wait() here, cubieboard's reboot does not exit!
554+
# cubieboard's reboot is not functioning; omit reboot test.
559555

560556
def test_arm_orangepi(self):
561557
"""

0 commit comments

Comments
 (0)