Skip to content

Commit 10c8ace

Browse files
committed
Fix a race condition between concurrently executing stubs
1 parent 7d98404 commit 10c8ace

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

test/conda.bats

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ unstub_pyenv() {
2626
stub_pyenv "${PYENV_VERSION}"
2727
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
2828
stub pyenv-virtualenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
29-
stub pyenv-exec "conda * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
29+
stub -N pyenv-exec "conda list * : true"
30+
stub -N pyenv-exec "conda create * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
3031
stub pyenv-exec "python -s -m ensurepip : true"
3132

3233
run pyenv-virtualenv venv
@@ -49,11 +50,11 @@ OUT
4950
stub_pyenv "${PYENV_VERSION}"
5051
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
5152
stub pyenv-virtualenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
52-
stub pyenv-exec "conda * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
53+
stub pyenv-exec "conda create * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
5354
stub pyenv-exec "python -s -m ensurepip : true"
5455

5556
run pyenv-virtualenv -p python3.5 venv
56-
57+
5758
assert_success
5859
assert_output <<OUT
5960
PYENV_VERSION=miniconda3-3.16.0 conda create --name venv --yes python=3.5
@@ -72,7 +73,7 @@ OUT
7273
stub_pyenv "${PYENV_VERSION}"
7374
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
7475
stub pyenv-virtualenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
75-
stub pyenv-exec "conda * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
76+
stub pyenv-exec "conda create * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
7677
stub pyenv-exec "python -s -m ensurepip : true"
7778

7879
run pyenv-virtualenv --python=python3.5 venv

0 commit comments

Comments
 (0)