Add --quiet option to activate and deactivate

This commit is contained in:
Yamashita Yuu
2014-07-04 20:47:10 +09:00
parent 5b3b909089
commit f0c400b669
4 changed files with 132 additions and 24 deletions

View File

@@ -137,7 +137,7 @@ EOS
}
@test "should fail if the version is not a virtualenv" {
stub pyenv-virtualenv-prefix "3.3.3 : echo \"not a virtualenv\" 1>&2; false"
stub pyenv-virtualenv-prefix "3.3.3 : false"
run pyenv-sh-activate "3.3.3"
@@ -145,7 +145,20 @@ EOS
assert_failure
assert_output <<EOS
not a virtualenv
pyenv-virtualenv: version \`3.3.3' is not a virtualenv
false
EOS
}
@test "should fail if the version is not a virtualenv (quiet)" {
stub pyenv-virtualenv-prefix "3.3.3 : false"
run pyenv-sh-activate --quiet "3.3.3"
unstub pyenv-virtualenv-prefix
assert_failure
assert_output <<EOS
false
EOS
}
@@ -160,6 +173,15 @@ false
EOS
}
@test "should fail if there are multiple versions (quiet)" {
run pyenv-sh-activate --quiet "venv" "venv27"
assert_failure
assert_output <<EOS
false
EOS
}
@test "should fail if activate is invoked as a command" {
run pyenv-activate

View File

@@ -23,7 +23,23 @@ fi;
EOS
}
@test "deactivate virtualenv (without pyenv-virtualenv-init)" {
@test "deactivate virtualenv (quiet)" {
export PYENV_VIRTUALENV_INIT=1
PYENV_SHELL="bash" run pyenv-sh-deactivate --quiet
assert_success
assert_output <<EOS
if declare -f deactivate 1>/dev/null 2>&1; then
export PYENV_DEACTIVATE="\$VIRTUAL_ENV";
deactivate;
else
false;
fi;
EOS
}
@test "deactivate virtualenv (w/o pyenv-virtualenv-init)" {
export PYENV_VIRTUALENV_INIT=
PYENV_SHELL="bash" run pyenv-sh-deactivate
@@ -41,6 +57,23 @@ fi;
EOS
}
@test "deactivate virtualenv (w/o pyenv-virtualenv-init) (quiet)" {
export PYENV_VIRTUALENV_INIT=
PYENV_SHELL="bash" run pyenv-sh-deactivate --quiet
assert_success
assert_output <<EOS
if declare -f deactivate 1>/dev/null 2>&1; then
pyenv shell --unset;
export PYENV_DEACTIVATE="\$VIRTUAL_ENV";
deactivate;
else
false;
fi;
EOS
}
@test "deactivate virtualenv (fish)" {
export PYENV_VIRTUALENV_INIT=1
@@ -58,7 +91,23 @@ end;
EOS
}
@test "deactivate virtualenv (fish) (without pyenv-virtualenv-init)" {
@test "deactivate virtualenv (fish) (quiet)" {
export PYENV_VIRTUALENV_INIT=1
PYENV_SHELL="fish" run pyenv-sh-deactivate --quiet
assert_success
assert_output <<EOS
if functions -q deactivate
setenv PYENV_DEACTIVATE "\$VIRTUAL_ENV";
deactivate;
else
false;
end;
EOS
}
@test "deactivate virtualenv (fish) (w/o pyenv-virtualenv-init)" {
export PYENV_VIRTUALENV_INIT=
PYENV_SHELL="fish" run pyenv-sh-deactivate
@@ -76,6 +125,22 @@ end;
EOS
}
@test "deactivate virtualenv (fish) (w/o pyenv-virtualenv-init) (quiet)" {
export PYENV_VIRTUALENV_INIT=
PYENV_SHELL="fish" run pyenv-sh-deactivate --quiet
assert_success
assert_output <<EOS
if functions -q deactivate
pyenv shell --unset;
setenv PYENV_DEACTIVATE "\$VIRTUAL_ENV";
deactivate;
else
false;
end;
EOS
}
@test "should fail if deactivate is invoked as a command" {
run pyenv-deactivate