diff --git a/plugins/python-build/test/build.bats b/plugins/python-build/test/build.bats index 472c9209..7674628e 100644 --- a/plugins/python-build/test/build.bats +++ b/plugins/python-build/test/build.bats @@ -6,7 +6,6 @@ export MAKE=make export MAKE_OPTS="-j 2" export CC=cc export -n PYTHON_CONFIGURE_OPTS -export PYTHON_BUILD_HTTP_CLIENT="curl" setup() { mkdir -p "$INSTALL_ROOT" diff --git a/plugins/python-build/test/cache.bats b/plugins/python-build/test/cache.bats index 3eea3386..2baef589 100644 --- a/plugins/python-build/test/cache.bats +++ b/plugins/python-build/test/cache.bats @@ -3,8 +3,6 @@ load test_helper export PYTHON_BUILD_SKIP_MIRROR=1 export PYTHON_BUILD_CACHE_PATH="$TMP/cache" -export PYTHON_BUILD_CURL_OPTS= -export PYTHON_BUILD_HTTP_CLIENT="curl" setup() { mkdir "$PYTHON_BUILD_CACHE_PATH" diff --git a/plugins/python-build/test/checksum.bats b/plugins/python-build/test/checksum.bats index dc4f958a..f80d5ae2 100644 --- a/plugins/python-build/test/checksum.bats +++ b/plugins/python-build/test/checksum.bats @@ -3,8 +3,6 @@ load test_helper export PYTHON_BUILD_SKIP_MIRROR=1 export PYTHON_BUILD_CACHE_PATH= -export PYTHON_BUILD_CURL_OPTS= -export PYTHON_BUILD_HTTP_CLIENT="curl" @test "package URL without checksum" { diff --git a/plugins/python-build/test/fetch.bats b/plugins/python-build/test/fetch.bats index 48b058ce..a2a41759 100644 --- a/plugins/python-build/test/fetch.bats +++ b/plugins/python-build/test/fetch.bats @@ -3,8 +3,6 @@ load test_helper export PYTHON_BUILD_SKIP_MIRROR=1 export PYTHON_BUILD_CACHE_PATH= -export PYTHON_BUILD_ARIA2_OPTS= -export PYTHON_BUILD_HTTP_CLIENT="curl" setup() { export PYTHON_BUILD_BUILD_PATH="${TMP}/source" @@ -21,6 +19,7 @@ setup() { } @test "using aria2c if available" { + export PYTHON_BUILD_ARIA2_OPTS= export PYTHON_BUILD_HTTP_CLIENT="aria2c" stub aria2c "--allow-overwrite=true --no-conf=true -o * http://example.com/* : cp $FIXTURE_ROOT/\${5##*/} \$4" diff --git a/plugins/python-build/test/mirror.bats b/plugins/python-build/test/mirror.bats index 0ee26b4f..62ed38c0 100644 --- a/plugins/python-build/test/mirror.bats +++ b/plugins/python-build/test/mirror.bats @@ -4,8 +4,6 @@ load test_helper export PYTHON_BUILD_SKIP_MIRROR= export PYTHON_BUILD_CACHE_PATH= export PYTHON_BUILD_MIRROR_URL=http://mirror.example.com -export PYTHON_BUILD_CURL_OPTS= -export PYTHON_BUILD_HTTP_CLIENT="curl" @test "package URL without checksum bypasses mirror" { diff --git a/plugins/python-build/test/test_helper.bash b/plugins/python-build/test/test_helper.bash index 74607ddd..f959dd19 100644 --- a/plugins/python-build/test/test_helper.bash +++ b/plugins/python-build/test/test_helper.bash @@ -1,4 +1,6 @@ export TMP="$BATS_TEST_DIRNAME/tmp" +export RUBY_BUILD_CURL_OPTS= +export RUBY_BUILD_HTTP_CLIENT="curl" if [ "$FIXTURE_ROOT" != "$BATS_TEST_DIRNAME/fixtures" ]; then export FIXTURE_ROOT="$BATS_TEST_DIRNAME/fixtures" diff --git a/test/test_helper.bash b/test/test_helper.bash index ed9bbb2c..e11cd8f1 100644 --- a/test/test_helper.bash +++ b/test/test_helper.bash @@ -1,6 +1,5 @@ unset PYENV_VERSION unset PYENV_DIR -unset PYTHON_BUILD_HTTP_CLIENT # guard against executing this block twice due to bats internals if [ -z "$PYENV_TEST_DIR" ]; then