TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-26 03:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

control/controlclient: fix a very rare httptest.Server log.Printf.

Browse Source 
Signed-off-by: Avery Pennarun <apenwarr@tailscale.com>
This commit is contained in:
Avery Pennarun 2020-05-14 01:08:05 -04:00
parent fc88e34f42
commit 286f96e412
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
control/controlclient/auto_test.go
View File

@ -30,6 +30,7 @@
"github.com/tailscale/wireguard-go/wgcfg" "github.com/tailscale/wireguard-go/wgcfg"
"tailscale.com/tailcfg" "tailscale.com/tailcfg"
"tailscale.com/tstest" "tailscale.com/tstest"
"tailscale.com/types/logger"
"tailscale.io/control" // not yet released "tailscale.io/control" // not yet released
"tailscale.io/control/cfgdb" "tailscale.io/control/cfgdb"
) )
@ -1039,6 +1040,8 @@ func newServer(t *testing.T) *server {
s.control.ServeHTTP(w, r) s.control.ServeHTTP(w, r)
} }
})) }))
s.http.Config.ErrorLog = logger.StdLogger(logf)
s.control, err = control.New(tmpdir, tmpdir, tmpdir, s.http.URL, true, logf) s.control, err = control.New(tmpdir, tmpdir, tmpdir, s.http.URL, true, logf)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)