[debian-edu-commits] r79659 - in branches/wheezy/debian-edu-config: debian testsuite

[pere at alioth.debian.org]

Author: pere
Date: 2013-04-21 05:05:22 +0000 (Sun, 21 Apr 2013)
New Revision: 79659

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/testsuite/cups
Log:
Rewrite CUPS testsuite check to use wget --no-check-certificate
instead of HEAD, to be able to check that the HTTP server is
working while ignoring that the SSL certificate name do not match
the URL we use to check it.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-04-21 05:03:23 UTC (rev 79658)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-04-21 05:05:22 UTC (rev 79659)
@@ -3,6 +3,10 @@
   * Fix RDP testsuite check to look for the correct TCP ports (3389
     and 3350), instead of some random PIDs I inserted by mistake in
     the first draft.
+  * Rewrite CUPS testsuite check to use wget --no-check-certificate
+    instead of HEAD, to be able to check that the HTTP server is
+    working while ignoring that the SSL certificate name do not match
+    the URL we use to check it.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sun, 21 Apr 2013 07:01:44 +0200
 

Modified: branches/wheezy/debian-edu-config/testsuite/cups
===================================================================
--- branches/wheezy/debian-edu-config/testsuite/cups	2013-04-21 05:03:23 UTC (rev 79658)
+++ branches/wheezy/debian-edu-config/testsuite/cups	2013-04-21 05:05:22 UTC (rev 79659)
@@ -24,8 +24,10 @@
 
 netstat_check ipp tcp "cupsd" || exit 1
 
-# Wait for 10 seconds
-HEADOPTS="-t 10"
+# * Ignore SSL certificate checking as the name do not match the server
+#   name
+# * Wait for 10 seconds
+WGETOPTS="--no-check-certificate --timeout=10"
 
 unset http_proxy || true
 unset ftp_proxy  || true
@@ -39,7 +41,7 @@
 
 for server in $servers ; do
     for url in "http://$server:631/" "https://$server:631/" ; do
-	if HEAD $HEADOPTS $url 2>&1 | grep -q '200 OK' ; then
+	if wget -O - $WGETOPTS $url > /dev/null 2>&1 ; then
 	    echo "success: $0: URL '$url' is working."
 	else
 	    echo "error: $0: URL '$url' is not working."