test: relax default-scope assertions and pass env to install

The ps plugin auto-adds --restart=on-failure:10 to the default deploy scope on app create, so docker-options:list --phase deploy is never empty for a freshly-created app. Switch the default-scope assertions from exact-match to contains/not-contains so the auto-injected restart line stops causing false failures. The migration test invoked the install binary directly via sudo, but DOKKU_LIB_ROOT is normally exported by the dokku launcher script and isn't set in that subprocess; pass it (and DOKKU_ROOT) explicitly.
This commit is contained in:
Jose Diaz-Gonzalez committed 2026-04-29 02:34:30 -04:00
1 parent 97b86707e7
commit d1213c14a8
1 file changed
+8 -8
+8 -8
View File
@@ -28,7 +28,7 @@ teardown() {
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"
assert_success assert_success
assert_output "" assert_output_contains "-p 8080:5000" 0
} }
@test "(docker-options:add) multiple --process flags add to each process" { @test "(docker-options:add) multiple --process flags add to each process" {
@@ -54,7 +54,7 @@ teardown() {
run /bin/bash -c "dokku docker-options:list $TEST_APP --phase deploy" run /bin/bash -c "dokku docker-options:list $TEST_APP --phase deploy"
echo "output: $output" echo "output: $output"
assert_output "-v /tmp/shared:/shared" assert_output_contains "-v /tmp/shared:/shared"
run /bin/bash -c "dokku docker-options:report $TEST_APP --docker-options-deploy" run /bin/bash -c "dokku docker-options:report $TEST_APP --docker-options-deploy"
echo "output: $output" echo "output: $output"
@@ -194,26 +194,26 @@ teardown() {
sudo rm -rf "/var/lib/dokku/config/docker-options/$TEST_APP" sudo rm -rf "/var/lib/dokku/config/docker-options/$TEST_APP"
sudo bash -c "echo '-v /tmp/legacy:/legacy' >\"$DOKKU_ROOT/$TEST_APP/DOCKER_OPTIONS_DEPLOY\"" sudo bash -c "echo '-v /tmp/legacy:/legacy' >\"$DOKKU_ROOT/$TEST_APP/DOCKER_OPTIONS_DEPLOY\""
run /bin/bash -c "sudo /var/lib/dokku/plugins/enabled/docker-options/install" run /bin/bash -c "sudo DOKKU_LIB_ROOT=/var/lib/dokku DOKKU_ROOT=$DOKKU_ROOT /var/lib/dokku/plugins/enabled/docker-options/install"
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"
assert_success assert_success
run /bin/bash -c "dokku docker-options:list $TEST_APP --phase deploy" run /bin/bash -c "dokku docker-options:list $TEST_APP --phase deploy"
echo "output: $output" echo "output: $output"
assert_output "-v /tmp/legacy:/legacy" assert_output_contains "-v /tmp/legacy:/legacy"
[[ -f "$DOKKU_ROOT/$TEST_APP/DOCKER_OPTIONS_DEPLOY.migrated" ]] [[ -f "$DOKKU_ROOT/$TEST_APP/DOCKER_OPTIONS_DEPLOY.migrated" ]]
[[ ! -f "$DOKKU_ROOT/$TEST_APP/DOCKER_OPTIONS_DEPLOY" ]] [[ ! -f "$DOKKU_ROOT/$TEST_APP/DOCKER_OPTIONS_DEPLOY" ]]
sudo bash -c "echo '-v /tmp/sneaky:/sneaky' >\"$DOKKU_ROOT/$TEST_APP/DOCKER_OPTIONS_DEPLOY\"" sudo bash -c "echo '-v /tmp/sneaky:/sneaky' >\"$DOKKU_ROOT/$TEST_APP/DOCKER_OPTIONS_DEPLOY\""
run /bin/bash -c "sudo /var/lib/dokku/plugins/enabled/docker-options/install" run /bin/bash -c "sudo DOKKU_LIB_ROOT=/var/lib/dokku DOKKU_ROOT=$DOKKU_ROOT /var/lib/dokku/plugins/enabled/docker-options/install"
echo "output: $output" echo "output: $output"
assert_success assert_success
run /bin/bash -c "dokku docker-options:list $TEST_APP --phase deploy" run /bin/bash -c "dokku docker-options:list $TEST_APP --phase deploy"
echo "output: $output" echo "output: $output"
assert_output "-v /tmp/legacy:/legacy" assert_output_contains "-v /tmp/legacy:/legacy"
[[ -f "$DOKKU_ROOT/$TEST_APP/DOCKER_OPTIONS_DEPLOY" ]] [[ -f "$DOKKU_ROOT/$TEST_APP/DOCKER_OPTIONS_DEPLOY" ]]
run /bin/bash -c "cat $DOKKU_ROOT/$TEST_APP/DOCKER_OPTIONS_DEPLOY" run /bin/bash -c "cat $DOKKU_ROOT/$TEST_APP/DOCKER_OPTIONS_DEPLOY"
@@ -238,7 +238,7 @@ teardown() {
run /bin/bash -c "dokku docker-options:list $CLONE_APP --phase deploy" run /bin/bash -c "dokku docker-options:list $CLONE_APP --phase deploy"
echo "output: $output" echo "output: $output"
assert_output "-v /logs:/logs" assert_output_contains "-v /logs:/logs"
dokku --force apps:destroy "$CLONE_APP" || true dokku --force apps:destroy "$CLONE_APP" || true
} }
@@ -259,7 +259,7 @@ teardown() {
assert_output "-p 8080:5000" assert_output "-p 8080:5000"
run /bin/bash -c "dokku docker-options:list $RENAMED_APP --phase deploy" run /bin/bash -c "dokku docker-options:list $RENAMED_APP --phase deploy"
assert_output "-v /logs:/logs" assert_output_contains "-v /logs:/logs"
[[ ! -d "/var/lib/dokku/config/docker-options/$TEST_APP" ]] [[ ! -d "/var/lib/dokku/config/docker-options/$TEST_APP" ]]