diff options
| author |  Thomas Guyot-Sionnest <dermoth@aei.ca>
| 2010-11-30 21:02:23 -0500 |
|---|---|---|
| committer | Thomas Guyot-Sionnest <dermoth@aei.ca>
| 2010-11-30 22:32:33 -0500 |
| commit | df88f95fcaf65d58a9ea172c2b3e2b96d80dff33 (patch) | |
| tree | 2ee4154b2f7e96cac96c8bfbc4e3fff5116095fa /plugins/t | |
| parent | 9faccbb26106fc6f134c783c91d1871af581af02 (diff) | |
| download | monitoring-plugins-df88f95fcaf65d58a9ea172c2b3e2b96d80dff33.tar.gz | |
check_snmp: Remove that is_numeric madness
Original patch to make Timeticks works as in check_snmp v1.4.14, it turns
out is_numeric isn't so useful and treating all types as numeric works
best for backwards-compatibility. This is how it used to work in 1.4.14.
As a special case, I also make calculate_rate look up for numeric values
as it would otherwise return the last value instead.
Diffstat (limited to 'plugins/t')
| -rw-r--r-- | plugins/t/check_snmp.t | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/plugins/t/check_snmp.t b/plugins/t/check_snmp.t index 004ba1ae..25a2999d 100644 --- a/plugins/t/check_snmp.t +++ b/plugins/t/check_snmp.t @@ -8,7 +8,7 @@ use strict; use Test::More; use NPTest; -my $tests = 8+38+2+2; +my $tests = 8+42+2+2; plan tests => $tests; my $res; @@ -124,6 +124,13 @@ SKIP: { cmp_ok( $res->return_code, '==', 0, "Skipping all thresholds"); like($res->output, '/^SNMP OK - \d+ \w+ \d+\s.*$/', "Skipping all thresholds, result printed rather than parsed"); + $res = NPTest->testCmd( "./check_snmp -H $host_snmp -C $snmp_community -o system.sysUpTime.0 -c 1000000000: -u '1/100 sec'"); + cmp_ok( $res->return_code, '==', 2, "Timetick used as a threshold"); + like($res->output, '/^SNMP CRITICAL - \*\d+\* 1\/100 sec.*$/', "Timetick used as a threshold, parsed as numeric"); + + $res = NPTest->testCmd( "./check_snmp -H $host_snmp -C $snmp_community -o system.sysUpTime.0"); + cmp_ok( $res->return_code, '==', 0, "Timetick used as a string"); + like($res->output, '/^SNMP OK - Timeticks:\s\(\d+\)\s+(?:\d+ days?,\s+)?\d+:\d+:\d+\.\d+\s.*$/', "Timetick used as a string, result printed rather than parsed"); } # These checks need a complete command line. An invalid community is used so |