Skip to content

Commit bc4c73a

Browse files
ackalkerackalker
committed
Fix tests failing after pyenv#423 
1 parent 8f721ac commit bc4c73a

File tree

4 files changed

+49
-49
lines changed

4 files changed

+49
-49
lines changed

‎test/activate.bats

+14-14
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ deactivated
3434
export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
3535
export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
3636
pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
37-
export _OLD_VIRTUAL_PS1="\${PS1}";
38-
export PS1="(venv) \${PS1}";
37+
export _OLD_VIRTUAL_PS1="\${PS1:-}";
38+
export PS1="(venv) \${PS1:-}";
3939
EOS
4040

4141
unstub pyenv-version-name
@@ -59,8 +59,8 @@ EOS
5959
deactivated
6060
export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
6161
export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
62-
export _OLD_VIRTUAL_PS1="\${PS1}";
63-
export PS1="(venv) \${PS1}";
62+
export _OLD_VIRTUAL_PS1="\${PS1:-}";
63+
export PS1="(venv) \${PS1:-}";
6464
EOS
6565

6666
unstub pyenv-version-name
@@ -87,8 +87,8 @@ pyenv-virtualenv: activate venv
8787
export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
8888
export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
8989
pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
90-
export _OLD_VIRTUAL_PS1="\${PS1}";
91-
export PS1="(venv) \${PS1}";
90+
export _OLD_VIRTUAL_PS1="\${PS1:-}";
91+
export PS1="(venv) \${PS1:-}";
9292
EOS
9393

9494
unstub pyenv-version-name
@@ -115,8 +115,8 @@ export PYENV_ACTIVATE_SHELL=1;
115115
export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
116116
export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
117117
pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
118-
export _OLD_VIRTUAL_PS1="\${PS1}";
119-
export PS1="(venv) \${PS1}";
118+
export _OLD_VIRTUAL_PS1="\${PS1:-}";
119+
export PS1="(venv) \${PS1:-}";
120120
EOS
121121

122122
unstub pyenv-version-name
@@ -192,8 +192,8 @@ export PYENV_ACTIVATE_SHELL=1;
192192
export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv27";
193193
export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv27";
194194
pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
195-
export _OLD_VIRTUAL_PS1="\${PS1}";
196-
export PS1="(venv27) \${PS1}";
195+
export _OLD_VIRTUAL_PS1="\${PS1:-}";
196+
export PS1="(venv27) \${PS1:-}";
197197
EOS
198198

199199
unstub pyenv-virtualenv-prefix
@@ -218,8 +218,8 @@ export PYENV_ACTIVATE_SHELL=1;
218218
export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv27";
219219
export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv27";
220220
pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
221-
export _OLD_VIRTUAL_PS1="\${PS1}";
222-
export PS1="(venv27) \${PS1}";
221+
export _OLD_VIRTUAL_PS1="\${PS1:-}";
222+
export PS1="(venv27) \${PS1:-}";
223223
EOS
224224

225225
unstub pyenv-virtualenv-prefix
@@ -391,8 +391,8 @@ export PYENV_ACTIVATE_SHELL=1;
391391
export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv27";
392392
export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv27";
393393
pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
394-
export _OLD_VIRTUAL_PS1="\${PS1}";
395-
export PS1="(venv27) \${PS1}";
394+
export _OLD_VIRTUAL_PS1="\${PS1:-}";
395+
export PS1="(venv27) \${PS1:-}";
396396
EOS
397397

398398
unstub pyenv-sh-deactivate

‎test/conda-activate.bats

+8-8
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0";
3737
export VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0";
3838
export CONDA_DEFAULT_ENV="root";
3939
pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
40-
export _OLD_VIRTUAL_PS1="\${PS1}";
41-
export PS1="(anaconda-2.3.0) \${PS1}";
40+
export _OLD_VIRTUAL_PS1="\${PS1:-}";
41+
export PS1="(anaconda-2.3.0) \${PS1:-}";
4242
export CONDA_PREFIX="${TMP}/pyenv/versions/anaconda-2.3.0";
4343
EOS
4444

