Skip to content

Commit 59ca3e0

Browse files
kylecarbskylecarbs
committed
Fix startup script test
1 parent 8c289e5 commit 59ca3e0

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

‎agent/agent_test.go

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func TestAgent(t *testing.T) {
6161
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
6262
defer cancel()
6363

64-
conn, stats := setupAgent(t, codersdk.WorkspaceAgentMetadata{}, 0)
64+
conn, stats, _ := setupAgent(t, codersdk.WorkspaceAgentMetadata{}, 0)
6565

6666
sshClient, err := conn.SSHClient(ctx)
6767
require.NoError(t, err)
@@ -81,7 +81,7 @@ func TestAgent(t *testing.T) {
8181
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
8282
defer cancel()
8383

84-
conn, stats := setupAgent(t, codersdk.WorkspaceAgentMetadata{}, 0)
84+
conn, stats, _ := setupAgent(t, codersdk.WorkspaceAgentMetadata{}, 0)
8585

8686
ptyConn, err := conn.ReconnectingPTY(ctx, uuid.NewString(), 128, 128, "/bin/bash")
8787
require.NoError(t, err)
@@ -231,7 +231,7 @@ func TestAgent(t *testing.T) {
231231
if runtime.GOOS == "windows" {
232232
home = "/" + strings.ReplaceAll(home, "\\", "/")
233233
}
234-
conn, _ := setupAgent(t, codersdk.WorkspaceAgentMetadata{}, 0)
234+
conn, _, _ := setupAgent(t, codersdk.WorkspaceAgentMetadata{}, 0)
235235
sshClient, err := conn.SSHClient(ctx)
236236
require.NoError(t, err)
237237
defer sshClient.Close()
@@ -261,7 +261,7 @@ func TestAgent(t *testing.T) {
261261
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
262262
defer cancel()
263263

264-
conn, _ := setupAgent(t, codersdk.WorkspaceAgentMetadata{}, 0)
264+
conn, _, _ := setupAgent(t, codersdk.WorkspaceAgentMetadata{}, 0)
265265
sshClient, err := conn.SSHClient(ctx)
266266
require.NoError(t, err)
267267
defer sshClient.Close()
@@ -362,13 +362,13 @@ func TestAgent(t *testing.T) {
362362
t.Parallel()
363363
tempPath := filepath.Join(t.TempDir(), "content.txt")
364364
content := "somethingnice"
365-
setupAgent(t, codersdk.WorkspaceAgentMetadata{
365+
_, _, fs := setupAgent(t, codersdk.WorkspaceAgentMetadata{
366366
StartupScript: fmt.Sprintf("echo %s> %s", content, tempPath),
367367
}, 0)
368368

369369
var gotContent string
370370
require.Eventually(t, func() bool {
371-
content, err := os.ReadFile(tempPath)
371+
content, err := afero.ReadFile(fs, tempPath)
372372
if err != nil {
373373
t.Logf("read file %q: %s", tempPath, err)
374374
return false
@@ -402,7 +402,7 @@ func TestAgent(t *testing.T) {
402402
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
403403
defer cancel()
404404

405-
conn, _ := setupAgent(t, codersdk.WorkspaceAgentMetadata{}, 0)
405+
conn, _, _ := setupAgent(t, codersdk.WorkspaceAgentMetadata{}, 0)
406406
id := uuid.NewString()
407407
netConn, err := conn.ReconnectingPTY(ctx, id, 100, 100, "/bin/bash")
408408
require.NoError(t, err)
@@ -499,7 +499,7 @@ func TestAgent(t *testing.T) {
499499
}
500500
}()
501501

502-
conn, _ := setupAgent(t, codersdk.WorkspaceAgentMetadata{}, 0)
502+
conn, _, _ := setupAgent(t, codersdk.WorkspaceAgentMetadata{}, 0)
503503
require.True(t, conn.AwaitReachable(context.Background()))
504504
conn1, err := conn.DialContext(context.Background(), l.Addr().Network(), l.Addr().String())
505505
require.NoError(t, err)
@@ -520,7 +520,7 @@ func TestAgent(t *testing.T) {
520520
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
521521
defer cancel()
522522
derpMap := tailnettest.RunDERPAndSTUN(t)
523-
conn, _ := setupAgent(t, codersdk.WorkspaceAgentMetadata{
523+
conn, _, _ := setupAgent(t, codersdk.WorkspaceAgentMetadata{
524524
DERPMap: derpMap,
525525
}, 0)
526526
defer conn.Close()
@@ -603,7 +603,7 @@ func TestAgent(t *testing.T) {
603603
}
604604

605605
func setupSSHCommand(t *testing.T, beforeArgs []string, afterArgs []string) *exec.Cmd {
606-
agentConn, _ := setupAgent(t, codersdk.WorkspaceAgentMetadata{}, 0)
606+
agentConn, _, _ := setupAgent(t, codersdk.WorkspaceAgentMetadata{}, 0)
607607
listener, err := net.Listen("tcp", "127.0.0.1:0")
608608
require.NoError(t, err)
609609
waitGroup := sync.WaitGroup{}
@@ -646,7 +646,7 @@ func setupSSHCommand(t *testing.T, beforeArgs []string, afterArgs []string) *exe
646646
func setupSSHSession(t *testing.T, options codersdk.WorkspaceAgentMetadata) *ssh.Session {
647647
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
648648
defer cancel()
649-
conn, _ := setupAgent(t, options, 0)
649+
conn, _, _ := setupAgent(t, options, 0)
650650
sshClient, err := conn.SSHClient(ctx)
651651
require.NoError(t, err)
652652
t.Cleanup(func() {
@@ -666,13 +666,15 @@ func (c closeFunc) Close() error {
666666
func setupAgent(t *testing.T, metadata codersdk.WorkspaceAgentMetadata, ptyTimeout time.Duration) (
667667
*codersdk.AgentConn,
668668
<-chan *codersdk.AgentStats,
669+
afero.Fs,
669670
) {
670671
if metadata.DERPMap == nil {
671672
metadata.DERPMap = tailnettest.RunDERPAndSTUN(t)
672673
}
673674
coordinator := tailnet.NewCoordinator()
674675
agentID := uuid.New()
675676
statsCh := make(chan *codersdk.AgentStats)
677+
fs := afero.NewMemMapFs()
676678
closer := agent.New(agent.Options{
677679
Client: &client{
678680
t: t,
@@ -681,7 +683,7 @@ func setupAgent(t *testing.T, metadata codersdk.WorkspaceAgentMetadata, ptyTimeo
681683
statsChan: statsCh,
682684
coordinator: coordinator,
683685
},
684-
Filesystem: afero.NewMemMapFs(),
686+
Filesystem: fs,
685687
Logger: slogtest.Make(t, nil).Leveled(slog.LevelDebug),
686688
ReconnectingPTYTimeout: ptyTimeout,
687689
})
@@ -707,7 +709,7 @@ func setupAgent(t *testing.T, metadata codersdk.WorkspaceAgentMetadata, ptyTimeo
707709
conn.SetNodeCallback(sendNode)
708710
return &codersdk.AgentConn{
709711
Conn: conn,
710-
}, statsCh
712+
}, statsCh, fs
711713
}
712714

713715
var dialTestPayload = []byte("dean-was-here123")

0 commit comments

Comments
 (0)