Merge pull request DIRACGrid#7746 from fstagni/90_test_debug_flag

fix: make DEBUG a flag
fstagni · Aug 1, 2024 · fd7bb26 · fd7bb26
2 parents 0bf2b7b + 0e5fbc3
commit fd7bb26
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/integration_tests.py b/integration_tests.py
@@ -34,6 +34,7 @@
     "DIRAC_FEWER_CFG_LOCKS": None,
     "DIRAC_USE_JSON_ENCODE": None,
     "INSTALLATION_BRANCH": "",
+    "DEBUG": "Yes",
 }
 DIRACX_OPTIONS = ()
 DEFAULT_MODULES = {"DIRAC": Path(__file__).parent.absolute()}
@@ -1118,7 +1119,6 @@ def _create_iam_group_membership(
 
 def _make_config(modules, flags, release_var, editable):
     config = {
-        "DEBUG": "True",
         # MYSQL Settings
         "DB_USER": DB_USER,
         "DB_PASSWORD": DB_PASSWORD,

diff --git a/tests/CI/install_server.sh b/tests/CI/install_server.sh
@@ -12,12 +12,13 @@ set -x
 
 source CONFIG
 
-if [ -n "$DEBUG" ]
-then
+# if the DEBUG variable is set and its values is "Yes", we run in DEBUG mode
+if [ "$DEBUG" = "Yes" ]; then
   echo '==> Running in DEBUG mode'
   DEBUG='-ddd'
 else
   echo '==> Running in non-DEBUG mode'
+  DEBUG='-dd'
 fi
 
 echo -e "*** $(date -u) **** Getting the tests ****\n"

diff --git a/tests/Integration/WorkloadManagementSystem/Test_TimeLeft.sh b/tests/Integration/WorkloadManagementSystem/Test_TimeLeft.sh
@@ -7,11 +7,13 @@
 
 echo "\n======> Test_TimeLeft <======\n"
 
-if [[ ! -z "$DEBUG" ]]; then
+# if the DEBUG variable is set and its values is "Yes", we run in DEBUG mode
+if [ "$DEBUG" = "Yes" ]; then
   echo '==> Running in DEBUG mode'
   DEBUG='-ddd'
 else
   echo '==> Running in non-DEBUG mode'
+  DEBUG='-dd'
 fi
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"

diff --git a/tests/Integration/WorkloadManagementSystem/Test_dirac-jobexec.sh b/tests/Integration/WorkloadManagementSystem/Test_dirac-jobexec.sh
@@ -7,11 +7,13 @@
 
 echo "\n======> Test_dirac-jobexec <======\n"
 
-if [[ ! -z "$DEBUG" ]]; then
+# if the DEBUG variable is set and its values is "Yes", we run in DEBUG mode
+if [ "$DEBUG" = "Yes" ]; then
   echo '==> Running in DEBUG mode'
   DEBUG='-ddd'
 else
   echo '==> Running in non-DEBUG mode'
+  DEBUG='-dd'
 fi
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"

diff --git a/tests/Jenkins/dirac_ci.sh b/tests/Jenkins/dirac_ci.sh
@@ -45,11 +45,13 @@
 
 # Def of environment variables:
 
-if [[ "${DEBUG}" ]]; then
+# if the DEBUG variable is set and its values is "Yes", we run in DEBUG mode
+if [ "$DEBUG" = "Yes" ]; then
   echo "==> Running in DEBUG mode"
   DEBUG='-ddd'
 else
   echo "==> Running in non-DEBUG mode"
+  DEBUG='-dd'
 fi
 
 if [[ "$WORKSPACE" ]]; then