@@ -96,8 +96,8 @@ export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/miniconda-3.9.1";
9696
export VIRTUAL_ENV="${PYENV_ROOT}/versions/miniconda-3.9.1";
9797
export CONDA_DEFAULT_ENV="root";
9898
pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
99-
export _OLD_VIRTUAL_PS1="\${PS1}";
100-
export PS1="(miniconda-3.9.1) \${PS1}";
99+
export _OLD_VIRTUAL_PS1="\${PS1:-}";
100+
export PS1="(miniconda-3.9.1) \${PS1:-}";
101101
export CONDA_PREFIX="${TMP}/pyenv/versions/miniconda-3.9.1";
102102
EOS
103103

@@ -126,8 +126,8 @@ export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo";
126126
export VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo";
127127
export CONDA_DEFAULT_ENV="foo";
128128
pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
129-
export _OLD_VIRTUAL_PS1="\${PS1}";
130-
export PS1="(anaconda-2.3.0/envs/foo) \${PS1}";
129+
export _OLD_VIRTUAL_PS1="\${PS1:-}";
130+
export PS1="(anaconda-2.3.0/envs/foo) \${PS1:-}";
131131
export CONDA_PREFIX="${TMP}/pyenv/versions/anaconda-2.3.0/envs/foo";
132132
. "${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo/etc/conda/activate.d/activate.sh";
133133
EOS
@@ -159,8 +159,8 @@ export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar";
159159
export VIRTUAL_ENV="${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar";
160160
export CONDA_DEFAULT_ENV="bar";
161161
pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
162-
export _OLD_VIRTUAL_PS1="\${PS1}";
163-
export PS1="(miniconda-3.9.1/envs/bar) \${PS1}";
162+
export _OLD_VIRTUAL_PS1="\${PS1:-}";
163+
export PS1="(miniconda-3.9.1/envs/bar) \${PS1:-}";
164164
export CONDA_PREFIX="${TMP}/pyenv/versions/miniconda-3.9.1/envs/bar";
165165
. "${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar/etc/conda/activate.d/activate.sh";
166166
EOS

‎test/conda-deactivate.bats

+6-6
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ unset CONDA_PREFIX
3434
unset PYENV_VIRTUAL_ENV;
3535
unset VIRTUAL_ENV;
3636
unset CONDA_DEFAULT_ENV;
37-
if [ -n "\${_OLD_VIRTUAL_PATH}" ]; then
37+
if [ -n "\${_OLD_VIRTUAL_PATH:-}" ]; then
3838
export PATH="\${_OLD_VIRTUAL_PATH}";
3939
unset _OLD_VIRTUAL_PATH;
4040
fi;
41-
if [ -n "\${_OLD_VIRTUAL_PYTHONHOME}" ]; then
41+
if [ -n "\${_OLD_VIRTUAL_PYTHONHOME:-}" ]; then
4242
export PYTHONHOME="\${_OLD_VIRTUAL_PYTHONHOME}";
4343
unset _OLD_VIRTUAL_PYTHONHOME;
4444
fi;
45-
if [ -n "\${_OLD_VIRTUAL_PS1}" ]; then
45+
if [ -n "\${_OLD_VIRTUAL_PS1:-}" ]; then
4646
export PS1="\${_OLD_VIRTUAL_PS1}";
4747
unset _OLD_VIRTUAL_PS1;
4848
fi;
@@ -102,15 +102,15 @@ unset CONDA_PREFIX
102102
unset PYENV_VIRTUAL_ENV;
103103
unset VIRTUAL_ENV;
104104
unset CONDA_DEFAULT_ENV;
105-
if [ -n "\${_OLD_VIRTUAL_PATH}" ]; then
105+
if [ -n "\${_OLD_VIRTUAL_PATH:-}" ]; then
106106
export PATH="\${_OLD_VIRTUAL_PATH}";
107107
unset _OLD_VIRTUAL_PATH;
108108
fi;
109-
if [ -n "\${_OLD_VIRTUAL_PYTHONHOME}" ]; then
109+
if [ -n "\${_OLD_VIRTUAL_PYTHONHOME:-}" ]; then
110110
export PYTHONHOME="\${_OLD_VIRTUAL_PYTHONHOME}";
111111
unset _OLD_VIRTUAL_PYTHONHOME;
112112
fi;
113-
if [ -n "\${_OLD_VIRTUAL_PS1}" ]; then
113+
if [ -n "\${_OLD_VIRTUAL_PS1:-}" ]; then
114114
export PS1="\${_OLD_VIRTUAL_PS1}";
115115
unset _OLD_VIRTUAL_PS1;
116116
fi;

