Skip to content

K
k3s
Commit ffff1ab6 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #28319 from grodrigues3/revert-comments-tLogf

Automatic merge from submit-queue reverted the code from 23688 that cause race condition with older version of Go ```release-note * release-note-None ``` [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
parents b7e87917 02e29a98
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 12 deletions
pkg/client/record/event_test.go
View file @ ffff1ab6
...@@ -350,10 +350,7 @@ func TestEventf(t *testing.T) { ...@@ -350,10 +350,7 @@ 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)
// TODO: uncomment this after we upgrade to Go 1.6.1. logWatcher1 := eventBroadcaster.StartLogging(t.Logf) // Prove that it is useful
// 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)
...@@ -372,8 +369,7 @@ func TestEventf(t *testing.T) { ...@@ -372,8 +369,7 @@ func TestEventf(t *testing.T) {
actualEvent := <-createEvent actualEvent := <-createEvent
validateEvent(strconv.Itoa(index), actualEvent, item.expect, t) validateEvent(strconv.Itoa(index), actualEvent, item.expect, t)
} }
// TODO: uncomment this after we upgrade to Go 1.6.1. logWatcher1.Stop()
// logWatcher1.Stop()
logWatcher2.Stop() logWatcher2.Stop()
} }
sinkWatcher.Stop() sinkWatcher.Stop()
...@@ -601,10 +597,7 @@ func TestEventfNoNamespace(t *testing.T) { ...@@ -601,10 +597,7 @@ 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)
// TODO: uncomment this after we upgrade to Go 1.6.1. logWatcher1 := eventBroadcaster.StartLogging(t.Logf) // Prove that it is useful
// 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)
...@@ -624,8 +617,7 @@ func TestEventfNoNamespace(t *testing.T) { ...@@ -624,8 +617,7 @@ func TestEventfNoNamespace(t *testing.T) {
validateEvent(strconv.Itoa(index), actualEvent, item.expect, t) validateEvent(strconv.Itoa(index), actualEvent, item.expect, t)
} }
// TODO: uncomment this after we upgrade to Go 1.6.1. logWatcher1.Stop()
// logWatcher1.Stop()
logWatcher2.Stop() logWatcher2.Stop()
} }
sinkWatcher.Stop() sinkWatcher.Stop()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment