aboutgitcodebugslistschat
path: root/test/lib/layout
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2022-09-12 20:56:23 +1000
committerStefano Brivio <sbrivio@redhat.com>2022-09-13 05:32:00 +0200
commit87a57156cfa8ee8263b3a842db70b5f7dc9c2362 (patch)
tree3c15c57c957f10f2c4c668a3a426b08715472f18 /test/lib/layout
parent56e755ba1146dc6bd488bedc155db5be9c47ac12 (diff)
downloadpasst-87a57156cfa8ee8263b3a842db70b5f7dc9c2362.tar
passt-87a57156cfa8ee8263b3a842db70b5f7dc9c2362.tar.gz
passt-87a57156cfa8ee8263b3a842db70b5f7dc9c2362.tar.bz2
passt-87a57156cfa8ee8263b3a842db70b5f7dc9c2362.tar.lz
passt-87a57156cfa8ee8263b3a842db70b5f7dc9c2362.tar.xz
passt-87a57156cfa8ee8263b3a842db70b5f7dc9c2362.tar.zst
passt-87a57156cfa8ee8263b3a842db70b5f7dc9c2362.zip
test: Use context system for two_guests tests
Now that we have all the pieces we need for issuing commands both into namespaces and into guests, we can use those to convert the two_guests to using only the new style context command issue. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'test/lib/layout')
-rw-r--r--test/lib/layout15
1 files changed, 4 insertions, 11 deletions
diff --git a/test/lib/layout b/test/lib/layout
index 985d31b..b9d30e9 100644
--- a/test/lib/layout
+++ b/test/lib/layout
@@ -172,23 +172,16 @@ layout_two_guests() {
get_info_cols
- tmux pipe-pane -O -t ${PANE_GUEST_1} "cat >> ${LOGDIR}/pane_guest_1.log"
- tmux select-pane -t ${PANE_GUEST_1} -T "guest #1 in namespace #1"
-
- tmux pipe-pane -O -t ${PANE_GUEST_2} "cat >> ${LOGDIR}/pane_guest_2.log"
- tmux select-pane -t ${PANE_GUEST_2} -T "guest #2 in namespace #2"
+ pane_watch_contexts ${PANE_GUEST_1} "guest #1 in namespace #1" qemu_1 guest_1
+ pane_watch_contexts ${PANE_GUEST_2} "guest #2 in namespace #2" qemu_2 guest_2
tmux send-keys -l -t ${PANE_INFO} 'while cat /tmp/.passt_test_log_pipe; do :; done'
tmux send-keys -t ${PANE_INFO} -N 100 C-m
tmux select-pane -t ${PANE_INFO} -T "test log"
pane_watch_contexts ${PANE_HOST} host host
-
- tmux pipe-pane -O -t ${PANE_PASST_1} "cat >> ${LOGDIR}/pane_passt_1.log"
- tmux select-pane -t ${PANE_PASST_1} -T "passt #1 in namespace #1"
-
- tmux pipe-pane -O -t ${PANE_PASST_2} "cat >> ${LOGDIR}/pane_passt_2.log"
- tmux select-pane -t ${PANE_PASST_2} -T "passt #2 in namespace #2"
+ pane_watch_contexts ${PANE_PASST_1} "passt #1 in namespace #1" pasta_1 passt_1
+ pane_watch_contexts ${PANE_PASST_2} "passt #2 in namespace #2" pasta_2 passt_2
info_layout "two guests, two passt instances, in namespaces"