1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
moby--moby/pkg/mount
Kir Kolyshkin d78e885326 pkg/mount/TestMount: fix wrt selinux
Sometimes docker-master CI fails on rhel4+selinux configuration,
like this:

--- FAIL: TestMount (0.12s)
    --- FAIL: TestMount/none-remount,size=128k (0.01s)
    	mounter_linux_test.go:209: unexpected mount option "seclabel" expected "rw,size=128k"
    --- FAIL: TestMount/none-remount,ro,size=128k (0.01s)
    	mounter_linux_test.go:209: unexpected mount option "seclabel" expected "ro,size=128k"

Earlier, commit 8bebd42df2 (PR #34965) fixed this failure,
but not entirely (i.e. the test is now flaky). It looks like
either selinux detection code is not always working (it won't
work in d-in-d), or the kernel might or might not add 'seclabel'
option).

As the subject of this test case is definitely not selinux,
it can just ignore the option added by it.

While at it, fix error messages:
 - add missing commas;
 - fix a typo;
 - allow for clear distinction between mount
   and vfs (per-superblock) options.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-05-22 23:30:47 -07:00
..
flags.go Add canonical import comment 2018-02-05 16:51:57 -05:00
flags_freebsd.go Add canonical import comment 2018-02-05 16:51:57 -05:00
flags_linux.go Add canonical import comment 2018-02-05 16:51:57 -05:00
flags_unsupported.go Add canonical import comment 2018-02-05 16:51:57 -05:00
mount.go mount.Unmount(): don't look into /proc/self/mountinfo 2018-04-19 14:49:50 -07:00
mount_unix_test.go pkg/mount: implement/use filter for mountinfo parsing 2018-04-19 14:48:09 -07:00
mounter_freebsd.go Add canonical import comment 2018-02-05 16:51:57 -05:00
mounter_linux.go Add canonical import comment 2018-02-05 16:51:57 -05:00
mounter_linux_test.go pkg/mount/TestMount: fix wrt selinux 2018-05-22 23:30:47 -07:00
mounter_unsupported.go Add canonical import comment 2018-02-05 16:51:57 -05:00
mountinfo.go pkg/mount: use sort.Slice 2018-03-06 12:46:58 -08:00
mountinfo_freebsd.go pkg/mount: implement/use filter for mountinfo parsing 2018-04-19 14:48:09 -07:00
mountinfo_linux.go pkg/mount/mountinfo_linux: parser speed up 2018-04-19 14:49:42 -07:00
mountinfo_linux_test.go pkg/mount/mountinfo_linux: parser speed up 2018-04-19 14:49:42 -07:00
mountinfo_unsupported.go pkg/mount: implement/use filter for mountinfo parsing 2018-04-19 14:48:09 -07:00
mountinfo_windows.go pkg/mount: implement/use filter for mountinfo parsing 2018-04-19 14:48:09 -07:00
sharedsubtree_linux.go Add canonical import comment 2018-02-05 16:51:57 -05:00
sharedsubtree_linux_test.go pkg/mount unit tests: skip some test under non-root 2018-03-06 12:37:27 -08:00