diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/ViewCFTest.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/ViewCFTest.py index be4d7604f3d74a695e6a4eade2e7b09787c1ed90..d4ed0a34863d2ac84d883c5252285188cca99919 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/ViewCFTest.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/ViewCFTest.py @@ -1,4 +1,4 @@ -# 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 AthenaCommon.AlgSequence import AlgSequence @@ -47,10 +47,10 @@ class ViewCFTest( unittest.TestCase ): # Check misconfigured EVCA evca1.ViewNodeName = "aFakeNode" - with self.assertRaisesRegexp( RuntimeError, "no corresponding upstream EventViewCreatorAlgorithm" ): + with self.assertRaisesRegex( RuntimeError, "no corresponding upstream EventViewCreatorAlgorithm" ): checkVDV( topSequence, [topSequence.name()], {} ) evca1.ViewNodeName = "viewSequence" - with self.assertRaisesRegexp( RuntimeError, "no external data" ): + with self.assertRaisesRegex( RuntimeError, "no external data" ): checkVDV( topSequence, [topSequence.name()], {} ) evca1.RequireParentView = True checkVDV( topSequence, [topSequence.name()], {} ) @@ -65,6 +65,6 @@ class ViewCFTest( unittest.TestCase ): topSequence.makeViewSequence += evca2 checkVDV( topSequence, [topSequence.name()], {} ) 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()], {} )