Merge pull request #528 from cpuguy83/skip_selinux_test

Minor cleanup on selinux test
containerd · Jan 10, 2018 · 5bfa5e4 · 5bfa5e4
2 parents f6437b4 + 2a07847
commit 5bfa5e4
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/pkg/server/helpers_selinux_test.go b/pkg/server/helpers_selinux_test.go
@@ -28,7 +28,7 @@ import (
 
 func TestInitSelinuxOpts(t *testing.T) {
 	if !selinux.GetEnabled() {
-		return
+		t.Skip("selinux is not enabled")
 	}
 
 	for desc, test := range map[string]struct {
@@ -62,10 +62,11 @@ func TestInitSelinuxOpts(t *testing.T) {
 			mountLabels:  []string{"user_u:object_r:container_file_t:s0:c1,c2", "user_u:object_r:svirt_sandbox_file_t:s0:c1,c2"},
 		},
 	} {
-		t.Logf("TestCase %q", desc)
-		processLabel, mountLabel, err := initSelinuxOpts(test.selinuxOpt)
-		assert.NoError(t, err)
-		assert.Equal(t, test.processLabel, processLabel)
-		assert.Contains(t, test.mountLabels, mountLabel)
+		t.Run(desc, func(t *testing.T) {
+			processLabel, mountLabel, err := initSelinuxOpts(test.selinuxOpt)
+			assert.NoError(t, err)
+			assert.Equal(t, test.processLabel, processLabel)
+			assert.Contains(t, test.mountLabels, mountLabel)
+		})
 	}
 }