linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use `t.Name()` instead of `t.Name` in tests (#3970) 

Use `t.Name()` instead of `t.Name` when retrieving the name of tests.
This was causing an error to be added in the log:
```
output: logrus_error="can not add field \"test\"
```

Followup to
[comment](https://github.com/linkerd/linkerd2/pull/3965#discussion_r370387990)
This commit is contained in:
Alejandro Pedraza 2020-01-27 09:17:19 -05:00 committed by GitHub
parent 91bc054449
commit afb93cddc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controller/api/destination/endpoint_translator_test.go
View File

@ -102,7 +102,7 @@ func makeEndpointTranslator(t *testing.T) (*mockDestinationGetServer, *endpointT
false,
"service-name.service-ns",
mockGetServer,
logging.WithField("test", t.Name),
logging.WithField("test", t.Name()),
)
return mockGetServer, translator
}

18
controller/api/destination/profile_translator_test.go
View File

@ -433,7 +433,7 @@ func TestProfileTranslator(t *testing.T) {
translator := &profileTranslator{
stream: mockGetProfileServer,
log: logging.WithField("test", t.Name),
log: logging.WithField("test", t.Name()),
}
translator.Update(profile)
@ -453,7 +453,7 @@ func TestProfileTranslator(t *testing.T) {
translator := &profileTranslator{
stream: mockGetProfileServer,
log: logging.WithField("test", t.Name),
log: logging.WithField("test", t.Name()),
}
translator.Update(multipleRequestMatches)
@ -473,7 +473,7 @@ func TestProfileTranslator(t *testing.T) {
translator := &profileTranslator{
stream: mockGetProfileServer,
log: logging.WithField("test", t.Name),
log: logging.WithField("test", t.Name()),
}
translator.Update(notEnoughRequestMatches)
@ -489,7 +489,7 @@ func TestProfileTranslator(t *testing.T) {
translator := &profileTranslator{
stream: mockGetProfileServer,
log: logging.WithField("test", t.Name),
log: logging.WithField("test", t.Name()),
}
translator.Update(multipleResponseMatches)
@ -509,7 +509,7 @@ func TestProfileTranslator(t *testing.T) {
translator := &profileTranslator{
stream: mockGetProfileServer,
log: logging.WithField("test", t.Name),
log: logging.WithField("test", t.Name()),
}
translator.Update(notEnoughResponseMatches)
@ -525,7 +525,7 @@ func TestProfileTranslator(t *testing.T) {
translator := &profileTranslator{
stream: mockGetProfileServer,
log: logging.WithField("test", t.Name),
log: logging.WithField("test", t.Name()),
}
translator.Update(invalidStatusRange)
@ -541,7 +541,7 @@ func TestProfileTranslator(t *testing.T) {
translator := &profileTranslator{
stream: mockGetProfileServer,
log: logging.WithField("test", t.Name),
log: logging.WithField("test", t.Name()),
}
translator.Update(oneSidedStatusRange)
@ -557,7 +557,7 @@ func TestProfileTranslator(t *testing.T) {
translator := &profileTranslator{
stream: mockGetProfileServer,
log: logging.WithField("test", t.Name),
log: logging.WithField("test", t.Name()),
}
translator.Update(nil)
@ -577,7 +577,7 @@ func TestProfileTranslator(t *testing.T) {
translator := &profileTranslator{
stream: mockGetProfileServer,
log: logging.WithField("test", t.Name),
log: logging.WithField("test", t.Name()),
}
translator.Update(profileWithTimeout)

2
controller/api/destination/server_test.go
View File

@ -97,7 +97,7 @@ spec:
if err != nil {
t.Fatalf("NewFakeAPI returned an error: %s", err)
}
log := logging.WithField("test", t.Name)
log := logging.WithField("test", t.Name())
k8sAPI.Sync()

2
controller/api/destination/watcher/endpoints_watcher_test.go
View File

@ -468,7 +468,7 @@ status:
t.Fatalf("NewFakeAPI returned an error: %s", err)
}
watcher := NewEndpointsWatcher(k8sAPI, logging.WithField("test", t.Name))
watcher := NewEndpointsWatcher(k8sAPI, logging.WithField("test", t.Name()))
k8sAPI.Sync()

4
controller/api/destination/watcher/ip_watcher_test.go
View File

@ -427,8 +427,8 @@ status:
t.Fatalf("NewFakeAPI returned an error: %s", err)
}
endpoints := NewEndpointsWatcher(k8sAPI, logging.WithField("test", t.Name))
watcher := NewIPWatcher(k8sAPI, endpoints, logging.WithField("test", t.Name))
endpoints := NewEndpointsWatcher(k8sAPI, logging.WithField("test", t.Name()))
watcher := NewIPWatcher(k8sAPI, endpoints, logging.WithField("test", t.Name()))
k8sAPI.Sync()

2
controller/api/destination/watcher/profile_watcher_test.go
View File

@ -72,7 +72,7 @@ spec:
t.Fatalf("NewFakeAPI returned an error: %s", err)
}
watcher := NewProfileWatcher(k8sAPI, logging.WithField("test", t.Name))
watcher := NewProfileWatcher(k8sAPI, logging.WithField("test", t.Name()))
k8sAPI.Sync()

2
controller/api/destination/watcher/traffic_split_watcher_test.go
View File

@ -85,7 +85,7 @@ spec:
t.Fatalf("NewFakeAPI returned an error: %s", err)
}
watcher := NewTrafficSplitWatcher(k8sAPI, logging.WithField("test", t.Name))
watcher := NewTrafficSplitWatcher(k8sAPI, logging.WithField("test", t.Name()))
k8sAPI.Sync()

2
controller/tap/handlers_test.go
View File

@ -54,7 +54,7 @@ func TestHandleTap(t *testing.T) {
h := &handler{
k8sAPI: k8sAPI,
log: logrus.WithField("test", t.Name),
log: logrus.WithField("test", t.Name()),
}
recorder := httptest.NewRecorder()
h.handleTap(recorder, exp.req, exp.params)