dokku/dokku-redis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: update tests to properly handle case where app is not running

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2023-02-21 00:48:23 -05:00
parent 3154beb12d
commit b3747635b2
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common-functions
View File

@@ -633,6 +633,7 @@ service_link() {
plugn trigger service-action post-link "$PLUGIN_COMMAND_PREFIX" "$SERVICE" "$APP" plugn trigger service-action post-link "$PLUGIN_COMMAND_PREFIX" "$SERVICE" "$APP"
if [[ "$DOKKU_GLOBAL_FLAGS" == *"--no-restart"* ]] || [[ "$SERVICE_RESTART_APPS" == "false" ]]; then if [[ "$DOKKU_GLOBAL_FLAGS" == *"--no-restart"* ]] || [[ "$SERVICE_RESTART_APPS" == "false" ]]; then
config_set --no-restart "$APP" "${ALIAS}_URL=$SERVICE_URL" config_set --no-restart "$APP" "${ALIAS}_URL=$SERVICE_URL"
dokku_log_verbose "Skipping restart of linked app"
else else
config_set "$APP" "${ALIAS}_URL=$SERVICE_URL" config_set "$APP" "${ALIAS}_URL=$SERVICE_URL"
fi fi
@@ -977,6 +978,7 @@ service_unlink() {
plugn trigger service-action post-unlink "$PLUGIN_COMMAND_PREFIX" "$SERVICE" "$APP" plugn trigger service-action post-unlink "$PLUGIN_COMMAND_PREFIX" "$SERVICE" "$APP"
if [[ "$DOKKU_GLOBAL_FLAGS" == *"--no-restart"* ]] || [[ "$SERVICE_RESTART_APPS" == "false" ]]; then if [[ "$DOKKU_GLOBAL_FLAGS" == *"--no-restart"* ]] || [[ "$SERVICE_RESTART_APPS" == "false" ]]; then
config_unset --no-restart "$APP" "${LINK[@]}" config_unset --no-restart "$APP" "${LINK[@]}"
dokku_log_verbose "Skipping restart of linked app"
else else
config_unset "$APP" "${LINK[@]}" config_unset "$APP" "${LINK[@]}"
fi fi

7
tests/service_link.bats
View File

@@ -117,11 +117,12 @@ teardown() {
dokku "$PLUGIN_COMMAND_PREFIX:unlink" ls my-app dokku "$PLUGIN_COMMAND_PREFIX:unlink" ls my-app
} }
@test "($PLUGIN_COMMAND_PREFIX:link) respects --no-restart" { @test "($PLUGIN_COMMAND_PREFIX:link) respects --no-restart" {
run dokku "$PLUGIN_COMMAND_PREFIX:link" ls my-app --no-restart run dokku "$PLUGIN_COMMAND_PREFIX:link" ls my-app
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"
assert_output_contains "Restarting app my-app" 1 assert_output_contains "Skipping restart of linked app" 0
assert_success assert_success
run dokku "$PLUGIN_COMMAND_PREFIX:unlink" ls my-app run dokku "$PLUGIN_COMMAND_PREFIX:unlink" ls my-app
@@ -132,7 +133,7 @@ teardown() {
run dokku "$PLUGIN_COMMAND_PREFIX:link" ls my-app --no-restart run dokku "$PLUGIN_COMMAND_PREFIX:link" ls my-app --no-restart
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"
assert_output_contains "Restarting app my-app" 0 assert_output_contains "Skipping restart of linked app"
assert_success assert_success
run dokku "$PLUGIN_COMMAND_PREFIX:unlink" ls my-app run dokku "$PLUGIN_COMMAND_PREFIX:unlink" ls my-app

4
tests/service_unlink.bats
View File

@@ -56,7 +56,7 @@ teardown() {
run dokku "$PLUGIN_COMMAND_PREFIX:unlink" ls my-app run dokku "$PLUGIN_COMMAND_PREFIX:unlink" ls my-app
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"
assert_output_contains "Restarting app my-app" 1 assert_output_contains "Skipping restart of linked app" 0
assert_success assert_success
run dokku "$PLUGIN_COMMAND_PREFIX:link" ls my-app run dokku "$PLUGIN_COMMAND_PREFIX:link" ls my-app
@@ -67,6 +67,6 @@ teardown() {
run dokku "$PLUGIN_COMMAND_PREFIX:unlink" ls my-app --no-restart run dokku "$PLUGIN_COMMAND_PREFIX:unlink" ls my-app --no-restart
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"
assert_output_contains "Restarting app my-app" 0 assert_output_contains "Skipping restart of linked app"
assert_success assert_success
} }