[debian-edu-commits] debian-edu/ 01/01: Extend testsuite/webcache to detect if the squid binary is missing.

[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 25f68cffd0a5461b9777eb7d1e92d2cd490c86c8
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Fri Aug 22 17:27:10 2014 +0200

    Extend testsuite/webcache to detect if the squid binary is missing.
---
 debian/changelog   | 3 ++-
 testsuite/webcache | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 650d31f..5e08b19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,9 +32,10 @@ debian-edu-config (1.721) UNRELEASED; urgency=low
   * Make failing SAMBASID fetch non-fatal in ldap-debian-edu-install.
   * Adjust testsuite/cups; the daemon is now called cups-browsed.
 
-  [ Petter Reinholdtse ]
+  [ Petter Reinholdtsen ]
   * Set samba sid to 'bogus-sid' when continuing the ldap-debian-edu-install
     script.
+  * Extend testsuite/webcache to detect if the squid binary is missing.
 
  -- Alexander Alemayhu <alexander at bitraf.no>  Thu, 21 Aug 2014 22:51:52 +0200
 
diff --git a/testsuite/webcache b/testsuite/webcache
index 36cee24..14860a3 100755
--- a/testsuite/webcache
+++ b/testsuite/webcache
@@ -38,6 +38,13 @@ fi
 HEADOPTS="-t 10"
 
 if echo "$PROFILE" | egrep -q 'Main-Server' ; then
+    # Test that the binary exist
+    if test -x /usr/sbin/squid ; then
+        echo "success: $0: Binary /usr/sbin/squid is present."
+    else
+        echo "error: $0: Binary /usr/sbin/squid is missing."
+    fi
+
     if pidof squid > /dev/null ; then
         echo "success: $0: squid is running."
     else

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