Skip to content

Commit d6be55f

Browse files
committed
-debug
1 parent ea56486 commit d6be55f

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

test/conda.bats

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +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 list * : true"
30-
stub pyenv-exec "conda * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
29+
stub pyenv-exec "conda list * : true"
30+
stub pyenv-exec "conda create * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
3131
stub pyenv-exec "python -s -m ensurepip : true"
3232

3333
run pyenv-virtualenv venv
@@ -50,11 +50,11 @@ OUT
5050
stub_pyenv "${PYENV_VERSION}"
5151
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
5252
stub pyenv-virtualenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
53-
stub pyenv-exec "conda * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
53+
stub pyenv-exec "conda create * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
5454
stub pyenv-exec "python -s -m ensurepip : true"
5555

56-
export PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
5756
run pyenv-virtualenv -p python3.5 venv
57+
5858
assert_success
5959
assert_output <<OUT
6060
PYENV_VERSION=miniconda3-3.16.0 conda create --name venv --yes python=3.5
@@ -73,7 +73,7 @@ OUT
7373
stub_pyenv "${PYENV_VERSION}"
7474
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
7575
stub pyenv-virtualenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
76-
stub pyenv-exec "conda * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
76+
stub pyenv-exec "conda create * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
7777
stub pyenv-exec "python -s -m ensurepip : true"
7878

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

test/stubs/stub

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
#!/usr/bin/env bash
22
export PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
3-
set -ex
3+
set -e
44

5-
echo "stub called: $0 $@" >&2
65
status=0
76
program="${0##*/}"
87
PROGRAM="$(echo "$program" | tr a-z- A-Z_)"

0 commit comments

Comments
 (0)