diff options
Diffstat (limited to 'test/lib')
-rw-r--r-- | test/lib/layout | 39 | ||||
-rwxr-xr-x | test/lib/setup | 15 | ||||
-rwxr-xr-x | test/lib/test | 3 |
3 files changed, 56 insertions, 1 deletions
diff --git a/test/lib/layout b/test/lib/layout index 79a6c80..fcd1db4 100644 --- a/test/lib/layout +++ b/test/lib/layout @@ -43,6 +43,45 @@ layout_host() { sleep 1 } +# layout_pasta_simple() - Panes for host and pasta +layout_pasta_simple() { + sleep 3 + + tmux kill-pane -a -t 0 + cmd_write 0 clear + + tmux split-window -v -t passt_test + tmux split-window -h -t passt_test + + PANE_PASST=0 + PANE_HOST=1 + PANE_INFO=2 + + get_info_cols + + tmux send-keys -l -t ${PANE_INFO} 'while cat '"$STATEBASE/log_pipe"'; do :; done' + tmux send-keys -t ${PANE_INFO} -N 100 C-m + tmux select-pane -t ${PANE_INFO} -T "test log" + + if context_exists host; then + pane_watch_contexts ${PANE_HOST} host host + else + tmux pipe-pane -O -t ${PANE_HOST} "cat >> ${LOGDIR}/pane_host.log" + tmux select-pane -t ${PANE_HOST} -T "host" + fi + + if context_exists passt; then + pane_watch_contexts ${PANE_PASST} host host + else + tmux pipe-pane -O -t ${PANE_PASST} "cat >> ${LOGDIR}/pane_passt.log" + tmux select-pane -t ${PANE_PASST} -T "pasta" + fi + + info_layout "single pasta instance" + + sleep 1 +} + # layout_pasta() - Panes for host, pasta, and separate one for namespace layout_pasta() { sleep 3 diff --git a/test/lib/setup b/test/lib/setup index 071e11d..e2d0ff0 100755 --- a/test/lib/setup +++ b/test/lib/setup @@ -106,6 +106,13 @@ 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 @@ -294,7 +301,7 @@ teardown_passt() { teardown_context_watch ${PANE_GUEST} qemu guest } -# teardown_passt() - Exit namespace, kill pasta process +# teardown_pasta() - Exit namespace, kill pasta process teardown_pasta() { ${NSHOLDER} "${STATESETUP}/ns.hold" stop context_wait unshare @@ -304,6 +311,12 @@ 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") diff --git a/test/lib/test b/test/lib/test index 558d0f0..4c271a5 100755 --- a/test/lib/test +++ b/test/lib/test @@ -137,6 +137,9 @@ test_one_line() { "passtw") pane_or_context_wait passt || TEST_ONE_nok=1 ;; + "pint") + tmux send-keys -t ${PANE_PASST} "C-c" + ;; "pout") __varname="${__arg%% *}" __output="$(pane_or_context_output passt "${__arg#* }")" |