github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Add more test cases with single quotes

Browse Source 
Signed-off-by: Johannes Frey <me@johannes-frey.de>
This commit is contained in:
Johannes Frey 2020-06-16 13:02:53 +02:00
parent cb91b1724d
commit 8897e15203
No known key found for this signature in database
GPG Key ID: 37DE758DC116FCA8
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
mount/mountinfo_linux_test.go
View File

@ -440,9 +440,11 @@ const (
mountInfoWithSpaces = `486 28 252:1 / /mnt/foo\040bar rw,relatime shared:243 - ext4 /dev/vda1 rw,data=ordered mountInfoWithSpaces = `486 28 252:1 / /mnt/foo\040bar rw,relatime shared:243 - ext4 /dev/vda1 rw,data=ordered
31 21 0:23 / /DATA/foo_bla_bla rw,relatime - cifs //foo/BLA\040BLA\040BLA/ rw,sec=ntlm,cache=loose,unc=\\foo\BLA BLA BLA,username=my_login,domain=mydomain.com,uid=12345678,forceuid,gid=12345678,forcegid,addr=10.1.30.10,file_mode=0755,dir_mode=0755,nounix,rsize=61440,wsize=65536,actimeo=1` 31 21 0:23 / /DATA/foo_bla_bla rw,relatime - cifs //foo/BLA\040BLA\040BLA/ rw,sec=ntlm,cache=loose,unc=\\foo\BLA BLA BLA,username=my_login,domain=mydomain.com,uid=12345678,forceuid,gid=12345678,forcegid,addr=10.1.30.10,file_mode=0755,dir_mode=0755,nounix,rsize=61440,wsize=65536,actimeo=1`
mountInfoWithDoubleQuotes = `1046 30 253:1 /tmp/bar /var/lib/kubelet/pods/98d150a4-d814-4d52-9068-b10f62d7a895/volumes/kubernetes.io~empty-dir/tmp-dir/"var rw,relatime shared:1 - ext4 /dev/mapper/ubuntu--vg-root rw,errors=remount-ro mountInfoWithQuotes = `1046 30 253:1 /tmp/bar /var/lib/kubelet/pods/98d150a4-d814-4d52-9068-b10f62d7a895/volumes/kubernetes.io~empty-dir/tmp-dir/"var rw,relatime shared:1 - ext4 /dev/mapper/ubuntu--vg-root rw,errors=remount-ro
1046 30 253:1 /tmp/bar /tmp/"foo" rw,relatime shared:1 - ext4 /dev/mapper/ubuntu--vg-root rw,errors=remount-ro 1046 30 253:1 /tmp/bar /tmp/"foo" rw,relatime shared:1 - ext4 /dev/mapper/ubuntu--vg-root rw,errors=remount-ro
1060 30 253:1 /tmp/bar /tmp/\134"foo\134" rw,relatime shared:1 - ext4 /dev/mapper/ubuntu--vg-root rw,errors=remount-ro` 1060 30 253:1 /tmp/bar /tmp/\134"foo\134" rw,relatime shared:1 - ext4 /dev/mapper/ubuntu--vg-root rw,errors=remount-ro
1060 30 253:1 /tmp/"what's\040up?" /tmp/foo rw,relatime shared:1 - ext4 /dev/mapper/ubuntu--vg-root rw,errors=remount-ro
1100 1060 253:1 /tmp/'what's\040up?' /tmp/foo rw,relatime shared:1 - ext4 /dev/mapper/ubuntu--vg-root rw,errors=remount-ro`
) )
func TestParseFedoraMountinfo(t *testing.T) { func TestParseFedoraMountinfo(t *testing.T) {
@ -543,8 +545,8 @@ func TestParseMountinfoWithSpaces(t *testing.T) {
} }
} }
func TestParseMountinfoWithDoubleQuotes(t *testing.T) { func TestParseMountinfoWithQuotes(t *testing.T) {
r := bytes.NewBuffer([]byte(mountInfoWithDoubleQuotes)) r := bytes.NewBuffer([]byte(mountInfoWithQuotes))
infos, err := parseInfoFile(r) infos, err := parseInfoFile(r)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -589,6 +591,32 @@ func TestParseMountinfoWithDoubleQuotes(t *testing.T) {
Source: "/dev/mapper/ubuntu--vg-root", Source: "/dev/mapper/ubuntu--vg-root",
VFSOptions: "rw,errors=remount-ro", VFSOptions: "rw,errors=remount-ro",
}, },
{
ID: 1060,
Parent: 30,
Major: 253,
Minor: 1,
Root: `/tmp/"what's up?"`,
Mountpoint: "/tmp/foo",
Options: "rw,relatime",
Optional: "shared:1",
FSType: "ext4",
Source: "/dev/mapper/ubuntu--vg-root",
VFSOptions: "rw,errors=remount-ro",
},
{
ID: 1100,
Parent: 1060,
Major: 253,
Minor: 1,
Root: `/tmp/'what's up?'`,
Mountpoint: "/tmp/foo",
Options: "rw,relatime",
Optional: "shared:1",
FSType: "ext4",
Source: "/dev/mapper/ubuntu--vg-root",
VFSOptions: "rw,errors=remount-ro",
},
} }
if len(infos) != len(expected) { if len(infos) != len(expected) {