[debian-edu-commits] debian-edu/ 13/15: Adjust cups, webcache and webserver testsuite scripts to be compliant with HTTPS

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu-config.

commit 3405ef808140619781e31985d753347a1b369c2c
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sun Feb 4 12:28:33 2018 +0100

    Adjust cups, webcache and webserver testsuite scripts to be compliant with HTTPS
---
 testsuite/cups      | 1 +
 testsuite/webcache  | 2 +-
 testsuite/webserver | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/testsuite/cups b/testsuite/cups
index 7095873..7e35ab4 100755
--- a/testsuite/cups
+++ b/testsuite/cups
@@ -30,6 +30,7 @@ netstat_check ipp tcp "cupsd" || exit 1
 WGETOPTS="--no-check-certificate --timeout=10"
 
 unset http_proxy || true
+unset https_proxy || true
 unset ftp_proxy  || true
 
 # CUPS only listens on port 631 on localhost.
diff --git a/testsuite/webcache b/testsuite/webcache
index 7a09fad..ecc544f 100755
--- a/testsuite/webcache
+++ b/testsuite/webcache
@@ -63,7 +63,7 @@ fi
 # Verify that the automatic proxy configuration file is available
 url=http://wpad/wpad.dat
 
-if HEAD $HEADOPTS $url 2>&1 | grep -q 'certificate verify' ; then
+if HEAD $HEADOPTS $url > /dev/null 2>&1 ; then
     echo "success: $0: WPAD file is available from '$url'."
 
     # Subshell to avoid leaking http_proxy and ftp_proxy variables to
diff --git a/testsuite/webserver b/testsuite/webserver
index 07fa75e..a0b4c6c 100755
--- a/testsuite/webserver
+++ b/testsuite/webserver
@@ -31,6 +31,7 @@ server=www
 HEADOPTS="-t 10"
 
 unset http_proxy || true
+unset https_proxy || true
 unset ftp_proxy  || true
 
 if pidof apache > /dev/null ; then

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git