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 b3c60e4bfa1e98c64afc77751e7a74f9c39f27f4..d3902cd0b86130c3f5f38fb1a1e150a57ca6ba66 100755 --- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_newJO_build.py +++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_newJO_build.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration # art-description: Trigger AthenaMT test running new-style job options # art-type: build @@ -20,7 +20,7 @@ copy_jo.auto_report_result = False # Do not set art-result for this step copy_jo.output_stream = Step.Step.OutputStream.STDOUT_ONLY # Do not create a log file for this step # Generate configuration run file -run = ExecStep.ExecStep('athena') +run = ExecStep.ExecStep('athena_run') run.type = 'other' run.input = 'data' run.executable = 'python' @@ -34,15 +34,19 @@ run.prmon = False # The full test configuration test = Test.Test() test.art_type = 'build' -#test.check_steps = CheckSteps.default_check_steps(test) test.exec_steps = [copy_jo, run] -check_log = CheckSteps.CheckLogStep('CheckLog') -check_log.log_file = run.get_log_file_name() -test.check_steps = [check_log] - -# Change RegTest pattern -#regtest = test.get_step('RegTest') -#regtest.regex = r'TrigSignatureMoniMT\s*INFO\sHLT_.*|TrigSignatureMoniMT\s*INFO\s-- #[0-9]+ (Events|Features).*' +test.check_steps = CheckSteps.default_check_steps(test) +[t for t in test.check_steps if isinstance(t, CheckSteps.MessageCountStep)][0].args='athena_run.log' + + +chaindump = test.get_step("ChainDump") +chaindump.args = '--json --yaml ref_data_newJO_build.new' +# In future, when this is primary test will enable strict reference checking +# The code below does so. +# refcomp = CheckSteps.ChainCompStep("CountRefComp") +# refcomp.input_file = 'ref_data_newJO_build.new' +# refcomp.required = True # Final exit code depends on this step +# CheckSteps.add_step_after_type(test.check_steps, CheckSteps.ChainDumpStep, refcomp) import sys sys.exit(test.run())