Gotea/docker-machine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix #2204 broken env unset

Browse Source 
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
This commit is contained in:
Jean-Laurent de Morlhon
2015-11-10 14:41:07 +01:00
parent 9dd438e1f6
commit fe37f1fb0d
4 changed files with 146 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
test/integration/core/env_shell.bats
View File

@@ -7,6 +7,14 @@ load ${BASE_TEST_DIR}/helpers.bash
[ "$status" -eq 0 ]
}
@test "$DRIVER: test basic bash / zsh notation" {
run machine env $NAME
[[ ${lines[0]} == "export DOCKER_TLS_VERIFY=\"1\"" ]]
[[ ${lines[1]} == "export DOCKER_HOST=\"$(machine url $NAME)\"" ]]
[[ ${lines[2]} == "export DOCKER_CERT_PATH=\"$MACHINE_STORAGE_PATH/machines/$NAME\"" ]]
[[ ${lines[3]} == "export DOCKER_MACHINE_NAME=\"$NAME\"" ]]
}
@test "$DRIVER: test powershell notation" {
run machine env --shell powershell --no-proxy $NAME
[[ ${lines[0]} == "\$Env:DOCKER_TLS_VERIFY = \"1\"" ]]
@@ -16,7 +24,7 @@ load ${BASE_TEST_DIR}/helpers.bash
[[ ${lines[4]} == "\$Env:NO_PROXY = \"$(machine ip $NAME)\"" ]]
}
@test "$DRIVER: test bash / zsh notation" {
@test "$DRIVER: test bash / zsh notation with no-proxy" {
run machine env --no-proxy $NAME
[[ ${lines[0]} == "export DOCKER_TLS_VERIFY=\"1\"" ]]
[[ ${lines[1]} == "export DOCKER_HOST=\"$(machine url $NAME)\"" ]]
@@ -43,8 +51,56 @@ load ${BASE_TEST_DIR}/helpers.bash
[[ ${lines[4]} == "set -x NO_PROXY \"$(machine ip $NAME)\";" ]]
}
@test "$DRIVER: no proxy with NO_PROXY already set" {
@test "$DRIVER: test no proxy with NO_PROXY already set" {
export NO_PROXY=localhost
run machine env --no-proxy $NAME
[[ ${lines[4]} == "export NO_PROXY=\"localhost,$(machine ip $NAME)\"" ]]
}
@test "$DRIVER: test unset with an args should fail" {
run machine env -u $NAME
[ "$status" -eq 1 ]
[[ ${lines} == "Error: Expected no machine name when the -u flag is present" ]]
}
@test "$DRIVER: test bash/zsh unset" {
run machine env -u
[[ ${lines[0]} == "unset DOCKER_TLS_VERIFY" ]]
[[ ${lines[1]} == "unset DOCKER_HOST" ]]
[[ ${lines[2]} == "unset DOCKER_CERT_PATH" ]]
[[ ${lines[3]} == "unset DOCKER_MACHINE_NAME" ]]
}
@test "$DRIVER: test unset killing no proxy" {
run machine env --no-proxy -u
[[ ${lines[0]} == "unset DOCKER_TLS_VERIFY" ]]
[[ ${lines[1]} == "unset DOCKER_HOST" ]]
[[ ${lines[2]} == "unset DOCKER_CERT_PATH" ]]
[[ ${lines[3]} == "unset DOCKER_MACHINE_NAME" ]]
[[ ${lines[4]} == "unset NO_PROXY" ]]
}
@test "$DRIVER: unset powershell" {
run machine env --shell powershell -u
[[ ${lines[0]} == 'Remove-Item Env:\\DOCKER_TLS_VERIFY' ]]
[[ ${lines[1]} == 'Remove-Item Env:\\DOCKER_HOST' ]]
[[ ${lines[2]} == 'Remove-Item Env:\\DOCKER_CERT_PATH' ]]
[[ ${lines[3]} == 'Remove-Item Env:\\DOCKER_MACHINE_NAME' ]]
}
@test "$DRIVER: unset with fish shell" {
run machine env --shell fish -u
[[ ${lines[0]} == "set -e DOCKER_TLS_VERIFY;" ]]
[[ ${lines[1]} == "set -e DOCKER_HOST;" ]]
[[ ${lines[2]} == "set -e DOCKER_CERT_PATH;" ]]
[[ ${lines[3]} == "set -e DOCKER_MACHINE_NAME;" ]]
}
@test "$DRIVER: unset with cmd shell" {
run machine env --shell cmd -u
[[ ${lines[0]} == "SET DOCKER_TLS_VERIFY=" ]]
[[ ${lines[1]} == "SET DOCKER_HOST=" ]]
[[ ${lines[2]} == "SET DOCKER_CERT_PATH=" ]]
[[ ${lines[3]} == "SET DOCKER_MACHINE_NAME=" ]]
}