From 08619d0c7ccc0ad7b9c30aa7b72a8ee37c0caf5e Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Mon, 25 Sep 2017 10:42:20 +0200 Subject: [PATCH] Fix TestMount under a selinux system Signed-off-by: Vincent Demeester Upstream-commit: 8bebd42df2d8eaa0ecdc9c78bc1e395a752eb5c9 Component: engine --- components/engine/pkg/mount/mounter_linux_test.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/components/engine/pkg/mount/mounter_linux_test.go b/components/engine/pkg/mount/mounter_linux_test.go index 47c03b3631..f02bd13786 100644 --- a/components/engine/pkg/mount/mounter_linux_test.go +++ b/components/engine/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) }) } }