diff --git a/integtest/disabled_output_test.py b/integtest/disabled_output_test.py index 47003c73..59749d87 100644 --- a/integtest/disabled_output_test.py +++ b/integtest/disabled_output_test.py @@ -87,7 +87,7 @@ conf_dict = data_classes.drunc_config() conf_dict.dro_map_config.n_streams = number_of_data_producers conf_dict.op_env = "integtest" -conf_dict.session = "disabled" +conf_dict.config_session_name= "disabled" conf_dict.tpg_enabled = False # We accept the default values for all of the other fields in the drunc_config data structure # (defined in integrationtest/src/integrationtest/data_classes.py), including the "frame_file", diff --git a/integtest/hdf5_compression_test.py b/integtest/hdf5_compression_test.py index f5205869..4e8c9fa9 100644 --- a/integtest/hdf5_compression_test.py +++ b/integtest/hdf5_compression_test.py @@ -126,7 +126,7 @@ conf_dict.dro_map_config.n_streams = number_of_data_producers conf_dict.dro_map_config.n_apps = number_of_readout_apps conf_dict.op_env = "integtest" -conf_dict.session = "hdf5compression" +conf_dict.config_session_name= "hdf5compression" conf_dict.tpg_enabled = True conf_dict.fake_hsi_enabled = True conf_dict.dro_map_config.det_id = 2 # det_id = 2 for kHD_PDS diff --git a/integtest/insufficient_disk_space_test.py b/integtest/insufficient_disk_space_test.py index da6460cc..f3e76215 100644 --- a/integtest/insufficient_disk_space_test.py +++ b/integtest/insufficient_disk_space_test.py @@ -97,7 +97,7 @@ conf_dict.dro_map_config.n_streams = number_of_data_producers conf_dict.dro_map_config.n_apps = number_of_readout_apps conf_dict.op_env = "integtest" -conf_dict.session = "insufficient" +conf_dict.config_session_name= "insufficient" conf_dict.tpg_enabled = False conf_dict.n_df_apps = number_of_dataflow_apps conf_dict.fake_hsi_enabled = False diff --git a/integtest/large_trigger_record_test.py b/integtest/large_trigger_record_test.py index 3ec3f954..8b75e0a8 100644 --- a/integtest/large_trigger_record_test.py +++ b/integtest/large_trigger_record_test.py @@ -95,7 +95,7 @@ conf_dict.dro_map_config.n_streams = number_of_data_producers conf_dict.dro_map_config.n_apps = number_of_readout_apps conf_dict.op_env = "integtest" -conf_dict.session = "largerecord" +conf_dict.config_session_name= "largerecord" conf_dict.tpg_enabled = False conf_dict.n_df_apps = number_of_dataflow_apps diff --git a/integtest/max_file_size_test.py b/integtest/max_file_size_test.py index 58da7623..34b36119 100644 --- a/integtest/max_file_size_test.py +++ b/integtest/max_file_size_test.py @@ -109,7 +109,7 @@ conf_dict.dro_map_config.n_streams = number_of_data_producers conf_dict.dro_map_config.n_apps = number_of_readout_apps conf_dict.op_env = "integtest" -conf_dict.session = "maxfilesize" +conf_dict.config_session_name= "maxfilesize" conf_dict.tpg_enabled = True conf_dict.fake_hsi_enabled = True conf_dict.frame_file = ( diff --git a/integtest/multiple_data_writers_test.py b/integtest/multiple_data_writers_test.py index bbd89be4..cad0d282 100644 --- a/integtest/multiple_data_writers_test.py +++ b/integtest/multiple_data_writers_test.py @@ -84,7 +84,7 @@ conf_dict.dro_map_config.n_streams = number_of_data_producers conf_dict.dro_map_config.n_apps = number_of_readout_apps conf_dict.op_env = "integtest" -conf_dict.session = "multidatawriter" +conf_dict.config_session_name= "multidatawriter" conf_dict.fake_hsi_enabled = True conf_dict.n_data_writers = 3 diff --git a/integtest/offline_prod_run_test.py b/integtest/offline_prod_run_test.py index 8ad7a437..699117ea 100644 --- a/integtest/offline_prod_run_test.py +++ b/integtest/offline_prod_run_test.py @@ -64,7 +64,7 @@ conf_dict = data_classes.drunc_config() conf_dict.dro_map_config.n_streams = number_of_data_producers conf_dict.op_env = "integtest" -conf_dict.session = "smallfootprint" +conf_dict.config_session_name= "prodruntype" conf_dict.tpg_enabled = False conf_dict.fake_hsi_enabled = True diff --git a/integtest/trmonrequestor_test.py b/integtest/trmonrequestor_test.py index 1b3d52ca..23ded65b 100755 --- a/integtest/trmonrequestor_test.py +++ b/integtest/trmonrequestor_test.py @@ -62,7 +62,7 @@ conf_dict = data_classes.drunc_config() conf_dict.dro_map_config.n_streams = number_of_data_producers conf_dict.op_env = "integtest" -conf_dict.session = "trmonrequestor" +conf_dict.config_session_name= "trmonrequestor" conf_dict.tpg_enabled = False conf_dict.trmon_app_enabled = True conf_dict.n_df_apps = number_of_dataflow_apps @@ -121,17 +121,17 @@ def test_log_files(run_dunerc): # Check that at least some of the expected log files are present assert any( - f"{run_dunerc.session}_df-01" in str(logname) + f"{run_dunerc.daq_session_name}_df-01" in str(logname) for logname in run_dunerc.log_files ) assert any( - f"{run_dunerc.session}_dfo" in str(logname) for logname in run_dunerc.log_files + f"{run_dunerc.daq_session_name}_dfo" in str(logname) for logname in run_dunerc.log_files ) assert any( - f"{run_dunerc.session}_mlt" in str(logname) for logname in run_dunerc.log_files + f"{run_dunerc.daq_session_name}_mlt" in str(logname) for logname in run_dunerc.log_files ) assert any( - f"{run_dunerc.session}_ru" in str(logname) for logname in run_dunerc.log_files + f"{run_dunerc.daq_session_name}_ru" in str(logname) for logname in run_dunerc.log_files ) if check_for_logfile_errors: