Updating test harness

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

5 files changed, 19 insertions, 13 deletions

diff --git a/plugins/t/check_dns.t b/plugins/t/check_dns.t
index a85e2e76..bee1d34b 100644
--- a/plugins/t/check_dns.t
+++ b/plugins/t/check_dns.t
@@ -14,11 +14,10 @@ my $cmd;
 my $str;
 my $t;
 
-$cmd = "./check_dns 127.0.0.1 -to 5";
-$str = `$cmd`;
+$str = `./check_dns $Cache::dnshost -to 5`;
 $t += ok $?>>8,0;
 print "Test was: $cmd\n" if ($?);
-$t += ok $str, '/DNS ok - +[\.0-9]+ seconds response time, Address\(es\) is\/are /';
+$t += ok $str, '/DNS OK: +[\.0-9]+ seconds response time, /';
 
 $cmd = "./check_dns $Cache::nullhost -to 1";
 $str = `$cmd`;
diff --git a/plugins/t/check_http.t b/plugins/t/check_http.t
index 0c71794f..5be549ad 100644
--- a/plugins/t/check_http.t
+++ b/plugins/t/check_http.t
@@ -11,9 +11,9 @@ my $null = '';
 my $str;
 my $t;
 
-$str = `./check_http $Cache::hostname -wt 300 -ct 600`;
+$str = `./check_http $Cache::httphost -wt 300 -ct 600`;
 $t += ok $?>>8,0;
-$t += ok $str, '/(HTTP\s[o|O][k|K]\s)?\s?HTTP\/1.[01]\s[0-9]{3}\s(OK|Found)\s-\s+([0-9]+|[0-9]+\.[0-9]+)\ssecond response time/';
+$t += ok $str, '/(HTTP\s[o|O][k|K]\s)?\s?HTTP\/1.[01]\s[0-9]{3}\s(OK|Found)\s-\s+[0-9]+\sbytes\sin\s+([0-9]+|[0-9]+\.[0-9]+)\sseconds/';
 
 $str = `./check_http $Cache::nullhost -wt 1 -ct 2`;
 $t += ok $?>>8,2;
diff --git a/plugins/t/check_load.t b/plugins/t/check_load.t
index fce168fc..414e09d6 100644
--- a/plugins/t/check_load.t
+++ b/plugins/t/check_load.t
@@ -15,13 +15,13 @@ $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, '/^OK - load average: [0-9]\.?[0-9]+, [0-9]\.?[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 -w 0,0,0 -c 0,0,0";
 $str = `$cmd`;
 $t += ok $?>>8,2;
 print "Test was: $cmd\n" unless ($?);
-$t += ok $str, '/^CRITICAL - load average: [0-9]\.?[0-9]+, [0-9]\.?[0-9]+, [0-9]\.?[0-9]+$/';
+$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);
diff --git a/plugins/t/check_mysql.t b/plugins/t/check_mysql.t
index ae2a0087..0fae65fe 100644
--- a/plugins/t/check_mysql.t
+++ b/plugins/t/check_mysql.t
@@ -1,11 +1,12 @@
 #! /usr/bin/perl -w
 
 use strict;
+use Helper;
 use Cache;
 use Test;
 use vars qw($tests);
 
-BEGIN {$tests = 1; plan tests => $tests}
+BEGIN {$tests = 2; plan tests => $tests}
 
 exit(0) unless (-x "./check_mysql");
 
@@ -14,10 +15,12 @@ my $cmd;
 my $str;
 my $t;
 
-$cmd = "./check_mysql -H 127.0.0.1 -P 3306";
+my $mysqlserver = get_option("mysqlserver","host for MYSQL tests");
+
+$cmd = "./check_mysql -H $mysqlserver -P 3306";
 $str = `$cmd`;
-$t += ok $?>>8,0;
-print "Test was: $cmd\n" if ($?);
+$t += ok $?>>8,2;
+$t += ok $str, '/Access denied for user: /';
 
 exit(0) if defined($Test::Harness::VERSION);
 exit($tests - $t);
diff --git a/test.pl.in b/test.pl.in
index 0b895a31..e88c473d 100755
--- a/test.pl.in
+++ b/test.pl.in
@@ -14,14 +14,16 @@ require Exporter;
 }
 
 use Helper;
-my ($tstdir,$spath,$hostname,$mailhost,$noserver,$nullhost,$quickcheck);
+my ($tstdir,$spath,$hostname,$httphost,$mailhost,$dnshost,$noserver,$nullhost,$quickcheck);
 
 use Getopt::Long;
 GetOptions
         ("tstdir:s"=>\$tstdir,
          "spath:s"=>\$spath,
          "hostname:s"=>\$hostname,
+         "httpname:s"=>\$httphost,
          "mailhost:s"=>\$mailhost,
+         "dnshost:s"=>\$dnshost,
          "noserver:s"=>\$noserver,
          "nullhost:s"=>\$nullhost,
          "quickcheck"=>\$quickcheck);
@@ -30,8 +32,10 @@ $spath = "." unless ($spath);
 
 unless ($quickcheck) {
     
-        $hostname = get_option("hostname","host for FTP/HTTP/UDP tests")        unless ($hostname);
+        $hostname = get_option("hostname","host for FTP/UDP tests")             unless ($hostname);
+        $httphost = get_option("httphost","host for HTTP tests")                unless ($httphost);
         $mailhost = get_option("mailhost","host for SMTP/IMAP/POP tests")       unless ($mailhost);
+        $dnshost  = get_option("dnshost","hostname to lookup for DNS tests")    unless ($dnshost);
         $noserver = get_option("noserver","host that rejects above services")   unless ($noserver);
         # This machine should not be locatable from your network.  Use IP
         # private addresses like 10.x.x.x and pick one that does not exist