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

admission_test.go(TestAdmitPreferNonmutating): simplify test by replacing expectedPodUser by a constant value.

Browse Source
This commit is contained in:
Slava Semushin 2017-11-24 17:10:39 +01:00
parent 64ccd7665f
commit 2b95212ad3
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugin/pkg/admission/security/podsecuritypolicy/admission_test.go
View File

@ -352,7 +352,6 @@ func TestAdmitPreferNonmutating(t *testing.T) {
shouldPassAdmit bool shouldPassAdmit bool
shouldPassValidate bool shouldPassValidate bool
expectMutation bool expectMutation bool
expectedPodUser *int64
expectedContainerUser *int64 expectedContainerUser *int64
expectedPSP string expectedPSP string
}{ }{
@ -363,7 +362,6 @@ func TestAdmitPreferNonmutating(t *testing.T) {
shouldPassAdmit: true, shouldPassAdmit: true,
shouldPassValidate: true, shouldPassValidate: true,
expectMutation: false, expectMutation: false,
expectedPodUser: nil,
expectedContainerUser: nil, expectedContainerUser: nil,
expectedPSP: privilegedPSP.Name, expectedPSP: privilegedPSP.Name,
}, },
@ -374,7 +372,6 @@ func TestAdmitPreferNonmutating(t *testing.T) {
shouldPassAdmit: true, shouldPassAdmit: true,
shouldPassValidate: true, shouldPassValidate: true,
expectMutation: false, expectMutation: false,
expectedPodUser: nil,
expectedContainerUser: nil, expectedContainerUser: nil,
expectedPSP: privilegedPSP.Name, expectedPSP: privilegedPSP.Name,
}, },
@ -385,7 +382,6 @@ func TestAdmitPreferNonmutating(t *testing.T) {
shouldPassAdmit: true, shouldPassAdmit: true,
shouldPassValidate: true, shouldPassValidate: true,
expectMutation: true, expectMutation: true,
expectedPodUser: nil,
expectedContainerUser: &mutating1.Spec.RunAsUser.Ranges[0].Min, expectedContainerUser: &mutating1.Spec.RunAsUser.Ranges[0].Min,
expectedPSP: mutating1.Name, expectedPSP: mutating1.Name,
}, },
@ -397,7 +393,6 @@ func TestAdmitPreferNonmutating(t *testing.T) {
shouldPassAdmit: true, shouldPassAdmit: true,
shouldPassValidate: true, shouldPassValidate: true,
expectMutation: false, expectMutation: false,
expectedPodUser: nil,
expectedContainerUser: nil, expectedContainerUser: nil,
expectedPSP: privilegedPSP.Name, expectedPSP: privilegedPSP.Name,
}, },
@ -409,7 +404,6 @@ func TestAdmitPreferNonmutating(t *testing.T) {
shouldPassAdmit: true, shouldPassAdmit: true,
shouldPassValidate: false, shouldPassValidate: false,
expectMutation: false, expectMutation: false,
expectedPodUser: nil,
expectedContainerUser: nil, expectedContainerUser: nil,
expectedPSP: "", expectedPSP: "",
}, },
@ -421,7 +415,6 @@ func TestAdmitPreferNonmutating(t *testing.T) {
shouldPassAdmit: true, shouldPassAdmit: true,
shouldPassValidate: true, shouldPassValidate: true,
expectMutation: false, expectMutation: false,
expectedPodUser: nil,
expectedContainerUser: nil, expectedContainerUser: nil,
expectedPSP: "", expectedPSP: "",
}, },
@ -433,7 +426,6 @@ func TestAdmitPreferNonmutating(t *testing.T) {
shouldPassAdmit: true, shouldPassAdmit: true,
shouldPassValidate: true, shouldPassValidate: true,
expectMutation: false, expectMutation: false,
expectedPodUser: nil,
expectedContainerUser: nil, expectedContainerUser: nil,
expectedPSP: "", expectedPSP: "",
}, },
@ -447,10 +439,8 @@ func TestAdmitPreferNonmutating(t *testing.T) {
if v.pod.Spec.SecurityContext != nil { if v.pod.Spec.SecurityContext != nil {
actualPodUser = v.pod.Spec.SecurityContext.RunAsUser actualPodUser = v.pod.Spec.SecurityContext.RunAsUser
} }
if (actualPodUser == nil) != (v.expectedPodUser == nil) { if actualPodUser != nil {
t.Errorf("%s expected pod user %v, got %v", k, v.expectedPodUser, actualPodUser) t.Errorf("%s expected pod user nil, got %v", k, *actualPodUser)
} else if actualPodUser != nil && *actualPodUser != *v.expectedPodUser {
t.Errorf("%s expected pod user %v, got %v", k, *v.expectedPodUser, *actualPodUser)
} }
actualContainerUser := (*int64)(nil) actualContainerUser := (*int64)(nil)