TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 13:05:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This matches the new API requirements.

Signed-off-by: Avery Pennarun <apenwarr@tailscale.com>
This commit is contained in:
Avery Pennarun 2020-05-13 22:43:47 -04:00
parent 9ccbcda612
commit a7edf11a40
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

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

4
control/controlclient/direct_test.go
View File

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

2
ipn/e2e_test.go
View File

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