diff options
Diffstat (limited to 'plugins')
| -rwxr-xr-x | plugins/tests/check_http.t | 35 | ||||
| -rwxr-xr-x | plugins/tests/check_snmp.t | 14 |
2 files changed, 28 insertions, 21 deletions
diff --git a/plugins/tests/check_http.t b/plugins/tests/check_http.t index f03933bd..74eff175 100755 --- a/plugins/tests/check_http.t +++ b/plugins/tests/check_http.t @@ -18,9 +18,24 @@ use Test::More; use NPTest; use FindBin qw($Bin); -use HTTP::Daemon; -use HTTP::Status; -use HTTP::Response; +my $common_tests = 66; +my $ssl_only_tests = 6; +# Check that all dependent modules are available +eval { + require HTTP::Daemon; + require HTTP::Status; + require HTTP::Response; +}; + +if ($@) { + plan skip_all => "Missing required module for test: $@"; +} else { + if (-x "./check_http") { + plan tests => $common_tests * 2 + $ssl_only_tests; + } else { + plan skip_all => "No check_http compiled"; + } +} my $servers = { http => 0 }; # HTTP::Daemon should always be available eval { require HTTP::Daemon::SSL }; @@ -112,9 +127,9 @@ sub run_server { $c->send_response("slow"); } elsif ($r->url->path eq "/method") { if ($r->method eq "DELETE") { - $c->send_error(RC_METHOD_NOT_ALLOWED); + $c->send_error(HTTP::Status->RC_METHOD_NOT_ALLOWED); } elsif ($r->method eq "foo") { - $c->send_error(RC_NOT_IMPLEMENTED); + $c->send_error(HTTP::Status->RC_NOT_IMPLEMENTED); } else { $c->send_status_line(200, $r->method); } @@ -138,7 +153,7 @@ sub run_server { delete($persist[1000]); next MAINLOOP; } else { - $c->send_error(RC_FORBIDDEN); + $c->send_error(HTTP::Status->RC_FORBIDDEN); } $c->close; } @@ -157,14 +172,6 @@ if ($ARGV[0] && $ARGV[0] eq "-d") { } } -my $common_tests = 66; -my $ssl_only_tests = 6; -if (-x "./check_http") { - plan tests => $common_tests * 2 + $ssl_only_tests; -} else { - plan skip_all => "No check_http compiled"; -} - my $result; my $command = "./check_http -H 127.0.0.1"; diff --git a/plugins/tests/check_snmp.t b/plugins/tests/check_snmp.t index c960f7b1..b978a859 100755 --- a/plugins/tests/check_snmp.t +++ b/plugins/tests/check_snmp.t @@ -8,6 +8,7 @@ use Test::More; use NPTest; use FindBin qw($Bin); +my $tests = 39; # Check that all dependent modules are available eval { require NetSNMP::OID; @@ -17,6 +18,12 @@ eval { if ($@) { plan skip_all => "Missing required module for test: $@"; +} else { + if (-x "./check_snmp") { + plan tests => $tests; + } else { + plan skip_all => "No check_snmp compiled"; + } } my $port_snmp = 16100 + int(rand(100)); @@ -54,13 +61,6 @@ if ($ARGV[0] && $ARGV[0] eq "-d") { # We should merge that with $ENV{'NPTEST_CACHE'}, use one dir for all test data $ENV{'NAGIOS_PLUGIN_STATE_DIRECTORY'} ||= "/var/tmp"; -my $tests = 39; -if (-x "./check_snmp") { - plan tests => $tests; -} else { - plan skip_all => "No check_snmp compiled"; -} - my $res; $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.0"); |