tests: fix grpc topotest xdist collection mismatch in CI (backport #22048) - #22193
Merged
Conversation
Author
Jafar: fixed |
|
Target branch is not in the allowed branches list. |
Follow-up to ea85c7c ("fix grpc_basic xdist collection mismatch"): that commit made missing grpc imports skip consistently, but the per-worker grpc-query --check subprocess could still fail on some xdist workers while others collected grpc_basic tests, aborting CI with "Different tests were collected". Rely on the import guard only; proto generation still runs when tests execute grpc-query. Signed-off-by: Jafar Al-Gharaibeh <jafar@atcorp.com> (cherry picked from commit 54429f5)
When parallel collection fails, xdist records errors named gw0, gw5, etc. analyze.py turned those into nonexistent gw5.py rerun targets. Skip worker ids so CI serial reruns only real topotest modules. Signed-off-by: Jafar Al-Gharaibeh <jafar@atcorp.com> (cherry picked from commit 2717992)
After dropping the collection-time grpc-query --check guard, CI always collected grpc_basic when Python grpc was installed, but grpc.s (frr-grpc) might not be installed. Zebra then failed to start with -M grpc and surfaced as a misleading mgmtd connection timeout. Skip the module when the northbound gRPC module is absent. Signed-off-by: Jafar Al-Gharaibeh <jafar@atcorp.com> (cherry picked from commit 94abacf)
Jafaral
force-pushed
the
mergify/bp/stable/10.6/pr-22048
branch
from
June 4, 2026 04:22
5e90ae9 to
3b22785
Compare
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
1 participant
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.
Fix intermittent CI topotest failures where pytest-xdist aborts with Different tests were collected between gw0 and gw5 because grpc_basic was collected on some workers but module-skipped on others.
Example CI failure here
This is an automatic backport of pull request #22048 done by Mergify.