Skip to content
Snippets Groups Projects

TriggerMenuMT: Deprecation fix.

Merged Scott Snyder requested to merge ssnyder/athena:py38.TriggerMenuMT-20200726 into master
1 file
+ 4
4
Compare changes
  • Side-by-side
  • Inline
# 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 TriggerMenuMT.HLTMenuConfig.Menu.CFValidation import findViewAlgs, checkVDV
from TriggerMenuMT.HLTMenuConfig.Menu.CFValidation import findViewAlgs, checkVDV
from AthenaCommon.AlgSequence import AlgSequence
from AthenaCommon.AlgSequence import AlgSequence
@@ -47,10 +47,10 @@ class ViewCFTest( unittest.TestCase ):
@@ -47,10 +47,10 @@ class ViewCFTest( unittest.TestCase ):
# Check misconfigured EVCA
# Check misconfigured EVCA
evca1.ViewNodeName = "aFakeNode"
evca1.ViewNodeName = "aFakeNode"
with self.assertRaisesRegexp( RuntimeError, "no corresponding upstream EventViewCreatorAlgorithm" ):
with self.assertRaisesRegex( RuntimeError, "no corresponding upstream EventViewCreatorAlgorithm" ):
checkVDV( topSequence, [topSequence.name()], {} )
checkVDV( topSequence, [topSequence.name()], {} )
evca1.ViewNodeName = "viewSequence"
evca1.ViewNodeName = "viewSequence"
with self.assertRaisesRegexp( RuntimeError, "no external data" ):
with self.assertRaisesRegex( RuntimeError, "no external data" ):
checkVDV( topSequence, [topSequence.name()], {} )
checkVDV( topSequence, [topSequence.name()], {} )
evca1.RequireParentView = True
evca1.RequireParentView = True
checkVDV( topSequence, [topSequence.name()], {} )
checkVDV( topSequence, [topSequence.name()], {} )
@@ -65,6 +65,6 @@ class ViewCFTest( unittest.TestCase ):
@@ -65,6 +65,6 @@ class ViewCFTest( unittest.TestCase ):
topSequence.makeViewSequence += evca2
topSequence.makeViewSequence += evca2
checkVDV( topSequence, [topSequence.name()], {} )
checkVDV( topSequence, [topSequence.name()], {} )
evca2.ViewNodeName = "viewSequence"
evca2.ViewNodeName = "viewSequence"
with self.assertRaisesRegexp( RuntimeError, "Found duplicate view node name" ):
with self.assertRaisesRegex( RuntimeError, "Found duplicate view node name" ):
checkVDV( topSequence, [topSequence.name()], {} )
checkVDV( topSequence, [topSequence.name()], {} )
Loading