Merge pull request #1514 from progrium/mh-no-exit0-in-config-func

do not use exit 0 in config functions
This commit is contained in:
Jose Diaz-Gonzalez committed 2015-09-28 21:49:58 -04:00
commit 781b8e9009
3 files changed
+42 -6

No files matched your search

+2 -2
View File
@@ -6,8 +6,8 @@ source "$PLUGIN_AVAILABLE_PATH/config/functions"
APP="$1"; IMAGE=$(get_app_image_name $APP); BUILD_ENV="" APP="$1"; IMAGE=$(get_app_image_name $APP); BUILD_ENV=""
verify_app_name "$APP" verify_app_name "$APP"
config_get --global CURL_CONNECT_TIMEOUT > /dev/null 2>&1 || config_set --global CURL_CONNECT_TIMEOUT=5 [[ -z $(config_get --global CURL_CONNECT_TIMEOUT) ]] && config_set --global CURL_CONNECT_TIMEOUT=5
config_get --global CURL_TIMEOUT > /dev/null 2>&1 || config_set --global CURL_TIMEOUT=30 [[ -z $(config_get --global CURL_TIMEOUT) ]] && config_set --global CURL_TIMEOUT=30
if [[ -n $(config_export global) ]]; then if [[ -n $(config_export global) ]]; then
BUILD_ENV+=$'\n' BUILD_ENV+=$'\n'
+3 -3
View File
@@ -102,7 +102,7 @@ config_all() {
[[ "$1" == "config" ]] || set -- "config" "$@" [[ "$1" == "config" ]] || set -- "config" "$@"
config_parse_args "$@" config_parse_args "$@"
config_create "$ENV_FILE" config_create "$ENV_FILE"
is_config_export "$@" && config_export "$DOKKU_CONFIG_TYPE" "$APP" && exit 0 is_config_export "$@" && config_export "$DOKKU_CONFIG_TYPE" "$APP" && return 0
[[ "$APP" ]] && DOKKU_CONFIG_TYPE=$APP [[ "$APP" ]] && DOKKU_CONFIG_TYPE=$APP
[[ ! -s $ENV_FILE ]] && dokku_log_fail "no config vars for $DOKKU_CONFIG_TYPE" [[ ! -s $ENV_FILE ]] && dokku_log_fail "no config vars for $DOKKU_CONFIG_TYPE"
@@ -112,7 +112,7 @@ config_all() {
for var in "$@"; do for var in "$@"; do
if [[ "$var" == "--shell" ]]; then if [[ "$var" == "--shell" ]]; then
echo $VARS echo $VARS
exit 0 return 0
fi fi
done done
@@ -132,7 +132,7 @@ config_get() {
config_create "$ENV_FILE" config_create "$ENV_FILE"
if [[ ! -s $ENV_FILE ]]; then if [[ ! -s $ENV_FILE ]]; then
exit 0 return 0
fi fi
KEY="$3" KEY="$3"
+37 -1
View File
@@ -11,11 +11,47 @@ teardown() {
} }
@test "(build-env) special characters" { @test "(build-env) special characters" {
run dokku config:set $TEST_APP NEWRELIC_APP_NAME="$TEST_APP (Staging)" run dokku config:set --no-restart $TEST_APP NEWRELIC_APP_NAME="$TEST_APP (Staging)"
echo "output: "$output echo "output: "$output
echo "status: "$status echo "status: "$status
assert_success assert_success
deploy_app deploy_app
run dokku config $TEST_APP run dokku config $TEST_APP
assert_success assert_success
} }
@test "(build-env) default curl timeouts" {
run dokku config:unset --global CURL_CONNECT_TIMEOUT
echo "output: "$output
echo "status: "$status
assert_success
run dokku config:unset --global CURL_TIMEOUT
echo "output: "$output
echo "status: "$status
assert_success
deploy_app
run /bin/bash -c "dokku config:get --global CURL_CONNECT_TIMEOUT | grep 5"
echo "output: "$output
echo "status: "$status
assert_success
run /bin/bash -c "dokku config:get --global CURL_TIMEOUT | grep 30"
echo "output: "$output
echo "status: "$status
assert_success
}
@test "(build-env) buildpack failure" {
run dokku config:set --no-restart $TEST_APP BUILDPACK_URL='https://github.com/dokku/fake-buildpack'
echo "output: "$output
echo "status: "$status
assert_success
run deploy_app
echo "output: "$output
echo "status: "$status
assert_failure
}