diff --git a/test/conda-prefix.bats b/test/conda-prefix.bats index 6965d52..4c2436a 100644 --- a/test/conda-prefix.bats +++ b/test/conda-prefix.bats @@ -9,7 +9,6 @@ setup() { @test "display conda root" { setup_conda "anaconda-2.3.0" stub pyenv-version-name "echo anaconda-2.3.0" - stub pyenv-prefix "anaconda-2.3.0 : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0\"" PYENV_VERSION="anaconda-2.3.0" run pyenv-virtualenv-prefix @@ -19,14 +18,12 @@ ${PYENV_ROOT}/versions/anaconda-2.3.0 OUT unstub pyenv-version-name - unstub pyenv-prefix teardown_conda "anaconda-2.3.0" } @test "display conda env" { setup_conda "anaconda-2.3.0" "foo" stub pyenv-version-name "echo anaconda-2.3.0/envs/foo" - stub pyenv-prefix "anaconda-2.3.0/envs/foo : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo\"" PYENV_VERSION="anaconda-2.3.0/envs/foo" run pyenv-virtualenv-prefix @@ -36,6 +33,5 @@ ${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo OUT unstub pyenv-version-name - unstub pyenv-prefix teardown_conda "anaconda-2.3.0" "foo" } diff --git a/test/prefix.bats b/test/prefix.bats index a21c3f9..7a1d50f 100644 --- a/test/prefix.bats +++ b/test/prefix.bats @@ -72,7 +72,6 @@ remove_conda() { @test "display prefix of virtualenv created by virtualenv" { stub pyenv-version-name "echo foo" - stub pyenv-prefix "foo : echo \"${PYENV_ROOT}/versions/foo\"" create_virtualenv "foo" "2.7.11" PYENV_VERSION="foo" run pyenv-virtualenv-prefix @@ -83,13 +82,11 @@ ${PYENV_ROOT}/versions/2.7.11 OUT unstub pyenv-version-name - unstub pyenv-prefix remove_virtualenv "foo" "2.7.11" } @test "display prefix of virtualenv created by virtualenv (pypy)" { stub pyenv-version-name "echo foo" - stub pyenv-prefix "foo : echo \"${PYENV_ROOT}/versions/foo\"" create_virtualenv_pypy "foo" "pypy-4.0.1" PYENV_VERSION="foo" run pyenv-virtualenv-prefix @@ -100,13 +97,11 @@ ${PYENV_ROOT}/versions/pypy-4.0.1 OUT unstub pyenv-version-name - unstub pyenv-prefix remove_virtualenv "foo" "pypy-4.0.1" } @test "display prefix of virtualenv created by virtualenv (jython)" { stub pyenv-version-name "echo foo" - stub pyenv-prefix "foo : echo \"${PYENV_ROOT}/versions/foo\"" create_virtualenv_jython "foo" "jython-2.7.0" PYENV_VERSION="foo" run pyenv-virtualenv-prefix @@ -117,14 +112,11 @@ ${PYENV_ROOT}/versions/jython-2.7.0 OUT unstub pyenv-version-name - unstub pyenv-prefix remove_virtualenv "foo" "jython-2.7.0" } @test "display prefixes of virtualenv created by virtualenv" { stub pyenv-version-name "echo foo:bar" - stub pyenv-prefix "foo : echo \"${PYENV_ROOT}/versions/foo\"" \ - "bar : echo \"${PYENV_ROOT}/versions/bar\"" create_virtualenv "foo" "2.7.11" create_virtualenv "bar" "3.5.1" @@ -136,14 +128,12 @@ ${PYENV_ROOT}/versions/2.7.11:${PYENV_ROOT}/versions/3.5.1 OUT unstub pyenv-version-name - unstub pyenv-prefix remove_virtualenv "foo" "2.7.11" remove_virtualenv "bar" "3.5.1" } @test "display prefix of virtualenv created by venv" { stub pyenv-version-name "echo foo" - stub pyenv-prefix "foo : echo \"${PYENV_ROOT}/versions/foo\"" create_m_venv "foo" "3.3.6" PYENV_VERSION="foo" run pyenv-virtualenv-prefix @@ -154,14 +144,11 @@ ${PYENV_ROOT}/versions/3.3.6 OUT unstub pyenv-version-name - unstub pyenv-prefix remove_m_venv "foo" "3.3.6" } @test "display prefixes of virtualenv created by venv" { stub pyenv-version-name "echo foo:bar" - stub pyenv-prefix "foo : echo \"${PYENV_ROOT}/versions/foo\"" \ - "bar : echo \"${PYENV_ROOT}/versions/bar\"" create_m_venv "foo" "3.3.6" create_m_venv "bar" "3.4.4" @@ -173,14 +160,12 @@ ${PYENV_ROOT}/versions/3.3.6:${PYENV_ROOT}/versions/3.4.4 OUT unstub pyenv-version-name - unstub pyenv-prefix remove_m_venv "foo" "3.3.6" remove_m_venv "bar" "3.4.4" } @test "display prefix of virtualenv created by conda" { stub pyenv-version-name "echo miniconda3-3.16.0/envs/foo" - stub pyenv-prefix "miniconda3-3.16.0/envs/foo : echo \"${PYENV_ROOT}/versions/miniconda3-3.16.0/envs/foo\"" create_conda "miniconda3-3.16.0/envs/foo" "miniconda3-3.16.0" PYENV_VERSION="miniconda3-3.16.0/envs/foo" run pyenv-virtualenv-prefix @@ -191,7 +176,6 @@ ${PYENV_ROOT}/versions/miniconda3-3.16.0/envs/foo OUT unstub pyenv-version-name - unstub pyenv-prefix remove_conda "miniconda3-3.16.0/envs/foo" "miniconda3-3.16.0" } @@ -210,7 +194,6 @@ OUT @test "should fail if the version is not a virtualenv" { stub pyenv-version-name "echo 3.4.4" - stub pyenv-prefix "3.4.4 : echo \"${PYENV_ROOT}/versions/3.4.4\"" create_version "3.4.4" PYENV_VERSION="3.4.4" run pyenv-virtualenv-prefix @@ -221,14 +204,11 @@ pyenv-virtualenv: version \`3.4.4' is not a virtualenv OUT unstub pyenv-version-name - unstub pyenv-prefix remove_version "3.4.4" } @test "should fail if one of the versions is not a virtualenv" { stub pyenv-version-name "echo venv33:3.4.4" - stub pyenv-prefix "venv33 : echo \"${PYENV_ROOT}/versions/venv33\"" \ - "3.4.4 : echo \"${PYENV_ROOT}/versions/3.4.4\"" create_virtualenv "venv33" "3.3.6" create_version "3.4.4" @@ -240,7 +220,6 @@ pyenv-virtualenv: version \`3.4.4' is not a virtualenv OUT unstub pyenv-version-name - unstub pyenv-prefix remove_virtualenv "venv33" "3.3.6" remove_version "3.4.4" }