From 098fb9f07acfca10c131825e0844527e6fde0a31 Mon Sep 17 00:00:00 2001
From: "Yamashita, Yuu" <peek824545201@gmail.com>
Date: Tue, 24 Apr 2018 05:22:32 +0000
Subject: [PATCH] Rewrite python-build tests with using
 `PYTHON_BUILD_HTTP_CLIENT`

---
 plugins/python-build/test/build.bats       |  2 +-
 plugins/python-build/test/cache.bats       |  2 +-
 plugins/python-build/test/checksum.bats    |  5 +---
 plugins/python-build/test/fetch.bats       |  3 ++-
 plugins/python-build/test/mirror.bats      |  5 +---
 plugins/python-build/test/pyenv_ext.bats   |  2 +-
 plugins/python-build/test/test_helper.bash | 29 ----------------------
 7 files changed, 7 insertions(+), 41 deletions(-)

diff --git a/plugins/python-build/test/build.bats b/plugins/python-build/test/build.bats
index 69afb6f4..472c9209 100644
--- a/plugins/python-build/test/build.bats
+++ b/plugins/python-build/test/build.bats
@@ -6,9 +6,9 @@ export MAKE=make
 export MAKE_OPTS="-j 2"
 export CC=cc
 export -n PYTHON_CONFIGURE_OPTS
+export PYTHON_BUILD_HTTP_CLIENT="curl"
 
 setup() {
-  ensure_not_found_in_path aria2c
   mkdir -p "$INSTALL_ROOT"
   stub md5 false
   stub curl false
diff --git a/plugins/python-build/test/cache.bats b/plugins/python-build/test/cache.bats
index 88b3f89d..3eea3386 100644
--- a/plugins/python-build/test/cache.bats
+++ b/plugins/python-build/test/cache.bats
@@ -4,9 +4,9 @@ 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() {
-  ensure_not_found_in_path aria2c
   mkdir "$PYTHON_BUILD_CACHE_PATH"
 }
 
diff --git a/plugins/python-build/test/checksum.bats b/plugins/python-build/test/checksum.bats
index 04973a97..dc4f958a 100644
--- a/plugins/python-build/test/checksum.bats
+++ b/plugins/python-build/test/checksum.bats
@@ -4,10 +4,7 @@ load test_helper
 export PYTHON_BUILD_SKIP_MIRROR=1
 export PYTHON_BUILD_CACHE_PATH=
 export PYTHON_BUILD_CURL_OPTS=
-
-setup() {
-  ensure_not_found_in_path aria2c
-}
+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 c131e688..48b058ce 100644
--- a/plugins/python-build/test/fetch.bats
+++ b/plugins/python-build/test/fetch.bats
@@ -4,9 +4,9 @@ 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() {
-  ensure_not_found_in_path aria2c
   export PYTHON_BUILD_BUILD_PATH="${TMP}/source"
   mkdir -p "${PYTHON_BUILD_BUILD_PATH}"
 }
@@ -21,6 +21,7 @@ setup() {
 }
 
 @test "using aria2c if available" {
+  export PYTHON_BUILD_HTTP_CLIENT="aria2c"
   stub aria2c "--allow-overwrite=true --no-conf=true -o * http://example.com/* : cp $FIXTURE_ROOT/\${5##*/} \$4"
 
   install_fixture definitions/without-checksum
diff --git a/plugins/python-build/test/mirror.bats b/plugins/python-build/test/mirror.bats
index 038a920a..0ee26b4f 100644
--- a/plugins/python-build/test/mirror.bats
+++ b/plugins/python-build/test/mirror.bats
@@ -5,10 +5,7 @@ export PYTHON_BUILD_SKIP_MIRROR=
 export PYTHON_BUILD_CACHE_PATH=
 export PYTHON_BUILD_MIRROR_URL=http://mirror.example.com
 export PYTHON_BUILD_CURL_OPTS=
-
-setup() {
-  ensure_not_found_in_path aria2c
-}
+export PYTHON_BUILD_HTTP_CLIENT="curl"
 
 
 @test "package URL without checksum bypasses mirror" {
diff --git a/plugins/python-build/test/pyenv_ext.bats b/plugins/python-build/test/pyenv_ext.bats
index ae9f72ab..5f6d5037 100644
--- a/plugins/python-build/test/pyenv_ext.bats
+++ b/plugins/python-build/test/pyenv_ext.bats
@@ -5,11 +5,11 @@ export PYTHON_BUILD_CACHE_PATH="$TMP/cache"
 export MAKE=make
 export MAKE_OPTS="-j 2"
 export CC=cc
+export PYTHON_BUILD_HTTP_CLIENT="curl"
 
 export TMP_FIXTURES="$TMP/fixtures"
 
 setup() {
-  ensure_not_found_in_path aria2c
   mkdir -p "$INSTALL_ROOT"
   stub md5 false
   stub curl false
diff --git a/plugins/python-build/test/test_helper.bash b/plugins/python-build/test/test_helper.bash
index 1ad42d58..74607ddd 100644
--- a/plugins/python-build/test/test_helper.bash
+++ b/plugins/python-build/test/test_helper.bash
@@ -9,35 +9,6 @@ if [ "$FIXTURE_ROOT" != "$BATS_TEST_DIRNAME/fixtures" ]; then
   export PATH
 fi
 
-remove_command_from_path() {
-  OLDIFS="${IFS}"
-  local cmd="$1"
-  local path
-  local paths=()
-  IFS=:
-  for path in ${PATH}; do
-    if [ -e "${path}/${cmd}" ]; then
-      local tmp_path="$(mktemp -d "${TMP}/path.XXXXX")"
-      ln -fs "${path}"/* "${tmp_path}"
-      rm -f "${tmp_path}/${cmd}"
-      paths["${#paths[@]}"]="${tmp_path}"
-    else
-      paths["${#paths[@]}"]="${path}"
-    fi
-  done
-  export PATH="${paths[*]}"
-  IFS="${OLDIFS}"
-}
-
-ensure_not_found_in_path() {
-  local cmd
-  for cmd; do
-    if command -v "${cmd}" 1>/dev/null 2>&1; then
-      remove_command_from_path "${cmd}"
-    fi
-  done
-}
-
 teardown() {
   rm -fr "${TMP:?}"/*
 }