[debian-edu-commits] debian-edu/ 02/04: Change cups test to only expect port 631 listening on localhost.

[Petter Reinholdtsen]

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

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

commit b68ed0eb1b9313dbf3113f001e0774d58c6cc4a8
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Mon Sep 1 08:54:05 2014 +0200

    Change cups test to only expect port 631 listening on localhost.
---
 debian/changelog |  6 ++++++
 testsuite/cups   | 22 +++++++---------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 82d7470..e98fdee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debian-edu-config (1.724) UNRELEASED; urgency=low
+
+  * Change cups test to only expect port 631 listening on localhost.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Mon, 01 Sep 2014 08:53:00 +0200
+
 debian-edu-config (1.723) unstable; urgency=high
 
   * Fix typo in shell test in sssd-generate-config.
diff --git a/testsuite/cups b/testsuite/cups
index 08c0800..c519961 100755
--- a/testsuite/cups
+++ b/testsuite/cups
@@ -32,21 +32,13 @@ WGETOPTS="--no-check-certificate --timeout=10"
 unset http_proxy || true
 unset ftp_proxy  || true
 
-servers=localhost
-
-# Only the main server, CUPS should listen on the www interface too
-if echo "$PROFILE" | egrep -q 'Main-Server' ; then
-    servers="www $servers"
-fi
-
-for server in $servers ; do
-    for url in "http://$server:631/" "https://$server:631/" ; do
-	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."
-	fi
-    done
+# Since Jessie, Expect CUPS to only listed on port 631 on localhost.
+for url in "http://localhost:631/" "https://localhost:631/" ; do
+    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."
+    fi
 done
 
 exit 0

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