From 9287ba1f1b0e40eaad839b408e39878ff59994ae Mon Sep 17 00:00:00 2001 From: Kurt Biery Date: Thu, 7 May 2026 04:24:43 +0200 Subject: [PATCH] initial changes to adapt to confgen (integtest config params) improvements --- integtest/3ru_1df_multirun_test.py | 8 ++------ integtest/3ru_3df_multirun_test.py | 11 ++--------- integtest/example_system_test.py | 4 ++-- integtest/fake_data_producer_test.py | 5 ++--- integtest/long_window_readout_test.py | 8 ++------ integtest/minimal_system_quick_test.py | 10 ++++------ integtest/readout_type_scan_test.py | 8 ++------ integtest/sample_ehn1_multihost_test.py | 4 ++-- integtest/small_footprint_quick_test.py | 9 ++------- integtest/tpg_state_collection_test.py | 4 ++-- integtest/tpreplay_test.py | 4 ++-- integtest/tpstream_writing_test.py | 4 ++-- integtest/trigger_bitwords_test.py | 6 +++--- 13 files changed, 29 insertions(+), 56 deletions(-) diff --git a/integtest/3ru_1df_multirun_test.py b/integtest/3ru_1df_multirun_test.py index d04835c..104fc1c 100644 --- a/integtest/3ru_1df_multirun_test.py +++ b/integtest/3ru_1df_multirun_test.py @@ -98,13 +98,9 @@ actual_output_path = get_pytest_tmpdir() resource_validator.free_disk_space_needs(actual_output_path, 1) # more than 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/3ru_3df_multirun_test.py b/integtest/3ru_3df_multirun_test.py index aa95fab..9453996 100644 --- a/integtest/3ru_3df_multirun_test.py +++ b/integtest/3ru_3df_multirun_test.py @@ -122,16 +122,9 @@ actual_output_path = get_pytest_tmpdir() resource_validator.free_disk_space_needs(actual_output_path, 1) # more than what we observe -# 29-Dec-2025, KAB: The following comment about three variables is out-of-date. -# It will be replaced soon, and the comment block above is a start on that. -# -# 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/example_system_test.py b/integtest/example_system_test.py index bcffbcf..b1d172d 100755 --- a/integtest/example_system_test.py +++ b/integtest/example_system_test.py @@ -93,9 +93,9 @@ # The arguments to pass to the config generator, excluding the json # output directory (the test framework handles that) -common_config_obj = data_classes.drunc_config() +common_config_obj = data_classes.integtest_params_for_predefined_dunedaq_config() common_config_obj.op_env = "test" -common_config_obj.config_db = ( +common_config_obj.predefined_config_db = ( os.path.dirname(__file__) + "/../config/daqsystemtest/example-configs.data.xml" ) common_config_obj.config_substitutions.append( diff --git a/integtest/fake_data_producer_test.py b/integtest/fake_data_producer_test.py index 37d58a4..5b84606 100644 --- a/integtest/fake_data_producer_test.py +++ b/integtest/fake_data_producer_test.py @@ -63,10 +63,9 @@ # 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.op_env = "integtest" conf_dict.config_session_name = "fakedata" conf_dict.use_fakedataprod = True diff --git a/integtest/long_window_readout_test.py b/integtest/long_window_readout_test.py index 0f10465..b4fab32 100644 --- a/integtest/long_window_readout_test.py +++ b/integtest/long_window_readout_test.py @@ -83,13 +83,9 @@ resource_validator.free_disk_space_needs(actual_output_path, 25) # 25% more than what we need resource_validator.total_disk_space_needs(actual_output_path, recommended_total_disk_space=40) # 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/minimal_system_quick_test.py b/integtest/minimal_system_quick_test.py index d936e1f..cd88a02 100644 --- a/integtest/minimal_system_quick_test.py +++ b/integtest/minimal_system_quick_test.py @@ -71,17 +71,15 @@ # The arguments to pass to the config generator, excluding the json # output directory (the test framework handles that) -# CCM includes FSM, hosts; moduleconfs includes connections -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 = "minimal" conf_dict.tpg_enabled = False -# For testing, allow drunc to manage ConnectivityService (default is False, integrationtest manages Connectivity Service) -#conf_dict.drunc_connsvc = True +# For testing, allow drunc to manage ConnectivityService +#conf_dict.connsvc_control = ConnSvcControl.RUNCONTROL # For testing, specify connectivity service port (default is 0, a random port is chosen for the Connectivity Service) #conf_dict.connsvc_port = 12345 diff --git a/integtest/readout_type_scan_test.py b/integtest/readout_type_scan_test.py index 278f025..7aa5b07 100644 --- a/integtest/readout_type_scan_test.py +++ b/integtest/readout_type_scan_test.py @@ -172,13 +172,9 @@ actual_output_path = get_pytest_tmpdir() resource_validator.free_disk_space_needs(actual_output_path, 1) # more than 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 = "readout" diff --git a/integtest/sample_ehn1_multihost_test.py b/integtest/sample_ehn1_multihost_test.py index 222be1f..6dc20b5 100644 --- a/integtest/sample_ehn1_multihost_test.py +++ b/integtest/sample_ehn1_multihost_test.py @@ -158,9 +158,9 @@ print(f"*** WARNING: the directory referenced by PYTEST_DEBUG_TEMPROOT ({pytest_tmpdir}) does not exist!") print("") -common_config_obj = data_classes.drunc_config() +common_config_obj = data_classes.integtest_params_for_predefined_dunedaq_config() common_config_obj.op_env = "test" -common_config_obj.config_db = ( +common_config_obj.predefined_config_db = ( os.path.dirname(__file__) + "/../config/daqsystemtest/example-configs.data.xml" ) common_config_obj.config_substitutions.append( diff --git a/integtest/small_footprint_quick_test.py b/integtest/small_footprint_quick_test.py index ff1934f..c9c48ac 100644 --- a/integtest/small_footprint_quick_test.py +++ b/integtest/small_footprint_quick_test.py @@ -64,16 +64,11 @@ actual_output_path = get_pytest_tmpdir() resource_validator.free_disk_space_needs(actual_output_path, 1) # more than 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 - # 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 = "smallfootprint" diff --git a/integtest/tpg_state_collection_test.py b/integtest/tpg_state_collection_test.py index f833a19..05b2be2 100644 --- a/integtest/tpg_state_collection_test.py +++ b/integtest/tpg_state_collection_test.py @@ -113,9 +113,9 @@ actual_output_path = get_pytest_tmpdir() resource_validator.free_disk_space_needs(actual_output_path, 1) # more than what we observe -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/tpreplay_test.py b/integtest/tpreplay_test.py index 1cb3f81..d5e77c2 100644 --- a/integtest/tpreplay_test.py +++ b/integtest/tpreplay_test.py @@ -94,10 +94,10 @@ def _cleanup_tmpdir(): copy_configuration(path, [os.path.dirname(__file__) + "/../config/daqsystemtest/example-configs.data.xml"]) local_db = conffwk.Configuration("oksconflibs:" + tmpdirname + "/example-configs.data.xml") -common_config_obj = data_classes.drunc_config() +common_config_obj = data_classes.integtest_params_for_predefined_dunedaq_config() common_config_obj.op_env = "test" common_config_obj.tpg_enabled = False -common_config_obj.config_db = ( tmpdirname + "/example-configs.data.xml" ) +common_config_obj.predefined_config_db = ( tmpdirname + "/example-configs.data.xml" ) # Get default tpreplay config tpreplay_local_conf = copy.deepcopy(common_config_obj) diff --git a/integtest/tpstream_writing_test.py b/integtest/tpstream_writing_test.py index 2783fc3..9ab0b1c 100644 --- a/integtest/tpstream_writing_test.py +++ b/integtest/tpstream_writing_test.py @@ -112,9 +112,9 @@ actual_output_path = get_pytest_tmpdir() resource_validator.free_disk_space_needs(actual_output_path, 1) # more than what we observe -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/trigger_bitwords_test.py b/integtest/trigger_bitwords_test.py index 9ae24e7..68ef657 100644 --- a/integtest/trigger_bitwords_test.py +++ b/integtest/trigger_bitwords_test.py @@ -69,10 +69,10 @@ resource_validator.free_disk_space_needs(actual_output_path, 1) # more than what we observe ### Config setup -common_config_obj = data_classes.drunc_config() +common_config_obj = data_classes.integtest_params_for_predefined_dunedaq_config() common_config_obj.op_env = "test" common_config_obj.tpg_enabled = False -common_config_obj.config_db = ( +common_config_obj.predefined_config_db = ( os.path.dirname(__file__) + "/../config/daqsystemtest/example-configs.data.xml" ) @@ -81,7 +81,7 @@ onebyone_local_conf.config_session_name = "local-1x1-config" # Get necessary dal objects -db = conffwk.Configuration("oksconflibs:" + str(common_config_obj.config_db)) +db = conffwk.Configuration("oksconflibs:" + str(common_config_obj.predefined_config_db)) prescale_bitword = db.get_dal(class_name="TriggerBitword", uid="test-bitword") timing_bitword = db.get_dal(class_name="TriggerBitword", uid="test-bitword2")