Merge branch 'trigtest-refcomp' into 'master'

TriggerTest: Use new reference formats in MT and reverseViews tests

Closes ATR-22368

See merge request atlas/athena!38317

Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_MT_build.py

@@ -29,12 +29,13 @@ test.art_type = 'build'
 test.exec_steps = [ex]
 test.check_steps = CheckSteps.default_check_steps(test)
 
-# Add a step comparing counts in the log against reference from test_trig_data_v1Dev_build
-refcomp = CheckSteps.RegTestStep("CountRefComp")
-refcomp.regex = r'TrigSignatureMoniMT\s*INFO\sHLT_.*|TrigSignatureMoniMT\s*INFO\s-- #[0-9]+ (Events|Features).*'
-refcomp.reference = 'TriggerTest/ref_data_v1Dev_build.ref'
+# Add a step comparing counts against a reference
+chaindump = test.get_step("ChainDump")
+chaindump.args = '--json --yaml ref_data_v1Dev_build.new'
+refcomp = CheckSteps.ChainCompStep("CountRefComp")
+refcomp.input_file = 'ref_data_v1Dev_build.new'
 refcomp.required = True # Final exit code depends on this step
-CheckSteps.add_step_after_type(test.check_steps, CheckSteps.LogMergeStep, refcomp)
+CheckSteps.add_step_after_type(test.check_steps, CheckSteps.ChainDumpStep, refcomp)
 
 # Use RootComp reference from test_trig_data_v1Dev_build
 test.get_step('RootComp').ref_test_name = 'trig_data_v1Dev_build'

Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_reverseViews_build.py

@@ -29,12 +29,13 @@ test.art_type = 'build'
 test.exec_steps = [ex]
 test.check_steps = CheckSteps.default_check_steps(test)
 
-# Add a step comparing counts in the log against reference from test_trig_data_v1Dev_build
-refcomp = CheckSteps.RegTestStep("CountRefComp")
-refcomp.regex = r'TrigSignatureMoniMT\s*INFO\sHLT_.*|TrigSignatureMoniMT\s*INFO\s-- #[0-9]+ (Events|Features).*'
-refcomp.reference = 'TriggerTest/ref_data_v1Dev_build.ref'
+# Add a step comparing counts against a reference
+chaindump = test.get_step("ChainDump")
+chaindump.args = '--json --yaml ref_data_v1Dev_build.new'
+refcomp = CheckSteps.ChainCompStep("CountRefComp")
+refcomp.input_file = 'ref_data_v1Dev_build.new'
 refcomp.required = True # Final exit code depends on this step
-CheckSteps.add_step_after_type(test.check_steps, CheckSteps.LogMergeStep, refcomp)
+CheckSteps.add_step_after_type(test.check_steps, CheckSteps.ChainDumpStep, refcomp)
 
 # Use RootComp reference from test_trig_data_v1Dev_build
 test.get_step('RootComp').ref_test_name = 'trig_data_v1Dev_build'