summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/t/check_dns.t5
-rw-r--r--plugins/t/check_http.t4
-rw-r--r--plugins/t/check_load.t4
-rw-r--r--plugins/t/check_mysql.t11
-rwxr-xr-xtest.pl.in8
5 files changed, 19 insertions, 13 deletions
diff --git a/plugins/t/check_dns.t b/plugins/t/check_dns.t
index a85e2e7..bee1d34 100644
--- a/plugins/t/check_dns.t
+++ b/plugins/t/check_dns.t
@@ -14,11 +14,10 @@ my $cmd;
14my $str; 14my $str;
15my $t; 15my $t;
16 16
17$cmd = "./check_dns 127.0.0.1 -to 5"; 17$str = `./check_dns $Cache::dnshost -to 5`;
18$str = `$cmd`;
19$t += ok $?>>8,0; 18$t += ok $?>>8,0;
20print "Test was: $cmd\n" if ($?); 19print "Test was: $cmd\n" if ($?);
21$t += ok $str, '/DNS ok - +[\.0-9]+ seconds response time, Address\(es\) is\/are /'; 20$t += ok $str, '/DNS OK: +[\.0-9]+ seconds response time, /';
22 21
23$cmd = "./check_dns $Cache::nullhost -to 1"; 22$cmd = "./check_dns $Cache::nullhost -to 1";
24$str = `$cmd`; 23$str = `$cmd`;
diff --git a/plugins/t/check_http.t b/plugins/t/check_http.t
index 0c71794..5be549a 100644
--- a/plugins/t/check_http.t
+++ b/plugins/t/check_http.t
@@ -11,9 +11,9 @@ my $null = '';
11my $str; 11my $str;
12my $t; 12my $t;
13 13
14$str = `./check_http $Cache::hostname -wt 300 -ct 600`; 14$str = `./check_http $Cache::httphost -wt 300 -ct 600`;
15$t += ok $?>>8,0; 15$t += ok $?>>8,0;
16$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/'; 16$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/';
17 17
18$str = `./check_http $Cache::nullhost -wt 1 -ct 2`; 18$str = `./check_http $Cache::nullhost -wt 1 -ct 2`;
19$t += ok $?>>8,2; 19$t += ok $?>>8,2;
diff --git a/plugins/t/check_load.t b/plugins/t/check_load.t
index fce168f..414e09d 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";
15$str = `$cmd`; 15$str = `$cmd`;
16$t += ok $?>>8,0; 16$t += ok $?>>8,0;
17print "Test was: $cmd\n" if ($?); 17print "Test was: $cmd\n" if ($?);
18$t += ok $str, '/^OK - load average: [0-9]\.?[0-9]+, [0-9]\.?[0-9]+, [0-9]\.?[0-9]+$/'; 18$t += ok $str, '/^OK - load average: [0-9]\.?[0-9]+, [0-9]\.?[0-9]+, [0-9]\.?[0-9]+/';
19 19
20$cmd = "./check_load -w 0,0,0 -c 0,0,0"; 20$cmd = "./check_load -w 0,0,0 -c 0,0,0";
21$str = `$cmd`; 21$str = `$cmd`;
22$t += ok $?>>8,2; 22$t += ok $?>>8,2;
23print "Test was: $cmd\n" unless ($?); 23print "Test was: $cmd\n" unless ($?);
24$t += ok $str, '/^CRITICAL - load average: [0-9]\.?[0-9]+, [0-9]\.?[0-9]+, [0-9]\.?[0-9]+$/'; 24$t += ok $str, '/^CRITICAL - load average: [0-9]\.?[0-9]+, [0-9]\.?[0-9]+, [0-9]\.?[0-9]+/';
25 25
26exit(0) if defined($Test::Harness::VERSION); 26exit(0) if defined($Test::Harness::VERSION);
27exit($tests - $t); 27exit($tests - $t);
diff --git a/plugins/t/check_mysql.t b/plugins/t/check_mysql.t
index ae2a008..0fae65f 100644
--- a/plugins/t/check_mysql.t
+++ b/plugins/t/check_mysql.t
@@ -1,11 +1,12 @@
1#! /usr/bin/perl -w 1#! /usr/bin/perl -w
2 2
3use strict; 3use strict;
4use Helper;
4use Cache; 5use Cache;
5use Test; 6use Test;
6use vars qw($tests); 7use vars qw($tests);
7 8
8BEGIN {$tests = 1; plan tests => $tests} 9BEGIN {$tests = 2; plan tests => $tests}
9 10
10exit(0) unless (-x "./check_mysql"); 11exit(0) unless (-x "./check_mysql");
11 12
@@ -14,10 +15,12 @@ my $cmd;
14my $str; 15my $str;
15my $t; 16my $t;
16 17
17$cmd = "./check_mysql -H 127.0.0.1 -P 3306"; 18my $mysqlserver = get_option("mysqlserver","host for MYSQL tests");
19
20$cmd = "./check_mysql -H $mysqlserver -P 3306";
18$str = `$cmd`; 21$str = `$cmd`;
19$t += ok $?>>8,0; 22$t += ok $?>>8,2;
20print "Test was: $cmd\n" if ($?); 23$t += ok $str, '/Access denied for user: /';
21 24
22exit(0) if defined($Test::Harness::VERSION); 25exit(0) if defined($Test::Harness::VERSION);
23exit($tests - $t); 26exit($tests - $t);
diff --git a/test.pl.in b/test.pl.in
index 0b895a3..e88c473 100755
--- a/test.pl.in
+++ b/test.pl.in
@@ -14,14 +14,16 @@ require Exporter;
14} 14}
15 15
16use Helper; 16use Helper;
17my ($tstdir,$spath,$hostname,$mailhost,$noserver,$nullhost,$quickcheck); 17my ($tstdir,$spath,$hostname,$httphost,$mailhost,$dnshost,$noserver,$nullhost,$quickcheck);
18 18
19use Getopt::Long; 19use Getopt::Long;
20GetOptions 20GetOptions
21 ("tstdir:s"=>\$tstdir, 21 ("tstdir:s"=>\$tstdir,
22 "spath:s"=>\$spath, 22 "spath:s"=>\$spath,
23 "hostname:s"=>\$hostname, 23 "hostname:s"=>\$hostname,
24 "httpname:s"=>\$httphost,
24 "mailhost:s"=>\$mailhost, 25 "mailhost:s"=>\$mailhost,
26 "dnshost:s"=>\$dnshost,
25 "noserver:s"=>\$noserver, 27 "noserver:s"=>\$noserver,
26 "nullhost:s"=>\$nullhost, 28 "nullhost:s"=>\$nullhost,
27 "quickcheck"=>\$quickcheck); 29 "quickcheck"=>\$quickcheck);
@@ -30,8 +32,10 @@ $spath = "." unless ($spath);
30 32
31unless ($quickcheck) { 33unless ($quickcheck) {
32 34
33 $hostname = get_option("hostname","host for FTP/HTTP/UDP tests") unless ($hostname); 35 $hostname = get_option("hostname","host for FTP/UDP tests") unless ($hostname);
36 $httphost = get_option("httphost","host for HTTP tests") unless ($httphost);
34 $mailhost = get_option("mailhost","host for SMTP/IMAP/POP tests") unless ($mailhost); 37 $mailhost = get_option("mailhost","host for SMTP/IMAP/POP tests") unless ($mailhost);
38 $dnshost = get_option("dnshost","hostname to lookup for DNS tests") unless ($dnshost);
35 $noserver = get_option("noserver","host that rejects above services") unless ($noserver); 39 $noserver = get_option("noserver","host that rejects above services") unless ($noserver);
36 # This machine should not be locatable from your network. Use IP 40 # This machine should not be locatable from your network. Use IP
37 # private addresses like 10.x.x.x and pick one that does not exist 41 # private addresses like 10.x.x.x and pick one that does not exist