Merge pull request #24909 from pmorie/security-context-loc

Reduce LOC in security context tests
This commit is contained in:
Alex Robinson 2016-05-27 10:27:55 -07:00
commit d2a45f0ba5

View File

@ -84,6 +84,10 @@ func compareContexts(name string, ex, ac *api.SELinuxOptions, t *testing.T) {
} }
} }
func containerWithUser(ptr *int64) *api.Container {
return &api.Container{SecurityContext: &api.SecurityContext{RunAsUser: ptr}}
}
func TestHaRootUID(t *testing.T) { func TestHaRootUID(t *testing.T) {
var nonRoot int64 = 1 var nonRoot int64 = 1
var root int64 = 0 var root int64 = 0
@ -96,26 +100,14 @@ func TestHaRootUID(t *testing.T) {
container: &api.Container{SecurityContext: nil}, container: &api.Container{SecurityContext: nil},
}, },
"nil runAsuser": { "nil runAsuser": {
container: &api.Container{ container: containerWithUser(nil),
SecurityContext: &api.SecurityContext{
RunAsUser: nil,
},
},
}, },
"runAsUser non-root": { "runAsUser non-root": {
container: &api.Container{ container: containerWithUser(&nonRoot),
SecurityContext: &api.SecurityContext{
RunAsUser: &nonRoot,
},
},
}, },
"runAsUser root": { "runAsUser root": {
container: &api.Container{ container: containerWithUser(&root),
SecurityContext: &api.SecurityContext{ expect: true,
RunAsUser: &root,
},
},
expect: true,
}, },
} }
@ -138,19 +130,11 @@ func TestHasRunAsUser(t *testing.T) {
container: &api.Container{SecurityContext: nil}, container: &api.Container{SecurityContext: nil},
}, },
"nil runAsUser": { "nil runAsUser": {
container: &api.Container{ container: containerWithUser(nil),
SecurityContext: &api.SecurityContext{
RunAsUser: nil,
},
},
}, },
"valid runAsUser": { "valid runAsUser": {
container: &api.Container{ container: containerWithUser(&runAsUser),
SecurityContext: &api.SecurityContext{ expect: true,
RunAsUser: &runAsUser,
},
},
expect: true,
}, },
} }
@ -174,26 +158,14 @@ func TestHasRootRunAsUser(t *testing.T) {
container: &api.Container{SecurityContext: nil}, container: &api.Container{SecurityContext: nil},
}, },
"nil runAsuser": { "nil runAsuser": {
container: &api.Container{ container: containerWithUser(nil),
SecurityContext: &api.SecurityContext{
RunAsUser: nil,
},
},
}, },
"runAsUser non-root": { "runAsUser non-root": {
container: &api.Container{ container: containerWithUser(&nonRoot),
SecurityContext: &api.SecurityContext{
RunAsUser: &nonRoot,
},
},
}, },
"runAsUser root": { "runAsUser root": {
container: &api.Container{ container: containerWithUser(&root),
SecurityContext: &api.SecurityContext{ expect: true,
RunAsUser: &root,
},
},
expect: true,
}, },
} }