TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-01-07 08:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

controlclient, ipn: fix tests for new control param

Browse Source
This commit is contained in:
David Crawshaw 2020-03-18 08:35:28 +11:00
parent e085aec8ef
commit 5a0822eefd
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
control/controlclient/auto_test.go
View File

@ -945,7 +945,7 @@ func newServer(t *testing.T) *server {
s.control.ServeHTTP(w, r) 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 { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

4
control/controlclient/direct_test.go
View File

@ -30,7 +30,7 @@ func TestClientsReusingKeys(t *testing.T) {
httpsrv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { httpsrv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
server.ServeHTTP(w, r) server.ServeHTTP(w, r)
})) }))
server, err = control.New(tmpdir, httpsrv.URL, true) server, err = control.New(tmpdir, tmpdir, httpsrv.URL, true)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -132,7 +132,7 @@ func TestClientsReusingOldKey(t *testing.T) {
httpsrv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { httpsrv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
server.ServeHTTP(w, r) server.ServeHTTP(w, r)
})) }))
server, err = control.New(tmpdir, httpsrv.URL, true) server, err = control.New(tmpdir, tmpdir, httpsrv.URL, true)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

2
ipn/e2e_test.go
View File

@ -52,7 +52,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, serverURL, true) ctl, err = control.New(tmpdir, tmpdir, serverURL, true)
if err != nil { if err != nil {
t.Fatalf("create control server: %v\n", ctl) t.Fatalf("create control server: %v\n", ctl)
} }