tyler.durden
/
centreon-plugins
mirror of https://github.com/centreon/centreon-plugins.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(tests): fixed a remainder of a conflict and a wrong column name

This commit is contained in:
omercier 2024-08-06 14:41:11 +02:00
parent 0db155e7a1
commit fe58ff841f
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/robot/network/fortinet/fortigate/snmp/network-fortinet-fortigate-snmp.robot
View File

@ -382,10 +382,8 @@ Network Fortinet Fortigate SNMP link monitor
... ${command}
... --critical-packet-loss=${fortinet_fortigate_linkmonitor_test.criticalpacketloss}
END
<<<<<<< HEAD
=======
Log To Console . no_newline=true
>>>>>>> d2f6ed1b7b934e98662f00ec0f40e2f063b33828
Ctn Run Command And Check Result As Strings ${command} ${fortinet_fortigate_linkmonitor_test.result}
END

2
tests/robot/network/teldat/snmp/cpu.robot
View File

@ -30,7 +30,7 @@ CPU ${tc}
Ctn Run Command And Check Result As Strings ${command} ${expected_result}
Examples: tc warningcpuutilization5s criticalcpuutilization5s warningcpuutilization1m criticalcpuutilization1m warningcpuutilization5m criticalcpuutilization5m result --
Examples: tc warningcpuutilization5s criticalcpuutilization5s warningcpuutilization1m criticalcpuutilization1m warningcpuutilization5m criticalcpuutilization5m expected_result --
... 1 ${EMPTY} ${EMPTY} ${EMPTY} ${EMPTY} ${EMPTY} ${EMPTY} OK: cpu average usage: 1.00 % (5s), 1.00 % (1m), 1.00 % (5m) | 'cpu.utilization.5s.percentage'=1.00%;;;0;100 'cpu.utilization.1m.percentage'=1.00%;;;0;100 'cpu.utilization.15m.percentage'=1.00%;;;0;100
... 2 0.5 ${EMPTY} ${EMPTY} ${EMPTY} ${EMPTY} ${EMPTY} WARNING: cpu average usage: 1.00 % (5s) | 'cpu.utilization.5s.percentage'=1.00%;0:0.5;;0;100 'cpu.utilization.1m.percentage'=1.00%;;;0;100 'cpu.utilization.15m.percentage'=1.00%;;;0;100
... 3 ${EMPTY} 0.5 ${EMPTY} ${EMPTY} ${EMPTY} ${EMPTY} CRITICAL: cpu average usage: 1.00 % (5s) | 'cpu.utilization.5s.percentage'=1.00%;;0:0.5;0;100 'cpu.utilization.1m.percentage'=1.00%;;;0;100 'cpu.utilization.15m.percentage'=1.00%;;;0;100