Skip to content

Commit

Permalink
State-based tests enhancements
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
dermoth committed Dec 1, 2010
1 parent df88f95 commit 811684f
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion plugins/tests/check_snmp.t
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ 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 = 41;
if (-x "./check_snmp") {
plan tests => $tests;
Expand Down Expand Up @@ -106,7 +109,7 @@ like($res->output, '/'.quotemeta('SNMP OK - And now have fun with with this: \"C
"And now have fun with with this: \"C:\\\\\"
because we\'re not done yet!"').'/m', "Attempt to confuse parser No.3");

system("rm /usr/local/nagios/var/check_snmp/*");
system("rm -f ".$ENV{'NAGIOS_PLUGIN_STATE_DIRECTORY'}."/check_snmp/*");
$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" );
is($res->return_code, 0, "Returns OK");
is($res->output, "No previous data to calculate rate - assume okay");
Expand Down

0 comments on commit 811684f

Please sign in to comment.