Skip to content
Snippets Groups Projects
Commit 5094c095 authored by scott snyder's avatar scott snyder Committed by scott snyder
Browse files

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.
parent d4cc3248
No related merge requests found
...@@ -5,7 +5,16 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags ...@@ -5,7 +5,16 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles from AthenaConfiguration.TestDefaults import defaultTestFiles
ConfigFlags.Input.Files = defaultTestFiles.EVNT ConfigFlags.Input.Files = defaultTestFiles.EVNT
ConfigFlags._loadDynaFlags("Detector") 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.initAll()
ConfigFlags.dump() ConfigFlags.dump()
...@@ -5,7 +5,16 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags ...@@ -5,7 +5,16 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles from AthenaConfiguration.TestDefaults import defaultTestFiles
ConfigFlags.Input.Files = defaultTestFiles.HITS ConfigFlags.Input.Files = defaultTestFiles.HITS
ConfigFlags._loadDynaFlags("Detector") 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.initAll()
ConfigFlags.dump() ConfigFlags.dump()
...@@ -5,7 +5,16 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags ...@@ -5,7 +5,16 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles from AthenaConfiguration.TestDefaults import defaultTestFiles
ConfigFlags.Input.Files = defaultTestFiles.RDO ConfigFlags.Input.Files = defaultTestFiles.RDO
ConfigFlags._loadDynaFlags("Detector") 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.initAll()
ConfigFlags.dump() ConfigFlags.dump()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment