Skip to content

Changes to adapt to confgen (integtest config params) improvements #319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bieryAtFnal wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Changes to adapt to confgen (integtest config params) improvements #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions integtest/3ru_1df_multirun_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
11 changes: 2 additions & 9 deletions integtest/3ru_3df_multirun_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions integtest/example_system_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
5 changes: 2 additions & 3 deletions integtest/fake_data_producer_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 2 additions & 6 deletions integtest/long_window_readout_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 4 additions & 6 deletions integtest/minimal_system_quick_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 2 additions & 6 deletions integtest/readout_type_scan_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions integtest/sample_ehn1_multihost_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
9 changes: 2 additions & 7 deletions integtest/small_footprint_quick_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions integtest/tpg_state_collection_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions integtest/tpreplay_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions integtest/tpstream_writing_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions integtest/trigger_bitwords_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand All @@ -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")

Expand Down