fix(agent/agentcontainers): filter out "is test run" devcontainers #18568
+31
−1
Conversation
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
Contributor
There was a problem hiding this comment.
Pull Request Overview
Adds support to exclude devcontainers marked as test runs by introducing a new label and adjusting the filtering logic, along with tests to verify this behavior.
- Introduce
DevcontainerIsTestRunLabelconstant - Update
processUpdatedContainersLockedto handle the new test-run label - Add test cases that include containers labeled as test runs
Reviewed Changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| agent/agentcontainers/devcontainer.go | Define DevcontainerIsTestRunLabel constant |
| agent/agentcontainers/api.go | Modify include/filter logic to account for the test-run label |
| agent/agentcontainers/api_test.go | Insert test cases for containers with DevcontainerIsTestRunLabel |
|
|
||
| if len(api.containerLabelIncludeFilter) > 0 { | ||
| // Filter out devcontainer tests, unless explicitly set in include filters. | ||
| if len(api.containerLabelIncludeFilter) > 0 || container.Labels[DevcontainerIsTestRunLabel] == "true" { |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
agent/agentcontainers/api_test.go
Outdated
Comment on lines
797
to
804
| ID: "test-container-1", | ||
| FriendlyName: "test-container-1", | ||
| Running: true, | ||
| Labels: map[string]string{ | ||
| agentcontainers.DevcontainerLocalFolderLabel: "/workspace/test1", | ||
| agentcontainers.DevcontainerConfigFileLabel: "/workspace/test1/.devcontainer/devcontainer.json", | ||
| agentcontainers.DevcontainerIsTestRunLabel: "true", | ||
| }, |
There was a problem hiding this comment.
[nitpick] The test block for a test-container-1 with DevcontainerIsTestRunLabel is duplicated across multiple test cases. Consider extracting this repeated setup into a helper function or shared test data to reduce duplication.
Suggested change
| ID: "test-container-1", | |
| FriendlyName: "test-container-1", | |
| Running: true, | |
| Labels: map[string]string{ | |
| agentcontainers.DevcontainerLocalFolderLabel: "/workspace/test1", | |
| agentcontainers.DevcontainerConfigFileLabel: "/workspace/test1/.devcontainer/devcontainer.json", | |
| agentcontainers.DevcontainerIsTestRunLabel: "true", | |
| }, | |
| getTestContainer1(), |
johnstcn
approved these changes
Jun 25, 2025
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This change filters out
"devcontainer.is_test_run"devcontainers, a label set by@devconainters/cliwhen running tests.Related #18545