From 58e93f9e0d7fa45e44bb2f13caff49668e1cad47 Mon Sep 17 00:00:00 2001 From: Yamashita Yuu Date: Mon, 27 Oct 2014 11:04:42 +0900 Subject: [PATCH] Fix test which has broken by 2060c43387d452a00d2aed0f094fc8e248bdb0db --- test/init.bats | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/init.bats b/test/init.bats index 7712c9e..238f7ea 100644 --- a/test/init.bats +++ b/test/init.bats @@ -37,7 +37,7 @@ _pyenv_virtualenv_hook() { unset PYENV_DEACTIVATE return 0 fi - if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix)" ]; then + if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix 2>/dev/null)" ]; then if pyenv deactivate --no-error --verbose; then unset PYENV_DEACTIVATE pyenv activate --no-error --verbose || unset PYENV_DEACTIVATE @@ -46,7 +46,7 @@ _pyenv_virtualenv_hook() { fi fi 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 fi fi @@ -69,7 +69,7 @@ function _pyenv_virtualenv_hook --on-event fish_prompt; set -e PYENV_DEACTIVATE return 0 end - if [ "\$PYENV_ACTIVATE" != (pyenv prefix) ] + if [ "\$PYENV_ACTIVATE" != (pyenv prefix 2>/dev/null) ] if pyenv deactivate --no-error --verbose 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 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 end end @@ -98,7 +98,7 @@ _pyenv_virtualenv_hook() { unset PYENV_DEACTIVATE return 0 fi - if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix)" ]; then + if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix 2>/dev/null)" ]; then if pyenv deactivate --no-error --verbose; then unset PYENV_DEACTIVATE pyenv activate --no-error --verbose || unset PYENV_DEACTIVATE @@ -107,7 +107,7 @@ _pyenv_virtualenv_hook() { fi fi 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 fi fi