diff --git a/tests/integration/app_deploy.bats b/tests/integration/app_deploy.bats index 5137b38f..b987cede 100644 --- a/tests/integration/app_deploy.bats +++ b/tests/integration/app_deploy.bats @@ -598,7 +598,7 @@ teardown(){ run $ABRA app deploy "$TEST_APP_DOMAIN" --no-input assert_success - _inspect + _inspect_env_test_app assert_success assert_output --partial "WITH_COMMENT=foo" @@ -609,13 +609,13 @@ teardown(){ run $ABRA app deploy "$TEST_APP_DOMAIN" --no-input --force assert_success - _inspect + _inspect_env_test_app assert_success refute_output --partial "WITH_COMMENT=foo" assert_output --partial "WITH_COMMENT=bar" } -# bats test_tags=slow,error +# bats test_tags=slow @test "deploy with udp and tcp on same port" { run sed -i 's/TYPE=abra-test-recipe:.*/TYPE=git.coopcloud.tech\/p4u1\/abra-test-recipe:030e8a1cb1a0f17281847b3e55d829220ad32c50/g' \ "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env" @@ -675,9 +675,6 @@ teardown(){ @test "unable to deploy borked tag" { _remove_tags - # can not tag without it - _set_git_author - run git -C "$ABRA_DIR/recipes/$TEST_RECIPE" tag \ -a "2.4.8_1" -m "feat: completely borked tag" assert_success diff --git a/tests/integration/app_deploy_env_version.bats b/tests/integration/app_deploy_env_version.bats index a57fd5b5..66b6a4a7 100644 --- a/tests/integration/app_deploy_env_version.bats +++ b/tests/integration/app_deploy_env_version.bats @@ -133,7 +133,7 @@ teardown(){ run $ABRA app deploy "$TEST_APP_DOMAIN" "0.1.0+1.20.0" --no-input assert_success - _inspect + _inspect_env_test_app assert_success assert_output --partial "$TEST_RECIIPE:0.1.0+1.20.0" } diff --git a/tests/integration/app_rollback_env_version.bats b/tests/integration/app_rollback_env_version.bats index de78d08c..8b7c6e34 100644 --- a/tests/integration/app_rollback_env_version.bats +++ b/tests/integration/app_rollback_env_version.bats @@ -54,7 +54,7 @@ teardown(){ --no-input assert_success - _inspect + _inspect_env_test_app assert_success assert_output --partial "$TEST_RECIIPE:0.1.0+1.20.0" } diff --git a/tests/integration/app_upgrade_env_version.bats b/tests/integration/app_upgrade_env_version.bats index 5ca9f71b..a503be4c 100644 --- a/tests/integration/app_upgrade_env_version.bats +++ b/tests/integration/app_upgrade_env_version.bats @@ -53,7 +53,7 @@ teardown(){ run $ABRA app upgrade "$TEST_APP_DOMAIN" "0.2.0+1.21.0" --no-input assert_success - _inspect + _inspect_env_test_app assert_success assert_output --partial "$TEST_RECIPE:0.2.0+1.21.0" } diff --git a/tests/integration/helpers/docker.bash b/tests/integration/helpers/docker.bash index c1cd1ab2..59572243 100644 --- a/tests/integration/helpers/docker.bash +++ b/tests/integration/helpers/docker.bash @@ -25,13 +25,13 @@ _ensure_swarm() { fi } -_inspect() { +_inspect_env_test_app() { if _is_local; then containerId="$(docker ps -f name="$TEST_APP_DOMAIN_$TEST_SERVER" -q)" - run docker inspect "$containerId" + run docker inspect --format='{{range .Config.Env}}{{println .}}{{end}}' "$containerId" else containerId="$(ssh "$TEST_SERVER" docker ps -f name="$TEST_APP_DOMAIN" -q)" - run ssh "$TEST_SERVER" docker inspect "$containerId" + run ssh "$TEST_SERVER" "docker inspect --format='{{range .Config.Env}}{{println .}}{{end}}' '$containerId'" fi }