From e655abbd416ec6223fc05a9e4a46eb5f3029a640 Mon Sep 17 00:00:00 2001 From: Yamashita Yuu Date: Sun, 12 Oct 2014 21:37:10 +0900 Subject: [PATCH] Fix broken tests (#47) --- test/init.bats | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/init.bats b/test/init.bats index 65dfbda..7712c9e 100644 --- a/test/init.bats +++ b/test/init.bats @@ -34,10 +34,12 @@ _pyenv_virtualenv_hook() { if [ -n "\$PYENV_ACTIVATE" ]; then if [ "\$(pyenv version-name)" = "system" ]; then pyenv deactivate --no-error --verbose + unset PYENV_DEACTIVATE return 0 fi if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix)" ]; then if pyenv deactivate --no-error --verbose; then + unset PYENV_DEACTIVATE pyenv activate --no-error --verbose || unset PYENV_DEACTIVATE else pyenv activate --no-error --verbose @@ -64,10 +66,12 @@ function _pyenv_virtualenv_hook --on-event fish_prompt; if [ -n "\$PYENV_ACTIVATE" ] if [ (pyenv version-name) = "system" ] pyenv deactivate --no-error --verbose + set -e PYENV_DEACTIVATE return 0 end if [ "\$PYENV_ACTIVATE" != (pyenv prefix) ] if pyenv deactivate --no-error --verbose + set -e PYENV_DEACTIVATE pyenv activate --no-error --verbose; or set -e PYENV_DEACTIVATE else pyenv activate --no-error --verbose @@ -91,10 +95,12 @@ _pyenv_virtualenv_hook() { if [ -n "\$PYENV_ACTIVATE" ]; then if [ "\$(pyenv version-name)" = "system" ]; then pyenv deactivate --no-error --verbose + unset PYENV_DEACTIVATE return 0 fi if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix)" ]; then if pyenv deactivate --no-error --verbose; then + unset PYENV_DEACTIVATE pyenv activate --no-error --verbose || unset PYENV_DEACTIVATE else pyenv activate --no-error --verbose