diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_MT_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_MT_build.py index 9e97298e354f41bbf184d2c0ab2d7323ec469191..75fb30eb3a9085c131d757f99729a7bb5d15c0af 100755 --- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_MT_build.py +++ b/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' diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_reverseViews_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_reverseViews_build.py index 55c710bd709a6f8da0079ddb2d5b05e15349a081..d382eb381bc7291743dcb5e300c3efe14f26e25a 100755 --- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_reverseViews_build.py +++ b/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'