summaryrefslogtreecommitdiffstats
path: root/plugins/t
diff options
context:
space:
mode:
authorThomas Guyot-Sionnest <dermoth@users.sourceforge.net>2007-01-30 05:01:00 (GMT)
committerThomas Guyot-Sionnest <dermoth@users.sourceforge.net>2007-01-30 05:01:00 (GMT)
commite8a3864bca84196a20c6d5566671852b6e80370e (patch)
treea84132a9c264d9b83b1e7dbaa30a209600c613a4 /plugins/t
parent986abfd43d6b2b412c6695c435508eb19db520bb (diff)
downloadmonitoring-plugins-e8a3864bca84196a20c6d5566671852b6e80370e.tar.gz
Fix reporting bug using expect, affecting (not fixing) Debian bug #392610: check_jabber always return warning
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1596 f882894a-f735-0410-b71e-b25c423dba1c
Diffstat (limited to 'plugins/t')
-rw-r--r--plugins/t/check_tcp.t5
1 files changed, 4 insertions, 1 deletions
diff --git a/plugins/t/check_tcp.t b/plugins/t/check_tcp.t
index ffe559d..67e527a 100644
--- a/plugins/t/check_tcp.t
+++ b/plugins/t/check_tcp.t
@@ -10,7 +10,7 @@ use Test;
10use NPTest; 10use NPTest;
11 11
12use vars qw($tests); 12use vars qw($tests);
13BEGIN {$tests = 5; plan tests => $tests} 13BEGIN {$tests = 7; plan tests => $tests}
14 14
15my $host_tcp_http = getTestParameter( "host_tcp_http", "NP_HOST_TCP_HTTP", "localhost", 15my $host_tcp_http = getTestParameter( "host_tcp_http", "NP_HOST_TCP_HTTP", "localhost",
16 "A host providing the HTTP Service (a web server)" ); 16 "A host providing the HTTP Service (a web server)" );
@@ -23,12 +23,15 @@ my $hostname_invalid = getTestParameter( "hostname_invalid", "NP_HOSTNAME_IN
23 23
24my $successOutput = '/^TCP OK\s-\s+[0-9]?\.?[0-9]+ second response time on port [0-9]+/'; 24my $successOutput = '/^TCP OK\s-\s+[0-9]?\.?[0-9]+ second response time on port [0-9]+/';
25 25
26my $failedExpect = '/^TCP WARNING\s-\sUnexpected response from host/socket on port [0-9]+/';
27
26my $t; 28my $t;
27 29
28$t += checkCmd( "./check_tcp $host_tcp_http -p 80 -wt 300 -ct 600", 0, $successOutput ); 30$t += checkCmd( "./check_tcp $host_tcp_http -p 80 -wt 300 -ct 600", 0, $successOutput );
29$t += checkCmd( "./check_tcp $host_tcp_http -p 81 -wt 0 -ct 0 -to 1", 2 ); # use invalid port for this test 31$t += checkCmd( "./check_tcp $host_tcp_http -p 81 -wt 0 -ct 0 -to 1", 2 ); # use invalid port for this test
30$t += checkCmd( "./check_tcp $host_nonresponsive -p 80 -wt 0 -ct 0 -to 1", 2 ); 32$t += checkCmd( "./check_tcp $host_nonresponsive -p 80 -wt 0 -ct 0 -to 1", 2 );
31$t += checkCmd( "./check_tcp $hostname_invalid -p 80 -wt 0 -ct 0 -to 1", 2 ); 33$t += checkCmd( "./check_tcp $hostname_invalid -p 80 -wt 0 -ct 0 -to 1", 2 );
34$t += checkCmd( "./check_tcp $host_tcp_http -p 80 -s 'GET /\n' -e 'ThisShouldntMatch' -j", 1, $failedExpect );
32 35
33exit(0) if defined($Test::Harness::VERSION); 36exit(0) if defined($Test::Harness::VERSION);
34exit($tests - $t); 37exit($tests - $t);