more r1879 fixes

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1899 f882894a-f735-0410-b71e-b25c423dba1c

diff --git a/plugins/t/check_imap.t b/plugins/t/check_imap.t
index fa957d1b8581df018c139e82b0248bc03ba07d45..29343025c19fe79ae2ac4efd27b55590614e5504 100644 (file)
--- a/plugins/t/check_imap.t
+++ b/plugins/t/check_imap.t
@@ -36,7 +36,7 @@ $t = NPTest->testCmd( "./check_imap $host_nonresponsive" );
 cmp_ok( $t->return_code, '==', 2, "Get error with non reponsive host" );
 
 $t = NPTest->testCmd( "./check_imap $hostname_invalid" );
-cmp_ok( $t->return_code, '==', 2, "Invalid hostname" );
+cmp_ok( $t->return_code, '==', 3, "Invalid hostname" );
 
 $t = NPTest->testCmd( "./check_imap -H $host_tcp_imap -e unlikely_string");
 cmp_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 6a3d4ef7676a03ae5a2bded1c6e84d9bad77338e..b6193214dfcf2eab3924fb7ca903875ac9869480 100644 (file)
--- 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/';
 
 my $jabberUnresponsive = '/CRITICAL\s-\sSocket timeout after\s\d+\sseconds/';
 
-my $jabberInvalid = '/JABBER CRITICAL - Invalid hostname, address or socket:\s.+/';
+my $jabberInvalid = '/JABBER UNKNOWN - Invalid hostname, address or socket:\s.+/';
 
 my $r;
 
@@ -60,6 +60,6 @@ is( $r->return_code, 2, "Unresponsive host gives critical" );
 like( $r->output, $jabberUnresponsive );
 
 $r = NPTest->testCmd( "./check_jabber $hostname_invalid" );
-is( $r->return_code, 2, "Invalid hostname gives critical" );
+is( $r->return_code, 3, "Invalid hostname gives critical" );
 like( $r->output, $jabberInvalid );
 

diff --git a/plugins/t/check_pop.t b/plugins/t/check_pop.t
index b78291dafe781d71614b6a0907e4cc6073a3f821..565a57717ce2e4b116e192edc4874018f8b7dfbc 100644 (file)
--- a/plugins/t/check_pop.t
+++ b/plugins/t/check_pop.t
@@ -53,4 +53,4 @@ $res = NPTest->testCmd( "./check_pop $host_nonresponsive" );
 cmp_ok( $res->return_code, '==', 2, "Non responsive host");
 
 $res = NPTest->testCmd( "./check_pop $hostname_invalid" );
-cmp_ok( $res->return_code, '==', 2, "Invalid host");
+cmp_ok( $res->return_code, '==', 3, "Invalid host");