github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #23688 from caesarxuchao/fix-23533

Browse Source 
Temporarily disable goroutine calls to testing.T.Logf to avoid race
This commit is contained in:
Wojciech Tyczynski 2016-03-31 21:35:54 +02:00
commit c2a5998248
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/client/record/event_test.go
View File

@ -348,7 +348,10 @@ func TestEventf(t *testing.T) {
recorder := recorderWithFakeClock(api.EventSource{Component: "eventTest"}, eventBroadcaster, clock) recorder := recorderWithFakeClock(api.EventSource{Component: "eventTest"}, eventBroadcaster, clock)
for index, item := range table { for index, item := range table {
clock.Step(1 * time.Second) clock.Step(1 * time.Second)
logWatcher1 := eventBroadcaster.StartLogging(t.Logf) // Prove that it is useful // TODO: uncomment this after we upgrade to Go 1.6.1.
// testing.(*common).log() is racing with testing.(*T).report() in Go 1.6.
// See #23533 for more details.
// logWatcher1 := eventBroadcaster.StartLogging(t.Logf) // Prove that it is useful
logWatcher2 := eventBroadcaster.StartLogging(func(formatter string, args ...interface{}) { logWatcher2 := eventBroadcaster.StartLogging(func(formatter string, args ...interface{}) {
if e, a := item.expectLog, fmt.Sprintf(formatter, args...); e != a { if e, a := item.expectLog, fmt.Sprintf(formatter, args...); e != a {
t.Errorf("Expected '%v', got '%v'", e, a) t.Errorf("Expected '%v', got '%v'", e, a)
@ -367,7 +370,8 @@ func TestEventf(t *testing.T) {
actualEvent := <-createEvent actualEvent := <-createEvent
validateEvent(string(index), actualEvent, item.expect, t) validateEvent(string(index), actualEvent, item.expect, t)
} }
logWatcher1.Stop() // TODO: uncomment this after we upgrade to Go 1.6.1.
// logWatcher1.Stop()
logWatcher2.Stop() logWatcher2.Stop()
} }
sinkWatcher.Stop() sinkWatcher.Stop()
@ -560,7 +564,10 @@ func TestEventfNoNamespace(t *testing.T) {
for index, item := range table { for index, item := range table {
clock.Step(1 * time.Second) clock.Step(1 * time.Second)
logWatcher1 := eventBroadcaster.StartLogging(t.Logf) // Prove that it is useful // TODO: uncomment this after we upgrade to Go 1.6.1.
// testing.(*common).log() is racing with testing.(*T).report() in Go 1.6.
// See #23533 for more details.
// logWatcher1 := eventBroadcaster.StartLogging(t.Logf) // Prove that it is useful
logWatcher2 := eventBroadcaster.StartLogging(func(formatter string, args ...interface{}) { logWatcher2 := eventBroadcaster.StartLogging(func(formatter string, args ...interface{}) {
if e, a := item.expectLog, fmt.Sprintf(formatter, args...); e != a { if e, a := item.expectLog, fmt.Sprintf(formatter, args...); e != a {
t.Errorf("Expected '%v', got '%v'", e, a) t.Errorf("Expected '%v', got '%v'", e, a)
@ -580,7 +587,8 @@ func TestEventfNoNamespace(t *testing.T) {
validateEvent(string(index), actualEvent, item.expect, t) validateEvent(string(index), actualEvent, item.expect, t)
} }
logWatcher1.Stop() // TODO: uncomment this after we upgrade to Go 1.6.1.
// logWatcher1.Stop()
logWatcher2.Stop() logWatcher2.Stop()
} }
sinkWatcher.Stop() sinkWatcher.Stop()