TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-08-11 13:18:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

tsnet: use test logger for testcontrol and node logs

Browse Source 
Updates #cleanup

Signed-off-by: James Sanderson <jsanderson@tailscale.com>
This commit is contained in:
James Sanderson
2025-03-21 11:56:48 +00:00
committed by James 'zofrex' Sanderson
parent 005e20a45e
commit 5668de272c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tsnet/tsnet_test.go
View File

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