github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1439 from mikebrow/fix-selinux-unit-test

Browse Source 
fixes bad unit test when selinux is enabled
This commit is contained in:
Mike Brown 2020-04-15 13:54:19 -05:00 committed by GitHub
commit 3d250b8289
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/server/helpers_selinux_test.go
View File

@ -106,7 +106,7 @@ func TestInitSelinuxOpts(t *testing.T) {
func TestCheckSelinuxLevel(t *testing.T) { func TestCheckSelinuxLevel(t *testing.T) {
for desc, test := range map[string]struct { for desc, test := range map[string]struct {
level string level string
expectErr bool expectNoMatch bool
}{ }{
"s0": { "s0": {
level: "s0", level: "s0",
@ -137,29 +137,29 @@ func TestCheckSelinuxLevel(t *testing.T) {
}, },
"s0,c0,c3": { "s0,c0,c3": {
level: "s0,c0,c3", level: "s0,c0,c3",
expectErr: true, expectNoMatch: true,
}, },
"s0:c0.c3.c6": { "s0:c0.c3.c6": {
level: "s0:c0.c3.c6", level: "s0:c0.c3.c6",
expectErr: true, expectNoMatch: true,
}, },
"s0-s0,c0,c3": { "s0-s0,c0,c3": {
level: "s0-s0,c0,c3", level: "s0-s0,c0,c3",
expectErr: true, expectNoMatch: true,
}, },
"s0-s0:c0.c3.c6": { "s0-s0:c0.c3.c6": {
level: "s0-s0:c0.c3.c6", level: "s0-s0:c0.c3.c6",
expectErr: true, expectNoMatch: true,
}, },
"s0-s0:c0,c3.c6.c8": { "s0-s0:c0,c3.c6.c8": {
level: "s0-s0:c0,c3.c6.c8", level: "s0-s0:c0,c3.c6.c8",
expectErr: true, expectNoMatch: true,
}, },
} { } {
t.Run(desc, func(t *testing.T) { t.Run(desc, func(t *testing.T) {
ok, err := checkSelinuxLevel(test.level) ok, err := checkSelinuxLevel(test.level)
if test.expectErr { if test.expectNoMatch {
assert.Error(t, err) assert.NoError(t, err)
assert.False(t, ok) assert.False(t, ok)
} else { } else {
assert.NoError(t, err) assert.NoError(t, err)