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

@@ -20,16 +20,13 @@ import (
"testing"
"tailscale.com/tailcfg"
"tailscale.com/tstest"
)
type peerAPITestEnv struct {
ph *peerAPIHandler
rr *httptest.ResponseRecorder
logBuf bytes.Buffer
}
func (e *peerAPITestEnv) logf(format string, a ...interface{}) {
fmt.Fprintf(&e.logBuf, format, a...)
logBuf tstest.MemLogger
}
type check func(*testing.T, *peerAPITestEnv)
@@ -403,7 +400,7 @@ func TestHandlePeerAPI(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
var e peerAPITestEnv
lb := &LocalBackend{
logf: e.logf,
logf: e.logBuf.Logf,
capFileSharing: tt.capSharing,
}
e.ph = &peerAPIHandler{