1
0
Fork 0
mirror of https://passt.top/passt synced 2025-05-21 00:35:34 +02:00

test/lib: Move screen-scraping setup and layout functions to _ugly files

I'm going to add yet another one of those, for which I have no quick
solution. It's a regression in some sense, but at least if we make
this regression more observable and defined, it should be easier to
find a comprehensive solution later, within this or another testing
framework.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Stefano Brivio 2022-10-31 10:25:30 +01:00
parent ea5e046646
commit e76e65a36e
5 changed files with 123 additions and 92 deletions
test/lib

View file

@ -26,11 +26,6 @@ setup_build() {
layout_host
}
# setup_distro() - Set up pane layout for distro tests
setup_distro() {
layout_host
}
# setup_passt() - Start qemu and passt
setup_passt() {
context_setup_host host
@ -106,13 +101,6 @@ setup_pasta() {
wait_for [ -f "${STATESETUP}/passt.pid" ]
}
# setup_pasta_options() - Set up layout and host context without starting pasta
setup_pasta_options() {
context_setup_host host
layout_pasta_simple
}
# setup_passt_in_ns() - Set up namespace (with pasta), run qemu and passt into it
setup_passt_in_ns() {
context_setup_host host
@ -285,11 +273,6 @@ teardown_build() {
teardown_context_watch ${PANE_HOST} host
}
# teardown_distro() - Nothing to do, yet
teardown_distro() {
:
}
# teardown_passt() - Kill qemu, remove passt PID file
teardown_passt() {
kill $(cat "${STATESETUP}/qemu.pid")
@ -311,12 +294,6 @@ teardown_pasta() {
teardown_context_watch ${PANE_NS} unshare ns
}
# teardown_pasta_options() - Tear down pasta and host context, no namespace
teardown_pasta_options() {
teardown_context_watch ${PANE_HOST} host
teardown_context_watch ${PANE_PASST} passt
}
# teardown_passt_in_ns() - Exit namespace, kill qemu and pasta, remove pid file
teardown_passt_in_ns() {
context_run ns kill $(cat "${STATESETUP}/qemu.pid")