containers
/
storage
mirror of https://github.com/containers/storage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't fail the mounter test because the kernel added options 

On SELinux-enabled kernels, the kernel will helpfully add a "seclabel"
option to mounted filesystems to indicate that labeling is supported.
Don't let that break our tests.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
This commit is contained in:
Nalin Dahyabhai 2019-01-17 14:03:08 -05:00
parent 263351e912
commit 252bf574a0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/mount/mounter_linux_test.go
View File

@ -140,6 +140,7 @@ func validateMount(t *testing.T, mnt string, opts, optional, vfs string) {
wantedVFS[opt] = struct{}{}
}
}
volunteeredVFS := map[string]struct{}{"seclabel": {}}
mnts := make(map[int]*Info, len(info))
for _, mi := range info {
@ -199,7 +200,7 @@ func validateMount(t *testing.T, mnt string, opts, optional, vfs string) {
if mi.VfsOpts != "" {
for _, opt := range strings.Split(mi.VfsOpts, ",") {
opt = clean(opt)
if !has(wantedVFS, opt) {
if !has(wantedVFS, opt) && !has(volunteeredVFS, opt) {
t.Errorf("unexpected mount option %q expected %q", opt, vfs)
}
delete(wantedVFS, opt)