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 <jsnow@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Cleber Rosa <crosa@redhat.com> Tested-by: Cleber Rosa <crosa@redhat.com> Message-Id: <20200710050649.32434-10-jsnow@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
This commit is contained in:
parent
a0690c3900
commit
fdb87f0dc2
@ -508,9 +508,7 @@ class BootLinuxConsole(LinuxKernelTest):
|
|||||||
'Allwinner sun4i/sun5i')
|
'Allwinner sun4i/sun5i')
|
||||||
exec_command_and_wait_for_pattern(self, 'cat /proc/iomem',
|
exec_command_and_wait_for_pattern(self, 'cat /proc/iomem',
|
||||||
'system-control@1c00000')
|
'system-control@1c00000')
|
||||||
exec_command_and_wait_for_pattern(self, 'reboot',
|
# cubieboard's reboot is not functioning; omit reboot test.
|
||||||
'reboot: Restarting system')
|
|
||||||
# NB: Do not issue vm.wait() here, cubieboard's reboot does not exit!
|
|
||||||
|
|
||||||
def test_arm_cubieboard_sata(self):
|
def test_arm_cubieboard_sata(self):
|
||||||
"""
|
"""
|
||||||
@ -553,9 +551,7 @@ class BootLinuxConsole(LinuxKernelTest):
|
|||||||
'Allwinner sun4i/sun5i')
|
'Allwinner sun4i/sun5i')
|
||||||
exec_command_and_wait_for_pattern(self, 'cat /proc/partitions',
|
exec_command_and_wait_for_pattern(self, 'cat /proc/partitions',
|
||||||
'sda')
|
'sda')
|
||||||
exec_command_and_wait_for_pattern(self, 'reboot',
|
# cubieboard's reboot is not functioning; omit reboot test.
|
||||||
'reboot: Restarting system')
|
|
||||||
# NB: Do not issue vm.wait() here, cubieboard's reboot does not exit!
|
|
||||||
|
|
||||||
def test_arm_orangepi(self):
|
def test_arm_orangepi(self):
|
||||||
"""
|
"""
|
||||||
|
Loading…
Reference in New Issue
Block a user