Merge pull request DIRACGrid#7053 from DIRACGridBot/cherry-pick-2-55d…

…ef243e-integration [sweep:integration] Workflow tests need pilot.cfg to work
fstagni · Jun 16, 2023 · 192c704 · 192c704
2 parents 3734de2 + 5bcd946
commit 192c704
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/DIRAC/__init__.py b/src/DIRAC/__init__.py
@@ -214,6 +214,8 @@ def initialize(
     localCfg = LocalConfiguration()
 
     for config_file in extra_config_files or []:
+        if not os.path.exists(config_file):
+            continue
         cfg = CFG()
         cfg.loadFromFile(config_file)
         gConfigurationData.mergeWithLocal(cfg)

diff --git a/tests/Workflow/Integration/Test_UserJobs.py b/tests/Workflow/Integration/Test_UserJobs.py
@@ -10,7 +10,7 @@
 
 import DIRAC
 
-DIRAC.initialize()  # Initialize configuration
+DIRAC.initialize(extra_config_files=["pilot.cfg"])  # Initialize configuration
 
 from DIRAC import gLogger, rootPath
 from DIRAC.tests.Utilities.IntegrationTest import IntegrationTest

diff --git a/tests/Workflow/Regression/Test_RegressionUserJobs.py b/tests/Workflow/Regression/Test_RegressionUserJobs.py
@@ -8,7 +8,7 @@
 
 import DIRAC
 
-DIRAC.initialize()  # Initialize configuration
+DIRAC.initialize(extra_config_files=["pilot.cfg"])  # Initialize configuration
 
 from DIRAC import gLogger, rootPath