Fix flakey undulator dcm test - #2142
Merged
Merged
Conversation
ophyd-async 0.20.1 adds set_mock_attr (in ophyd_async.core) and enforces that test code can no longer assign directly to attribute names that collide with bluesky protocol verbs (set, read, trigger, kickoff, complete, prepare, describe, check_value). Replace direct assignments like `signal.set = AsyncMock(...)` with `set_mock_attr(signal, "set", AsyncMock(...))` across the affected test files and fixtures. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01EQPRwf3pUved4ihrBLPi1g
The set_mock_attr fixes in the previous commit cover every reserved-attr NameError that this autouse fixture was blanket-suppressing, so the mask is no longer needed. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01EQPRwf3pUved4ihrBLPi1g
set_mock_attr(device, "attr", mock) doesn't let pyright narrow device.attr to the mock's type, so later device.attr.assert_*() calls failed with reportAttributeAccessIssue. Capture set_mock_attr's return value (it returns the mock unchanged, per its own docstring) and assert on that instead. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01EQPRwf3pUved4ihrBLPi1g
…LightSource/dodal into update_to_ophyd_async_0_20
oliwenmandiamond
changed the base branch from
main
to
update_to_ophyd_async_0_20
July 29, 2026 09:55
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #2142 +/- ##
=======================================
Coverage 99.19% 99.19%
=======================================
Files 367 367
Lines 14596 14596
=======================================
Hits 14479 14479
Misses 117 117 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
Relm-Arrowny
approved these changes
Aug 25, 2026
Relm-Arrowny
left a comment
Relm-Arrowny
left a comment
Contributor
There was a problem hiding this comment.
It fixed it but I think all we needed to do is increase the time out. but it is nice to not have type: ignore.
Comment on lines
+244
to
246
| done, _ = await asyncio.wait([status.task], timeout=0.1) | ||
| assert status.task in done | ||
|
|
Contributor
There was a problem hiding this comment.
nit: The cause of the flakey test was the timeout being too short, we could have just change it to 0.1 and it would have fixed it.
Suggested change
| done, _ = await asyncio.wait([status.task], timeout=0.1) | |
| assert status.task in done | |
| await status | |
| assert status.done |
Or
await asyncio.wait_for(status, timeout=0.1)New code still fail with old timeout:
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Fixes #2141
Have verified that it is no longer flakey using the event_loop_fuzzing fixture and ran 100 times and all passed as shown below
Instructions to reviewer on how to test:
Checks for reviewer
dodal connect ${BEAMLINE}