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

Merge pull request #29219 from caesarxuchao/fix-testeventf

Browse Source 
Automatic merge from submit-queue

Don't do string(int)

This is causing https://github.com/kubernetes/kubernetes/pull/29147 to fail the unit test, because the bug prints control character to the test log, and the grep at this [line](https://github.com/kubernetes/kubernetes/blob/master/hack/make-rules/test.sh#L190) returns `Binary file (standard input) matches` error. I don't know why this bug isn't caught before.
This commit is contained in:
k8s-merge-robot 2016-07-19 14:06:57 -07:00 committed by GitHub
commit 9ada26d6cd
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"math/rand" "math/rand"
"net/http"
"strconv" "strconv"
"testing" "testing"
"time" "time"
@ -32,7 +33,6 @@ import (
k8sruntime "k8s.io/kubernetes/pkg/runtime" k8sruntime "k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/strategicpatch" "k8s.io/kubernetes/pkg/util/strategicpatch"
"net/http"
) )
type testEventSink struct { type testEventSink struct {
@ -367,10 +367,10 @@ func TestEventf(t *testing.T) {
// validate event // validate event
if item.expectUpdate { if item.expectUpdate {
actualEvent := <-patchEvent actualEvent := <-patchEvent
validateEvent(string(index), actualEvent, item.expect, t) validateEvent(strconv.Itoa(index), actualEvent, item.expect, t)
} else { } else {
actualEvent := <-createEvent actualEvent := <-createEvent
validateEvent(string(index), actualEvent, item.expect, t) validateEvent(strconv.Itoa(index), actualEvent, item.expect, t)
} }
// TODO: uncomment this after we upgrade to Go 1.6.1. // TODO: uncomment this after we upgrade to Go 1.6.1.
// logWatcher1.Stop() // logWatcher1.Stop()
@ -618,10 +618,10 @@ func TestEventfNoNamespace(t *testing.T) {
// validate event // validate event
if item.expectUpdate { if item.expectUpdate {
actualEvent := <-patchEvent actualEvent := <-patchEvent
validateEvent(string(index), actualEvent, item.expect, t) validateEvent(strconv.Itoa(index), actualEvent, item.expect, t)
} else { } else {
actualEvent := <-createEvent actualEvent := <-createEvent
validateEvent(string(index), actualEvent, item.expect, t) validateEvent(strconv.Itoa(index), actualEvent, item.expect, t)
} }
// TODO: uncomment this after we upgrade to Go 1.6.1. // TODO: uncomment this after we upgrade to Go 1.6.1.
@ -898,10 +898,10 @@ func TestMultiSinkCache(t *testing.T) {
// validate event // validate event
if item.expectUpdate { if item.expectUpdate {
actualEvent := <-patchEvent actualEvent := <-patchEvent
validateEvent(string(index), actualEvent, item.expect, t) validateEvent(strconv.Itoa(index), actualEvent, item.expect, t)
} else { } else {
actualEvent := <-createEvent actualEvent := <-createEvent
validateEvent(string(index), actualEvent, item.expect, t) validateEvent(strconv.Itoa(index), actualEvent, item.expect, t)
} }
} }
@ -914,10 +914,10 @@ func TestMultiSinkCache(t *testing.T) {
// validate event // validate event
if item.expectUpdate { if item.expectUpdate {
actualEvent := <-patchEvent2 actualEvent := <-patchEvent2
validateEvent(string(index), actualEvent, item.expect, t) validateEvent(strconv.Itoa(index), actualEvent, item.expect, t)
} else { } else {
actualEvent := <-createEvent2 actualEvent := <-createEvent2
validateEvent(string(index), actualEvent, item.expect, t) validateEvent(strconv.Itoa(index), actualEvent, item.expect, t)
} }
} }