Fix comments

kylecarbs · kylecarbs · commit 64993a09de55 · 2023-01-29T20:44:39.000Z
diff --git a/agent/agent.go b/agent/agent.go
@@ -455,7 +455,9 @@ func (a *agent) createTailnet(ctx context.Context, derpMap *tailcfg.DERPMap) (_
 			if err != nil {
 				continue
 			}
-			_ = a.handleReconnectingPTY(ctx, logger, msg, conn)
+			go func() {
+				_ = a.handleReconnectingPTY(ctx, logger, msg, conn)
+			}()
 		}
 	}); err != nil {
 		return nil, err
diff --git a/cli/ssh.go b/cli/ssh.go
@@ -471,8 +471,6 @@ fi
 
 test ! -S "$agent_socket"
 `)
-	fmt.Printf("Agent bytes %s\n", agentSocketBytes)
-
 	agentSocket := strings.TrimSpace(string(agentSocketBytes))
 	if err != nil {
 		return xerrors.Errorf("check if agent socket is running (check if %q exists): %w", agentSocket, err)
diff --git a/scaletest/reconnectingpty/run_test.go b/scaletest/reconnectingpty/run_test.go
@@ -22,7 +22,10 @@ import (
 
 func Test_Runner(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+	// There's a race condition in agent/agent.go where connections
+	// aren't closed when the Tailnet connection is. This causes the
+	// goroutines to hang around and cause the test to fail.
+	t.Skip("TODO: fix this test")
 
 	t.Run("OK", func(t *testing.T) {
 		t.Parallel()

Original file line number	Diff line number	Diff line change
`@@ -455,7 +455,9 @@ func (a agent) createTailnet(ctx context.Context, derpMap tailcfg.DERPMap) (_`
`455`	`455`	`if err != nil {`
`456`	`456`	`continue`
`457`	`457`	`}`
`458`		`- _ = a.handleReconnectingPTY(ctx, logger, msg, conn)`
	`458`	`+ go func() {`
	`459`	`+ _ = a.handleReconnectingPTY(ctx, logger, msg, conn)`
	`460`	`+ }()`
`459`	`461`	`}`
`460`	`462`	`}); err != nil {`
`461`	`463`	`return nil, err`