Fixed tests (Mathew Ericson - 738607)

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

diff --git a/plugins/t/check_load.t b/plugins/t/check_load.t
index ac14620f5a56f86864ba18797f7a60aafb110681..fce168fc81fdb708152118e83b610e1fd85a0c3d 100644 (file)
--- a/plugins/t/check_load.t
+++ b/plugins/t/check_load.t
@@ -11,17 +11,17 @@ my $cmd;
 my $str;
 my $t;
 
-$cmd = "./check_load 100 100 100 100 100 100";
+$cmd = "./check_load -w 100,100,100 -c 100,100,100";
 $str = `$cmd`;
 $t += ok $?>>8,0;
 print "Test was: $cmd\n" if ($?);
-$t += ok $str, '/^load average: +[\.0-9]+, +[\.0-9]+, +[\.0-9]+$/';
+$t += ok $str, '/^OK - load average: [0-9]\.?[0-9]+, [0-9]\.?[0-9]+, [0-9]\.?[0-9]+$/';
 
-$cmd = "./check_load 0 0 0 0 0 0";
+$cmd = "./check_load -w 0,0,0 -c 0,0,0";
 $str = `$cmd`;
 $t += ok $?>>8,2;
 print "Test was: $cmd\n" unless ($?);
-$t += ok $str, '/^load average: +[\.0-9]+, +[\.0-9]+, +[\.0-9]+ CRITICAL$/';
+$t += ok $str, '/^CRITICAL - load average: [0-9]\.?[0-9]+, [0-9]\.?[0-9]+, [0-9]\.?[0-9]+$/';
 
 exit(0) if defined($Test::Harness::VERSION);
 exit($tests - $t);