[Nagiosplug-checkins] SF.net SVN: nagiosplug: [1901] nagiosplug/trunk/plugins/t

[tonvoon at users.sourceforge.net]

Revision: 1901
          http://nagiosplug.svn.sourceforge.net/nagiosplug/?rev=1901&view=rev
Author:   tonvoon
Date:     2008-01-08 03:57:24 -0800 (Tue, 08 Jan 2008)

Log Message:
-----------
Reverted commits 1898 and 1899 due to reversion of 1879

Modified Paths:
--------------
    nagiosplug/trunk/plugins/t/check_ftp.t
    nagiosplug/trunk/plugins/t/check_imap.t
    nagiosplug/trunk/plugins/t/check_jabber.t
    nagiosplug/trunk/plugins/t/check_pop.t
    nagiosplug/trunk/plugins/t/check_tcp.t

Modified: nagiosplug/trunk/plugins/t/check_ftp.t
===================================================================
--- nagiosplug/trunk/plugins/t/check_ftp.t	2008-01-08 11:51:53 UTC (rev 1900)
+++ nagiosplug/trunk/plugins/t/check_ftp.t	2008-01-08 11:57:24 UTC (rev 1901)
@@ -27,7 +27,7 @@
 
 $t += checkCmd( "./check_ftp $host_tcp_ftp       -wt 300 -ct 600",       0, $successOutput );
 $t += checkCmd( "./check_ftp $host_nonresponsive -wt 0   -ct 0   -to 1", 2 );
-$t += checkCmd( "./check_ftp $hostname_invalid   -wt 0   -ct 0",         3 );
+$t += checkCmd( "./check_ftp $hostname_invalid   -wt 0   -ct 0",         2 );
 
 exit(0) if defined($Test::Harness::VERSION);
 exit($tests - $t);

Modified: nagiosplug/trunk/plugins/t/check_imap.t
===================================================================
--- nagiosplug/trunk/plugins/t/check_imap.t	2008-01-08 11:51:53 UTC (rev 1900)
+++ nagiosplug/trunk/plugins/t/check_imap.t	2008-01-08 11:57:24 UTC (rev 1901)
@@ -36,7 +36,7 @@
 cmp_ok( $t->return_code, '==', 2, "Get error with non reponsive host" );
 
 $t = NPTest->testCmd( "./check_imap $hostname_invalid" );
-cmp_ok( $t->return_code, '==', 3, "Invalid hostname" );
+cmp_ok( $t->return_code, '==', 2, "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" );

Modified: nagiosplug/trunk/plugins/t/check_jabber.t
===================================================================
--- nagiosplug/trunk/plugins/t/check_jabber.t	2008-01-08 11:51:53 UTC (rev 1900)
+++ nagiosplug/trunk/plugins/t/check_jabber.t	2008-01-08 11:57:24 UTC (rev 1901)
@@ -34,7 +34,7 @@
 
 my $jabberUnresponsive = '/CRITICAL\s-\sSocket timeout after\s\d+\sseconds/';
 
-my $jabberInvalid = '/JABBER UNKNOWN - Invalid hostname, address or socket:\s.+/';
+my $jabberInvalid = '/JABBER CRITICAL - Invalid hostname, address or socket:\s.+/';
 
 my $r;
 
@@ -60,6 +60,6 @@
 like( $r->output, $jabberUnresponsive );
 
 $r = NPTest->testCmd( "./check_jabber $hostname_invalid" );
-is( $r->return_code, 3, "Invalid hostname gives critical" );
+is( $r->return_code, 2, "Invalid hostname gives critical" );
 like( $r->output, $jabberInvalid );
 

Modified: nagiosplug/trunk/plugins/t/check_pop.t
===================================================================
--- nagiosplug/trunk/plugins/t/check_pop.t	2008-01-08 11:51:53 UTC (rev 1900)
+++ nagiosplug/trunk/plugins/t/check_pop.t	2008-01-08 11:57:24 UTC (rev 1901)
@@ -53,4 +53,4 @@
 cmp_ok( $res->return_code, '==', 2, "Non responsive host");
 
 $res = NPTest->testCmd( "./check_pop $hostname_invalid" );
-cmp_ok( $res->return_code, '==', 3, "Invalid host");
+cmp_ok( $res->return_code, '==', 2, "Invalid host");

Modified: nagiosplug/trunk/plugins/t/check_tcp.t
===================================================================
--- nagiosplug/trunk/plugins/t/check_tcp.t	2008-01-08 11:51:53 UTC (rev 1900)
+++ nagiosplug/trunk/plugins/t/check_tcp.t	2008-01-08 11:57:24 UTC (rev 1901)
@@ -30,7 +30,7 @@
 $t += checkCmd( "./check_tcp $host_tcp_http      -p 80 -wt 300 -ct 600",       0, $successOutput );
 $t += checkCmd( "./check_tcp $host_tcp_http      -p 81 -wt   0 -ct   0 -to 1", 2 ); # use invalid port for this test
 $t += checkCmd( "./check_tcp $host_nonresponsive -p 80 -wt   0 -ct   0 -to 1", 2 );
-$t += checkCmd( "./check_tcp $hostname_invalid   -p 80 -wt   0 -ct   0 -to 1", 3 );
+$t += checkCmd( "./check_tcp $hostname_invalid   -p 80 -wt   0 -ct   0 -to 1", 2 );
 
 # Need the \r\n to make it more standards compliant with web servers. Need the various quotes
 # so that perl doesn't interpret the \r\n and is passed onto command line correctly


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.