lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

control/controlclient: also rename HTTPC in the tests

reviewable/pr331/r1
Brad Fitzpatrick 2020-04-26 07:51:54 -07:00
parent eb6de2bd88
commit 95a658e1e3
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
control/controlclient/auto_test.go
View File

@ -1089,9 +1089,9 @@ func (s *server) newClientWithKey(t *testing.T, name, authKey string) *client {
hi.FrontendLogID = "go-test-only" hi.FrontendLogID = "go-test-only"
hi.BackendLogID = "go-test-only" hi.BackendLogID = "go-test-only"
ctlc, err := NewNoStart(Options{ ctlc, err := NewNoStart(Options{
ServerURL: s.http.URL, ServerURL: s.http.URL,
HTTPC: httpc, HTTPTestClient: httpc,
TimeNow: s.control.TimeNow, TimeNow: s.control.TimeNow,
Logf: func(fmt string, args ...interface{}) { Logf: func(fmt string, args ...interface{}) {
t.Helper() t.Helper()
t.Logf(name+": "+fmt, args...) t.Logf(name+": "+fmt, args...)

12
control/controlclient/direct_test.go
View File

@ -51,8 +51,8 @@ func TestClientsReusingKeys(t *testing.T) {
hi.FrontendLogID = "go-test-only" hi.FrontendLogID = "go-test-only"
hi.BackendLogID = "go-test-only" hi.BackendLogID = "go-test-only"
c1, err := NewDirect(Options{ c1, err := NewDirect(Options{
ServerURL: httpsrv.URL, ServerURL: httpsrv.URL,
HTTPC: httpsrv.Client(), HTTPTestClient: httpsrv.Client(),
//TimeNow: s.control.TimeNow, //TimeNow: s.control.TimeNow,
Logf: func(fmt string, args ...interface{}) { Logf: func(fmt string, args ...interface{}) {
t.Helper() t.Helper()
@ -92,8 +92,8 @@ func TestClientsReusingKeys(t *testing.T) {
} }
c2, err := NewDirect(Options{ c2, err := NewDirect(Options{
ServerURL: httpsrv.URL, ServerURL: httpsrv.URL,
HTTPC: httpsrv.Client(), HTTPTestClient: httpsrv.Client(),
Logf: func(fmt string, args ...interface{}) { Logf: func(fmt string, args ...interface{}) {
t.Helper() t.Helper()
t.Logf("c2: "+fmt, args...) t.Logf("c2: "+fmt, args...)
@ -159,8 +159,8 @@ func TestClientsReusingOldKey(t *testing.T) {
hi.BackendLogID = "go-test-only" hi.BackendLogID = "go-test-only"
genOpts := func() Options { genOpts := func() Options {
return Options{ return Options{
ServerURL: httpsrv.URL, ServerURL: httpsrv.URL,
HTTPC: httpc, HTTPTestClient: httpc,
//TimeNow: s.control.TimeNow, //TimeNow: s.control.TimeNow,
Logf: func(fmt string, args ...interface{}) { Logf: func(fmt string, args ...interface{}) {
t.Helper() t.Helper()