Merge pull request kubernetes#104435 from liggitt/convertible-test

k8s-ci-robot · web-flow · commit 7652353523b5 · 2021-08-20T12:38:47.000-07:00
Fix slice type comparison bug
diff --git a/plugin/pkg/admission/serviceaccount/admission_test.go b/plugin/pkg/admission/serviceaccount/admission_test.go
@@ -747,6 +747,11 @@ func TestAddImagePullSecrets(t *testing.T) {
 			{Name: "bar"},
 		},
 	}
+	originalSA := sa.DeepCopy()
+	expected := []api.LocalObjectReference{
+		{Name: "foo"},
+		{Name: "bar"},
+	}
 	// Add the default service account for the ns with a secret reference into the cache
 	informerFactory.Core().V1().ServiceAccounts().Informer().GetStore().Add(sa)
 
@@ -757,10 +762,10 @@ func TestAddImagePullSecrets(t *testing.T) {
 		t.Errorf("Unexpected error: %v", err)
 	}
 
-	assert.EqualValues(t, sa.ImagePullSecrets, pod.Spec.ImagePullSecrets, "expected %v, got %v", sa.ImagePullSecrets, pod.Spec.ImagePullSecrets)
+	assert.EqualValues(t, expected, pod.Spec.ImagePullSecrets, "expected %v, got %v", expected, pod.Spec.ImagePullSecrets)
 
 	pod.Spec.ImagePullSecrets[1] = api.LocalObjectReference{Name: "baz"}
-	if reflect.DeepEqual(sa.ImagePullSecrets, pod.Spec.ImagePullSecrets) {
+	if !reflect.DeepEqual(originalSA, sa) {
 		t.Errorf("accidentally mutated the ServiceAccount.ImagePullSecrets: %v", sa.ImagePullSecrets)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -747,6 +747,11 @@ func TestAddImagePullSecrets(t *testing.T) {`
`747`	`747`	`{Name: "bar"},`
`748`	`748`	`},`
`749`	`749`	`}`
	`750`	`+ originalSA := sa.DeepCopy()`
	`751`	`+ expected := []api.LocalObjectReference{`
	`752`	`+ {Name: "foo"},`
	`753`	`+ {Name: "bar"},`
	`754`	`+ }`
`750`	`755`	`// Add the default service account for the ns with a secret reference into the cache`
`751`	`756`	`informerFactory.Core().V1().ServiceAccounts().Informer().GetStore().Add(sa)`
`752`	`757`
`@@ -757,10 +762,10 @@ func TestAddImagePullSecrets(t *testing.T) {`
`757`	`762`	`t.Errorf("Unexpected error: %v", err)`
`758`	`763`	`}`
`759`	`764`
`760`		`- assert.EqualValues(t, sa.ImagePullSecrets, pod.Spec.ImagePullSecrets, "expected %v, got %v", sa.ImagePullSecrets, pod.Spec.ImagePullSecrets)`
	`765`	`+ assert.EqualValues(t, expected, pod.Spec.ImagePullSecrets, "expected %v, got %v", expected, pod.Spec.ImagePullSecrets)`
`761`	`766`
`762`	`767`	`pod.Spec.ImagePullSecrets[1] = api.LocalObjectReference{Name: "baz"}`
`763`		`- if reflect.DeepEqual(sa.ImagePullSecrets, pod.Spec.ImagePullSecrets) {`
	`768`	`+ if !reflect.DeepEqual(originalSA, sa) {`
`764`	`769`	`t.Errorf("accidentally mutated the ServiceAccount.ImagePullSecrets: %v", sa.ImagePullSecrets)`
`765`	`770`	`}`
`766`	`771`	`}`