From 5094c09552733d9538ae918fa2e4fe85c764f1f6 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Thu, 23 May 2019 16:15:36 +0200
Subject: [PATCH] AthenaConfiguration: Don't fail unit tests if simulation
 packages not present.

Unit tests were failing if the G4AtlasApps package wasn't present in the build.
Be tolerant of this.
---
 .../python/testAllConfigFlags_EVNT.py                 | 11 ++++++++++-
 .../python/testAllConfigFlags_HITS.py                 | 11 ++++++++++-
 .../python/testAllConfigFlags_RDO.py                  | 11 ++++++++++-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/Control/AthenaConfiguration/python/testAllConfigFlags_EVNT.py b/Control/AthenaConfiguration/python/testAllConfigFlags_EVNT.py
index 00fbbe0d7dd..f1be0c50076 100755
--- a/Control/AthenaConfiguration/python/testAllConfigFlags_EVNT.py
+++ b/Control/AthenaConfiguration/python/testAllConfigFlags_EVNT.py
@@ -5,7 +5,16 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 ConfigFlags.Input.Files = defaultTestFiles.EVNT
 ConfigFlags._loadDynaFlags("Detector")
-ConfigFlags._loadDynaFlags("Sim")
+
+# Don't fail just because G4AtlasApps isn't present in this build.
+havesim = True
+try:
+    import G4AtlasApps # noqa: F401
+except ImportError:
+    havesim = False
+if havesim:
+    ConfigFlags._loadDynaFlags("Sim")
+
 ConfigFlags.initAll()
 ConfigFlags.dump()
 
diff --git a/Control/AthenaConfiguration/python/testAllConfigFlags_HITS.py b/Control/AthenaConfiguration/python/testAllConfigFlags_HITS.py
index 92842b3dcbe..66c4c41447c 100755
--- a/Control/AthenaConfiguration/python/testAllConfigFlags_HITS.py
+++ b/Control/AthenaConfiguration/python/testAllConfigFlags_HITS.py
@@ -5,7 +5,16 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 ConfigFlags.Input.Files = defaultTestFiles.HITS
 ConfigFlags._loadDynaFlags("Detector")
-ConfigFlags._loadDynaFlags("Sim")
+
+# Don't fail just because G4AtlasApps isn't present in this build.
+havesim = True
+try:
+    import G4AtlasApps # noqa: F401
+except ImportError:
+    havesim = False
+if havesim:
+    ConfigFlags._loadDynaFlags("Sim")
+
 ConfigFlags.initAll()
 ConfigFlags.dump()
 
diff --git a/Control/AthenaConfiguration/python/testAllConfigFlags_RDO.py b/Control/AthenaConfiguration/python/testAllConfigFlags_RDO.py
index 9401e4d52ff..3464da83e25 100755
--- a/Control/AthenaConfiguration/python/testAllConfigFlags_RDO.py
+++ b/Control/AthenaConfiguration/python/testAllConfigFlags_RDO.py
@@ -5,7 +5,16 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 ConfigFlags.Input.Files = defaultTestFiles.RDO
 ConfigFlags._loadDynaFlags("Detector")
-ConfigFlags._loadDynaFlags("Sim")
+
+# Don't fail just because G4AtlasApps isn't present in this build.
+havesim = True
+try:
+    import G4AtlasApps # noqa: F401
+except ImportError:
+    havesim = False
+if havesim:
+    ConfigFlags._loadDynaFlags("Sim")
+
 ConfigFlags.initAll()
 ConfigFlags.dump()
 
-- 
GitLab