From 5a0822eefde0b908449498b5c9a4eef2ff4f558b Mon Sep 17 00:00:00 2001 From: David Crawshaw Date: Wed, 18 Mar 2020 08:35:28 +1100 Subject: [PATCH] controlclient, ipn: fix tests for new control param --- 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 1f08045cf..e86995e1d 100644 --- a/control/controlclient/auto_test.go +++ b/control/controlclient/auto_test.go @@ -945,7 +945,7 @@ func newServer(t *testing.T) *server { s.control.ServeHTTP(w, r) } })) - s.control, err = control.New(tmpdir, s.http.URL, true) + s.control, err = control.New(tmpdir, tmpdir, s.http.URL, true) if err != nil { t.Fatal(err) } diff --git a/control/controlclient/direct_test.go b/control/controlclient/direct_test.go index 4946be441..799b72c75 100644 --- a/control/controlclient/direct_test.go +++ b/control/controlclient/direct_test.go @@ -30,7 +30,7 @@ func TestClientsReusingKeys(t *testing.T) { httpsrv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { server.ServeHTTP(w, r) })) - server, err = control.New(tmpdir, httpsrv.URL, true) + server, err = control.New(tmpdir, tmpdir, httpsrv.URL, true) if err != nil { t.Fatal(err) } @@ -132,7 +132,7 @@ func TestClientsReusingOldKey(t *testing.T) { httpsrv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { server.ServeHTTP(w, r) })) - server, err = control.New(tmpdir, httpsrv.URL, true) + server, err = control.New(tmpdir, tmpdir, httpsrv.URL, true) if err != nil { t.Fatal(err) } diff --git a/ipn/e2e_test.go b/ipn/e2e_test.go index 4dcbd2719..a9a7202cd 100644 --- a/ipn/e2e_test.go +++ b/ipn/e2e_test.go @@ -52,7 +52,7 @@ func TestIPN(t *testing.T) { if err != nil { t.Fatalf("create tempdir: %v\n", err) } - ctl, err = control.New(tmpdir, serverURL, true) + ctl, err = control.New(tmpdir, tmpdir, serverURL, true) if err != nil { t.Fatalf("create control server: %v\n", ctl) }