From b3dee5c4bf9909c44a43dea0d27475cdbf79f243 Mon Sep 17 00:00:00 2001 From: Sven Nierlein Date: Fri, 10 Mar 2017 19:37:37 +0100 Subject: make snmp tests more reliable snmp tests fail if the snmp daemon runs systemd, then the process with 1 has arguments. Convert the test into a regex which works for sysv and systemd. Signed-off-by: Sven Nierlein --- plugins/t/check_snmp.t | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/t/check_snmp.t b/plugins/t/check_snmp.t index eff46ea1..9a6cd2bb 100644 --- a/plugins/t/check_snmp.t +++ b/plugins/t/check_snmp.t @@ -154,9 +154,9 @@ SKIP: { 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"); - $res = NPTest->testCmd( "./check_snmp -H $host_snmp -C $snmp_community -o HOST-RESOURCES-MIB::hrSWRunParameters.1"); - cmp_ok( $res->return_code, '==', 0, "Timetick used as a string"); - is( $res->output, 'SNMP OK - "" | ', "snmp response without datatype" ); + $res = NPTest->testCmd( "./check_snmp -H $host_snmp -C $snmp_community -o HOST-RESOURCES-MIB::hrSWRunName.1"); + cmp_ok( $res->return_code, '==', 0, "snmp response without datatype"); + like( $res->output, '/^SNMP OK - "(systemd|init)" \| $/', "snmp response without datatype" ); } SKIP: { -- cgit v1.2.3