Skip to content

Commit

Permalink
Merge pull request #361 from DUNE-DAQ/kbiery/v4.4.x_fixes_for_integtests
Browse files Browse the repository at this point in the history 
updated integtests in dfmodules to work in fddaq-v4.4.x
  • Loading branch information
@wesketchum
wesketchum committed Jul 6, 2024
2 parents bfbdf46 + 0b95cfd commit 2ac7a94
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions integtest/disabled_output_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@
triggeractivity_frag_params={"fragment_type_description": "Trigger Activity",
"fragment_type": "Trigger_Activity",
"hdf5_source_subsystem": "Trigger",
"expected_fragment_count": 1,
"expected_fragment_count": 3,
"min_size_bytes": 72, "max_size_bytes": 216}
triggertp_frag_params={"fragment_type_description": "Trigger with TPs",
"fragment_type": "Trigger_Primitive",
"hdf5_source_subsystem": "Trigger",
"expected_fragment_count": 2, # number of readout apps (1) times 2
"expected_fragment_count": 3, # number of readout apps (1) times 3, one per plane
"min_size_bytes": 72, "max_size_bytes": 16000}
hsi_frag_params ={"fragment_type_description": "HSI",
"fragment_type": "Hardware_Signal",
Expand Down Expand Up @@ -116,10 +116,10 @@

# The commands to run in nanorc, as a list
nanorc_command_list="integtest-partition boot conf".split()
nanorc_command_list+="start_run --disable-data-storage 101 wait ".split() + [str(run_duration)] + "stop_run --wait 2 wait 2".split()
nanorc_command_list+="start_run 102 wait ".split() + [str(run_duration)] + "stop_run --wait 2 wait 2".split()
nanorc_command_list+="start_run --disable-data-storage 103 wait ".split() + [str(run_duration)] + "disable_triggers wait 2 stop_run wait 2".split()
nanorc_command_list+="start_run 104 wait ".split() + [str(run_duration)] + "disable_triggers wait 2 stop_run wait 2".split()
nanorc_command_list+="start_run --disable-data-storage --wait 2 101 wait ".split() + [str(run_duration)] + "stop_run --wait 2 wait 2".split()
nanorc_command_list+="start_run --wait 2 102 wait ".split() + [str(run_duration)] + "stop_run --wait 2 wait 2".split()
nanorc_command_list+="start_run --disable-data-storage --wait 2 103 wait ".split() + [str(run_duration)] + "disable_triggers wait 2 stop_run wait 2".split()
nanorc_command_list+="start_run --wait 2 104 wait ".split() + [str(run_duration)] + "disable_triggers wait 2 stop_run wait 2".split()
nanorc_command_list+="scrap terminate".split()

# The tests themselves
Expand Down
6 changes: 3 additions & 3 deletions integtest/multi_output_file_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@
triggeractivity_frag_params={"fragment_type_description": "Trigger Activity",
"fragment_type": "Trigger_Activity",
"hdf5_source_subsystem": "Trigger",
"expected_fragment_count": number_of_readout_apps,
"expected_fragment_count": (3*number_of_readout_apps),
"min_size_bytes": 72, "max_size_bytes": 520}
triggertp_frag_params={"fragment_type_description": "Trigger with TPs",
"fragment_type": "Trigger_Primitive",
"hdf5_source_subsystem": "Trigger",
"expected_fragment_count": (2*number_of_readout_apps),
"expected_fragment_count": (3*number_of_readout_apps),
"min_size_bytes": 72, "max_size_bytes": 16000}
hsi_frag_params ={"fragment_type_description": "HSI",
"fragment_type": "Hardware_Signal",
Expand Down Expand Up @@ -132,7 +132,7 @@
}

# The commands to run in nanorc, as a list
nanorc_command_list="integtest-partition boot conf start_run 101 wait 180 disable_triggers wait 2 stop_run wait 21 start_run 102 wait 120 disable_triggers wait 2 stop_run wait 21 scrap terminate".split()
nanorc_command_list="integtest-partition boot conf start_run --wait 3 101 wait 180 disable_triggers wait 2 stop_run wait 21 start_run --wait 3 102 wait 120 disable_triggers wait 2 stop_run wait 21 scrap terminate".split()

# The tests themselves

Expand Down

0 comments on commit 2ac7a94

Please sign in to comment.