fix(tests): wip

centreon · Mar 31, 2023 · cbc23fa · cbc23fa
1 parent e51c3cc
commit cbc23fa
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/tests/resources/Common.py b/tests/resources/Common.py
@@ -87,8 +87,7 @@ def find_regex_in_log_with_timeout(log: str, date, content, timeout: int):
         if ok:
             return True, c
         time.sleep(5)
-    logger.console(
-        "Unable to find regex '{}' from {} during {}s".format(c, date, timeout))
+    logger.console(f"Unable to find regex '{c}' from {date} during {timeout}s")
     return False, c
 
 
@@ -101,9 +100,8 @@ def find_in_log_with_timeout(log: str, date, content, timeout: int):
         if ok:
             return True
         time.sleep(5)
-    logger.console(
-        "Unable to find '{}' from {} during {}s".format(c, date, timeout))
-    return False, c
+    logger.console(f"Unable to find '{c}' from {date} during {timeout}s")
+    return False
 
 
 def find_in_log(log: str, date, content, regex=False):

diff --git a/tests/resources/db_variables.robot b/tests/resources/db_variables.robot
@@ -7,6 +7,6 @@ ${DBHost}	localhost
 ${DBUser}	centreon
 ${DBPass}	centreon
 ${DBPort}	3306
-${DBUserRoot}	root_centreon
+${DBUserRoot}	root
 ${DBPassRoot}	centreon
 
diff --git a/tests/robot.sh b/tests/robot.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-sed -i -r 's/(\$\{DBUserRoot\}\s*)root_centreon/\1centreon/g' resources/db_variables.robot
+sed -i -r 's/(\$\{DBUserRoot\}\s*)root_centreon/\1root/g' resources/db_variables.robot
 ulimit -c unlimited
 sysctl -w kernel.core_pattern=/tmp/core-%e.%p.%h.%t