controlclient, ipn: fix tests for new control param

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)
 	}

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)
 	}

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)
 	}