Remove tests support for running over proxy and remove ArchLinux from…

… tests (#750)
tj · Dec 14, 2022 · 6ed06f7 · 6ed06f7
1 parent 4d6f017
commit 6ed06f7
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 115 deletions.
diff --git a/bin/release → bin/dev/release b/bin/release → bin/dev/release
diff --git a/test/bin/proxy-build b/test/bin/proxy-build
diff --git a/test/bin/proxy-run b/test/bin/proxy-run
diff --git a/test/bin/run-all-tests b/test/bin/run-all-tests
@@ -2,7 +2,7 @@
 BIN_DIRECTORY="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
 # We want to cover curl and wget especially, gz and xz and variety of OS a bonus.
-services=( archlinux-curl ubuntu-wget )
+services=( ubuntu-curl ubuntu-wget )
 
 cd "$(dirname "${BIN_DIRECTORY}")" || exit 2
 for service in "${services[@]}" ; do

diff --git a/test/config/.curlrc b/test/config/.curlrc
diff --git a/test/config/.wgetrc b/test/config/.wgetrc
diff --git a/test/docker-base.yml b/test/docker-base.yml
@@ -16,10 +16,3 @@ services:
       - ../node_modules/bats-assert:/mnt/node_modules/bats-assert
       # the n script
       - ../bin/n:/usr/local/bin/n
-      # override settings to allow insecure connection in case using mitm proxy
-      - ./config/.curlrc:/root/.curlrc
-      - ./config/.wgetrc:/root/.wgetrc
-    environment:
-      # pass through proxy settings to allow caching proxy
-      - http_proxy
-      - https_proxy
diff --git a/test/docker-compose.yml b/test/docker-compose.yml
@@ -14,10 +14,3 @@ services:
     build:
       context: dockerfiles
       dockerfile: Dockerfile-ubuntu-wget
-  archlinux-curl:
-    extends:
-      file: ./docker-base.yml
-      service: testbed
-    build:
-      context: dockerfiles
-      dockerfile: Dockerfile-archlinux-curl
diff --git a/test/dockerfiles/Dockerfile-archlinux-curl b/test/dockerfiles/Dockerfile-archlinux-curl
diff --git a/test/tests.md b/test/tests.md
@@ -28,22 +28,6 @@ Run single test on a single system::
     npx bats tests/install-contents.bats
     docker-compose run ubuntu-curl bats /mnt/test/tests/install-contents.bats
 
-## Proxy
-
-To speed up running tests multiple times, you can optionally run a caching proxy for the node downloads. The curl settings are modified
-to allow an insecure connection through the mitm proxy.
-
-    cd test
-    bin/proxy-build
-    bin/proxy-run
-    # follow the instructions for configuring environment variables for using proxy, then run tests
-
-`node` versions added to proxy cache (and used in tests):
-
-* v4.9.1
-* lts
-* latest
-
 ## Docker Tips
 
 Using `docker-compose` in addition to `docker` for convenient mounting of `n` script and the tests into the container. Changes to the tests or to `n` itself are reflected immediately without needing to rebuild the containers.

diff --git a/test/tests/install-reference-versions.bash b/test/tests/install-reference-versions.bash