diff options
author | Thomas Guyot-Sionnest <dermoth@aei.ca> | 2010-12-01 03:28:19 (GMT) |
---|---|---|
committer | Thomas Guyot-Sionnest <dermoth@aei.ca> | 2010-12-01 03:33:34 (GMT) |
commit | 811684ffe394d050158c2a98d5be211d5ded3c88 (patch) | |
tree | 1c8b689c2e7b79667ed92e2b914f245349981504 /plugins/tests | |
parent | df88f95fcaf65d58a9ea172c2b3e2b96d80dff33 (diff) | |
download | monitoring-plugins-811684ffe394d050158c2a98d5be211d5ded3c88.tar.gz |
State-based tests enhancements
- Use /var/tmp for state if no state dir environment variable is set,
this avoid the need for a writable localstatedir during tests.
- Use "rm -f", mostly to avoid printing out garbage of the directory
doesn't exists
Diffstat (limited to 'plugins/tests')
-rwxr-xr-x | plugins/tests/check_snmp.t | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/plugins/tests/check_snmp.t b/plugins/tests/check_snmp.t index 08348d2..6966838 100755 --- a/plugins/tests/check_snmp.t +++ b/plugins/tests/check_snmp.t | |||
@@ -51,6 +51,9 @@ if ($ARGV[0] && $ARGV[0] eq "-d") { | |||
51 | } | 51 | } |
52 | } | 52 | } |
53 | 53 | ||
54 | # We should merge that with $ENV{'NPTEST_CACHE'}, use one dir for all test data | ||
55 | $ENV{'NAGIOS_PLUGIN_STATE_DIRECTORY'} ||= "/var/tmp"; | ||
56 | |||
54 | my $tests = 41; | 57 | my $tests = 41; |
55 | if (-x "./check_snmp") { | 58 | if (-x "./check_snmp") { |
56 | plan tests => $tests; | 59 | plan tests => $tests; |
@@ -106,7 +109,7 @@ like($res->output, '/'.quotemeta('SNMP OK - And now have fun with with this: \"C | |||
106 | "And now have fun with with this: \"C:\\\\\" | 109 | "And now have fun with with this: \"C:\\\\\" |
107 | because we\'re not done yet!"').'/m', "Attempt to confuse parser No.3"); | 110 | because we\'re not done yet!"').'/m', "Attempt to confuse parser No.3"); |
108 | 111 | ||
109 | system("rm /usr/local/nagios/var/check_snmp/*"); | 112 | system("rm -f ".$ENV{'NAGIOS_PLUGIN_STATE_DIRECTORY'}."/check_snmp/*"); |
110 | $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.10 --rate -w 600" ); | 113 | $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.10 --rate -w 600" ); |
111 | is($res->return_code, 0, "Returns OK"); | 114 | is($res->return_code, 0, "Returns OK"); |
112 | is($res->output, "No previous data to calculate rate - assume okay"); | 115 | is($res->output, "No previous data to calculate rate - assume okay"); |