From a7edf11a4003d28244fdc37a0d1cfc9ed6020fcb Mon Sep 17 00:00:00 2001 From: Avery Pennarun Date: Wed, 13 May 2020 22:43:47 -0400 Subject: [PATCH] {ipn,control/controlclient}/tests: pass a logf function to control.New(). This matches the new API requirements. Signed-off-by: Avery Pennarun --- control/controlclient/auto_test.go | 2 +- control/controlclient/direct_test.go | 4 ++-- ipn/e2e_test.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/control/controlclient/auto_test.go b/control/controlclient/auto_test.go index ef40620f8..1483c87cf 100644 --- a/control/controlclient/auto_test.go +++ b/control/controlclient/auto_test.go @@ -1036,7 +1036,7 @@ func newServer(t *testing.T) *server { 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 { t.Fatal(err) } diff --git a/control/controlclient/direct_test.go b/control/controlclient/direct_test.go index 3dd744c28..ec01fdebe 100644 --- a/control/controlclient/direct_test.go +++ b/control/controlclient/direct_test.go @@ -45,7 +45,7 @@ func TestClientsReusingKeys(t *testing.T) { 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 { t.Fatal(err) } @@ -191,7 +191,7 @@ func TestClientsReusingOldKey(t *testing.T) { if err != nil { 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 { t.Fatal(err) } diff --git a/ipn/e2e_test.go b/ipn/e2e_test.go index ac652b11e..6accd8785 100644 --- a/ipn/e2e_test.go +++ b/ipn/e2e_test.go @@ -66,7 +66,7 @@ func TestIPN(t *testing.T) { if err != nil { 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 { t.Fatalf("create control server: %v\n", ctl) }