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

wgengine/magicsock: prevent log-after-test in TestTwoDevicePing

Browse Source
This commit is contained in:
Josh Bleecher Snyder 2021-01-19 11:04:17 -08:00
parent edce91a8a6
commit e4c075cd95
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wgengine/magicsock/magicsock_test.go
View File

@ -896,7 +896,10 @@ func testTwoDevicePing(t *testing.T, d *devices) {
// This gets reassigned inside every test, so that the connections // This gets reassigned inside every test, so that the connections
// all log using the "current" t.Logf function. Sigh. // all log using the "current" t.Logf function. Sigh.
logf, setT := makeNestable(t) nestedLogf, setT := makeNestable(t)
logf, closeLogf := logger.LogfCloser(nestedLogf)
defer closeLogf()
derpMap, cleanup := runDERPAndStun(t, logf, d.stun, d.stunIP) derpMap, cleanup := runDERPAndStun(t, logf, d.stun, d.stunIP)
defer cleanup() defer cleanup()