mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 03:11:40 +00:00
Merge pull request #40194 from bruceauyeung/k8s-branch-fix-error-message-in-TestGetAddonImage
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:
commit
babecf10dd
@ -33,7 +33,7 @@ type getCoreImageTest struct {
|
||||
const testversion = "1"
|
||||
|
||||
func TestGetCoreImage(t *testing.T) {
|
||||
var tokenTest = []struct {
|
||||
var imageTest = []struct {
|
||||
t getCoreImageTest
|
||||
expected string
|
||||
}{
|
||||
@ -64,12 +64,12 @@ func TestGetCoreImage(t *testing.T) {
|
||||
fmt.Sprintf("%s/%s-%s:%s", gcrPrefix, "kube-proxy", runtime.GOARCH, testversion),
|
||||
},
|
||||
}
|
||||
for _, rt := range tokenTest {
|
||||
actual := GetCoreImage(rt.t.i, rt.t.c, rt.t.o)
|
||||
if actual != rt.expected {
|
||||
for _, it := range imageTest {
|
||||
actual := GetCoreImage(it.t.i, it.t.c, it.t.o)
|
||||
if actual != it.expected {
|
||||
t.Errorf(
|
||||
"failed GetCoreImage:\n\texpected: %s\n\t actual: %s",
|
||||
rt.expected,
|
||||
it.expected,
|
||||
actual,
|
||||
)
|
||||
}
|
||||
@ -77,7 +77,7 @@ func TestGetCoreImage(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestGetAddonImage(t *testing.T) {
|
||||
var tokenTest = []struct {
|
||||
var imageTest = []struct {
|
||||
t string
|
||||
expected string
|
||||
}{
|
||||
@ -99,12 +99,12 @@ func TestGetAddonImage(t *testing.T) {
|
||||
fmt.Sprintf("%s/%s-%s:%s", gcrPrefix, Pause, runtime.GOARCH, pauseVersion),
|
||||
},
|
||||
}
|
||||
for _, rt := range tokenTest {
|
||||
actual := GetAddonImage(rt.t)
|
||||
if actual != rt.expected {
|
||||
for _, it := range imageTest {
|
||||
actual := GetAddonImage(it.t)
|
||||
if actual != it.expected {
|
||||
t.Errorf(
|
||||
"failed GetCoreImage:\n\texpected: %s\n\t actual: %s",
|
||||
rt.expected,
|
||||
"failed GetAddonImage:\n\texpected: %s\n\t actual: %s",
|
||||
it.expected,
|
||||
actual,
|
||||
)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user