From 676fcb722f31f3f8eedb017bee828002d23b68f8 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Sun, 21 Mar 2021 18:23:31 +0100 Subject: Add new docker-compose test for two networks Also fix the tests so we can use the podman function with the output. Signed-off-by: Paul Holzinger --- test/compose/test-compose | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'test/compose/test-compose') diff --git a/test/compose/test-compose b/test/compose/test-compose index 3cda8514e..704c71a9f 100755 --- a/test/compose/test-compose +++ b/test/compose/test-compose @@ -224,10 +224,11 @@ function start_service() { ############ function podman() { echo "\$ podman $*" >>$WORKDIR/output.log - $PODMAN_BIN \ + output=$($PODMAN_BIN \ --root $WORKDIR/root \ --runroot $WORKDIR/runroot \ - "$@" >>$WORKDIR/output.log 2>&1 + "$@") + echo -n "$output" >>$WORKDIR/output.log } ################### @@ -329,7 +330,7 @@ for t in ${tests_to_run[@]}; do fi # Done. Clean up. - docker-compose down &> $logfile + docker-compose down &>> $logfile rc=$? if [[ $rc -eq 0 ]]; then _show_ok 1 "$testname - down" -- cgit v1.2.3-54-g00ecf