SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests/functional/test_ppc64_hv: Simplify console handling

Browse Source 
Since functional tests have character-based console output parsing,
there is no need for strange hacks to work around old line-based.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Message-ID: <20241220024617.1968556-3-npiggin@gmail.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Nicholas Piggin 2024-12-20 12:46:15 +10:00 committed by Thomas Huth
parent b7edbbf432
commit 8c8dd70037
1 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
tests/functional/test_ppc64_hv.py
View File

@ -12,6 +12,7 @@
from qemu_test import QemuSystemTest, Asset from qemu_test import QemuSystemTest, Asset
from qemu_test import wait_for_console_pattern, exec_command from qemu_test import wait_for_console_pattern, exec_command
from qemu_test import skipIfMissingCommands, skipBigDataTest from qemu_test import skipIfMissingCommands, skipBigDataTest
from qemu_test import exec_command_and_wait_for_pattern
import os import os
import time import time
import subprocess import subprocess
@ -73,31 +74,28 @@ class HypervisorTest(QemuSystemTest):
"id=drive0,read-only=true") "id=drive0,read-only=true")
self.vm.launch() self.vm.launch()
wait_for_console_pattern(self, 'Welcome to Alpine Linux 3.18') ps1='localhost:~#'
exec_command(self, 'root')
wait_for_console_pattern(self, 'localhost login:') wait_for_console_pattern(self, 'localhost login:')
wait_for_console_pattern(self, 'You may change this message by editing /etc/motd.') exec_command_and_wait_for_pattern(self, 'root', ps1)
# If the time is wrong, SSL certificates can fail. # If the time is wrong, SSL certificates can fail.
exec_command(self, 'date -s "' + datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S' + '"')) exec_command_and_wait_for_pattern(self, 'date -s "' + datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S' + '"'), ps1)
exec_command(self, 'setup-alpine -qe') ps1='alpine:~#'
wait_for_console_pattern(self, 'Updating repository indexes... done.') exec_command_and_wait_for_pattern(self, 'setup-alpine -qe', ps1)
def do_stop_alpine(self): def do_stop_alpine(self):
exec_command(self, 'poweroff') exec_command(self, 'echo "TEST ME"')
wait_for_console_pattern(self, 'alpine:~#') wait_for_console_pattern(self, 'alpine:~#')
exec_command(self, 'poweroff')
wait_for_console_pattern(self, 'reboot: Power down')
self.vm.wait() self.vm.wait()
def do_setup_kvm(self): def do_setup_kvm(self):
exec_command(self, 'echo http://dl-cdn.alpinelinux.org/alpine/v3.18/main > /etc/apk/repositories') ps1='alpine:~#'
wait_for_console_pattern(self, 'alpine:~#') exec_command_and_wait_for_pattern(self, 'echo http://dl-cdn.alpinelinux.org/alpine/v3.18/main > /etc/apk/repositories', ps1)
exec_command(self, 'echo http://dl-cdn.alpinelinux.org/alpine/v3.18/community >> /etc/apk/repositories') exec_command_and_wait_for_pattern(self, 'echo http://dl-cdn.alpinelinux.org/alpine/v3.18/community >> /etc/apk/repositories', ps1)
wait_for_console_pattern(self, 'alpine:~#') exec_command_and_wait_for_pattern(self, 'apk update', ps1)
exec_command(self, 'apk update') exec_command_and_wait_for_pattern(self, 'apk add qemu-system-ppc64', ps1)
wait_for_console_pattern(self, 'alpine:~#') exec_command_and_wait_for_pattern(self, 'modprobe kvm-hv', ps1)
exec_command(self, 'apk add qemu-system-ppc64')
wait_for_console_pattern(self, 'alpine:~#')
exec_command(self, 'modprobe kvm-hv')
wait_for_console_pattern(self, 'alpine:~#')
# This uses the host's block device as the source file for guest block # This uses the host's block device as the source file for guest block
# device for install media. This is a bit hacky but allows reuse of the # device for install media. This is a bit hacky but allows reuse of the
@ -116,15 +114,12 @@ class HypervisorTest(QemuSystemTest):
'-kernel /media/nvme0n1/boot/vmlinuz-lts ' '-kernel /media/nvme0n1/boot/vmlinuz-lts '
'-append \'usbcore.nousb ' + append + '\'') '-append \'usbcore.nousb ' + append + '\'')
# Alpine 3.18 kernel seems to crash in XHCI USB driver. # Alpine 3.18 kernel seems to crash in XHCI USB driver.
wait_for_console_pattern(self, 'Welcome to Alpine Linux 3.18') ps1='localhost:~#'
exec_command(self, 'root')
wait_for_console_pattern(self, 'localhost login:') wait_for_console_pattern(self, 'localhost login:')
wait_for_console_pattern(self, 'You may change this message by editing /etc/motd.') exec_command_and_wait_for_pattern(self, 'root', ps1)
exec_command(self, 'poweroff >& /dev/null') exec_command(self, 'poweroff')
wait_for_console_pattern(self, 'localhost:~#')
wait_for_console_pattern(self, 'reboot: Power down') wait_for_console_pattern(self, 'reboot: Power down')
time.sleep(1) # Now wait for the host's prompt to come back
exec_command(self, '')
wait_for_console_pattern(self, 'alpine:~#') wait_for_console_pattern(self, 'alpine:~#')
def test_hv_pseries(self): def test_hv_pseries(self):