From bce9c9b69b362a2ee2010ae0c7730f0571899ae8 Mon Sep 17 00:00:00 2001 From: lugrazet <Luke.Grazette@CERN.CH> Date: Sun, 15 Oct 2023 17:48:23 +0100 Subject: [PATCH] Successful step 4 --- ...y => hlt1_bandwidth_streamless_streams.py} | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) rename Hlt/Hlt1Conf/tests/options/bandwidth/{hlt1_bandwidth_production_streams.py => hlt1_bandwidth_streamless_streams.py} (75%) diff --git a/Hlt/Hlt1Conf/tests/options/bandwidth/hlt1_bandwidth_production_streams.py b/Hlt/Hlt1Conf/tests/options/bandwidth/hlt1_bandwidth_streamless_streams.py similarity index 75% rename from Hlt/Hlt1Conf/tests/options/bandwidth/hlt1_bandwidth_production_streams.py rename to Hlt/Hlt1Conf/tests/options/bandwidth/hlt1_bandwidth_streamless_streams.py index 920c59971e8..f0351c7b4da 100644 --- a/Hlt/Hlt1Conf/tests/options/bandwidth/hlt1_bandwidth_production_streams.py +++ b/Hlt/Hlt1Conf/tests/options/bandwidth/hlt1_bandwidth_streamless_streams.py @@ -32,30 +32,21 @@ from inspect import signature fname_helper = FileNameHelper(process="hlt1") fname_helper.make_tmp_dirs() options.output_file = fname_helper.mdf_fname_for_Moore( - stream_config="production") + stream_config="streamless").format(stream="streamless") options.output_type = 'MDF' -options.output_manifest_file = fname_helper.tck(stream_config="production") +options.output_manifest_file = fname_helper.tck(stream_config="streamless") def name(linedefn): return signature(linedefn).parameters['name'].default -def make_module_streams(): - linedict = { #Â stream per line to calculate line-similarity - name(line): [line] - for line in all_lines_functions() - } - - # Write out stream configuration to JSON file for use later in the test +def make_lines(): with open( - fname_helper.stream_config_json_path(stream_config="production"), + fname_helper.stream_config_json_path(stream_config="streamless"), 'w') as f: - json.dump({k: [name(line) for line in v] - for k, v in linedict.items()}, - f) #trivial json {name(line): [name(line)]} - return linedict - + json.dump({"streamless": [name(line) for line in all_lines_functions()]}, f) + return [line() for line in all_lines_functions()] options.scheduler_legacy_mode = False -run_moore(options, make_streams=make_module_streams) +run_moore(options, make_lines) -- GitLab