[debian-edu-commits] r83703 - in branches/debian-edu-config/jessie: debian testsuite

[pere at alioth.debian.org]

Author: pere
Date: 2014-08-21 11:46:44 +0000 (Thu, 21 Aug 2014)
New Revision: 83703

Modified:
   branches/debian-edu-config/jessie/debian/changelog
   branches/debian-edu-config/jessie/testsuite/nagios
Log:
Extend nagios test to detect if nagsio3 is completely missing.

Modified: branches/debian-edu-config/jessie/debian/changelog
===================================================================
--- branches/debian-edu-config/jessie/debian/changelog	2014-08-21 11:12:24 UTC (rev 83702)
+++ branches/debian-edu-config/jessie/debian/changelog	2014-08-21 11:46:44 UTC (rev 83703)
@@ -16,6 +16,7 @@
     Apache 2 cfengine rules to enable configuration on fresh installs.
   * Update from debhelper version 7 to 9 to get the support needed for
     the Apache 2.4 migration.
+  * Extend nagios test to detect if nagsio3 is completely missing.
 
  -- Petter Reinholdtsen <pere at debian.org>  Tue, 19 Aug 2014 22:25:29 +0200
 

Modified: branches/debian-edu-config/jessie/testsuite/nagios
===================================================================
--- branches/debian-edu-config/jessie/testsuite/nagios	2014-08-21 11:12:24 UTC (rev 83702)
+++ branches/debian-edu-config/jessie/testsuite/nagios	2014-08-21 11:46:44 UTC (rev 83703)
@@ -11,6 +11,12 @@
     exit 0
 fi
 
+if [ -x /usr/sbin/nagios3 ] ; then
+    echo "success: Found /usr/sbin/nagios3 binary."
+else
+    echo "error: Missing /usr/sbin/nagios3."
+fi
+
 if [ -x /usr/sbin/nagios3stats ] ; then
     for field in NUMSVCCRIT NUMSVCWARN NUMSVCUNKN; do
 	count="$(nagios3stats -m -d$field)"