fix(agent/agentcontainers): filter out "is a test" devcontainers

mafredri · mafredri · commit 14dc6691452d · 2025-06-25T10:29:15.000Z
diff --git a/agent/agentcontainers/api.go b/agent/agentcontainers/api.go
@@ -571,7 +571,8 @@ func (api *API) processUpdatedContainersLocked(ctx context.Context, updated code
 			slog.F("config_file", configFile),
 		)
 
-		if len(api.containerLabelIncludeFilter) > 0 {
+		// Filter out devcontainer tests, unless explicitly set in include filters.
+		if len(api.containerLabelIncludeFilter) > 0 || container.Labels[DevcontainerIsTestRunLabel] == "true" {
 			var ok bool
 			for label, value := range api.containerLabelIncludeFilter {
 				if v, found := container.Labels[label]; found && v == value {
diff --git a/agent/agentcontainers/api_test.go b/agent/agentcontainers/api_test.go
@@ -793,6 +793,16 @@ func TestAPI(t *testing.T) {
 									agentcontainers.DevcontainerConfigFileLabel:  "/workspace/runtime1/.devcontainer/devcontainer.json",
 								},
 							},
+							{
+								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",
+								},
+							},
 							{
 								ID:           "not-a-devcontainer",
 								FriendlyName: "not-a-devcontainer",
@@ -834,6 +844,16 @@ func TestAPI(t *testing.T) {
 									agentcontainers.DevcontainerLocalFolderLabel: "/workspace/runtime1",
 									agentcontainers.DevcontainerConfigFileLabel:  "/workspace/runtime1/.devcontainer/devcontainer.json",
 								},
+							},
+														{
+								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",
+								},
 							},
 						},
 					},
@@ -880,6 +900,16 @@ func TestAPI(t *testing.T) {
 									agentcontainers.DevcontainerLocalFolderLabel: "/workspace/non-running",
 									agentcontainers.DevcontainerConfigFileLabel:  "/workspace/non-running/.devcontainer/devcontainer.json",
 								},
+							},
+														{
+								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",
+								},
 							},
 						},
 					},
@@ -913,6 +943,16 @@ func TestAPI(t *testing.T) {
 									agentcontainers.DevcontainerLocalFolderLabel: "/workspace/known2",
 									agentcontainers.DevcontainerConfigFileLabel:  "/workspace/known2/.devcontainer/devcontainer.json",
 								},
+							},
+														{
+								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",
+								},
 							},
 						},
 					},
@@ -966,6 +1006,16 @@ func TestAPI(t *testing.T) {
 									agentcontainers.DevcontainerLocalFolderLabel: "/var/lib/project3",
 									agentcontainers.DevcontainerConfigFileLabel:  "/var/lib/project3/.devcontainer/devcontainer.json",
 								},
+							},
+														{
+								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",
+								},
 							},
 						},
 					},
diff --git a/agent/agentcontainers/devcontainer.go b/agent/agentcontainers/devcontainer.go
@@ -18,6 +18,9 @@ const (
 	// DevcontainerConfigFileLabel is the label that contains the path to
 	// the devcontainer.json configuration file.
 	DevcontainerConfigFileLabel = "devcontainer.config_file"
+	// DevcontainerIsTestRunLabel is set if the devcontainer is part of a test
+	// and should be excluded.
+	DevcontainerIsTestRunLabel = "devcontainer.is_test_run"
 	// The default workspace folder inside the devcontainer.
 	DevcontainerDefaultContainerWorkspaceFolder = "/workspaces"
 )

Original file line number	Diff line number	Diff line change
`@@ -571,7 +571,8 @@ func (api *API) processUpdatedContainersLocked(ctx context.Context, updated code`
`571`	`571`	`slog.F("config_file", configFile),`
`572`	`572`	`)`
`573`	`573`
`574`		`- if len(api.containerLabelIncludeFilter) > 0 {`
	`574`	`+ // Filter out devcontainer tests, unless explicitly set in include filters.`
	`575`	`+ if len(api.containerLabelIncludeFilter) > 0 \|\| container.Labels[DevcontainerIsTestRunLabel] == "true" {`
`575`	`576`	`var ok bool`
`576`	`577`	`for label, value := range api.containerLabelIncludeFilter {`
`577`	`578`	`if v, found := container.Labels[label]; found && v == value {`