fix broken tests

This commit is contained in:
Yamashita, Yuu
2015-11-06 18:26:23 +00:00
parent 017d20ad91
commit 0fa5de07c9
7 changed files with 66 additions and 62 deletions

View File

@@ -134,12 +134,12 @@ if [[ "$shell" != "fish" ]]; then
local ret=\$?
if [ -n "\$VIRTUAL_ENV" ]; then
if [ "\$VIRTUAL_ENV" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
eval "\$(pyenv sh-deactivate --quiet)" || true
eval "\$(pyenv sh-activate --quiet)" || true
eval "\$(pyenv sh-deactivate --quiet || true)" || true
eval "\$(pyenv sh-activate --quiet || true)" || true
fi
else
if [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
eval "\$(pyenv sh-activate --quiet)" || true
eval "\$(pyenv sh-activate --quiet || true)" || true
fi
fi
return \$ret