From ab5b5b922198947cc9811fa4b4d6a8a2a160ca25 Mon Sep 17 00:00:00 2001
From: puhitaku <puhitaku@gmail.com>
Date: Fri, 8 Apr 2016 17:27:11 +0900
Subject: [PATCH] Fix tests

---
 test/activate.bats | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/test/activate.bats b/test/activate.bats
index 5953265..05c4ecd 100644
--- a/test/activate.bats
+++ b/test/activate.bats
@@ -11,6 +11,7 @@ setup() {
   unset CONDA_DEFAULT_ENV
   unset PYTHONHOME
   unset _OLD_VIRTUAL_PYTHONHOME
+  unset PYENV_VIRTUALENV_VERBOSE_ACTIVATE
   unset PYENV_VIRTUALENV_DISABLE_PROMPT
   unset PYENV_VIRTUAL_ENV_DISABLE_PROMPT
   unset VIRTUAL_ENV_DISABLE_PROMPT
@@ -29,8 +30,6 @@ setup() {
 
   assert_success
   assert_output <<EOS
-deactivated
-pyenv-virtualenv: activate venv
 export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
 export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
 pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
@@ -46,6 +45,8 @@ EOS
 
 @test "activate virtualenv from current version (verbose)" {
   export PYENV_VIRTUALENV_INIT=1
+  export PYENV_VIRTUALENV_DISABLE_PROMPT=1
+  export PYENV_VIRTUALENV_VERBOSE_ACTIVATE=1
 
   stub pyenv-version-name "echo venv"
   stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
@@ -83,8 +84,6 @@ EOS
 
   assert_success
   assert_output <<EOS
-deactivated
-pyenv-virtualenv: activate venv
 export PYENV_VERSION="venv";
 export PYENV_ACTIVATE_SHELL=1;
 export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
@@ -112,8 +111,6 @@ EOS
 
   assert_success
   assert_output <<EOS
-deactivated
-pyenv-virtualenv: activate venv
 setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
 setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
 pyenv-virtualenv: prompt changing not working for fish.
@@ -137,8 +134,6 @@ EOS
 
   assert_success
   assert_output <<EOS
-deactivated
-pyenv-virtualenv: activate venv
 setenv PYENV_VERSION "venv";
 setenv PYENV_ACTIVATE_SHELL 1;
 setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
@@ -163,8 +158,6 @@ EOS
 
   assert_success
   assert_output <<EOS
-deactivated
-pyenv-virtualenv: activate venv27
 export PYENV_VERSION="venv27";
 export PYENV_ACTIVATE_SHELL=1;
 export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv27";
@@ -190,8 +183,6 @@ EOS
 
   assert_success
   assert_output <<EOS
-deactivated
-pyenv-virtualenv: activate venv27
 export PYENV_VERSION="venv27";
 export PYENV_ACTIVATE_SHELL=1;
 export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv27";
@@ -217,8 +208,6 @@ EOS
 
   assert_success
   assert_output <<EOS
-deactivated
-pyenv-virtualenv: activate venv27
 setenv PYENV_VERSION "venv27";
 setenv PYENV_ACTIVATE_SHELL 1;
 setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
@@ -242,8 +231,6 @@ EOS
 
   assert_success
   assert_output <<EOS
-deactivated
-pyenv-virtualenv: activate venv27
 setenv PYENV_VERSION "venv27";
 setenv PYENV_ACTIVATE_SHELL 1;
 setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
@@ -267,7 +254,6 @@ EOS
 
   assert_success
   assert_output <<EOS
-deactivated
 EOS
 
   unstub pyenv-sh-deactivate
@@ -366,8 +352,6 @@ EOS
 
   assert_success
   assert_output <<EOS
-deactivated
-pyenv-virtualenv: activate venv27
 export PYENV_VERSION="venv27:2.7.10";
 export PYENV_ACTIVATE_SHELL=1;
 export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv27";