‎test/deactivate.bats

+21-21
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ setup() {
3030
assert_output <<EOS
3131
unset PYENV_VIRTUAL_ENV;
3232
unset VIRTUAL_ENV;
33-
if [ -n "\${_OLD_VIRTUAL_PATH}" ]; then
33+
if [ -n "\${_OLD_VIRTUAL_PATH:-}" ]; then
3434
export PATH="\${_OLD_VIRTUAL_PATH}";
3535
unset _OLD_VIRTUAL_PATH;
3636
fi;
37-
if [ -n "\${_OLD_VIRTUAL_PYTHONHOME}" ]; then
37+
if [ -n "\${_OLD_VIRTUAL_PYTHONHOME:-}" ]; then
3838
export PYTHONHOME="\${_OLD_VIRTUAL_PYTHONHOME}";
3939
unset _OLD_VIRTUAL_PYTHONHOME;
4040
fi;
41-
if [ -n "\${_OLD_VIRTUAL_PS1}" ]; then
41+
if [ -n "\${_OLD_VIRTUAL_PS1:-}" ]; then
4242
export PS1="\${_OLD_VIRTUAL_PS1}";
4343
unset _OLD_VIRTUAL_PS1;
4444
fi;
@@ -60,15 +60,15 @@ EOS
6060
assert_output <<EOS
6161
unset PYENV_VIRTUAL_ENV;
6262
unset VIRTUAL_ENV;
63-
if [ -n "\${_OLD_VIRTUAL_PATH}" ]; then
63+
if [ -n "\${_OLD_VIRTUAL_PATH:-}" ]; then
6464
export PATH="\${_OLD_VIRTUAL_PATH}";
6565
unset _OLD_VIRTUAL_PATH;
6666
fi;
67-
if [ -n "\${_OLD_VIRTUAL_PYTHONHOME}" ]; then
67+
if [ -n "\${_OLD_VIRTUAL_PYTHONHOME:-}" ]; then
6868
export PYTHONHOME="\${_OLD_VIRTUAL_PYTHONHOME}";
6969
unset _OLD_VIRTUAL_PYTHONHOME;
7070
fi;
71-
if [ -n "\${_OLD_VIRTUAL_PS1}" ]; then
71+
if [ -n "\${_OLD_VIRTUAL_PS1:-}" ]; then
7272
export PS1="\${_OLD_VIRTUAL_PS1}";
7373
unset _OLD_VIRTUAL_PS1;
7474
fi;
@@ -92,15 +92,15 @@ EOS
9292
pyenv-virtualenv: deactivate venv
9393
unset PYENV_VIRTUAL_ENV;
9494
unset VIRTUAL_ENV;
95-
if [ -n "\${_OLD_VIRTUAL_PATH}" ]; then
95+
if [ -n "\${_OLD_VIRTUAL_PATH:-}" ]; then
9696
export PATH="\${_OLD_VIRTUAL_PATH}";
9797
unset _OLD_VIRTUAL_PATH;
9898
fi;
99-
if [ -n "\${_OLD_VIRTUAL_PYTHONHOME}" ]; then
99+
if [ -n "\${_OLD_VIRTUAL_PYTHONHOME:-}" ]; then
100100
export PYTHONHOME="\${_OLD_VIRTUAL_PYTHONHOME}";
101101
unset _OLD_VIRTUAL_PYTHONHOME;
102102
fi;
103-
if [ -n "\${_OLD_VIRTUAL_PS1}" ]; then
103+
if [ -n "\${_OLD_VIRTUAL_PS1:-}" ]; then
104104
export PS1="\${_OLD_VIRTUAL_PS1}";
105105
unset _OLD_VIRTUAL_PS1;
106106
fi;
@@ -122,15 +122,15 @@ EOS
122122
assert_output <<EOS
123123
unset PYENV_VIRTUAL_ENV;
124124
unset VIRTUAL_ENV;
125-
if [ -n "\${_OLD_VIRTUAL_PATH}" ]; then
125+
if [ -n "\${_OLD_VIRTUAL_PATH:-}" ]; then
126126
export PATH="\${_OLD_VIRTUAL_PATH}";
127127
unset _OLD_VIRTUAL_PATH;
128128
fi;
129-
if [ -n "\${_OLD_VIRTUAL_PYTHONHOME}" ]; then
129+
if [ -n "\${_OLD_VIRTUAL_PYTHONHOME:-}" ]; then
130130
export PYTHONHOME="\${_OLD_VIRTUAL_PYTHONHOME}";
131131
unset _OLD_VIRTUAL_PYTHONHOME;
132132
fi;
133-
if [ -n "\${_OLD_VIRTUAL_PS1}" ]; then
133+
if [ -n "\${_OLD_VIRTUAL_PS1:-}" ]; then
134134
export PS1="\${_OLD_VIRTUAL_PS1}";
135135
unset _OLD_VIRTUAL_PS1;
136136
fi;
@@ -154,15 +154,15 @@ unset PYENV_VERSION;
154154
unset PYENV_ACTIVATE_SHELL;
155155
unset PYENV_VIRTUAL_ENV;
156156
unset VIRTUAL_ENV;
157-
if [ -n "\${_OLD_VIRTUAL_PATH}" ]; then
157+
if [ -n "\${_OLD_VIRTUAL_PATH:-}" ]; then
158158
export PATH="\${_OLD_VIRTUAL_PATH}";
159159
unset _OLD_VIRTUAL_PATH;
160160
fi;
161-
if [ -n "\${_OLD_VIRTUAL_PYTHONHOME}" ]; then
161+
if [ -n "\${_OLD_VIRTUAL_PYTHONHOME:-}" ]; then
162162
export PYTHONHOME="\${_OLD_VIRTUAL_PYTHONHOME}";
163163
unset _OLD_VIRTUAL_PYTHONHOME;
164164
fi;
165-
if [ -n "\${_OLD_VIRTUAL_PS1}" ]; then
165+
if [ -n "\${_OLD_VIRTUAL_PS1:-}" ]; then
166166
export PS1="\${_OLD_VIRTUAL_PS1}";
167167
unset _OLD_VIRTUAL_PS1;
168168
fi;
@@ -186,15 +186,15 @@ unset PYENV_VERSION;
186186
unset PYENV_ACTIVATE_SHELL;
187187
unset PYENV_VIRTUAL_ENV;
188188
unset VIRTUAL_ENV;
189-
if [ -n "\${_OLD_VIRTUAL_PATH}" ]; then
189+
if [ -n "\${_OLD_VIRTUAL_PATH:-}" ]; then
190190
export PATH="\${_OLD_VIRTUAL_PATH}";
191191
unset _OLD_VIRTUAL_PATH;
192192
fi;
193-
if [ -n "\${_OLD_VIRTUAL_PYTHONHOME}" ]; then
193+
if [ -n "\${_OLD_VIRTUAL_PYTHONHOME:-}" ]; then
194194
export PYTHONHOME="\${_OLD_VIRTUAL_PYTHONHOME}";
195195
unset _OLD_VIRTUAL_PYTHONHOME;
196196
fi;
197-
if [ -n "\${_OLD_VIRTUAL_PS1}" ]; then
197+
if [ -n "\${_OLD_VIRTUAL_PS1:-}" ]; then
198198
export PS1="\${_OLD_VIRTUAL_PS1}";
199199
unset _OLD_VIRTUAL_PS1;
200200
fi;
@@ -216,15 +216,15 @@ EOS
216216
assert_output <<EOS
217217
unset PYENV_VIRTUAL_ENV;
218218
unset VIRTUAL_ENV;
219-
if [ -n "\${_OLD_VIRTUAL_PATH}" ]; then
219+
if [ -n "\${_OLD_VIRTUAL_PATH:-}" ]; then
220220
export PATH="\${_OLD_VIRTUAL_PATH}";
221221
unset _OLD_VIRTUAL_PATH;
222222
fi;
223-
if [ -n "\${_OLD_VIRTUAL_PYTHONHOME}" ]; then
223+
if [ -n "\${_OLD_VIRTUAL_PYTHONHOME:-}" ]; then
224224
export PYTHONHOME="\${_OLD_VIRTUAL_PYTHONHOME}";
225225
unset _OLD_VIRTUAL_PYTHONHOME;
226226
fi;
227-
if [ -n "\${_OLD_VIRTUAL_PS1}" ]; then
227+
if [ -n "\${_OLD_VIRTUAL_PS1:-}" ]; then
228228
export PS1="\${_OLD_VIRTUAL_PS1}";
229229
unset _OLD_VIRTUAL_PS1;
230230
fi;

0 commit comments

Comments
 (0)