diff options
| author | Paul Holzinger <paul.holzinger@web.de> | 2021-03-21 18:23:31 +0100 |
|---|---|---|
| committer | Paul Holzinger <paul.holzinger@web.de> | 2021-04-01 17:27:03 +0200 |
| commit | 676fcb722f31f3f8eedb017bee828002d23b68f8 (patch) | |
| tree | 15a1f683b172d47074c5592f9c214d45b5905acc /test/compose/test-compose | |
| parent | 954d92082534ac775761558b455408aca2246e36 (diff) | |
| download | podman-676fcb722f31f3f8eedb017bee828002d23b68f8.tar.gz podman-676fcb722f31f3f8eedb017bee828002d23b68f8.tar.bz2 podman-676fcb722f31f3f8eedb017bee828002d23b68f8.zip | |
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 <paul.holzinger@web.de>
Diffstat (limited to 'test/compose/test-compose')
| -rwxr-xr-x | test/compose/test-compose | 7 |
1 files changed, 4 insertions, 3 deletions
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" |