Module: monitoring-plugins
Branch: master
Commit: 44211a672959494849476c45ff761181e62762ff
Author: Lorenz Kästle <[email protected]>
Date: Thu Mar 13 12:59:40 2025 +0100
URL:
https://www.monitoring-plugins.org/repositories/monitoring-plugins/commit/?id=44211a67
Adapt tests more
---
plugins/t/check_ftp.t | 2 +-
plugins/t/check_jabber.t | 4 ++--
plugins/t/check_udp.t | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/plugins/t/check_ftp.t b/plugins/t/check_ftp.t
index 93a7d7c3..a2f79dca 100644
--- a/plugins/t/check_ftp.t
+++ b/plugins/t/check_ftp.t
@@ -15,7 +15,7 @@ my $host_tcp_ftp = getTestParameter("NP_HOST_TCP_FTP",
"A host providing t
my $host_nonresponsive = getTestParameter("NP_HOST_NONRESPONSIVE", "The
hostname of system not responsive to network requests", "10.0.0.1");
my $hostname_invalid = getTestParameter("NP_HOSTNAME_INVALID", "An invalid
(not known to DNS) hostname", "nosuchhost");
-my $successOutput = '/FTP OK -\s+[0-9]?\.?[0-9]+ second response time/';
+my $successOutput = '/Connection time\s+[0-9]?\.?[0-9]+/';
my $t;
diff --git a/plugins/t/check_jabber.t b/plugins/t/check_jabber.t
index 08cadcbd..dc46f4c3 100644
--- a/plugins/t/check_jabber.t
+++ b/plugins/t/check_jabber.t
@@ -15,11 +15,11 @@ my $host_nonresponsive =
getTestParameter("NP_HOST_NONRESPONSIVE", "The hostname
my $hostname_invalid = getTestParameter("NP_HOSTNAME_INVALID", "An invalid
(not known to DNS) hostname", "nosuchhost");
-my $jabberOK = '/JABBER OK\s-\s\d+\.\d+\ssecond response time on
'.$host_tcp_jabber.' port 5222/';
+my $jabberOK = '/Connection to '.$host_tcp_jabber.' on port 5222/';
my $jabberUnresponsive = '/Socket timeout after\s\d+\sseconds/';
-my $jabberInvalid = '/JABBER CRITICAL - Invalid hostname, address or
socket:\s.+/';
+my $jabberInvalid = '/Invalid hostname, address or socket:\s.+/';
my $r;
diff --git a/plugins/t/check_udp.t b/plugins/t/check_udp.t
index 6c47d095..5cb9e6dc 100644
--- a/plugins/t/check_udp.t
+++ b/plugins/t/check_udp.t
@@ -28,7 +28,7 @@ like ( $res->output, '/With UDP checks, a send/expect string
must be specified.
$res = NPTest->testCmd( "./check_udp -H localhost -p 3333 -s foo -e bar" );
cmp_ok( $res->return_code, '==', 2, "Errors correctly because no udp service
running" );
-like ( $res->output, '/No data received from host/', "Output OK");
+like ( $res->output, '/Received no data /', "Output OK");
my $nc;
if(system("which nc.traditional >/dev/null 2>&1") == 0) {
@@ -48,7 +48,7 @@ SKIP: {
sleep 1;
$res = NPTest->testCmd( "./check_udp -H localhost -p 3333 -s '' -e
barbar -4" );
cmp_ok( $res->return_code, '==', 0, "Got barbar response back" );
- like ( $res->output, '/\[barbar\]/', "Output OK");
+ like ( $res->output, '/answer of the server matched/', "Output OK");
close NC;
# Start up a udp server listening on port 3333, quit after 3 seconds