diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref index c71a10e3d15445198325156f6b3cf1f6d9282a55..6ba1603979a8269f154e00f47909c6a0d2b5a183 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref @@ -1,5 +1,3 @@ -TrigSignatureMoniMT 0 INFO The L1 seed to multi-item-seeded chain HLT_noalg_L1Standby could not be completely resolved. This is currently OK. Exception from menu access: L1Item L1_2EM13VH does not exist in the menu -TrigSignatureMoniMT 0 INFO The L1 seed to multi-item-seeded chain HLT_noalg_L1Calo could not be completely resolved. This is currently OK. Exception from menu access: L1Item L1_2EM13VH does not exist in the menu TrigSignatureMoniMT INFO HLT_2e17_etcut_L12EM15VH #3136730292 TrigSignatureMoniMT INFO -- #3136730292 Events 2 2 2 2 2 - - - - - - - - - 2 TrigSignatureMoniMT INFO -- #3136730292 Features 12 296 14 - - - - - - - - - diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_mt1_build.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_mt1_build.py index d757889b79a8e70beec21f41c3ba574d7448e356..36ff6edd29ffe1b593412b08e3b889a79023c56a 100755 --- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_mt1_build.py +++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_mt1_build.py @@ -23,7 +23,7 @@ test.check_steps = CheckSteps.default_check_steps(test) # Add a step comparing counts in the log against reference refcomp = CheckSteps.RegTestStep("CountRefComp") refcomp.input_base_name = 'athena.merged' -refcomp.regex = 'TrigSignatureMoniMT.*HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*' +refcomp.regex = r'TrigSignatureMoniMT\s*INFO\sHLT_.*|TrigSignatureMoniMT\s*INFO\s-- #[0-9]+ (Events|Features).*' refcomp.reference = 'TrigAnalysisTest/ref_RDOtoRDOTrig_mt1_build.ref' refcomp.required = True # Final exit code depends on this step CheckSteps.add_step_after_type(test.check_steps, CheckSteps.LogMergeStep, refcomp) diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref index 1cb25c9784238dc9591384791e8534bb8c5c77b8..bf68a61cfcc7993a5481e54a9a5ca9a059574f06 100644 --- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref +++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref @@ -1,5 +1,3 @@ -TrigSignatureMoniMT 0 INFO The L1 seed to multi-item-seeded chain HLT_noalg_L1Standby could not be completely resolved. This is currently OK. Exception from menu access: L1Item L1_2EM13VH does not exist in the menu -TrigSignatureMoniMT 0 INFO The L1 seed to multi-item-seeded chain HLT_noalg_L1Calo could not be completely resolved. This is currently OK. Exception from menu access: L1Item L1_2EM13VH does not exist in the menu TrigSignatureMoniMT INFO HLT_2e17_etcut_L12EM15VH #3136730292 TrigSignatureMoniMT INFO -- #3136730292 Events 20 20 0 0 0 - - - - - - - - - 0 TrigSignatureMoniMT INFO -- #3136730292 Features 0 0 0 - - - - - - - - - diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_newJO_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_newJO_build.py index 4d36210cf52b17683ab12dc6f359d8cd2a2f4b19..2a84539455c6a0a93f605d9da65f190d131783a8 100755 --- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_newJO_build.py +++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_newJO_build.py @@ -46,7 +46,7 @@ test.check_steps = [check_log] # Change RegTest pattern #regtest = test.get_step('RegTest') -#regtest.regex = 'TrigSignatureMoniMT.*HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*' +#regtest.regex = r'TrigSignatureMoniMT\s*INFO\sHLT_.*|TrigSignatureMoniMT\s*INFO\s-- #[0-9]+ (Events|Features).*' import sys sys.exit(test.run()) 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 6eb24083fd91c9ff7a5acd4562bd188dec87cb2c..9e97298e354f41bbf184d2c0ab2d7323ec469191 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 @@ -31,7 +31,7 @@ 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 = 'TrigSignatureMoniMT.*HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*' +refcomp.regex = r'TrigSignatureMoniMT\s*INFO\sHLT_.*|TrigSignatureMoniMT\s*INFO\s-- #[0-9]+ (Events|Features).*' refcomp.reference = 'TriggerTest/ref_data_v1Dev_build.ref' refcomp.required = True # Final exit code depends on this step CheckSteps.add_step_after_type(test.check_steps, CheckSteps.LogMergeStep, refcomp) diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_build.py index 04ba3739ca88c8bd104be6a124134530eda0dca6..606462a0cc42f12d9b4481801b52f89c5cfd67fd 100755 --- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_build.py +++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_build.py @@ -42,7 +42,7 @@ msgcount.required = True # make the test exit code depend on this step # Add a step comparing counts in the log against reference refcomp = CheckSteps.RegTestStep("CountRefComp") -refcomp.regex = 'TrigSignatureMoniMT.*HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*' +refcomp.regex = r'TrigSignatureMoniMT\s*INFO\sHLT_.*|TrigSignatureMoniMT\s*INFO\s-- #[0-9]+ (Events|Features).*' refcomp.reference = 'TriggerTest/ref_data_v1Dev_build.ref' refcomp.required = True # Final exit code depends on this step CheckSteps.add_step_after_type(test.check_steps, CheckSteps.LogMergeStep, refcomp) 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 5cb1502620d6ceb44966eb6c0301d3951d0af49e..55c710bd709a6f8da0079ddb2d5b05e15349a081 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 @@ -31,7 +31,7 @@ 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 = 'TrigSignatureMoniMT.*HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*' +refcomp.regex = r'TrigSignatureMoniMT\s*INFO\sHLT_.*|TrigSignatureMoniMT\s*INFO\s-- #[0-9]+ (Events|Features).*' refcomp.reference = 'TriggerTest/ref_data_v1Dev_build.ref' refcomp.required = True # Final exit code depends on this step CheckSteps.add_step_after_type(test.check_steps, CheckSteps.LogMergeStep, refcomp)