From a93786f35cd4fe0eb417b9f3202506d192863155 Mon Sep 17 00:00:00 2001
From: Gerhard Raven <gerhard.raven@nikhef.nl>
Date: Thu, 11 May 2023 10:30:05 +0200
Subject: [PATCH] do not hardwire potentially changing hash in qmt refblock
---
DaVinciExamples/python/DaVinciExamples/debugging.py | 2 +-
.../tests/qmtest/debugging.qms/test_example-PrintHeader.qmt | 2 +-
Phys/DaVinci/tests/config/test_algorithms.py | 5 +----
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/DaVinciExamples/python/DaVinciExamples/debugging.py b/DaVinciExamples/python/DaVinciExamples/debugging.py
index e447b810c..0046b3a72 100644
--- a/DaVinciExamples/python/DaVinciExamples/debugging.py
+++ b/DaVinciExamples/python/DaVinciExamples/debugging.py
@@ -45,7 +45,7 @@ def print_decay_tree(options: Options):
def print_header(options: Options):
- ph = PrintHeader(ODINLocation=make_odin())
+ ph = PrintHeader(name='PrintHeader', ODINLocation=make_odin())
node = CompositeNode("PHNode", children=[ph])
diff --git a/DaVinciExamples/tests/qmtest/debugging.qms/test_example-PrintHeader.qmt b/DaVinciExamples/tests/qmtest/debugging.qms/test_example-PrintHeader.qmt
index 4b504fb36..0559c8fec 100755
--- a/DaVinciExamples/tests/qmtest/debugging.qms/test_example-PrintHeader.qmt
+++ b/DaVinciExamples/tests/qmtest/debugging.qms/test_example-PrintHeader.qmt
@@ -24,7 +24,7 @@
</set></argument>
<argument name="validator"><text>
findReferenceBlock("""
-PrintHeader_14578b4c INFO Number of counters : 1
+PrintHeader INFO Number of counters : 1
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
| "EventCount" | 7 |
ApplicationMgr INFO Application Manager Stopped successfully
diff --git a/Phys/DaVinci/tests/config/test_algorithms.py b/Phys/DaVinci/tests/config/test_algorithms.py
index ab54c3159..3c73294bb 100644
--- a/Phys/DaVinci/tests/config/test_algorithms.py
+++ b/Phys/DaVinci/tests/config/test_algorithms.py
@@ -17,8 +17,6 @@ from PyConf.reading import get_odin, get_decreports, get_hlt_reports, upfront_de
from PyConf.application import default_raw_event
from GaudiConf.LbExec import InputProcessTypes
-import re
-
def test_define_write_fsr():
"""
@@ -162,8 +160,7 @@ def test_get_odin():
raw_event_format=options.input_raw_format,
stream=options.input_stream):
odin = get_odin()
- assert re.fullmatch("/Event/createODIN_[0-9a-f]*/ODIN",
- odin.location) is not None
+ assert "/Event/Decode_ODIN/ODIN" == odin.location
def test_get_decreports():
--
GitLab