From 5668de272c4e0fb5fda061564a297c7d530193bc Mon Sep 17 00:00:00 2001
From: James Sanderson <jsanderson@tailscale.com>
Date: Fri, 21 Mar 2025 11:56:48 +0000
Subject: [PATCH] tsnet: use test logger for testcontrol and node logs

Updates #cleanup

Signed-off-by: James Sanderson <jsanderson@tailscale.com>
---
 tsnet/tsnet_test.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tsnet/tsnet_test.go b/tsnet/tsnet_test.go
index 4b73707c9..d00628453 100644
--- a/tsnet/tsnet_test.go
+++ b/tsnet/tsnet_test.go
@@ -120,6 +120,7 @@ func startControl(t *testing.T) (controlURL string, control *testcontrol.Server)
 			Proxied: true,
 		},
 		MagicDNSDomain: "tail-scale.ts.net",
+		Logf:           t.Logf,
 	}
 	control.HTTPTestServer = httptest.NewUnstartedServer(control)
 	control.HTTPTestServer.Start()
@@ -221,7 +222,7 @@ func startServer(t *testing.T, ctx context.Context, controlURL, hostname string)
 		getCertForTesting: testCertRoot.getCert,
 	}
 	if *verboseNodes {
-		s.Logf = log.Printf
+		s.Logf = t.Logf
 	}
 	t.Cleanup(func() { s.Close() })