From ed2169ae997704cbecb59ff55544e2d9c7ce6cbc Mon Sep 17 00:00:00 2001 From: Josh Bleecher Snyder Date: Fri, 15 Jan 2021 18:19:20 -0800 Subject: [PATCH] wgengine/magicsock: prevent logging after TestActiveDiscovery completes --- wgengine/magicsock/magicsock_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wgengine/magicsock/magicsock_test.go b/wgengine/magicsock/magicsock_test.go index e2922a210..73d5f1468 100644 --- a/wgengine/magicsock/magicsock_test.go +++ b/wgengine/magicsock/magicsock_test.go @@ -835,11 +835,13 @@ func testActiveDiscovery(t *testing.T, d *devices) { setT(t) start := time.Now() - logf := func(msg string, args ...interface{}) { + wlogf := func(msg string, args ...interface{}) { t.Helper() msg = fmt.Sprintf("%s: %s", time.Since(start).Truncate(time.Microsecond), msg) tlogf(msg, args...) } + logf, closeLogf := logger.LogfCloser(wlogf) + defer closeLogf() derpMap, cleanup := runDERPAndStun(t, logf, d.stun, d.stunIP) defer cleanup()