From c7e1f2d380ab8bc6204c11967a22cbe208c2ec36 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 25 Feb 2024 16:12:07 -0500 Subject: [PATCH] fix: update test to fix case where intermediate containers are now immediately removed --- tests/unit/app-json.bats | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/unit/app-json.bats b/tests/unit/app-json.bats index 009009033..4af2b2eba 100644 --- a/tests/unit/app-json.bats +++ b/tests/unit/app-json.bats @@ -20,6 +20,9 @@ teardown() { echo "output: $output" echo "status: $status" assert_success + assert_output_contains "Executing predeploy task from app.json: touch /app/predeploy.test" + assert_output_contains "Executing postdeploy task from app.json: touch /app/postdeploy.test" + assert_output_contains "Executing prebuild task from app.json: touch /app/prebuild.test" 0 run docker inspect "${TEST_APP}.web.1" --format "{{json .Config.Cmd}}" echo "output: $output" @@ -37,13 +40,10 @@ teardown() { echo "status: $status" assert_success - CID=$(docker ps -a -q -f "ancestor=dokku/${TEST_APP}" -f "label=dokku_phase_script=postdeploy") - DOCKER_COMMIT_LABEL_ARGS=("--change" "LABEL org.label-schema.schema-version=1.0" "--change" "LABEL org.label-schema.vendor=dokku" "--change" "LABEL com.dokku.app-name=$TEST_APP") - IMAGE_ID=$(docker commit "${DOCKER_COMMIT_LABEL_ARGS[@]}" $CID dokku-test/${TEST_APP}) - run /bin/bash -c "docker run --rm $IMAGE_ID ls /app/postdeploy.test" + run /bin/bash -c "dokku run $TEST_APP ls /app/postdeploy.test" echo "output: $output" echo "status: $status" - assert_success + assert_failure } @test "(app-json) app.json scripts postdeploy" {