m/pyenv-virtualenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv-virtualenv.git synced 2025-11-12 21:43:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix test which has broken by 2060c43387

Browse Source
This commit is contained in:
Yamashita Yuu
2014-10-27 11:04:42 +09:00
parent 2060c43387
commit 58e93f9e0d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/init.bats
View File

@@ -37,7 +37,7 @@ _pyenv_virtualenv_hook() {
unset PYENV_DEACTIVATE unset PYENV_DEACTIVATE
return 0 return 0
fi fi
if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix)" ]; then if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix 2>/dev/null)" ]; then
if pyenv deactivate --no-error --verbose; then if pyenv deactivate --no-error --verbose; then
unset PYENV_DEACTIVATE unset PYENV_DEACTIVATE
pyenv activate --no-error --verbose || unset PYENV_DEACTIVATE pyenv activate --no-error --verbose || unset PYENV_DEACTIVATE
@@ -46,7 +46,7 @@ _pyenv_virtualenv_hook() {
fi fi
fi fi
else else
if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix)" ]; then if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null)" ]; then
pyenv activate --no-error --verbose pyenv activate --no-error --verbose
fi fi
fi fi
@@ -69,7 +69,7 @@ function _pyenv_virtualenv_hook --on-event fish_prompt;
set -e PYENV_DEACTIVATE set -e PYENV_DEACTIVATE
return 0 return 0
end end
if [ "\$PYENV_ACTIVATE" != (pyenv prefix) ] if [ "\$PYENV_ACTIVATE" != (pyenv prefix 2>/dev/null) ]
if pyenv deactivate --no-error --verbose if pyenv deactivate --no-error --verbose
set -e PYENV_DEACTIVATE set -e PYENV_DEACTIVATE
pyenv activate --no-error --verbose; or set -e PYENV_DEACTIVATE pyenv activate --no-error --verbose; or set -e PYENV_DEACTIVATE
@@ -78,7 +78,7 @@ function _pyenv_virtualenv_hook --on-event fish_prompt;
end end
end end
else else
if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != (pyenv prefix) ] if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != (pyenv prefix 2>/dev/null) ]
pyenv activate --no-error --verbose pyenv activate --no-error --verbose
end end
end end
@@ -98,7 +98,7 @@ _pyenv_virtualenv_hook() {
unset PYENV_DEACTIVATE unset PYENV_DEACTIVATE
return 0 return 0
fi fi
if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix)" ]; then if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix 2>/dev/null)" ]; then
if pyenv deactivate --no-error --verbose; then if pyenv deactivate --no-error --verbose; then
unset PYENV_DEACTIVATE unset PYENV_DEACTIVATE
pyenv activate --no-error --verbose || unset PYENV_DEACTIVATE pyenv activate --no-error --verbose || unset PYENV_DEACTIVATE
@@ -107,7 +107,7 @@ _pyenv_virtualenv_hook() {
fi fi
fi fi
else else
if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix)" ]; then if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null)" ]; then
pyenv activate --no-error --verbose pyenv activate --no-error --verbose
fi fi
fi fi