Updated and extended a few integtests to work with the ability to specify process manager types #281
+52
−17
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR is correlated with DUNE-DAQ/integrationtest#139.
In a discussion with Pawel and a few other people from the CCM WG, I learned that they are thinking about integration/regression tests that validate the behavior of different types of run control process managers. This led to the request for the ability to specify one or more process manager types in our integtest files.
The core changes to add this functionality were made in the
integrationtestrepo, and the changes in this repository were the following:3ru_3df_multirun_test)3ru_3df_multirun_testto provide more (and updated) information about the variables that need to be defined in each integtest (to pass the necessary information to the integrationtest infrastructure). I haven't finished that comment block because I want to discuss the current, slightly confusing, state of those variables with Eric and others and possibly make some changes to help reduce confusion.tpreplay_testto check whether the number of raw data files produced by each data-taking run was correct. It looked to me that this line had simply been missing.Regarding the first change, there was logic in the
trigger_bitwords_testand thetpreplay_testthat used a regular expression to pull the "confgen" name out of the current pytest name and use that to look up the appropriate test parameters in a locally-defined dictionary. With the addition of the process-manager-type fixture to our tests, the pytest names of our tests will now have three elements: confgen name, process manager type, and index or name of the run control command list. Instead of trying to update the regex to support this change, I simply modified the logic to check which confgen name appears in the pytest current test name. This seems to work fine, and it seems a little more future-proof than the previous logic.To test these changes, we can use the following steps:
Type of change
Testing checklist
dbt-build --unittest)pytest -s minimal_system_quick_test.py)daqsystemtest_integtest_bundle.sh)Further checks