Fix TestMount under a selinux system

vdemeester · vdemeester · commit 8bebd42df2d8 · 2017-09-25T11:54:30.000+02:00
Signed-off-by: Vincent Demeester &lt;vincent@sbr.pm&gt;
diff --git a/pkg/mount/mounter_linux_test.go b/pkg/mount/mounter_linux_test.go
@@ -8,6 +8,8 @@ import (
 	"os"
 	"strings"
 	"testing"
+
+	selinux "github.com/opencontainers/selinux/go-selinux"
 )
 
 func TestMount(t *testing.T) {
@@ -101,7 +103,11 @@ func TestMount(t *testing.T) {
 				t.Fatal(err)
 			}
 			defer ensureUnmount(t, target)
-			validateMount(t, target, tc.expectedOpts, tc.expectedOptional, tc.expectedVFS)
+			expectedVFS := tc.expectedVFS
+			if selinux.GetEnabled() && expectedVFS != "" {
+				expectedVFS = expectedVFS + ",seclabel"
+			}
+			validateMount(t, target, tc.expectedOpts, tc.expectedOptional, expectedVFS)
 		})
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@ import (`
`8`	`8`	`"os"`
`9`	`9`	`"strings"`
`10`	`10`	`"testing"`
	`11`	`+`
	`12`	`+ selinux "github.com/opencontainers/selinux/go-selinux"`
`11`	`13`	`)`
`12`	`14`
`13`	`15`	`func TestMount(t *testing.T) {`
`@@ -101,7 +103,11 @@ func TestMount(t *testing.T) {`
`101`	`103`	`t.Fatal(err)`
`102`	`104`	`}`
`103`	`105`	`defer ensureUnmount(t, target)`
`104`		`- validateMount(t, target, tc.expectedOpts, tc.expectedOptional, tc.expectedVFS)`
	`106`	`+ expectedVFS := tc.expectedVFS`
	`107`	`+ if selinux.GetEnabled() && expectedVFS != "" {`
	`108`	`+ expectedVFS = expectedVFS + ",seclabel"`
	`109`	`+ }`
	`110`	`+ validateMount(t, target, tc.expectedOpts, tc.expectedOptional, expectedVFS)`
`105`	`111`	`})`
`106`	`112`	`}`
`107`	`113`	`}`