Skip to content

Removed unneeded capsys argument to integtest function calls; added --pytest-options argument to the bundle script#294

Merged
eflumerf merged 3 commits intoeflumerf/SkipResourceChecksfrom
kbiery/ResCheckTweaks
Feb 17, 2026
Merged

Removed unneeded capsys argument to integtest function calls; added --pytest-options argument to the bundle script#294
eflumerf merged 3 commits intoeflumerf/SkipResourceChecksfrom
kbiery/ResCheckTweaks

Conversation

@bieryAtFnal
Copy link
Contributor

@bieryAtFnal bieryAtFnal commented Feb 17, 2026

Description

These changes are minor tweaks to the changes that Eric made in #293. They are based on Eric's branch, and they are related to DUNE-DAQ/integrationtest#145.

Eric,
I like the spirit of your changes.

Two things that I felt were lost (and I would like to get back) were

  • printout of the required_resources_report when a test is skipped and the --concise option is passed to the bundle script or the "-s" option is not given to pytest itself
  • printout of the recommended_resources_report at the end of the console output from a test (so that users don't have to scroll back to see it)

In the first case, I made modifications in the integrationtest repo and in the dunedaq_integtest_bundle.sh script to recover the message when --concise is used. I don't yet have a solution for the case when a user runs pytest directly and omits the "-s".

For the second case, I just added a second printout of recommended_resources_report after the "yield" in check_system_resources.

Another change that I felt would be useful was to switch from using a --skip-resource-check option in the bundle script to using a --pytest-options option. I know of an additional option that would be nice to pass to pytest (the process manager type), and it seems reasonable to simply give users a hook to pass all the options that they want to pass through the bundle script instead of trying to add support for each one. This change is part of this PR.

Type of change

  • Optimization (non-breaking change that improves code/performance)

Testing checklist

  • Minimal system quicktest passes (pytest -s minimal_system_quick_test.py)
  • Full set of integration tests pass (dunedaq_integtest_bundle.sh)

Further checks

  • Code is commented where needed, particularly in hard-to-understand areas

Kurt Biery added 3 commits February 17, 2026 08:18
…ption with --pytest-options so that we can support multiple options to be passed to pytest, and added the -rs option to pytes when --concise is specified so that we continue to see any messages about skipped tests after skipping has been moved into the integrationtest infrastructure.
@eflumerf eflumerf merged commit f25452a into eflumerf/SkipResourceChecks Feb 17, 2026
1 check passed
@eflumerf eflumerf deleted the kbiery/ResCheckTweaks branch February 17, 2026 16:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants