mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

os: make the os_test.v functions more robust on windows (normalise the returned paths before comparing them)

Browse Source
This commit is contained in:
Delyan Angelov 2021-10-24 19:54:00 +03:00
parent e99b699ac6
commit bb71089b70
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
vlib/os/os_test.v
View File

@ -220,6 +220,12 @@ fn remove_tree() {
os.rmdir_all('myfolder') or {} os.rmdir_all('myfolder') or {}
} }
fn normalise_paths(paths []string) []string {
mut res := paths.map(it.replace(os.path_separator, '/'))
res.sort()
return res
}
fn test_walk_ext() ? { fn test_walk_ext() ? {
create_tree() ? create_tree() ?
defer { defer {
@ -227,8 +233,7 @@ fn test_walk_ext() ? {
} }
all := os.walk_ext('.', '') all := os.walk_ext('.', '')
assert all.len > 10 assert all.len > 10
mut top := os.walk_ext('myfolder', '.txt') top := normalise_paths(os.walk_ext('myfolder', '.txt'))
top.sort()
assert top == [ assert top == [
'myfolder/a1/1.txt', 'myfolder/a1/1.txt',
'myfolder/a1/a2/a3/x.txt', 'myfolder/a1/a2/a3/x.txt',
@ -239,15 +244,13 @@ fn test_walk_ext() ? {
'myfolder/f1/f2/f3/b.txt', 'myfolder/f1/f2/f3/b.txt',
'myfolder/f1/f2/f3/c.txt', 'myfolder/f1/f2/f3/c.txt',
] ]
mut subfolder_txts := os.walk_ext('myfolder/a1/a2', '.txt') subfolder_txts := normalise_paths(os.walk_ext('myfolder/a1/a2', '.txt'))
subfolder_txts.sort()
assert subfolder_txts == [ assert subfolder_txts == [
'myfolder/a1/a2/a3/x.txt', 'myfolder/a1/a2/a3/x.txt',
'myfolder/a1/a2/a3/y.txt', 'myfolder/a1/a2/a3/y.txt',
'myfolder/a1/a2/a3/z.txt', 'myfolder/a1/a2/a3/z.txt',
] ]
mut mds := os.walk_ext('myfolder', '.md') mut mds := normalise_paths(os.walk_ext('myfolder', '.md'))
mds.sort()
assert mds == ['myfolder/another.md', 'myfolder/f1/f2/f3/d.md'] assert mds == ['myfolder/another.md', 'myfolder/f1/f2/f3/d.md']
} }
@ -260,6 +263,7 @@ fn test_walk_with_context() ? {
os.walk_with_context('myfolder', &res, fn (mut res []string, fpath string) { os.walk_with_context('myfolder', &res, fn (mut res []string, fpath string) {
res << fpath res << fpath
}) })
res = normalise_paths(res)
assert 'myfolder/f1/f2/f3/b.txt' in res assert 'myfolder/f1/f2/f3/b.txt' in res
assert 'myfolder/another.md' in res assert 'myfolder/another.md' in res
} }