fix(kms-connector): reduce port collision in tests#1680
Merged
mergify[bot] merged 1 commit intomainfrom Jan 5, 2026
Merged
Conversation
There was a problem hiding this comment.
Pull request overview
This PR fixes port collision issues in tests by switching from manually picking free ports to using testcontainers' dynamic port allocation. This ensures that containers can safely run in parallel without port conflicts.
- Removed
pick_free_port()usage in favor of testcontainers' dynamic port allocation - Updated test synchronization to wait for earlier log messages
- Simplified anvil container setup by removing manual port mapping
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| kms-connector/crates/utils/src/tests/setup/gw.rs | Removed manual port allocation for anvil container, now using dynamic port assignment via get_host_port_ipv4() |
| kms-connector/crates/utils/src/tests/setup/db.rs | Removed manual port allocation for Postgres container, now using dynamic port assignment via get_host_port_ipv4() |
| kms-connector/crates/gw-listener/tests/common/mod.rs | Updated test to wait for "Subscribed to " log message instead of "Waiting for next" for earlier synchronization |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
eudelins-zama
force-pushed
the
eudelins/fix/825/reduce-port-collision
branch
from
e1241fd to
082dae6
Compare
eudelins-zama
changed the title
eudelins-zama
force-pushed
the
eudelins/fix/825/reduce-port-collision
branch
from
082dae6 to
f5d983a
Compare
🧪 CI InsightsHere's what we observed from your CI run for f5d983a. 🟢 All jobs passed!But CI Insights is watching 👀 |
dartdart26
approved these changes
Jan 5, 2026
Contributor
Author
|
@Mergifyio queue |
✅ The pull request has been merged automaticallyDetailsThe pull request has been merged automatically at 77e5bb7 |
Merge Queue Status✅ The pull request has been merged at f5d983a This pull request spent 39 minutes 8 seconds in the queue, including 43 minutes 42 seconds running CI. Required conditions to merge
|
This was referenced Jan 5, 2026
87 tasks
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
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.
Closes https://github.com/zama-ai/fhevm-internal/issues/825
I reduce the usage of the
pick_free_portfn as much as possible, because I suspect it to be responsible for port collisions in integration tests due to race conditions (see our slack discussion for more details).I still use this fn for healthcheck tests, because it is more convenient this way, and these tests are run "alone", so I think the race condition is less likely to happen.