Skip to content

K
k3s
Commit 99d8868c authored by Chao Xu's avatar Chao Xu
Browse files
Options

don't use string(index)

parent 6d09ba41
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
pkg/client/record/event_test.go
View file @ 99d8868c
...@@ -20,6 +20,7 @@ import ( ...@@ -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 ( ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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)
} }
} }
......
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