From 99307312c98706d602aa24a05be9768f038af54e Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 2 Dec 2017 13:43:18 -0500 Subject: [PATCH 1/5] fix: Properly handle updated config functions Closes dokku/dokku-redis#90 --- .travis.yml | 11 +++++------ common-functions | 1 + tests/service_unlink.bats | 7 ++++++- tests/setup.sh | 6 ++++++ tests/test_helper.bash | 1 + 5 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 451fe6f..e2419ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,9 @@ sudo: required dist: trusty language: bash env: - - DOKKU_VERSION=master - - DOKKU_VERSION=v0.7.0 - - DOKKU_VERSION=v0.6.0 - - DOKKU_VERSION=v0.5.0 - - DOKKU_VERSION=v0.4.0 -before_install: make setup + - DOKKU_VERSION=system-user DOKKU_SYSTEM_GROUP=travis DOKKU_SYSTEM_USER=travis + - DOKKU_VERSION=v0.7.0 DOKKU_SYSTEM_GROUP=travis DOKKU_SYSTEM_USER=travis + - DOKKU_VERSION=v0.6.0 DOKKU_SYSTEM_GROUP=travis DOKKU_SYSTEM_USER=travis + - DOKKU_VERSION=v0.5.0 DOKKU_SYSTEM_GROUP=travis DOKKU_SYSTEM_USER=travis + - DOKKU_VERSION=v0.4.0 DOKKU_SYSTEM_GROUP=travis DOKKU_SYSTEM_USER=travis script: make test diff --git a/common-functions b/common-functions index 413c050..d08b2e4 100755 --- a/common-functions +++ b/common-functions @@ -1,5 +1,6 @@ #!/usr/bin/env bash set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x +source "$PLUGIN_AVAILABLE_PATH/config/functions" docker_ports_options() { declare desc="Exports a list of exposed ports" diff --git a/tests/service_unlink.bats b/tests/service_unlink.bats index 6958d45..d58ba6a 100755 --- a/tests/service_unlink.bats +++ b/tests/service_unlink.bats @@ -39,7 +39,12 @@ teardown() { @test "($PLUGIN_COMMAND_PREFIX:unlink) removes link from docker-options" { dokku "$PLUGIN_COMMAND_PREFIX:link" l my_app >&2 dokku "$PLUGIN_COMMAND_PREFIX:unlink" l my_app - options=$(dokku docker-options my_app | xargs) + + report_action="docker-options" + [[ "$(dokku version)" == "master" ]] && report_action="docker-options:report" + [[ "$(at-least-version 0.8.1 "$(dokku version)")" == "true" ]] && report_action="docker-options:report" + + options=$(dokku docker-options $report_action | xargs) check_value="" [[ "$(dokku version)" == "master" ]] && check_value="Deploy options: --restart=on-failure:10" [[ "$(at-least-version 0.7.0 "$(dokku version)")" == "true" ]] && check_value="Deploy options: --restart=on-failure:10" diff --git a/tests/setup.sh b/tests/setup.sh index 5703c57..9f78440 100644 --- a/tests/setup.sh +++ b/tests/setup.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/test_helper.bash" BIN_STUBS="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/bin" @@ -10,6 +11,11 @@ fi cd $DOKKU_ROOT echo "Dokku version $DOKKU_VERSION" git checkout $DOKKU_VERSION > /dev/null +if grep go-build Makefile > /dev/null; then + mv "$BIN_STUBS/docker" "$BIN_STUBS/docker-stub" + make go-build + mv "$BIN_STUBS/docker-stub" "$BIN_STUBS/docker" +fi cd - source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/config" diff --git a/tests/test_helper.bash b/tests/test_helper.bash index 1cad2f1..a1441b0 100644 --- a/tests/test_helper.bash +++ b/tests/test_helper.bash @@ -11,6 +11,7 @@ export PLUGIN_CORE_AVAILABLE_PATH="$PLUGIN_PATH" export REDIS_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/fixtures" export PLUGIN_DATA_ROOT="$REDIS_ROOT" export PLUGIN_CONFIG_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/config" +export DOKKU_LIB_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/lib-root" if [[ "$(uname)" == "Darwin" ]]; then export PLUGN_URL="https://github.com/dokku/plugn/releases/download/v0.3.0/plugn_0.3.0_darwin_x86_64.tgz" else From a4ce878846be48d56c51ab52b84475a5d0e90a21 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 12 Jan 2018 10:42:05 -0500 Subject: [PATCH 2/5] fix: call options correctly --- tests/service_unlink.bats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/service_unlink.bats b/tests/service_unlink.bats index d58ba6a..0d418ff 100755 --- a/tests/service_unlink.bats +++ b/tests/service_unlink.bats @@ -44,7 +44,7 @@ teardown() { [[ "$(dokku version)" == "master" ]] && report_action="docker-options:report" [[ "$(at-least-version 0.8.1 "$(dokku version)")" == "true" ]] && report_action="docker-options:report" - options=$(dokku docker-options $report_action | xargs) + options=$(dokku $report_action my_app | xargs) check_value="" [[ "$(dokku version)" == "master" ]] && check_value="Deploy options: --restart=on-failure:10" [[ "$(at-least-version 0.7.0 "$(dokku version)")" == "true" ]] && check_value="Deploy options: --restart=on-failure:10" From 82e4f11d7944bfc03e28278cf5278b093c7f3423 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 12 Jan 2018 11:46:52 -0500 Subject: [PATCH 3/5] fix: use correct branch --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e2419ef..81181d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: required dist: trusty language: bash env: - - DOKKU_VERSION=system-user DOKKU_SYSTEM_GROUP=travis DOKKU_SYSTEM_USER=travis + - DOKKU_VERSION=master DOKKU_SYSTEM_GROUP=travis DOKKU_SYSTEM_USER=travis - DOKKU_VERSION=v0.7.0 DOKKU_SYSTEM_GROUP=travis DOKKU_SYSTEM_USER=travis - DOKKU_VERSION=v0.6.0 DOKKU_SYSTEM_GROUP=travis DOKKU_SYSTEM_USER=travis - DOKKU_VERSION=v0.5.0 DOKKU_SYSTEM_GROUP=travis DOKKU_SYSTEM_USER=travis From 90b464eef2559a523e1ecde744a9dfda5140a080 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 12 Jan 2018 12:07:13 -0500 Subject: [PATCH 4/5] fix: set proper check_value for docker-options:report --- tests/service_unlink.bats | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/service_unlink.bats b/tests/service_unlink.bats index 0d418ff..165a7f4 100755 --- a/tests/service_unlink.bats +++ b/tests/service_unlink.bats @@ -40,14 +40,17 @@ teardown() { dokku "$PLUGIN_COMMAND_PREFIX:link" l my_app >&2 dokku "$PLUGIN_COMMAND_PREFIX:unlink" l my_app + check_value="" report_action="docker-options" - [[ "$(dokku version)" == "master" ]] && report_action="docker-options:report" - [[ "$(at-least-version 0.8.1 "$(dokku version)")" == "true" ]] && report_action="docker-options:report" + if [[ "$(dokku version)" == "master" ]]; then + check_value="Deploy options: --restart=on-failure:10" + report_action="docker-options:report" + elif [[ "$(at-least-version 0.8.1 "$(dokku version)")" == "true" ]]; then + check_value="Docker options build: Docker options deploy: --restart=on-failure:10 Docker options run:" + report_action="docker-options:report" + fi options=$(dokku $report_action my_app | xargs) - check_value="" - [[ "$(dokku version)" == "master" ]] && check_value="Deploy options: --restart=on-failure:10" - [[ "$(at-least-version 0.7.0 "$(dokku version)")" == "true" ]] && check_value="Deploy options: --restart=on-failure:10" assert_equal "$options" "$check_value" } From 6b80463820fb5f075826ee7ff6f1547c67448c6d Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 12 Jan 2018 12:45:25 -0500 Subject: [PATCH 5/5] fix: correct tests for 0.7.0 --- tests/service_unlink.bats | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/service_unlink.bats b/tests/service_unlink.bats index 165a7f4..cbd7c7f 100755 --- a/tests/service_unlink.bats +++ b/tests/service_unlink.bats @@ -43,11 +43,13 @@ teardown() { check_value="" report_action="docker-options" if [[ "$(dokku version)" == "master" ]]; then - check_value="Deploy options: --restart=on-failure:10" + check_value="Docker options build: Docker options deploy: --restart=on-failure:10 Docker options run:" report_action="docker-options:report" elif [[ "$(at-least-version 0.8.1 "$(dokku version)")" == "true" ]]; then check_value="Docker options build: Docker options deploy: --restart=on-failure:10 Docker options run:" report_action="docker-options:report" + elif [[ "$(at-least-version 0.7.0 "$(dokku version)")" == "true" ]]; then + check_value="Deploy options: --restart=on-failure:10" fi options=$(dokku $report_action my_app | xargs)