From: Thomas Guyot-Sionnest Date: Tue, 8 Jan 2008 11:35:06 +0000 (+0000) Subject: more r1879 fixes X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2e0da16fad96241dc6bde04daecc7ced840e9c9a;p=nagiosplug.git 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 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" ); 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 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/'; 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 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" ); 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");