aboutsummaryrefslogtreecommitdiff
path: root/plugins/tests/check_snmp.t
diff options
context:
space:
mode:
authorGravatar Thomas Guyot-Sionnest <dermoth@aei.ca> 2010-11-30 23:57:04 -0500
committerGravatar Thomas Guyot-Sionnest <dermoth@aei.ca> 2010-11-30 23:57:04 -0500
commitc49fed07c3837fb7590bd05d192d6b6f6c4ae5d4 (patch)
tree568936fcb453f6a00b96462cc987b93b0ea32158 /plugins/tests/check_snmp.t
parent5a2814a21bff07b87a7589ef19b63c9eecb8be9f (diff)
downloadmonitoring-plugins-c49fed07c3837fb7590bd05d192d6b6f6c4ae5d4.tar.gz
Fix minor test issues
My Test::More wouldn't print the total number of tests anymore, moving the plan at the top appears to fix it. At the same time I made check-http.t eval the special modules so it can skip the tests instead of failing.
Diffstat (limited to 'plugins/tests/check_snmp.t')
-rwxr-xr-xplugins/tests/check_snmp.t14
1 files changed, 7 insertions, 7 deletions
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");