From 003c6dea156e857b4c8f2498ea78332f6315ffae Mon Sep 17 00:00:00 2001 From: Ton Voon Date: Fri, 4 Nov 2005 09:38:24 +0000 Subject: [PATCH] Fixed --mismatch option for check_tcp. Added tests into check_imap (Rick Fey - 1339134) git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1273 f882894a-f735-0410-b71e-b25c423dba1c --- THANKS.in | 2 ++ plugins/check_tcp.c | 2 +- plugins/t/check_imap.t | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/THANKS.in b/THANKS.in index fb73b14..66e728c 100644 --- a/THANKS.in +++ b/THANKS.in @@ -169,3 +169,5 @@ Chester Hosey Pascal Larisch David Sullivan Bob Ingraham +Hans Engelen +Rick Frey diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c index cb7a869..08ec856 100644 --- a/plugins/check_tcp.c +++ b/plugins/check_tcp.c @@ -311,7 +311,7 @@ main (int argc, char **argv) /* did we get the response we hoped? */ if(match == -2 && result != STATE_CRITICAL) - result = STATE_WARNING; + result = expect_mismatch_state; /* reset the alarm */ alarm (0); diff --git a/plugins/t/check_imap.t b/plugins/t/check_imap.t index f86faa4..32b4136 100644 --- a/plugins/t/check_imap.t +++ b/plugins/t/check_imap.t @@ -10,7 +10,7 @@ use Test; use NPTest; use vars qw($tests); -BEGIN {$tests = 5; plan tests => $tests} +BEGIN {$tests = 7; plan tests => $tests} my $host_tcp_smtp = getTestParameter( "host_tcp_smtp", "NP_HOST_TCP_SMTP", "mailhost", "A host providing an STMP Service (a mail server)"); @@ -33,6 +33,8 @@ $t += checkCmd( "./check_imap -H $host_tcp_imap -p 143 -w 9 -c 9 -t 10 -e '* $t += checkCmd( "./check_imap $host_tcp_imap -p 143 -wt 9 -ct 9 -to 10 -e '* OK'", 0, undef, %exceptions ); $t += checkCmd( "./check_imap $host_nonresponsive", 2 ); $t += checkCmd( "./check_imap $hostname_invalid", 2 ); +$t += checkCmd( "./check_imap -H $host_tcp_imap -e unlikely_string", 1); +$t += checkCmd( "./check_imap -H $host_tcp_imap -e unlikely_string -M crit", 2); exit(0) if defined($Test::Harness::VERSION); -- 2.30.2