TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/portmapper: deflake TestPCPIntegration

Browse Source 
Logging in goroutines after the test completed
caused data races and panics. Prevent that.

Signed-off-by: Josh Bleecher Snyder <josh@tailscale.com>
This commit is contained in:
Josh Bleecher Snyder 2021-12-01 10:02:15 -08:00 committed by Josh Bleecher Snyder
parent 49a9e62d58
commit 2075c39fd7
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/portmapper/igd_test.go
View File

@ -63,11 +63,18 @@ type igdCounters struct {
func NewTestIGD(logf logger.Logf, t TestIGDOptions) (*TestIGD, error) { func NewTestIGD(logf logger.Logf, t TestIGDOptions) (*TestIGD, error) {
d := &TestIGD{ d := &TestIGD{
logf: logf,
doPMP: t.PMP, doPMP: t.PMP,
doPCP: t.PCP, doPCP: t.PCP,
doUPnP: t.UPnP, doUPnP: t.UPnP,
} }
d.logf = func(msg string, args ...interface{}) {
// Don't log after the device has closed;
// stray trailing logging angers testing.T.Logf.
if d.closed.Get() {
return
}
logf(msg, args...)
}
var err error var err error
if d.upnpConn, err = testListenUDP(); err != nil { if d.upnpConn, err = testListenUDP(); err != nil {
return nil, err return nil, err