From 7e89747ae8cc411c1b68d8a6022f225f76faeaf3 Mon Sep 17 00:00:00 2001 From: Sam Doran Date: Fri, 24 Apr 2026 13:15:50 -0400 Subject: [PATCH] Change the interface of create_m_venv to match setup_m_venv Also have create_m_venv call setup_m_venv. --- test/virtualenvs.bats | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/test/virtualenvs.bats b/test/virtualenvs.bats index 46578b8..9f66782 100644 --- a/test/virtualenvs.bats +++ b/test/virtualenvs.bats @@ -3,21 +3,22 @@ load test_helper create_m_venv() { - local version="$1" - local venv="$2" + setup_m_venv "$1" + + local version="${1%%/envs/*}" # Get the first part of "2.7.6/envs/venv27" + local venv="${1##*/}" # Get the last part of "2.7.6/envs/venv27" + local version_dir="${PYENV_ROOT}/versions/${version}" local env_dir="${version_dir}/envs/${venv}" + echo "home = ${version_dir}/bin" > "${env_dir}/pyvenv.cfg" ln -s "${env_dir}" "${PYENV_ROOT}/versions/${venv}" } setup() { export PYENV_ROOT="${TMP}/pyenv" - setup_m_venv "2.7.6/envs/venv27" - create_m_venv "2.7.6" "venv27" - - setup_m_venv "3.3.3/envs/venv33" - create_m_venv "3.3.3" "venv33" + create_m_venv "2.7.6/envs/venv27" + create_m_venv "3.3.3/envs/venv33" } @test "list virtual environments" {