Jun 12, 2025 · Jun 12, 2025 · Jun 12, 2025 · Jun 12, 2025 · Jun 12, 2025 · Jun 12, 2025
diff --git a/agent/agentcontainers/devcontainercli_test.go b/agent/agentcontainers/devcontainercli_test.go
 assert.NotEmpty(t, outBuf.String(), "stdout buffer should not be empty for exec with log file")
 assert.Empty(t, errBuf.String(), "stderr buffer should be empty")
 })

 t.Run("ReadConfig", func(t *testing.T) {
 t.Parallel()

 // Buffers to capture stdout and stderr.
 outBuf := &bytes.Buffer{}
 errBuf := &bytes.Buffer{}

 // Simulate CLI execution with a read-config-success.log file.
 wantArgs := "read-configuration --workspace-folder /test/workspace --config /test/config.json"
 testExecer := &testDevcontainerExecer{
 testExePath: testExePath,
 wantArgs:    wantArgs,
 wantError:   false,
 logFile:     filepath.Join("testdata", "devcontainercli", "readconfig", "read-config-success.log"),
 }
 logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}).Leveled(slog.LevelDebug)
 dccli := agentcontainers.NewDevcontainerCLI(logger, testExecer)

 // Call ReadConfig with WithReadConfigOutput to capture CLI logs.
 ctx := testutil.Context(t, testutil.WaitMedium)
 config, err := dccli.ReadConfig(ctx, "/test/workspace", "/test/config.json", agentcontainers.WithReadConfigOutput(outBuf, errBuf))
 require.NoError(t, err, "ReadConfig should succeed")
 require.NotEmpty(t, config.Configuration.Customizations, "expected non-empty customizations")

 // Read expected log content.
 expLog, err := os.ReadFile(filepath.Join("testdata", "devcontainercli", "readconfig", "read-config-success.log"))
 require.NoError(t, err, "reading expected log file")

 // Verify stdout buffer contains the CLI logs and stderr is empty.
 assert.Equal(t, string(expLog), outBuf.String(), "stdout buffer should match CLI logs")
 assert.Empty(t, errBuf.String(), "stderr buffer should be empty on success")
 })
 }

 // testDevcontainerExecer implements the agentexec.Execer interface for testing.
diff --git a/agent/agentcontainers/subagent_test.go b/agent/agentcontainers/subagent_test.go
 import (
 "testing"

 "github.com/google/uuid"
 "github.com/stretchr/testify/require"

 "github.com/coder/coder/v2/agent/agentcontainers"
 "github.com/coder/coder/v2/agent/agenttest"
 "github.com/coder/coder/v2/agent/proto"
 agentproto "github.com/coder/coder/v2/agent/proto"
 "github.com/coder/coder/v2/codersdk"
 "github.com/coder/coder/v2/codersdk/agentsdk"
 "github.com/coder/coder/v2/tailnet"
 "github.com/coder/coder/v2/testutil"
 "github.com/google/uuid"
 "github.com/stretchr/testify/require"
 )

 func TestSubAgentClient_CreateWithDisplayApps(t *testing.T) {

 ctx := testutil.Context(t, testutil.WaitShort)
 logger := testutil.Logger(t)
 statsCh := make(chan *proto.Stats)
 statsCh := make(chan *agentproto.Stats)

 agentAPI := agenttest.NewClient(t, logger, uuid.New(), agentsdk.Manifest{}, statsCh, tailnet.NewCoordinator(logger))

 })
 }
 })

 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -400,39 +400,6 @@ func TestDevcontainerCLI_WithOutput(t *testing.T) {
		assert.NotEmpty(t, outBuf.String(), "stdout buffer should not be empty for exec with log file")
		assert.Empty(t, errBuf.String(), "stderr buffer should be empty")
		})

		t.Run("ReadConfig", func(t *testing.T) {
		t.Parallel()

		// Buffers to capture stdout and stderr.
		outBuf := &bytes.Buffer{}
		errBuf := &bytes.Buffer{}

		// Simulate CLI execution with a read-config-success.log file.
		wantArgs := "read-configuration --workspace-folder /test/workspace --config /test/config.json"
		testExecer := &testDevcontainerExecer{
		testExePath: testExePath,
		wantArgs: wantArgs,
		wantError: false,
		logFile: filepath.Join("testdata", "devcontainercli", "readconfig", "read-config-success.log"),
		}
		logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}).Leveled(slog.LevelDebug)
		dccli := agentcontainers.NewDevcontainerCLI(logger, testExecer)

		// Call ReadConfig with WithReadConfigOutput to capture CLI logs.
		ctx := testutil.Context(t, testutil.WaitMedium)
		config, err := dccli.ReadConfig(ctx, "/test/workspace", "/test/config.json", agentcontainers.WithReadConfigOutput(outBuf, errBuf))
		require.NoError(t, err, "ReadConfig should succeed")
		require.NotEmpty(t, config.Configuration.Customizations, "expected non-empty customizations")

		// Read expected log content.
		expLog, err := os.ReadFile(filepath.Join("testdata", "devcontainercli", "readconfig", "read-config-success.log"))
		require.NoError(t, err, "reading expected log file")

		// Verify stdout buffer contains the CLI logs and stderr is empty.
		assert.Equal(t, string(expLog), outBuf.String(), "stdout buffer should match CLI logs")
		assert.Empty(t, errBuf.String(), "stderr buffer should be empty on success")
		})
		}

		// testDevcontainerExecer implements the agentexec.Execer interface for testing.
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,16 +3,16 @@ package agentcontainers_test
		import (
		"testing"

		"github.com/google/uuid"
		"github.com/stretchr/testify/require"

		"github.com/coder/coder/v2/agent/agentcontainers"
		"github.com/coder/coder/v2/agent/agenttest"
		"github.com/coder/coder/v2/agent/proto"
		agentproto "github.com/coder/coder/v2/agent/proto"
		"github.com/coder/coder/v2/codersdk"
		"github.com/coder/coder/v2/codersdk/agentsdk"
		"github.com/coder/coder/v2/tailnet"
		"github.com/coder/coder/v2/testutil"
		"github.com/google/uuid"
		"github.com/stretchr/testify/require"
		)

		func TestSubAgentClient_CreateWithDisplayApps(t *testing.T) {
Expand DownExpand Up		@@ -75,7 +75,7 @@ func TestSubAgentClient_CreateWithDisplayApps(t *testing.T) {

		ctx := testutil.Context(t, testutil.WaitShort)
		logger := testutil.Logger(t)
		statsCh := make(chan *proto.Stats)
		statsCh := make(chan *agentproto.Stats)

		agentAPI := agenttest.NewClient(t, logger, uuid.New(), agentsdk.Manifest{}, statsCh, tailnet.NewCoordinator(logger))

Expand All		@@ -102,5 +102,4 @@ func TestSubAgentClient_CreateWithDisplayApps(t *testing.T) {
		})
		}
		})

		}