diff options
author | Thomas Guyot-Sionnest <dermoth@aei.ca> | 2010-11-30 22:48:43 -0500 |
---|---|---|
committer | Thomas Guyot-Sionnest <dermoth@aei.ca> | 2010-11-30 22:48:43 -0500 |
commit | 5a2814a21bff07b87a7589ef19b63c9eecb8be9f (patch) | |
tree | e112f9645005cb6fb84b96c11640dd613fe14e0c /plugins/tests | |
parent | 811684ffe394d050158c2a98d5be211d5ded3c88 (diff) | |
download | monitoring-plugins-5a2814a21bff07b87a7589ef19b63c9eecb8be9f.tar.gz |
Revert "check_snmp now considers strings returned by SNMP that contain just"
This reverts commit 896962a1ad1b7d7c75d42c565b06cc799feb0a7c.
Conflicts:
NEWS
plugins/tests/check_snmp.t
Notes:
Reverting because I rebased a patch that was doing the same thing, plus
fixing more related regressions, and both didn't work together.
I kept the tests intact except for one that wouldn't pass on 1.4.14
either
Diffstat (limited to 'plugins/tests')
-rwxr-xr-x | plugins/tests/check_snmp.t | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/plugins/tests/check_snmp.t b/plugins/tests/check_snmp.t index 6966838c..c960f7b1 100755 --- a/plugins/tests/check_snmp.t +++ b/plugins/tests/check_snmp.t | |||
@@ -54,7 +54,7 @@ if ($ARGV[0] && $ARGV[0] eq "-d") { | |||
54 | # We should merge that with $ENV{'NPTEST_CACHE'}, use one dir for all test data | 54 | # We should merge that with $ENV{'NPTEST_CACHE'}, use one dir for all test data |
55 | $ENV{'NAGIOS_PLUGIN_STATE_DIRECTORY'} ||= "/var/tmp"; | 55 | $ENV{'NAGIOS_PLUGIN_STATE_DIRECTORY'} ||= "/var/tmp"; |
56 | 56 | ||
57 | my $tests = 41; | 57 | my $tests = 39; |
58 | if (-x "./check_snmp") { | 58 | if (-x "./check_snmp") { |
59 | plan tests => $tests; | 59 | plan tests => $tests; |
60 | } else { | 60 | } else { |
@@ -173,10 +173,6 @@ $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1 | |||
173 | is($res->return_code, 0, "OK as string doesn't match but inverted" ); | 173 | is($res->return_code, 0, "OK as string doesn't match but inverted" ); |
174 | is($res->output, 'SNMP OK - "stringtests" | ', "OK as inverted string no match" ); | 174 | is($res->output, 'SNMP OK - "stringtests" | ', "OK as inverted string no match" ); |
175 | 175 | ||
176 | $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.12" ); | ||
177 | is($res->return_code, 0, "Numeric in string test" ); | ||
178 | is($res->output, 'SNMP OK - 3.5 | iso.3.6.1.4.1.8072.3.2.67.12=3.5 ', "Check seen as numeric" ); | ||
179 | |||
180 | $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.12 -w 4:5" ); | 176 | $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.12 -w 4:5" ); |
181 | is($res->return_code, 1, "Numeric in string test" ); | 177 | is($res->return_code, 1, "Numeric in string test" ); |
182 | is($res->output, 'SNMP WARNING - *3.5* | iso.3.6.1.4.1.8072.3.2.67.12=3.5 ', "WARNING threshold checks for string masquerading as number" ); | 178 | is($res->output, 'SNMP WARNING - *3.5* | iso.3.6.1.4.1.8072.3.2.67.12=3.5 ', "WARNING threshold checks for string masquerading as number" ); |