fix coderd test

mafredri · mafredri · commit a8e4495d9656 · 2025-06-06T15:04:40.000Z
diff --git a/coderd/workspaceagents_test.go b/coderd/workspaceagents_test.go
@@ -1397,14 +1397,15 @@ func TestWorkspaceAgentRecreateDevcontainer(t *testing.T) {
 				agentcontainers.DevcontainerConfigFileLabel:  configFile,
 			}
 			devContainer = codersdk.WorkspaceAgentContainer{
-				ID:                uuid.NewString(),
-				CreatedAt:         dbtime.Now(),
-				FriendlyName:      testutil.GetRandomName(t),
-				Image:             "busybox:latest",
-				Labels:            dcLabels,
-				Running:           true,
-				Status:            "running",
-				DevcontainerDirty: true,
+				ID:                 uuid.NewString(),
+				CreatedAt:          dbtime.Now(),
+				FriendlyName:       testutil.GetRandomName(t),
+				Image:              "busybox:latest",
+				Labels:             dcLabels,
+				Running:            true,
+				Status:             "running",
+				DevcontainerDirty:  true,
+				DevcontainerStatus: codersdk.WorkspaceAgentDevcontainerStatusRunning,
 			}
 			plainContainer = codersdk.WorkspaceAgentContainer{
 				ID:           uuid.NewString(),
@@ -1419,14 +1420,15 @@ func TestWorkspaceAgentRecreateDevcontainer(t *testing.T) {
 
 		for _, tc := range []struct {
 			name      string
-			setupMock func(*acmock.MockContainerCLI, *acmock.MockDevcontainerCLI) (status int)
+			setupMock func(mcl *acmock.MockContainerCLI, mdccli *acmock.MockDevcontainerCLI) (status int)
 		}{
 			{
 				name: "Recreate",
 				setupMock: func(mcl *acmock.MockContainerCLI, mdccli *acmock.MockDevcontainerCLI) int {
 					mcl.EXPECT().List(gomock.Any()).Return(codersdk.WorkspaceAgentListContainersResponse{
 						Containers: []codersdk.WorkspaceAgentContainer{devContainer},
 					}, nil).AnyTimes()
+					mcl.EXPECT().DetectArchitecture(gomock.Any(), devContainer.ID).Return("<none>", nil).AnyTimes() // Prevent agent injection via incompatible architecture.
 					mdccli.EXPECT().Up(gomock.Any(), workspaceFolder, configFile, gomock.Any()).Return("someid", nil).Times(1)
 					return 0
 				},
@@ -1452,9 +1454,9 @@ func TestWorkspaceAgentRecreateDevcontainer(t *testing.T) {
 				t.Parallel()
 
 				ctrl := gomock.NewController(t)
-				mcl := acmock.NewMockContainerCLI(ctrl)
+				mccli := acmock.NewMockContainerCLI(ctrl)
 				mdccli := acmock.NewMockDevcontainerCLI(ctrl)
-				wantStatus := tc.setupMock(mcl, mdccli)
+				wantStatus := tc.setupMock(mccli, mdccli)
 				logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}).Leveled(slog.LevelDebug)
 				client, db := coderdtest.NewWithDatabase(t, &coderdtest.Options{
 					Logger: &logger,
@@ -1471,7 +1473,7 @@ func TestWorkspaceAgentRecreateDevcontainer(t *testing.T) {
 					o.ExperimentalDevcontainersEnabled = true
 					o.ContainerAPIOptions = append(
 						o.ContainerAPIOptions,
-						agentcontainers.WithContainerCLI(mcl),
+						agentcontainers.WithContainerCLI(mccli),
 						agentcontainers.WithDevcontainerCLI(mdccli),
 						agentcontainers.WithWatcher(watcher.NewNoop()),
 					)
