Changeset 67f2f58 in mod_gnutls for test

Timestamp:

Feb 11, 2016, 7:15:39 PM (4 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, master, proxy-ticket, upstream

Children:

f0923c4

Parents:

5aae10e

Message:

Support curl or Wget for test case "26_redirect_HTTP_to_HTTPS"

Location:

test

Files:

• Makefile.am (modified) (1 diff)
• test-26_redirect_HTTP_to_HTTPS.bash (modified) (1 diff)

test/Makefile.am

@@ -166 +166 @@
         export TEST_MSVA_WAIT="$(TEST_MSVA_WAIT)"; \
         export TEST_QUERY_DELAY="$(TEST_QUERY_DELAY)"; \
-        export BACKEND_HOST="$(TEST_HOST)";
+        export BACKEND_HOST="$(TEST_HOST)"; \
+        export HTTP_CLI="@HTTP_CLI@";
 
 if ENABLE_NETNS

test/test-26_redirect_HTTP_to_HTTPS.bash

@@ -33 +33 @@
 
 # Send status request over HTTP. This should get redirected to HTTPS.
-wget --ca-certificate=authority/x509.pem -O "${output}" \
-     "http://${TEST_HOST}:${TEST_HTTP_PORT}/status?auto"
+URL="http://${TEST_HOST}:${TEST_HTTP_PORT}/status?auto"
+if [ "$(basename ${HTTP_CLI})" = "curl" ]; then
+    ${HTTP_CLI} --location --cacert authority/x509.pem "${URL}" >"${output}"
+elif [ "$(basename ${HTTP_CLI})" = "wget" ]; then
+    ${HTTP_CLI} --ca-certificate=authority/x509.pem -O "${output}" "${URL}"
+else
+    echo "No HTTP client (curl or wget) found, skipping." 2>&1
+    exit 77
+fi
 
 # If the request was redirected correctly, the status report lists the