diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-09-26 19:21:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-26 19:21:16 +0200 |
| commit | 051eb43c6957b73e9c0f14cde91142ddee627204 (patch) | |
| tree | c3360ab9971ae8a99156b16bde521ed9601ec062 /test/compose | |
| parent | d5e13a3a9039fc1068bccce73ce5acd7bf98d576 (diff) | |
| parent | 52656887e1cd3476a18765aa81a7804fceb861b4 (diff) | |
| download | podman-051eb43c6957b73e9c0f14cde91142ddee627204.tar.gz podman-051eb43c6957b73e9c0f14cde91142ddee627204.tar.bz2 podman-051eb43c6957b73e9c0f14cde91142ddee627204.zip | |
Merge pull request #15907 from Luap99/compat-net-opts
compat API: network inspect do not show isolate option
Diffstat (limited to 'test/compose')
| -rw-r--r-- | test/compose/uptwice/docker-compose.yml | 3 | ||||
| -rw-r--r-- | test/compose/uptwice/teardown.sh | 3 | ||||
| -rw-r--r-- | test/compose/uptwice/tests.sh | 15 |
3 files changed, 19 insertions, 2 deletions
diff --git a/test/compose/uptwice/docker-compose.yml b/test/compose/uptwice/docker-compose.yml index e06f9e554..71cc0806c 100644 --- a/test/compose/uptwice/docker-compose.yml +++ b/test/compose/uptwice/docker-compose.yml @@ -2,4 +2,5 @@ version: '3' services: app: build: . - command: sleep 10002 + command: sleep 10001 + stop_signal: SIGKILL # faster shutdown, no reason to wait 10 seconds diff --git a/test/compose/uptwice/teardown.sh b/test/compose/uptwice/teardown.sh new file mode 100644 index 000000000..115c454dc --- /dev/null +++ b/test/compose/uptwice/teardown.sh @@ -0,0 +1,3 @@ +# -*- bash -*- + +mv docker-compose.yml.bak docker-compose.yml diff --git a/test/compose/uptwice/tests.sh b/test/compose/uptwice/tests.sh index 291694d83..013b5a29a 100644 --- a/test/compose/uptwice/tests.sh +++ b/test/compose/uptwice/tests.sh @@ -1,4 +1,17 @@ # -*- bash -*- +CR=$'\r' +NL=$'\n' + +cp docker-compose.yml docker-compose.yml.bak sed -i -e 's/10001/10002/' docker-compose.yml -docker-compose up -d +output=$(docker-compose up -d 2>&1) + +# Horrible output check here but we really want to make sure that there are +# no unexpected warning/errors and the normal messages are send on stderr as +# well so we cannot check for an empty stderr. +expected="Recreating uptwice_app_1 ... ${CR}${NL}Recreating uptwice_app_1 ... done$CR" +if [ "$TEST_FLAVOR" = "compose_v2" ]; then + expected="Container uptwice-app-1 Recreate${NL}Container uptwice-app-1 Recreated${NL}Container uptwice-app-1 Starting${NL}Container uptwice-app-1 Started" +fi +is "$output" "$expected" "no error output in compose up (#15580)" |