From bc2a4b5d5c5496cecce8353abc5d5482f8b2a281 Mon Sep 17 00:00:00 2001
From: omercier <32134301+omercier@users.noreply.github.com>
Date: Mon, 11 Aug 2025 10:58:22 +0200
Subject: [PATCH] Apply suggestions from code review

---
 .github/docker/testing/Dockerfile.testing-plugins-alma8 | 2 +-
 .github/docker/testing/Dockerfile.testing-plugins-alma9 | 2 +-
 tests/apps/backup/rubrik/restapi/jobs.robot             | 5 +++++
 tests/apps/eclipse/mosquitto/mqtt/messages.robot        | 2 +-
 tests/apps/eclipse/mosquitto/mqtt/numeric-value.robot   | 2 +-
 tests/apps/eclipse/mosquitto/mqtt/string-value.robot    | 2 +-
 tests/apps/eclipse/mosquitto/mqtt/uptime.robot          | 2 +-
 7 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/docker/testing/Dockerfile.testing-plugins-alma8 b/.github/docker/testing/Dockerfile.testing-plugins-alma8
index bd1f1508e..29d95d39e 100644
--- a/.github/docker/testing/Dockerfile.testing-plugins-alma8
+++ b/.github/docker/testing/Dockerfile.testing-plugins-alma8
@@ -63,7 +63,7 @@ gpgkey=https://yum-gpg.centreon.com/RPM-GPG-KEY-CES\n'\
 dnf config-manager --add-repo https://packages.centreon.com/rpm-standard/24.10/el8/centreon-24.10.repo
 dnf install -y centreon-connector-perl centreon-clib
 
-rm -f /etc/yum.repos.d/centreon-plugins.repo
+rm -f /etc/yum.repos.d/centreon-24.10.repo
 
 mkdir -p /var/lib/centreon/centplugins/
 chmod 777 /var/lib/centreon/centplugins/
diff --git a/.github/docker/testing/Dockerfile.testing-plugins-alma9 b/.github/docker/testing/Dockerfile.testing-plugins-alma9
index 985ba466c..34e875e4f 100644
--- a/.github/docker/testing/Dockerfile.testing-plugins-alma9
+++ b/.github/docker/testing/Dockerfile.testing-plugins-alma9
@@ -68,7 +68,7 @@ gpgkey=https://yum-gpg.centreon.com/RPM-GPG-KEY-CES\n'\
 dnf config-manager --add-repo https://packages.centreon.com/rpm-standard/24.10/el9/centreon-24.10.repo
 dnf install -y centreon-connector-perl centreon-clib
 
-rm -f /etc/yum.repos.d/centreon-plugins.repo
+rm -f /etc/yum.repos.d/centreon-24.10.repo
 
 mkdir -p /var/lib/centreon/centplugins/
 chmod 777 /var/lib/centreon/centplugins/
diff --git a/tests/apps/backup/rubrik/restapi/jobs.robot b/tests/apps/backup/rubrik/restapi/jobs.robot
index cd325624c..c00bc3d60 100644
--- a/tests/apps/backup/rubrik/restapi/jobs.robot
+++ b/tests/apps/backup/rubrik/restapi/jobs.robot
@@ -22,6 +22,11 @@ ${cmd}              ${CENTREON_PLUGINS}
 jobs ${tc}/11
     [Tags]    apps    backup   rubrik    restapi    jobs
     
+   ${command}    Catenate
+    ...    ${cmd}
+    ...    --mode=jobs
+    ...    ${extraoptions}
+    
     Ctn Run Command And Check Result As Regexp    ${command}    ${expected_result}    ${tc}
 
     Examples:    tc     extraoptions            expected_result   --
diff --git a/tests/apps/eclipse/mosquitto/mqtt/messages.robot b/tests/apps/eclipse/mosquitto/mqtt/messages.robot
index 7ecf08d23..a36ce13fe 100644
--- a/tests/apps/eclipse/mosquitto/mqtt/messages.robot
+++ b/tests/apps/eclipse/mosquitto/mqtt/messages.robot
@@ -32,7 +32,7 @@ Mosquitto MQTT messages help
     ...    ${CMD}
     ...    --help
 
-    Ctn Run Command Without Connector And Check Result As Regexp    ${tc}    ${command}    ^Plugin Description:
+    Ctn Run Command And Check Result As Regexp    ${command}    ^Plugin Description:    ${tc}
 
 Mosquitto MQTT messages ${tc}
     [Documentation]    Check Mosquitto MQTT messages
diff --git a/tests/apps/eclipse/mosquitto/mqtt/numeric-value.robot b/tests/apps/eclipse/mosquitto/mqtt/numeric-value.robot
index bbc5a9c4c..f43da87ae 100644
--- a/tests/apps/eclipse/mosquitto/mqtt/numeric-value.robot
+++ b/tests/apps/eclipse/mosquitto/mqtt/numeric-value.robot
@@ -32,7 +32,7 @@ Mosquitto MQTT numeric-value help
     ...    ${CMD}
     ...    --help
 
-    Ctn Run Command Without Connector And Check Result As Regexp    ${tc}    ${command}    ^Plugin Description:
+    Ctn Run Command And Check Result As Regexp    ${command}    ^Plugin Description:    ${tc}
 
 Mosquitto MQTT numeric-value ${tc}
     [Documentation]    Check Mosquitto MQTT numeric-value
diff --git a/tests/apps/eclipse/mosquitto/mqtt/string-value.robot b/tests/apps/eclipse/mosquitto/mqtt/string-value.robot
index caa3dd22e..d641e815c 100644
--- a/tests/apps/eclipse/mosquitto/mqtt/string-value.robot
+++ b/tests/apps/eclipse/mosquitto/mqtt/string-value.robot
@@ -32,7 +32,7 @@ Mosquitto MQTT string-value help
     ...    ${CMD}
     ...    --help
 
-    Ctn Run Command Without Connector And Check Result As Regexp    ${tc}    ${command}    ^Plugin Description:
+    Ctn Run Command And Check Result As Regexp    ${command}    ^Plugin Description:    ${tc}
 
 Mosquitto MQTT string-value ${tc}
     [Documentation]    Check Mosquitto MQTT string-value
diff --git a/tests/apps/eclipse/mosquitto/mqtt/uptime.robot b/tests/apps/eclipse/mosquitto/mqtt/uptime.robot
index 2374c0ba7..87cb8ab75 100644
--- a/tests/apps/eclipse/mosquitto/mqtt/uptime.robot
+++ b/tests/apps/eclipse/mosquitto/mqtt/uptime.robot
@@ -32,7 +32,7 @@ Mosquitto MQTT uptime help
     ...    ${CMD}
     ...    --help
 
-    Ctn Run Command Without Connector And Check Result As Regexp    ${tc}    ${command}    ^Plugin Description:
+    Ctn Run Command And Check Result As Regexp    ${command}    ^Plugin Description:    ${tc}
 
 Mosquitto MQTT uptime ${tc}
     [Documentation]    Check Mosquitto MQTT uptime