From aa4ab1b799e5b3287406441427860d280155aed2 Mon Sep 17 00:00:00 2001 From: Ton Voon Date: Sat, 17 May 2003 17:50:40 +0000 Subject: Fixed test commands (Mathew Ericson - 738605) git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@519 f882894a-f735-0410-b71e-b25c423dba1c --- plugins/t/check_procs.t | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/plugins/t/check_procs.t b/plugins/t/check_procs.t index 9c2330f9..da49ac61 100644 --- a/plugins/t/check_procs.t +++ b/plugins/t/check_procs.t @@ -13,39 +13,39 @@ my $str; my $t; # Reverse Compatibility -$cmd = "./check_procs 100000 100000"; +$cmd = "./check_procs -w 100000 -c 100000"; $str = `$cmd`; $t += ok $?>>8,0; print "Test was: $cmd\n" if ($?); -$t += ok $str, '/^OK - [0-9]+ processes running$/'; +$t += ok $str, '/^PROCS OK: [0-9]+ process(es)?$/'; # Reverse Compatibility -$cmd = "./check_procs 100000 100000 Z"; +$cmd = "./check_procs -w 100000 -c 100000 -s Z"; $str = `$cmd`; $t += ok $?>>8,0; print "Test was: $cmd\n" if ($?); -$t += ok $str, '/^OK - [0-9]+ processes running with /'; +$t += ok $str, '/^PROCS OK: [0-9]+ process(es)? with /'; # Reverse Compatibility -$cmd = "./check_procs 0 10000000"; +$cmd = "./check_procs -w 0 -c 10000000"; $str = `$cmd`; $t += ok $?>>8,1; print "Test was: $cmd\n" unless ($?); -$t += ok $str, '/^WARNING - [0-9]+ processes running$/'; +$t += ok $str, '/^PROCS WARNING: [0-9]+ process(es)?$/'; # Reverse Compatibility -$cmd = "./check_procs 0 0"; +$cmd = "./check_procs -w 0 -c 0"; $str = `$cmd`; $t += ok $?>>8,2; print "Test was: $cmd\n" unless ($?); -$t += ok $str, '/^CRITICAL - [0-9]+ processes running$/'; +$t += ok $str, '/^PROCS CRITICAL: [0-9]+ process(es)?$/'; # Reverse Compatibility -$cmd = "./check_procs 0 0 S"; +$cmd = "./check_procs -w 0 -c 0 -s S"; $str = `$cmd`; $t += ok $?>>8,2; print "Test was: $cmd\n" unless ($?); -$t += ok $str, '/^CRITICAL - [0-9]+ processes running with /'; +$t += ok $str, '/^PROCS CRITICAL: [0-9]+ process(es)? with /'; exit(0) if defined($Test::Harness::VERSION); exit($tests - $t); -- cgit v1.2.3