[Pkg-nagios-changes] [pkg-nagios-plugins-contrib] 02/02: avoid output on stderr in test_check_varnish

Bernd Zeimetz bernd at bzed.de
Tue Jan 3 17:12:42 UTC 2017


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

bzed pushed a commit to branch master
in repository pkg-nagios-plugins-contrib.

commit 87a77dcdd0a60446479f1bf5e42063ef89863f42
Author: Bernd Zeimetz <bernd at bzed.de>
Date:   Tue Jan 3 18:12:22 2017 +0100

    avoid output on stderr in test_check_varnish
---
 debian/tests/control            | 2 +-
 debian/tests/test_check_varnish | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/tests/control b/debian/tests/control
index be17baa..a46bd41 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -18,6 +18,6 @@ Test-Command: /usr/lib/nagios/plugins/check_libs
 Depends: libmonitoring-plugin-perl | libnagios-plugin-perl, @
 Test-Command: /usr/lib/nagios/plugins/check_uptime -f
 
-Depends: varnish, systemd, @
+Depends: varnish, systemd, dbus, @
 Restrictions: needs-root
 Tests: test_check_varnish
diff --git a/debian/tests/test_check_varnish b/debian/tests/test_check_varnish
index 9d2fc87..cd373aa 100755
--- a/debian/tests/test_check_varnish
+++ b/debian/tests/test_check_varnish
@@ -3,7 +3,7 @@
 VARNISH_PORT=$(( ($RANDOM % 60000) + 1024 ))
 API_PORT=$(( ($RANDOM % 60000) + 1024 ))
 
-systemctl stop varnish.service
+systemctl stop varnish.service 2>/dev/null
 
 cat > /etc/systemd/system/varnish.service << __EOF__
 
@@ -27,8 +27,8 @@ WantedBy=multi-user.target
 
 __EOF__
 
-systemctl daemon-reload
-systemctl start varnish.service
+systemctl daemon-reload 2>/dev/null
+systemctl start varnish.service 2>/dev/null
 
 /usr/lib/nagios/plugins/check_varnish -p MAIN.pools -w 1: -c 1:
 exit $?

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagios-plugins-contrib.git



More information about the Pkg-nagios-changes mailing list