Merge pull request #40 from ebeigarts/export-fix

Fix exit code for redis:export when SSH_TTY is not present
This commit is contained in:
Jose Diaz-Gonzalez
2016-02-25 01:34:56 -05:00
2 changed files with 12 additions and 1 deletions

View File

@@ -117,7 +117,9 @@ case "$1" in
[[ -n $SSH_TTY ]] && stty -opost
docker exec "$SERVICE_NAME" bash -c "echo SAVE | redis-cli" > /dev/null 2>&1
docker exec "$SERVICE_NAME" cat /data/dump.rdb
status=$?
[[ -n $SSH_TTY ]] && stty opost
exit $status
;;
$PLUGIN_COMMAND_PREFIX:import)

View File

@@ -21,9 +21,18 @@ teardown() {
assert_contains "${lines[*]}" "service not_existing_service does not exist"
}
@test "($PLUGIN_COMMAND_PREFIX:export) success" {
@test "($PLUGIN_COMMAND_PREFIX:export) success with SSH TTY" {
export ECHO_DOCKER_COMMAND="true"
export SSH_TTY=`tty`
run dokku "$PLUGIN_COMMAND_PREFIX:export" l
assert_exit_status 0
assert_output "docker exec dokku.redis.l cat /data/dump.rdb"
}
@test "($PLUGIN_COMMAND_PREFIX:export) success without SSH TTY" {
export ECHO_DOCKER_COMMAND="true"
unset SSH_TTY
run dokku "$PLUGIN_COMMAND_PREFIX:export" l
assert_exit_status 0
assert_output "docker exec dokku.redis.l cat /data/dump.rdb"
}