From: Karel Zak Date: Mon, 8 Apr 2019 11:33:04 +0000 (+0200) Subject: tests: add /mnt/test/foo^Mbar to mountinfo tests X-Git-Tag: v2.34-rc1~37 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b13d6a1c905e1e425e6b7ca340a410c580f0f75;p=thirdparty%2Futil-linux.git tests: add /mnt/test/foo^Mbar to mountinfo tests Addresses: https://github.com/karelzak/util-linux/issues/780 Signed-off-by: Karel Zak --- diff --git a/tests/expected/libmount/tabdiff-mount b/tests/expected/libmount/tabdiff-mount index dc1c4bd106..420aeacd5e 100644 --- a/tests/expected/libmount/tabdiff-mount +++ b/tests/expected/libmount/tabdiff-mount @@ -1,2 +1,3 @@ /dev/mapper/kzak-home on /home/kzak: MOUNTED /fooooo on /mnt/foo: MOUNTED +tmpfs on /mnt/test/foo bar: MOUNTED diff --git a/tests/expected/libmount/tabdiff-move b/tests/expected/libmount/tabdiff-move index 3618498bce..24f9bc791b 100644 --- a/tests/expected/libmount/tabdiff-move +++ b/tests/expected/libmount/tabdiff-move @@ -1,2 +1,3 @@ //foo.home/bar/ on /mnt/music: MOVED to /mnt/music /fooooo on /mnt/foo: UMOUNTED +tmpfs on /mnt/test/foo bar: UMOUNTED diff --git a/tests/expected/libmount/tabdiff-remount b/tests/expected/libmount/tabdiff-remount index c175fdb765..82ebeab390 100644 --- a/tests/expected/libmount/tabdiff-remount +++ b/tests/expected/libmount/tabdiff-remount @@ -1,3 +1,4 @@ /dev/mapper/kzak-home on /home/kzak: REMOUNTED from 'rw,noatime,barrier=1,data=ordered' to 'ro,noatime,barrier=1,data=ordered' //foo.home/bar/ on /mnt/sounds: REMOUNTED from 'rw,relatime,unc=\\foo.home\bar,username=kzak,domain=SRGROUP,uid=0,noforceuid,gid=0,noforcegid,addr=192.168.111.1,posixpaths,serverino,acl,rsize=16384,wsize=57344' to 'ro,relatime,unc=\\foo.home\bar,username=kzak,domain=SRGROUP,uid=0,noforceuid,gid=0,noforcegid,addr=192.168.111.1,posixpaths,serverino,acl,rsize=16384,wsize=57344' /fooooo on /mnt/foo: UMOUNTED +tmpfs on /mnt/test/foo bar: UMOUNTED diff --git a/tests/expected/libmount/tabdiff-umount b/tests/expected/libmount/tabdiff-umount index 7e39af21d8..a3e0fe48a1 100644 --- a/tests/expected/libmount/tabdiff-umount +++ b/tests/expected/libmount/tabdiff-umount @@ -1,2 +1,3 @@ /dev/mapper/kzak-home on /home/kzak: UMOUNTED /fooooo on /mnt/foo: UMOUNTED +tmpfs on /mnt/test/foo bar: UMOUNTED diff --git a/tests/expected/libmount/tabfiles-parse-mountinfo b/tests/expected/libmount/tabfiles-parse-mountinfo index c8390ac4ee..47eb770061 100644 --- a/tests/expected/libmount/tabfiles-parse-mountinfo +++ b/tests/expected/libmount/tabfiles-parse-mountinfo @@ -361,3 +361,15 @@ root: / id: 48 parent: 20 devno: 0:39 +------ fs: +source: tmpfs +target: /mnt/test/foo bar +fstype: tmpfs +optstr: rw,relatime +VFS-optstr: rw,relatime +FS-opstr: rw +optional-fields: 'shared:323' +root: / +id: 49 +parent: 20 +devno: 0:56 diff --git a/tests/expected/libmount/tabfiles-py-parse-mountinfo b/tests/expected/libmount/tabfiles-py-parse-mountinfo index c8390ac4ee..47eb770061 100644 --- a/tests/expected/libmount/tabfiles-py-parse-mountinfo +++ b/tests/expected/libmount/tabfiles-py-parse-mountinfo @@ -361,3 +361,15 @@ root: / id: 48 parent: 20 devno: 0:39 +------ fs: +source: tmpfs +target: /mnt/test/foo bar +fstype: tmpfs +optstr: rw,relatime +VFS-optstr: rw,relatime +FS-opstr: rw +optional-fields: 'shared:323' +root: / +id: 49 +parent: 20 +devno: 0:56 diff --git a/tests/ts/libmount/files/mountinfo b/tests/ts/libmount/files/mountinfo index 475ea1a337..c063071833 100644 --- a/tests/ts/libmount/files/mountinfo +++ b/tests/ts/libmount/files/mountinfo @@ -31,3 +31,4 @@ 45 20 0:37 / /var/lib/nfs/rpc_pipefs rw,relatime - rpc_pipefs sunrpc rw 47 20 0:38 / /mnt/sounds rw,relatime - cifs //foo.home/bar/ rw,unc=\\foo.home\bar,username=kzak,domain=SRGROUP,uid=0,noforceuid,gid=0,noforcegid,addr=192.168.111.1,posixpaths,serverino,acl,rsize=16384,wsize=57344 48 20 0:39 / /mnt/foo\040(deleted) rw,relatime - bar /fooooo rw +49 20 0:56 / /mnt/test/foo bar rw,relatime shared:323 - tmpfs tmpfs rw