diff --git a/test/conda.bats b/test/conda.bats index 0eb79d6..3c6ef02 100644 --- a/test/conda.bats +++ b/test/conda.bats @@ -25,6 +25,7 @@ unstub_pyenv() { setup_conda "${PYENV_VERSION}" stub_pyenv "${PYENV_VERSION}" stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'" + stub pyenv-virtualenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'" stub pyenv-exec "conda * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" stub pyenv-exec "python -s -m ensurepip : true" @@ -37,6 +38,7 @@ rehashed OUT unstub_pyenv + unstub pyenv-virtualenv-prefix unstub pyenv-exec teardown_pyvenv "miniconda3-3.16.0" } @@ -46,6 +48,7 @@ OUT setup_conda "${PYENV_VERSION}" stub_pyenv "${PYENV_VERSION}" stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'" + stub pyenv-virtualenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'" stub pyenv-exec "conda * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" stub pyenv-exec "python -s -m ensurepip : true" @@ -58,6 +61,7 @@ rehashed OUT unstub_pyenv + unstub pyenv-virtualenv-prefix unstub pyenv-exec teardown_pyvenv "miniconda3-3.16.0" } @@ -67,6 +71,7 @@ OUT setup_conda "${PYENV_VERSION}" stub_pyenv "${PYENV_VERSION}" stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'" + stub pyenv-virtualenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'" stub pyenv-exec "conda * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" stub pyenv-exec "python -s -m ensurepip : true" @@ -79,6 +84,7 @@ rehashed OUT unstub_pyenv + unstub pyenv-virtualenv-prefix unstub pyenv-exec teardown_pyvenv "miniconda3-3.16.0" } diff --git a/test/pip.bats b/test/pip.bats index e1af4fd..67381c1 100644 --- a/test/pip.bats +++ b/test/pip.bats @@ -25,6 +25,7 @@ unstub_pyenv() { setup_pyvenv "3.4.1" stub_pyenv "${PYENV_VERSION}" stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'" + stub pyenv-virtualenv-prefix " : false" stub pyenv-exec "pyvenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";mkdir -p \${PYENV_ROOT}/versions/3.4.1/envs/venv/bin" stub pyenv-exec "python -s -m ensurepip : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";touch \${PYENV_ROOT}/versions/3.4.1/envs/venv/bin/pip" @@ -39,6 +40,7 @@ OUT assert [ -e "${PYENV_ROOT}/versions/3.4.1/envs/venv/bin/pip" ] unstub_pyenv + unstub pyenv-virtualenv-prefix unstub pyenv-exec teardown_pyvenv "3.4.1" } @@ -48,6 +50,7 @@ OUT setup_pyvenv "3.3.5" stub_pyenv "${PYENV_VERSION}" stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'" + stub pyenv-virtualenv-prefix " : false" stub pyenv-exec "pyvenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";mkdir -p \${PYENV_ROOT}/versions/3.3.5/envs/venv/bin" stub pyenv-exec "python -s -m ensurepip : false" stub pyenv-exec "python -s */get-pip.py : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";touch \${PYENV_ROOT}/versions/3.3.5/envs/venv/bin/pip" @@ -65,6 +68,7 @@ OUT assert [ -e "${PYENV_ROOT}/versions/3.3.5/envs/venv/bin/pip" ] unstub_pyenv + unstub pyenv-virtualenv-prefix unstub pyenv-exec teardown_pyvenv "3.3.5" } diff --git a/test/pyvenv.bats b/test/pyvenv.bats index 32bde99..7a23078 100644 --- a/test/pyvenv.bats +++ b/test/pyvenv.bats @@ -25,6 +25,7 @@ unstub_pyenv() { setup_pyvenv "3.4.1" stub_pyenv "${PYENV_VERSION}" stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'" + stub pyenv-virtualenv-prefix " : false" stub pyenv-exec "pyvenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" stub pyenv-exec "python -s -m ensurepip : true" @@ -37,6 +38,7 @@ rehashed OUT unstub_pyenv + unstub pyenv-virtualenv-prefix unstub pyenv-exec teardown_pyvenv "3.4.1" } @@ -47,6 +49,7 @@ OUT create_executable "3.4.1" "virtualenv" stub_pyenv "${PYENV_VERSION}" stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'" + stub pyenv-virtualenv-prefix " : false" stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" stub pyenv-exec "python -s -m ensurepip : true" @@ -59,6 +62,7 @@ rehashed OUT unstub_pyenv + unstub pyenv-virtualenv-prefix unstub pyenv-exec teardown_pyvenv "3.4.1" } @@ -68,6 +72,7 @@ OUT setup_version "3.2.1" stub_pyenv "${PYENV_VERSION}" stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'" + stub pyenv-virtualenv-prefix " : false" stub pyenv-exec "pip install virtualenv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" stub pyenv-exec "python -s -m ensurepip : false" @@ -85,6 +90,7 @@ rehashed OUT unstub_pyenv + unstub pyenv-virtualenv-prefix unstub pyenv-exec unstub curl teardown_version "3.2.1" @@ -95,6 +101,7 @@ OUT setup_pyvenv "3.4.1" stub_pyenv "${PYENV_VERSION}" stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'" + stub pyenv-virtualenv-prefix " : false" stub pyenv-exec "pip install virtualenv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" stub pyenv-exec "python -s -m ensurepip : true" @@ -109,6 +116,7 @@ OUT assert_success unstub_pyenv + unstub pyenv-virtualenv-prefix unstub pyenv-exec teardown_pyvenv "3.4.1" } @@ -118,6 +126,7 @@ OUT setup_pyvenv "3.4.1" stub_pyenv "${PYENV_VERSION}" stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'" + stub pyenv-virtualenv-prefix " : false" stub pyenv-exec "pip install virtualenv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" stub pyenv-exec "python -s -m ensurepip : true" @@ -132,6 +141,7 @@ OUT assert_success unstub_pyenv + unstub pyenv-virtualenv-prefix unstub pyenv-exec teardown_pyvenv "3.4.1" } @@ -141,6 +151,7 @@ OUT setup_version "3.2.1" stub_pyenv "${PYENV_VERSION}" stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'" + stub pyenv-virtualenv-prefix " : false" stub pyenv-exec "pip install virtualenv : echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" stub pyenv-exec "virtualenv * : echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" stub pyenv-exec "python -s -m ensurepip : false" @@ -158,6 +169,7 @@ rehashed OUT unstub_pyenv + unstub pyenv-virtualenv-prefix unstub pyenv-exec unstub curl teardown_version "3.2.1" diff --git a/test/virtualenv.bats b/test/virtualenv.bats index 1baba15..7567deb 100644 --- a/test/virtualenv.bats +++ b/test/virtualenv.bats @@ -25,6 +25,7 @@ unstub_pyenv() { @test "create virtualenv from given version" { export PYENV_VERSION="3.2.1" stub_pyenv "${PYENV_VERSION}" + stub pyenv-virtualenv-prefix " : false" stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" stub pyenv-exec "python -s -m ensurepip : false" stub pyenv-exec "python -s */get-pip.py : true" @@ -40,6 +41,7 @@ rehashed OUT unstub_pyenv + unstub pyenv-virtualenv-prefix unstub pyenv-exec unstub curl } @@ -48,6 +50,7 @@ OUT export PYENV_VERSION="3.2.1" stub_pyenv "${PYENV_VERSION}" stub pyenv-version-name "echo \${PYENV_VERSION}" + stub pyenv-virtualenv-prefix " : false" stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" stub pyenv-exec "python -s -m ensurepip : false" stub pyenv-exec "python -s */get-pip.py : true" @@ -64,6 +67,7 @@ OUT unstub_pyenv unstub pyenv-version-name + unstub pyenv-virtualenv-prefix unstub pyenv-exec unstub curl } @@ -72,6 +76,7 @@ OUT export PYENV_VERSION="3.2.1" stub_pyenv "${PYENV_VERSION}" stub pyenv-version-name "echo \${PYENV_VERSION}" + stub pyenv-virtualenv-prefix " : false" stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" stub pyenv-exec "python -s -m ensurepip : false" stub pyenv-exec "python -s */get-pip.py : true" @@ -88,6 +93,7 @@ OUT unstub_pyenv unstub pyenv-version-name + unstub pyenv-virtualenv-prefix unstub pyenv-exec unstub curl } @@ -96,6 +102,7 @@ OUT export PYENV_VERSION="3.2.1" stub_pyenv "${PYENV_VERSION}" stub pyenv-version-name "echo \${PYENV_VERSION}" + stub pyenv-virtualenv-prefix " : false" stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" stub pyenv-exec "python -s -m ensurepip : false" stub pyenv-exec "python -s */get-pip.py : true" @@ -112,6 +119,7 @@ OUT unstub_pyenv unstub pyenv-version-name + unstub pyenv-virtualenv-prefix unstub pyenv-exec unstub curl } @@ -155,6 +163,7 @@ OUT @test "slash allowed if it is the long name of the virtualenv" { export PYENV_VERSION="3.2.1" stub_pyenv "${PYENV_VERSION}" + stub pyenv-virtualenv-prefix " : false" stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" stub pyenv-exec "python -s -m ensurepip : false" stub pyenv-exec "python -s */get-pip.py : true" @@ -170,6 +179,7 @@ rehashed OUT unstub_pyenv + unstub pyenv-virtualenv-prefix unstub pyenv-exec unstub curl }