Merge branch 'drop-hepmc' into 'master'

Adapt tests to the removal of HepMC related dictionaries

See merge request !1223

DaVinciTests/python/DaVinciTests/QMTest/DaVinciExclusions.py

@@ -8,7 +8,8 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from GaudiTest import LineSkipper
+from GaudiConf.QMTest.BaseTest import LineSkipper
+from GaudiConf.QMTest.LHCbExclusions import ignore_missing_hepmc_dicts
 from RecConf.QMTest.exclusions import preprocessor as RecPreprocessor
 
 remove_uninteresting_lines = LineSkipper(
@@ -42,32 +43,35 @@ remove_uninteresting_lines = LineSkipper(
 )
 
 # Remove known warnings from the references
-remove_known_warnings = LineSkipper(
-    regexps=[
-        # expected WARNINGs from the data broker
-        r"HiveDataBrokerSvc +WARNING non-reentrant algorithm: .*",
-        # Until tck is implemented HltPackedDataDecoder/HltDecReportsDecoder will raise warning
-        r"HltPackedBufferDecoder +WARNING TCK in rawbank seems to be 0 .*",
-        r"HltPackedBufferDe...WARNING TCK in rawbank seems to be 0 .*",
-        r"HltDecReportsDecoder +WARNING TCK obtained from rawbank seems to be 0 .*",
-        r"Hlt. +WARNING TCK obtained from rawbank seems to be 0 .*",
-        r"Hlt2DecReports +WARNING TCK obtained from rawbank seems to be 0 .*",
-        r"SpruceDecReports +WARNING TCK obtained from rawbank seems to be 0 .*",
-        r"Spruce +WARNING TCK obtained from rawbank seems to be 0 .*",
-        # Until MC tools become functional, MC tools will run but the output is nonsense
-        "WARNING: MC tools not functional yet outside Hlt2 - .*",
-        # FunTuple warning for the update_counters: skipping event is no candidates are found
-        r"[a-zA-Z0-9]* +WARNING FunTupleBase<KeyedContainer<LHCb::MCParticle,Containers::KeyedObjectManager<Containers::hashmap> > >:: .*",
-        r"DetectorPersistencySvc +INFO Added successfully Conversion service:XmlCnvSvc",
-        r"DetectorDataSvc +SUCCESS Detector description database: git:/lhcb.xml",
-        r"[a-zA-Z0-9]* +WARNING TransportSvc is currently incompatible with DD4HEP. .*",
-        r"[a-zA-Z0-9]* +WARNING See https://gitlab.cern.ch/lhcb/Rec/-/issues/326 for more details",
-        # backwards compatibility -- key is from manifest, not git
-        r"key 0x[0-9a-f#]+ has an explicitly configured overrule -- using that",
-        # backwards compatibility -- old data
-        r"DstData raw bank has a zero encoding key, and it is not explicitly specified for decoding -- make sure that this really what you want",
-        r"HltDecReports has a zero TCK, and it is not explicitly specified for decoding *",
-    ]
+remove_known_warnings = (
+    LineSkipper(
+        regexps=[
+            # expected WARNINGs from the data broker
+            r"HiveDataBrokerSvc +WARNING non-reentrant algorithm: .*",
+            # Until tck is implemented HltPackedDataDecoder/HltDecReportsDecoder will raise warning
+            r"HltPackedBufferDecoder +WARNING TCK in rawbank seems to be 0 .*",
+            r"HltPackedBufferDe...WARNING TCK in rawbank seems to be 0 .*",
+            r"HltDecReportsDecoder +WARNING TCK obtained from rawbank seems to be 0 .*",
+            r"Hlt. +WARNING TCK obtained from rawbank seems to be 0 .*",
+            r"Hlt2DecReports +WARNING TCK obtained from rawbank seems to be 0 .*",
+            r"SpruceDecReports +WARNING TCK obtained from rawbank seems to be 0 .*",
+            r"Spruce +WARNING TCK obtained from rawbank seems to be 0 .*",
+            # Until MC tools become functional, MC tools will run but the output is nonsense
+            "WARNING: MC tools not functional yet outside Hlt2 - .*",
+            # FunTuple warning for the update_counters: skipping event is no candidates are found
+            r"[a-zA-Z0-9]* +WARNING FunTupleBase<KeyedContainer<LHCb::MCParticle,Containers::KeyedObjectManager<Containers::hashmap> > >:: .*",
+            r"DetectorPersistencySvc +INFO Added successfully Conversion service:XmlCnvSvc",
+            r"DetectorDataSvc +SUCCESS Detector description database: git:/lhcb.xml",
+            r"[a-zA-Z0-9]* +WARNING TransportSvc is currently incompatible with DD4HEP. .*",
+            r"[a-zA-Z0-9]* +WARNING See https://gitlab.cern.ch/lhcb/Rec/-/issues/326 for more details",
+            # backwards compatibility -- key is from manifest, not git
+            r"key 0x[0-9a-f#]+ has an explicitly configured overrule -- using that",
+            # backwards compatibility -- old data
+            r"DstData raw bank has a zero encoding key, and it is not explicitly specified for decoding -- make sure that this really what you want",
+            r"HltDecReports has a zero TCK, and it is not explicitly specified for decoding *",
+        ]
+    )
+    + ignore_missing_hepmc_dicts
 )
 
 remove_known_fluctuating_counters = LineSkipper(