diff --git a/integtest/disabled_output_test.py b/integtest/disabled_output_test.py index 10a792f..aa35913 100644 --- a/integtest/disabled_output_test.py +++ b/integtest/disabled_output_test.py @@ -93,18 +93,14 @@ actual_output_path = get_pytest_tmpdir() resource_validator.free_disk_space_needs(actual_output_path, 1) # what we observe -# The next three variable declarations *must* be present as globals in the test -# file. They're read by the "fixtures" in conftest.py to determine how -# to run the config generation and dunerc -object_databases = ["config/daqsystemtest/integrationtest-objects.data.xml"] - -conf_dict = data_classes.drunc_config() +conf_dict = data_classes.integtest_params_for_generated_dunedaq_config() +conf_dict.object_databases = ["config/daqsystemtest/integrationtest-objects.data.xml"] conf_dict.dro_map_config.n_streams = number_of_data_producers conf_dict.op_env = "integtest" 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 +# We accept the default values for all of the other integtest config parameters # (defined in integrationtest/src/integrationtest/data_classes.py), including the "frame_file", # which is the data file that is used to emulated the data. The current default for that field # specifies a set of WIBEth frames from a relatively recent run at EHN1.) diff --git a/integtest/hdf5_compression_test.py b/integtest/hdf5_compression_test.py index 2373bdb..02d3f13 100644 --- a/integtest/hdf5_compression_test.py +++ b/integtest/hdf5_compression_test.py @@ -116,13 +116,9 @@ resource_validator.free_disk_space_needs(actual_output_path, 5) # what we actually use (3) plus margin resource_validator.total_disk_space_needs(actual_output_path, recommended_total_disk_space=10) # double what we need -# The next three variable declarations *must* be present as globals in the test -# file. They're read by the "fixtures" in conftest.py to determine how -# to run the config generation and dunerc -object_databases = ["config/daqsystemtest/integrationtest-objects.data.xml"] - -conf_dict = data_classes.drunc_config() +conf_dict = data_classes.integtest_params_for_generated_dunedaq_config() +conf_dict.object_databases = ["config/daqsystemtest/integrationtest-objects.data.xml"] 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" diff --git a/integtest/insufficient_disk_space_test.py b/integtest/insufficient_disk_space_test.py index 0f13d95..c504e66 100644 --- a/integtest/insufficient_disk_space_test.py +++ b/integtest/insufficient_disk_space_test.py @@ -87,13 +87,9 @@ # desired_free_disk_space_gb TriggerRecords before appearing to run out of space. free_space_safety_factor = round(resource_validator.free_disk_space_gb - desired_size_of_output_disk_gb) -# The next three variable declarations *must* be present as globals in the test -# file. They're read by the "fixtures" in conftest.py to determine how -# to run the config generation and dunerc -object_databases = ["config/daqsystemtest/integrationtest-objects.data.xml"] - -conf_dict = data_classes.drunc_config() +conf_dict = data_classes.integtest_params_for_generated_dunedaq_config() +conf_dict.object_databases = ["config/daqsystemtest/integrationtest-objects.data.xml"] 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" diff --git a/integtest/large_trigger_record_test.py b/integtest/large_trigger_record_test.py index 8f9519f..be3ff21 100644 --- a/integtest/large_trigger_record_test.py +++ b/integtest/large_trigger_record_test.py @@ -81,13 +81,9 @@ resource_validator.free_disk_space_needs(actual_output_path, 16, 20) resource_validator.total_disk_space_needs(actual_output_path, recommended_total_disk_space=24) -# The next three variable declarations *must* be present as globals in the test -# file. They're read by the "fixtures" in conftest.py to determine how -# to run the config generation and dunerc -object_databases = ["config/daqsystemtest/integrationtest-objects.data.xml"] - -conf_dict = data_classes.drunc_config() +conf_dict = data_classes.integtest_params_for_generated_dunedaq_config() +conf_dict.object_databases = ["config/daqsystemtest/integrationtest-objects.data.xml"] 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" diff --git a/integtest/max_file_size_test.py b/integtest/max_file_size_test.py index 22ed4c9..12a072b 100644 --- a/integtest/max_file_size_test.py +++ b/integtest/max_file_size_test.py @@ -98,13 +98,9 @@ resource_validator.free_disk_space_needs(actual_output_path, 6, 10) # 20% more than what we need resource_validator.total_disk_space_needs(actual_output_path, recommended_total_disk_space=15) # double what we need -# The next three variable declarations *must* be present as globals in the test -# file. They're read by the "fixtures" in conftest.py to determine how -# to run the config generation and dunerc -object_databases = ["config/daqsystemtest/integrationtest-objects.data.xml"] - -conf_dict = data_classes.drunc_config() +conf_dict = data_classes.integtest_params_for_generated_dunedaq_config() +conf_dict.object_databases = ["config/daqsystemtest/integrationtest-objects.data.xml"] 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" diff --git a/integtest/multiple_data_writers_test.py b/integtest/multiple_data_writers_test.py index 200cdef..24ad902 100644 --- a/integtest/multiple_data_writers_test.py +++ b/integtest/multiple_data_writers_test.py @@ -78,13 +78,9 @@ actual_output_path = get_pytest_tmpdir() resource_validator.free_disk_space_needs(actual_output_path, 1) # what we observe -# The next three variable declarations *must* be present as globals in the test -# file. They're read by the "fixtures" in conftest.py to determine how -# to run the config generation and dunerc -object_databases = ["config/daqsystemtest/integrationtest-objects.data.xml"] - -conf_dict = data_classes.drunc_config() +conf_dict = data_classes.integtest_params_for_generated_dunedaq_config() +conf_dict.object_databases = ["config/daqsystemtest/integrationtest-objects.data.xml"] 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" diff --git a/integtest/offline_prod_run_test.py b/integtest/offline_prod_run_test.py index 344058f..51d3b95 100644 --- a/integtest/offline_prod_run_test.py +++ b/integtest/offline_prod_run_test.py @@ -57,16 +57,11 @@ ], } -# The next three variable declarations *must* be present as globals in the test -# file. They're read by the "fixtures" in conftest.py to determine how -# to run the config generation and dunerc - # The arguments to pass to the config generator, excluding the json # output directory (the test framework handles that) -object_databases = ["config/daqsystemtest/integrationtest-objects.data.xml"] - -conf_dict = data_classes.drunc_config() +conf_dict = data_classes.integtest_params_for_generated_dunedaq_config() +conf_dict.object_databases = ["config/daqsystemtest/integrationtest-objects.data.xml"] conf_dict.dro_map_config.n_streams = number_of_data_producers conf_dict.op_env = "integtest" conf_dict.config_session_name= "prodruntype" diff --git a/integtest/trmonrequestor_test.py b/integtest/trmonrequestor_test.py index f88096f..9550074 100755 --- a/integtest/trmonrequestor_test.py +++ b/integtest/trmonrequestor_test.py @@ -58,13 +58,9 @@ ], } -# The next three variable declarations *must* be present as globals in the test -# file. They're read by the "fixtures" in conftest.py to determine how -# to run the config generation and dunerc -object_databases = ["config/daqsystemtest/integrationtest-objects.data.xml"] - -conf_dict = data_classes.drunc_config() +conf_dict = data_classes.integtest_params_for_generated_dunedaq_config() +conf_dict.object_databases = ["config/daqsystemtest/integrationtest-objects.data.xml"] conf_dict.dro_map_config.n_streams = number_of_data_producers conf_dict.op_env = "integtest" conf_dict.config_session_name= "trmonrequestor"