diff options
| author | Karel Zak | 2018-07-10 14:04:09 +0200 |
|---|---|---|
| committer | Karel Zak | 2018-07-10 14:04:09 +0200 |
| commit | 690fa00b6cdcd2d6acc1cd54c0d4f27613be9933 (patch) | |
| tree | 5a77b8d3adef6205001c9a9e66e97ba913295181 | |
| parent | libmount: (mountinfo) parse empty strings in source (diff) | |
| download | kernel-qcow2-util-linux-690fa00b6cdcd2d6acc1cd54c0d4f27613be9933.tar.gz kernel-qcow2-util-linux-690fa00b6cdcd2d6acc1cd54c0d4f27613be9933.tar.xz kernel-qcow2-util-linux-690fa00b6cdcd2d6acc1cd54c0d4f27613be9933.zip | |
tests: add mountinfo with empty source
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | tests/expected/libmount/tabfiles-parse-mountinfo-nosrc | 78 | ||||
| -rw-r--r-- | tests/ts/libmount/files/mountinfo_nosrc | 7 | ||||
| -rwxr-xr-x | tests/ts/libmount/tabfiles | 5 |
3 files changed, 90 insertions, 0 deletions
diff --git a/tests/expected/libmount/tabfiles-parse-mountinfo-nosrc b/tests/expected/libmount/tabfiles-parse-mountinfo-nosrc new file mode 100644 index 000000000..3d44ef60c --- /dev/null +++ b/tests/expected/libmount/tabfiles-parse-mountinfo-nosrc @@ -0,0 +1,78 @@ +------ fs: +source: /proc +target: /proc +fstype: proc +optstr: rw,relatime +VFS-optstr: rw,relatime +FS-opstr: rw +root: / +id: 15 +parent: 20 +devno: 0:3 +------ fs: +source: /sys +target: /sys +fstype: sysfs +optstr: rw,relatime +VFS-optstr: rw,relatime +FS-opstr: rw +root: / +id: 16 +parent: 20 +devno: 0:15 +------ fs: +source: udev +target: /dev +fstype: devtmpfs +optstr: rw,relatime,size=1983516k,nr_inodes=495879,mode=755 +VFS-optstr: rw,relatime +FS-opstr: rw,size=1983516k,nr_inodes=495879,mode=755 +root: / +id: 17 +parent: 20 +devno: 0:5 +------ fs: +source: devpts +target: /dev/pts +fstype: devpts +optstr: rw,relatime,gid=5,mode=620,ptmxmode=000 +VFS-optstr: rw,relatime +FS-opstr: rw,gid=5,mode=620,ptmxmode=000 +root: / +id: 18 +parent: 17 +devno: 0:10 +------ fs: +source: tmpfs +target: /dev/shm +fstype: tmpfs +optstr: rw,relatime +VFS-optstr: rw,relatime +FS-opstr: rw +root: / +id: 19 +parent: 17 +devno: 0:16 +------ fs: +source: /dev/sda4 +target: / +fstype: ext3 +optstr: rw,noatime,errors=continue,user_xattr,acl,barrier=0,data=ordered +VFS-optstr: rw,noatime +FS-opstr: rw,errors=continue,user_xattr,acl,barrier=0,data=ordered +root: / +id: 20 +parent: 1 +devno: 8:4 +------ fs: +source: +target: /mnt/test +fstype: tmpfs +optstr: rw,relatime +VFS-optstr: rw,relatime +FS-opstr: rw +optional-fields: 'shared:212' +root: / +id: 21 +parent: 20 +devno: 0:53 diff --git a/tests/ts/libmount/files/mountinfo_nosrc b/tests/ts/libmount/files/mountinfo_nosrc new file mode 100644 index 000000000..1ef7cf08b --- /dev/null +++ b/tests/ts/libmount/files/mountinfo_nosrc @@ -0,0 +1,7 @@ +15 20 0:3 / /proc rw,relatime - proc /proc rw +16 20 0:15 / /sys rw,relatime - sysfs /sys rw +17 20 0:5 / /dev rw,relatime - devtmpfs udev rw,size=1983516k,nr_inodes=495879,mode=755 +18 17 0:10 / /dev/pts rw,relatime - devpts devpts rw,gid=5,mode=620,ptmxmode=000 +19 17 0:16 / /dev/shm rw,relatime - tmpfs tmpfs rw +20 1 8:4 / / rw,noatime - ext3 /dev/sda4 rw,errors=continue,user_xattr,acl,barrier=0,data=ordered +21 20 0:53 / /mnt/test rw,relatime shared:212 - tmpfs rw diff --git a/tests/ts/libmount/tabfiles b/tests/ts/libmount/tabfiles index a45c28606..ec0eae8e1 100755 --- a/tests/ts/libmount/tabfiles +++ b/tests/ts/libmount/tabfiles @@ -37,6 +37,11 @@ ts_run $TESTPROG --parse "$TS_SELF/files/mountinfo" &> $TS_OUTPUT sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT ts_finalize_subtest +ts_init_subtest "parse-mountinfo-nosrc" +ts_run $TESTPROG --parse "$TS_SELF/files/mountinfo_nosrc" &> $TS_OUTPUT +sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT +ts_finalize_subtest + ts_init_subtest "parse-swaps" ts_run $TESTPROG --parse "$TS_SELF/files/swaps" &> $TS_OUTPUT sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT |