all: update tests to use tstest.MemLogger

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

View File

@@ -5,14 +5,13 @@
package dns
import (
"bytes"
"errors"
"fmt"
"io/fs"
"os"
"strings"
"testing"
"tailscale.com/tstest"
"tailscale.com/util/cmpver"
)
@@ -146,12 +145,8 @@ func TestLinuxDNSMode(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
var logBuf bytes.Buffer
logf := func(format string, a ...interface{}) {
fmt.Fprintf(&logBuf, format, a...)
logBuf.WriteByte('\n')
}
got, err := dnsMode(logf, tt.env)
var logBuf tstest.MemLogger
got, err := dnsMode(logBuf.Logf, tt.env)
if err != nil {
t.Fatal(err)
}

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 {