summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Guyot-Sionnest <dermoth@users.sourceforge.net>2008-01-08 11:35:06 (GMT)
committerThomas Guyot-Sionnest <dermoth@users.sourceforge.net>2008-01-08 11:35:06 (GMT)
commit2e0da16fad96241dc6bde04daecc7ced840e9c9a (patch)
tree00a5af556c83d0cfad29fc7b54005a9673787816
parent9693226cebc9408b6c8f66de25aa38bff98169e4 (diff)
downloadmonitoring-plugins-2e0da16fad96241dc6bde04daecc7ced840e9c9a.tar.gz
more r1879 fixes
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1899 f882894a-f735-0410-b71e-b25c423dba1c
-rw-r--r--plugins/t/check_imap.t2
-rw-r--r--plugins/t/check_jabber.t4
-rw-r--r--plugins/t/check_pop.t2
3 files changed, 4 insertions, 4 deletions
diff --git a/plugins/t/check_imap.t b/plugins/t/check_imap.t
index fa957d1..2934302 100644
--- a/plugins/t/check_imap.t
+++ b/plugins/t/check_imap.t
@@ -36,7 +36,7 @@ $t = NPTest->testCmd( "./check_imap $host_nonresponsive" );
36cmp_ok( $t->return_code, '==', 2, "Get error with non reponsive host" ); 36cmp_ok( $t->return_code, '==', 2, "Get error with non reponsive host" );
37 37
38$t = NPTest->testCmd( "./check_imap $hostname_invalid" ); 38$t = NPTest->testCmd( "./check_imap $hostname_invalid" );
39cmp_ok( $t->return_code, '==', 2, "Invalid hostname" ); 39cmp_ok( $t->return_code, '==', 3, "Invalid hostname" );
40 40
41$t = NPTest->testCmd( "./check_imap -H $host_tcp_imap -e unlikely_string"); 41$t = NPTest->testCmd( "./check_imap -H $host_tcp_imap -e unlikely_string");
42cmp_ok( $t->return_code, '==', 1, "Got warning with bad response" ); 42cmp_ok( $t->return_code, '==', 1, "Got warning with bad response" );
diff --git a/plugins/t/check_jabber.t b/plugins/t/check_jabber.t
index 6a3d4ef..b619321 100644
--- a/plugins/t/check_jabber.t
+++ b/plugins/t/check_jabber.t
@@ -34,7 +34,7 @@ my $jabberOK = '/JABBER OK\s-\s\d+\.\d+\ssecond response time on port 5222/';
34 34
35my $jabberUnresponsive = '/CRITICAL\s-\sSocket timeout after\s\d+\sseconds/'; 35my $jabberUnresponsive = '/CRITICAL\s-\sSocket timeout after\s\d+\sseconds/';
36 36
37my $jabberInvalid = '/JABBER CRITICAL - Invalid hostname, address or socket:\s.+/'; 37my $jabberInvalid = '/JABBER UNKNOWN - Invalid hostname, address or socket:\s.+/';
38 38
39my $r; 39my $r;
40 40
@@ -60,6 +60,6 @@ is( $r->return_code, 2, "Unresponsive host gives critical" );
60like( $r->output, $jabberUnresponsive ); 60like( $r->output, $jabberUnresponsive );
61 61
62$r = NPTest->testCmd( "./check_jabber $hostname_invalid" ); 62$r = NPTest->testCmd( "./check_jabber $hostname_invalid" );
63is( $r->return_code, 2, "Invalid hostname gives critical" ); 63is( $r->return_code, 3, "Invalid hostname gives critical" );
64like( $r->output, $jabberInvalid ); 64like( $r->output, $jabberInvalid );
65 65
diff --git a/plugins/t/check_pop.t b/plugins/t/check_pop.t
index b78291d..565a577 100644
--- a/plugins/t/check_pop.t
+++ b/plugins/t/check_pop.t
@@ -53,4 +53,4 @@ $res = NPTest->testCmd( "./check_pop $host_nonresponsive" );
53cmp_ok( $res->return_code, '==', 2, "Non responsive host"); 53cmp_ok( $res->return_code, '==', 2, "Non responsive host");
54 54
55$res = NPTest->testCmd( "./check_pop $hostname_invalid" ); 55$res = NPTest->testCmd( "./check_pop $hostname_invalid" );
56cmp_ok( $res->return_code, '==', 2, "Invalid host"); 56cmp_ok( $res->return_code, '==', 3, "Invalid host");