{ipn,control/controlclient}/tests: pass a logf function to control.New().

This matches the new API requirements.

Signed-off-by: Avery Pennarun <apenwarr@tailscale.com>
reviewable/pr386/r1
Avery Pennarun 5 years ago
parent 9ccbcda612
commit a7edf11a40

@ -1036,7 +1036,7 @@ func newServer(t *testing.T) *server {
s.control.ServeHTTP(w, r) s.control.ServeHTTP(w, r)
} }
})) }))
s.control, err = control.New(tmpdir, tmpdir, tmpdir, s.http.URL, true) s.control, err = control.New(tmpdir, tmpdir, tmpdir, s.http.URL, true, t.Logf)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

@ -45,7 +45,7 @@ func TestClientsReusingKeys(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
server, err = control.New(tmpdir, tmpdir, tmpdir, httpsrv.URL, true) server, err = control.New(tmpdir, tmpdir, tmpdir, httpsrv.URL, true, t.Logf)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -191,7 +191,7 @@ func TestClientsReusingOldKey(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
server, err = control.New(tmpdir, tmpdir, tmpdir, httpsrv.URL, true) server, err = control.New(tmpdir, tmpdir, tmpdir, httpsrv.URL, true, t.Logf)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

@ -66,7 +66,7 @@ func TestIPN(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("create tempdir: %v\n", err) t.Fatalf("create tempdir: %v\n", err)
} }
ctl, err = control.New(tmpdir, tmpdir, tmpdir, serverURL, true) ctl, err = control.New(tmpdir, tmpdir, tmpdir, serverURL, true, t.Logf)
if err != nil { if err != nil {
t.Fatalf("create control server: %v\n", ctl) t.Fatalf("create control server: %v\n", ctl)
} }

Loading…
Cancel
Save