github/pyenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv.git synced 2024-11-07 20:31:01 -05:00
Code Issues Projects Releases Packages Wiki Activity

Keep using original PATH ordering in test_helper

Browse source
This commit is contained in:
Yamashita, Yuu 2016-08-02 00:23:47 +00:00
parent 5c83c4abb7
commit b8885e4fe2
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
test/prefix.bats
View file

@ -25,12 +25,13 @@ load test_helper
} }
@test "prefix for system in /" { @test "prefix for system in /" {
mkdir -p "${PYENV_TEST_DIR}/bin" mkdir -p "${BATS_TEST_DIRNAME}/libexec"
touch "${PYENV_TEST_DIR}/bin/pyenv-which" touch "${BATS_TEST_DIRNAME}/libexec/pyenv-which"
echo "echo /bin/python" >"${PYENV_TEST_DIR}/bin/pyenv-which" echo "echo /bin/python" >"${BATS_TEST_DIRNAME}/libexec/pyenv-which"
chmod +x "${PYENV_TEST_DIR}/bin/pyenv-which" chmod +x "${BATS_TEST_DIRNAME}/libexec/pyenv-which"
PYENV_VERSION="system" run pyenv-prefix PYENV_VERSION="system" run pyenv-prefix
assert_success "/" assert_success "/"
rm -f "${BATS_TEST_DIRNAME}/libexec/pyenv-which"
} }
@test "prefix for invalid system" { @test "prefix for invalid system" {

2
test/test_helper.bash
View file

@ -20,10 +20,10 @@ if [ -z "$PYENV_TEST_DIR" ]; then
export PYENV_HOOK_PATH="${PYENV_ROOT}/pyenv.d" export PYENV_HOOK_PATH="${PYENV_ROOT}/pyenv.d"
PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
PATH="${PYENV_TEST_DIR}/bin:$PATH"
PATH="${BATS_TEST_DIRNAME}/../libexec:$PATH" PATH="${BATS_TEST_DIRNAME}/../libexec:$PATH"
PATH="${BATS_TEST_DIRNAME}/libexec:$PATH" PATH="${BATS_TEST_DIRNAME}/libexec:$PATH"
PATH="${PYENV_ROOT}/shims:$PATH" PATH="${PYENV_ROOT}/shims:$PATH"
PATH="${PYENV_TEST_DIR}/bin:$PATH"
export PATH export PATH
for xdg_var in `env 2>/dev/null | grep ^XDG_ | cut -d= -f1`; do unset "$xdg_var"; done for xdg_var in `env 2>/dev/null | grep ^XDG_ | cut -d= -f1`; do unset "$xdg_var"; done