Skip to content

Unify ps implementation to fix the PM integ test - #980

Merged
PawelPlesniak merged 4 commits into
developfrom
emmuhamm/fix-pm-test-979
Jul 22, 2026
Merged

Unify ps implementation to fix the PM integ test#980
PawelPlesniak merged 4 commits into
developfrom
emmuhamm/fix-pm-test-979

Conversation

@emmuhamm

@emmuhamm emmuhamm commented Jul 21, 2026

Copy link
Copy Markdown
Member

Description

Fixes issue #979

Fix the PM integ test

Fix PM integ test script itself

The PS command recently got updated to not print any table at all in case there is no process up and running (eg. before boot). This change was not reflected in the integ test. This is now rectified.

Unified the PS implementation

#912, among other things, unified a lot of the PM commands for them to be ported over to the US (see point 5). During this migration, the ps command was left behind ;-;.

On its own this would have been fine, but as luck would have it there are two different implementations. The PM implementation had a working --width and --user code, but the US did not. Hence, the integ tests (and any unified shell) will complain if doing eg. ps -w 140 or ps -u emmuhamm.

This is now rectified by unifying the two implementations, exactly the same way as was done in #912

Type of change

  • Bug fix

Suggested manual testing checklist

pytest -s src/drunc/integtest/controller_test.py --integtest-verbosity 5. This should pass.

Developer checklist

Prior to marking this as "Ready for Review"

Tests ran on: np04-srv-028 from release 21 June nightly.

  • Unit tests (pytest --marker) passed
    • With relevant marker
  • Integration tests passed
    • Only daqsystemtest_integtest_bundle.sh -k minimal_system_quick_test.py
  • Drunc integration tests pass (./scripts/drunc_integtest_bundle.sh)

Final checklist prior to marking this as "Ready for Review"

  • Code is clearly commented.
  • A suitable reviewer has been chosen from this list.

Reviewer checklist

  • This branch has been rebased with develop prior to testing.
  • Suggested manual tests show changes.
  • CI workflows fails documented (if present)
  • Integration tests passed (on either np0x or IC HEP clusters)
    • Use the following guidelines to determine which of the integration tests you need to run
      • You do not need to run any integration tests if
        • Code changes are not associated with src/
        • PR changes only affect docstrings
        • In this case, be sure to validate any suggested manual testing.
      • Run only the minimum integration test as daqsystemtest_integtest_bundle.sh -k minimal_system_quick_test.py if
        • PR changes only affect a few log entries
        • PR changes are small, and do not have a large impact on the workflow (use carefully)
      • Otherwise run the full integration test bundle as daqsystemtest_integtest_bundle.sh
    • What to do if the integration tests fail?
      • Only concern yourself if failures related to drunc are in the log files
      • If non-drunc failure appears:
        • Validate failure in fresh working area
        • Contact Pawel if unsure
  • If you have ran the full integration test bundle, leave a comment on the PR stating
    • Which host the integration tests have ran on
    • [Optional] A copy of the test summary
  • Drunc integration tests pass (scripts/drunc_integtest_bundle.sh)

Once the above boxes are checked, the PR(s) can be merged following the steps below.

Prior to merging

Choose one of the following an complete all substeps
  • Changes only affect the Run Control, are in a single repository, and do not affect the end user.
    • Changes are documented in docstrings and code comments
    • Wiki has been updated if architectural or endpoint changes
  • Otherwise
    • Workflow changes demonstrated in the Change Log (if necessary)
    • Wiki has been updated (if necessary)
    • #dunedaq-integration Slack channel notified (see below)

Once completed, the reviewer can merge the PR.

Notification message for a Slack channel

Note - this should be to #dunedaq-integration for general workflow that isn't during a release candidate period, and to #daq-release-prep otherwise.

For an single merge that changes the user workflow

The CCM WG has an isolated PR ready to merge that affects user workflows. The PR is:

_URL_

I will leave time for any comments, otherwise will merge these at the end of the work day _Insert your time zone_.

For co-ordinated merge

The CCM WG has a set of co-ordinated merges ready to merge. The PRs are:

_URL_

_URL_


I will leave time for any comments, otherwise will merge these at the end of the day.

@emmuhamm emmuhamm self-assigned this Jul 21, 2026
@emmuhamm emmuhamm linked an issue Jul 21, 2026 that may be closed by this pull request
Comment thread src/drunc/unified_shell/commands.py
@emmuhamm emmuhamm changed the title Fix PM test Unify ps implementation to fix the PM integ test Jul 22, 2026
@emmuhamm
emmuhamm marked this pull request as ready for review July 22, 2026 08:41
@emmuhamm
emmuhamm requested a review from PawelPlesniak July 22, 2026 08:41

@PawelPlesniak PawelPlesniak left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One small typo, otherwise changes look good. Running the process manager test as

pytest src/drunc/integtest/process_manager_test.py

passed. MSQT also passed, approved. Nice work!

Comment thread src/drunc/integtest/process_manager_test.py Outdated
@PawelPlesniak
PawelPlesniak merged commit 1883809 into develop Jul 22, 2026
4 checks passed
@PawelPlesniak
PawelPlesniak deleted the emmuhamm/fix-pm-test-979 branch July 22, 2026 15:21
@PawelPlesniak PawelPlesniak added this to the fddaq-v5.7.0 milestone Jul 23, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

ps -u in unified shell broken

3 participants