From 4b0cff846866bd1ed0b983babe50e6c74b6ac53e Mon Sep 17 00:00:00 2001 From: omercier Date: Fri, 8 Aug 2025 12:09:28 +0200 Subject: [PATCH] minor fixes --- tests/os/linux/snmp-connector/list-diskspath-connector.robot | 2 +- tests/os/linux/snmp-connector/list-interfaces-connector.robot | 2 +- tests/os/linux/snmp-connector/swap-connector.robot | 2 +- tests/os/linux/snmp-connector/time-connector.robot | 2 +- tests/os/linux/snmp/cpu-d.robot | 2 +- tests/os/linux/snmp/cpu.robot | 2 +- tests/resources/connector.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/os/linux/snmp-connector/list-diskspath-connector.robot b/tests/os/linux/snmp-connector/list-diskspath-connector.robot index 2345549ef..a84e44c73 100644 --- a/tests/os/linux/snmp-connector/list-diskspath-connector.robot +++ b/tests/os/linux/snmp-connector/list-diskspath-connector.robot @@ -13,7 +13,7 @@ ${CMD} /usr/lib/centreon/plugins/centreon_linux_snmp.pl --plugin=os::linux: *** Test Cases *** -list-diskspath ${tc} +list-diskspath-connector ${tc} [Tags] os linux ${command} Catenate ... ${CMD} diff --git a/tests/os/linux/snmp-connector/list-interfaces-connector.robot b/tests/os/linux/snmp-connector/list-interfaces-connector.robot index 2da4e4109..be62441d5 100644 --- a/tests/os/linux/snmp-connector/list-interfaces-connector.robot +++ b/tests/os/linux/snmp-connector/list-interfaces-connector.robot @@ -13,7 +13,7 @@ ${CMD} /usr/lib/centreon/plugins/centreon_linux_snmp.pl --plugin=os::linux: *** Test Cases *** -list-interfaces ${tc} +list-interfaces-connector ${tc} [Tags] os linux ${command} Catenate ... ${CMD} diff --git a/tests/os/linux/snmp-connector/swap-connector.robot b/tests/os/linux/snmp-connector/swap-connector.robot index 6e58496ec..3d9902704 100644 --- a/tests/os/linux/snmp-connector/swap-connector.robot +++ b/tests/os/linux/snmp-connector/swap-connector.robot @@ -13,7 +13,7 @@ ${CMD} /usr/lib/centreon/plugins/centreon_linux_snmp.pl --plugin=os::linux: *** Test Cases *** -swap ${tc} +swap-connector ${tc} [Tags] os linux ${command} Catenate ... ${CMD} diff --git a/tests/os/linux/snmp-connector/time-connector.robot b/tests/os/linux/snmp-connector/time-connector.robot index 7490beb0c..2e8abc2b2 100644 --- a/tests/os/linux/snmp-connector/time-connector.robot +++ b/tests/os/linux/snmp-connector/time-connector.robot @@ -12,7 +12,7 @@ ${CMD} /usr/lib/centreon/plugins/centreon_linux_snmp.pl --plugin=os::linux: *** Test Cases *** -time ${tc} +time-connector ${tc} [Tags] os linux ${command} Catenate ... ${CMD} diff --git a/tests/os/linux/snmp/cpu-d.robot b/tests/os/linux/snmp/cpu-d.robot index e6d61d645..5cac9f612 100644 --- a/tests/os/linux/snmp/cpu-d.robot +++ b/tests/os/linux/snmp/cpu-d.robot @@ -31,7 +31,7 @@ cpu ${tc} ... 3 --critical-average OK: 1 CPU(s) average usage is 2.00 % - CPU '0' usage : 2.00 % | 'total_cpu_avg'=2.00%;;;0;100 'cpu'=2.00%;;;0;100 ... 4 --warning-core OK: 1 CPU(s) average usage is 2.00 % - CPU '0' usage : 2.00 % | 'total_cpu_avg'=2.00%;;;0;100 'cpu'=2.00%;;;0;100 ... 5 --critical-core OK: 1 CPU(s) average usage is 2.00 % - CPU '0' usage : 2.00 % | 'total_cpu_avg'=2.00%;;;0;100 'cpu'=2.00%;;;0;100 - ... 6 --verbose OK: 1 CPU(s) average usage is 2.00 % - CPU '0' usage : 2.00 % | 'total_cpu_avg'=2.00%;;;0;100 'cpu'=2.00%;;;0;100 CPU '0' usage : 2.00 % + ... 6 --verbose OK: 1 CPU(s) average usage is 2.00 % - CPU '0' usage : 2.00 % | 'total_cpu_avg'=2.00%;;;0;100 'cpu'=2.00%;;;0;100 ... 7 --warning-average='0' WARNING: 1 CPU(s) average usage is 2.00 % | 'total_cpu_avg'=2.00%;0:0;;0;100 'cpu'=2.00%;;;0;100 ... 8 --critical-average='0' CRITICAL: 1 CPU(s) average usage is 2.00 % | 'total_cpu_avg'=2.00%;;0:0;0;100 'cpu'=2.00%;;;0;100 ... 9 --warning-core='0' WARNING: CPU '0' usage : 2.00 % | 'total_cpu_avg'=2.00%;;;0;100 'cpu'=2.00%;0:0;;0;100 diff --git a/tests/os/linux/snmp/cpu.robot b/tests/os/linux/snmp/cpu.robot index e6d61d645..5cac9f612 100644 --- a/tests/os/linux/snmp/cpu.robot +++ b/tests/os/linux/snmp/cpu.robot @@ -31,7 +31,7 @@ cpu ${tc} ... 3 --critical-average OK: 1 CPU(s) average usage is 2.00 % - CPU '0' usage : 2.00 % | 'total_cpu_avg'=2.00%;;;0;100 'cpu'=2.00%;;;0;100 ... 4 --warning-core OK: 1 CPU(s) average usage is 2.00 % - CPU '0' usage : 2.00 % | 'total_cpu_avg'=2.00%;;;0;100 'cpu'=2.00%;;;0;100 ... 5 --critical-core OK: 1 CPU(s) average usage is 2.00 % - CPU '0' usage : 2.00 % | 'total_cpu_avg'=2.00%;;;0;100 'cpu'=2.00%;;;0;100 - ... 6 --verbose OK: 1 CPU(s) average usage is 2.00 % - CPU '0' usage : 2.00 % | 'total_cpu_avg'=2.00%;;;0;100 'cpu'=2.00%;;;0;100 CPU '0' usage : 2.00 % + ... 6 --verbose OK: 1 CPU(s) average usage is 2.00 % - CPU '0' usage : 2.00 % | 'total_cpu_avg'=2.00%;;;0;100 'cpu'=2.00%;;;0;100 ... 7 --warning-average='0' WARNING: 1 CPU(s) average usage is 2.00 % | 'total_cpu_avg'=2.00%;0:0;;0;100 'cpu'=2.00%;;;0;100 ... 8 --critical-average='0' CRITICAL: 1 CPU(s) average usage is 2.00 % | 'total_cpu_avg'=2.00%;;0:0;0;100 'cpu'=2.00%;;;0;100 ... 9 --warning-core='0' WARNING: CPU '0' usage : 2.00 % | 'total_cpu_avg'=2.00%;;;0;100 'cpu'=2.00%;0:0;;0;100 diff --git a/tests/resources/connector.py b/tests/resources/connector.py index 703b36a0f..b49b9fedc 100644 --- a/tests/resources/connector.py +++ b/tests/resources/connector.py @@ -204,7 +204,7 @@ def ctn_extract_multiline_result_from_log(tc, log_path="/tmp/connector.log", out result_lines.append(m.group(2).strip()) in_result = True else: - if line.strip().startswith("error:") or re.match(r"^\d+ \[.*", line): + if line.strip().startswith("error:") or re.match(r"^\d+ \[20.*", line): break result_lines.append(line.strip())