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

Merge pull request #40194 from bruceauyeung/k8s-branch-fix-error-message-in-TestGetAddonImage

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 40132, 39302, 40194, 40619, 40601)

fix error message in TestGetAddonImage

Signed-off-by: bruceauyeung <ouyang.qinhua@zte.com.cn>

**What this PR does / why we need it**:

1. fix incorrect error message in TestGetAddonImage
2. rename some variables to make them more reasonable
This commit is contained in:
Kubernetes Submit Queue 2017-01-27 18:32:24 -08:00 committed by GitHub
commit babecf10dd
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/kubeadm/app/images/images_test.go
View File

@ -33,7 +33,7 @@ type getCoreImageTest struct {
const testversion = "1" const testversion = "1"
func TestGetCoreImage(t *testing.T) { func TestGetCoreImage(t *testing.T) {
var tokenTest = []struct { var imageTest = []struct {
t getCoreImageTest t getCoreImageTest
expected string expected string
}{ }{
@ -64,12 +64,12 @@ func TestGetCoreImage(t *testing.T) {
fmt.Sprintf("%s/%s-%s:%s", gcrPrefix, "kube-proxy", runtime.GOARCH, testversion), fmt.Sprintf("%s/%s-%s:%s", gcrPrefix, "kube-proxy", runtime.GOARCH, testversion),
}, },
} }
for _, rt := range tokenTest { for _, it := range imageTest {
actual := GetCoreImage(rt.t.i, rt.t.c, rt.t.o) actual := GetCoreImage(it.t.i, it.t.c, it.t.o)
if actual != rt.expected { if actual != it.expected {
t.Errorf( t.Errorf(
"failed GetCoreImage:\n\texpected: %s\n\t actual: %s", "failed GetCoreImage:\n\texpected: %s\n\t actual: %s",
rt.expected, it.expected,
actual, actual,
) )
} }
@ -77,7 +77,7 @@ func TestGetCoreImage(t *testing.T) {
} }
func TestGetAddonImage(t *testing.T) { func TestGetAddonImage(t *testing.T) {
var tokenTest = []struct { var imageTest = []struct {
t string t string
expected string expected string
}{ }{
@ -99,12 +99,12 @@ func TestGetAddonImage(t *testing.T) {
fmt.Sprintf("%s/%s-%s:%s", gcrPrefix, Pause, runtime.GOARCH, pauseVersion), fmt.Sprintf("%s/%s-%s:%s", gcrPrefix, Pause, runtime.GOARCH, pauseVersion),
}, },
} }
for _, rt := range tokenTest { for _, it := range imageTest {
actual := GetAddonImage(rt.t) actual := GetAddonImage(it.t)
if actual != rt.expected { if actual != it.expected {
t.Errorf( t.Errorf(
"failed GetCoreImage:\n\texpected: %s\n\t actual: %s", "failed GetAddonImage:\n\texpected: %s\n\t actual: %s",
rt.expected, it.expected,
actual, actual,
) )
} }