From 82e433906c4fb6e91ca4ec927a17ccefb2a5a343 Mon Sep 17 00:00:00 2001 From: ZyX Date: Sun, 20 Jul 2014 00:32:16 +0400 Subject: [PATCH] Fix shell tests: VIRTUAL_ENV is not accessible by powerline by default --- tests/test_shells/input.bash | 2 +- tests/test_shells/input.fish | 6 +++--- tests/test_shells/input.zsh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/test_shells/input.bash b/tests/test_shells/input.bash index 3a95d3a1..748e78fa 100644 --- a/tests/test_shells/input.bash +++ b/tests/test_shells/input.bash @@ -1,7 +1,7 @@ POWERLINE_COMMAND="$PWD/scripts/powerline -p $PWD/powerline/config_files" POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.args.only_if_ssh=false" POWERLINE_COMMAND="$POWERLINE_COMMAND -c ext.shell.theme=default_leftonly" -VIRTUAL_ENV= +export VIRTUAL_ENV= source powerline/bindings/bash/powerline.sh ; cd tests/shell/3rd cd .git cd .. diff --git a/tests/test_shells/input.fish b/tests/test_shells/input.fish index afb3df3b..3e69ad5e 100644 --- a/tests/test_shells/input.fish +++ b/tests/test_shells/input.fish @@ -1,13 +1,13 @@ set POWERLINE_COMMAND "$PWD/scripts/powerline -p $PWD/powerline/config_files" set POWERLINE_COMMAND "$POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.args.only_if_ssh=false" set POWERLINE_COMMAND "$POWERLINE_COMMAND -c ext.shell.theme=default_leftonly" -set VIRTUAL_ENV +setenv VIRTUAL_ENV set fish_function_path $fish_function_path "$PWD/powerline/bindings/fish" powerline-setup ; cd tests/shell/3rd cd .git cd .. -set VIRTUAL_ENV "$HOME/.virtenvs/some-virtual-environment" -set VIRTUAL_ENV +setenv VIRTUAL_ENV "$HOME/.virtenvs/some-virtual-environment" +setenv VIRTUAL_ENV bash -c 'echo $$>pid ; while true ; do sleep 0.1s ; done' & false kill (cat pid) ; sleep 1s diff --git a/tests/test_shells/input.zsh b/tests/test_shells/input.zsh index 5beb8517..ca888d51 100644 --- a/tests/test_shells/input.zsh +++ b/tests/test_shells/input.zsh @@ -2,7 +2,7 @@ unsetopt promptsp transientrprompt POWERLINE_COMMAND=( $PWD/scripts/powerline -p $PWD/powerline/config_files ) POWERLINE_COMMAND=( $POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.args.only_if_ssh=false ) POWERLINE_COMMAND=( $POWERLINE_COMMAND -c ext.shell.theme=default_leftonly ) -VIRTUAL_ENV= +export VIRTUAL_ENV= source powerline/bindings/zsh/powerline.zsh ; cd tests/shell/3rd cd .git cd ..