TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-08-14 23:17:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

all: update tests to use tstest.MemLogger

Browse Source 
And give MemLogger a mutex, as one caller had, which does match the logf
contract better.

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick
2021-09-07 19:27:19 -07:00
committed by Brad Fitzpatrick
parent 48bdffd395
commit 640134421e
6 changed files with 17 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
net/portmapper/upnp_test.go
View File

@@ -5,7 +5,6 @@
package portmapper
import (
"bytes"
"context"
"fmt"
"io"
@@ -17,6 +16,7 @@ import (
"testing"
"inet.af/netaddr"
"tailscale.com/tstest"
)
// Google Wifi
@@ -97,12 +97,8 @@ func TestGetUPnPClient(t *testing.T) {
}))
defer ts.Close()
gw, _ := netaddr.FromStdIP(ts.Listener.Addr().(*net.TCPAddr).IP)
var logBuf bytes.Buffer
logf := func(format string, a ...interface{}) {
fmt.Fprintf(&logBuf, format, a...)
logBuf.WriteByte('\n')
}
c, err := getUPnPClient(context.Background(), logf, gw, uPnPDiscoResponse{
var logBuf tstest.MemLogger
c, err := getUPnPClient(context.Background(), logBuf.Logf, gw, uPnPDiscoResponse{
Location: ts.URL + "/rootDesc.xml",
})
if err != nil {