Skip to content
Snippets Groups Projects
Commit 925c1963 authored by Scott Snyder's avatar Scott Snyder Committed by Adam Edward Barton
Browse files

AthenaCommon: Fix CFElements test.

In run 2 mode, need to skip initialization of configurables if it's
already been done.  Otherwise, we'll get errors about duplicates.
parent dce8f066
No related branches found
No related tags found
No related merge requests found
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from __future__ import print_function from __future__ import print_function
from AthenaConfiguration.ComponentFactory import CompFactory from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaCommon.Configurable import Configurable from AthenaCommon.Configurable import Configurable
...@@ -313,16 +313,20 @@ class TestLegacyCF( unittest.TestCase, TestCF ): ...@@ -313,16 +313,20 @@ class TestLegacyCF( unittest.TestCase, TestCF ):
from AthenaCommon.Configurable import ConfigurablePyAlgorithm from AthenaCommon.Configurable import ConfigurablePyAlgorithm
Configurable.configurableRun3Behavior=0 Configurable.configurableRun3Behavior=0
top = parOR("top") top = parOR("top")
top += parOR("nest1")
nest2 = seqAND("nest2") # Skip initialization if it's already been done... otherwise, we'll
top += nest2 # get errors about duplicates.
top += ConfigurablePyAlgorithm("SomeAlg0") if not top.getChildren():
nest2 += parOR("deep_nest1") top += parOR("nest1")
nest2 += parOR("deep_nest2") nest2 = seqAND("nest2")
top += nest2
nest2 += ConfigurablePyAlgorithm("SomeAlg1") top += ConfigurablePyAlgorithm("SomeAlg0")
nest2 += ConfigurablePyAlgorithm("SomeAlg2") nest2 += parOR("deep_nest1")
nest2 += ConfigurablePyAlgorithm("SomeAlg3") nest2 += parOR("deep_nest2")
nest2 += ConfigurablePyAlgorithm("SomeAlg1")
nest2 += ConfigurablePyAlgorithm("SomeAlg2")
nest2 += ConfigurablePyAlgorithm("SomeAlg3")
self.top = top self.top = top
......
test_findAlgorithms (AthenaCommon.CFElements.TestConf2CF) ... ok
test_findDeep (AthenaCommon.CFElements.TestConf2CF) ... ok
test_findMissing (AthenaCommon.CFElements.TestConf2CF) ... ok
test_findRespectingScope (AthenaCommon.CFElements.TestConf2CF) ... ok
test_findTop (AthenaCommon.CFElements.TestConf2CF) ... ok
test_flatCollectors (AthenaCommon.CFElements.TestConf2CF) ... ok
test_findAlgorithms (AthenaCommon.CFElements.TestLegacyCF) ... ok
test_findDeep (AthenaCommon.CFElements.TestLegacyCF) ... ok
test_findMissing (AthenaCommon.CFElements.TestLegacyCF) ... ok
test_findRespectingScope (AthenaCommon.CFElements.TestLegacyCF) ... ok
test_findTop (AthenaCommon.CFElements.TestLegacyCF) ... ok
test_flatCollectors (AthenaCommon.CFElements.TestLegacyCF) ... ok
----------------------------------------------------------------------
Ran 12 tests in 0.002s
OK
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