comparison src/testdir/test_delete.vim @ 29970:d891115c0aea v9.0.0323

patch 9.0.0323: using common name in tests leads to flaky tests Commit: https://github.com/vim/vim/commit/3b0d70f4ff436cb144683dafd956e8a3ee485a90 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Aug 29 22:31:20 2022 +0100 patch 9.0.0323: using common name in tests leads to flaky tests Problem: Using common name in tests leads to flaky tests. Solution: Rename files and directories to be more specific.
author Bram Moolenaar <Bram@vim.org>
date Mon, 29 Aug 2022 23:45:04 +0200
parents f74978697fb6
children 98f5a0618a77
comparison
equal deleted inserted replaced
29969:5f2d38cacd6c 29970:d891115c0aea
12 call assert_equal(-1, delete('Xfile')) 12 call assert_equal(-1, delete('Xfile'))
13 bwipe Xfile 13 bwipe Xfile
14 endfunc 14 endfunc
15 15
16 func Test_dir_delete() 16 func Test_dir_delete()
17 call mkdir('Xdir1') 17 call mkdir('Xdirdel')
18 call assert_true(isdirectory('Xdir1')) 18 call assert_true(isdirectory('Xdirdel'))
19 call assert_equal(0, delete('Xdir1', 'd')) 19 call assert_equal(0, delete('Xdirdel', 'd'))
20 call assert_false(isdirectory('Xdir1')) 20 call assert_false(isdirectory('Xdirdel'))
21 call assert_equal(-1, delete('Xdir1', 'd')) 21 call assert_equal(-1, delete('Xdirdel', 'd'))
22 endfunc 22 endfunc
23 23
24 func Test_recursive_delete() 24 func Test_recursive_delete()
25 call mkdir('Xdir1') 25 call mkdir('Xrecdel')
26 call mkdir('Xdir1/subdir') 26 call mkdir('Xrecdel/subdir')
27 call mkdir('Xdir1/empty') 27 call mkdir('Xrecdel/empty')
28 split Xdir1/Xfile 28 split Xrecdel/Xfile
29 call setline(1, ['a', 'b']) 29 call setline(1, ['a', 'b'])
30 w 30 w
31 w Xdir1/subdir/Xfile 31 w Xrecdel/subdir/Xfile
32 close 32 close
33 call assert_true(isdirectory('Xdir1')) 33 call assert_true(isdirectory('Xrecdel'))
34 call assert_equal(['a', 'b'], readfile('Xdir1/Xfile')) 34 call assert_equal(['a', 'b'], readfile('Xrecdel/Xfile'))
35 call assert_true(isdirectory('Xdir1/subdir')) 35 call assert_true(isdirectory('Xrecdel/subdir'))
36 call assert_equal(['a', 'b'], readfile('Xdir1/subdir/Xfile')) 36 call assert_equal(['a', 'b'], readfile('Xrecdel/subdir/Xfile'))
37 call assert_true('Xdir1/empty'->isdirectory()) 37 call assert_true('Xrecdel/empty'->isdirectory())
38 call assert_equal(0, delete('Xdir1', 'rf')) 38 call assert_equal(0, delete('Xrecdel', 'rf'))
39 call assert_false(isdirectory('Xdir1')) 39 call assert_false(isdirectory('Xrecdel'))
40 call assert_equal(-1, delete('Xdir1', 'd')) 40 call assert_equal(-1, delete('Xrecdel', 'd'))
41 bwipe Xdir1/Xfile 41 bwipe Xrecdel/Xfile
42 bwipe Xdir1/subdir/Xfile 42 bwipe Xrecdel/subdir/Xfile
43 endfunc 43 endfunc
44 44
45 func Test_symlink_delete() 45 func Test_symlink_delete()
46 CheckUnix 46 CheckUnix
47 split Xfile 47 split Xfile
48 call setline(1, ['a', 'b']) 48 call setline(1, ['a', 'b'])
49 wq 49 wq
50 silent !ln -s Xfile Xlink 50 silent !ln -s Xfile Xdellink
51 " Delete the link, not the file 51 " Delete the link, not the file
52 call assert_equal(0, delete('Xlink')) 52 call assert_equal(0, delete('Xdellink'))
53 call assert_equal(-1, delete('Xlink')) 53 call assert_equal(-1, delete('Xdellink'))
54 call assert_equal(0, delete('Xfile')) 54 call assert_equal(0, delete('Xfile'))
55 bwipe Xfile 55 bwipe Xfile
56 endfunc 56 endfunc
57 57
58 func Test_symlink_dir_delete() 58 func Test_symlink_dir_delete()
59 CheckUnix 59 CheckUnix
60 call mkdir('Xdir1') 60 call mkdir('Xsymdir')
61 silent !ln -s Xdir1 Xlink 61 silent !ln -s Xsymdir Xdirlink
62 call assert_true(isdirectory('Xdir1')) 62 call assert_true(isdirectory('Xsymdir'))
63 call assert_true(isdirectory('Xlink')) 63 call assert_true(isdirectory('Xdirlink'))
64 " Delete the link, not the directory 64 " Delete the link, not the directory
65 call assert_equal(0, delete('Xlink')) 65 call assert_equal(0, delete('Xdirlink'))
66 call assert_equal(-1, delete('Xlink')) 66 call assert_equal(-1, delete('Xdirlink'))
67 call assert_equal(0, delete('Xdir1', 'd')) 67 call assert_equal(0, delete('Xsymdir', 'd'))
68 endfunc 68 endfunc
69 69
70 func Test_symlink_recursive_delete() 70 func Test_symlink_recursive_delete()
71 CheckUnix 71 CheckUnix
72 call mkdir('Xdir3') 72 call mkdir('Xrecdir3')
73 call mkdir('Xdir3/subdir') 73 call mkdir('Xrecdir3/subdir')
74 call mkdir('Xdir4') 74 call mkdir('Xrecdir4')
75 split Xdir3/Xfile 75 split Xrecdir3/Xfile
76 call setline(1, ['a', 'b']) 76 call setline(1, ['a', 'b'])
77 w 77 w
78 w Xdir3/subdir/Xfile 78 w Xrecdir3/subdir/Xfile
79 w Xdir4/Xfile 79 w Xrecdir4/Xfile
80 close 80 close
81 silent !ln -s ../Xdir4 Xdir3/Xlink 81 silent !ln -s ../Xrecdir4 Xrecdir3/Xreclink
82 82
83 call assert_true(isdirectory('Xdir3')) 83 call assert_true(isdirectory('Xrecdir3'))
84 call assert_equal(['a', 'b'], readfile('Xdir3/Xfile')) 84 call assert_equal(['a', 'b'], readfile('Xrecdir3/Xfile'))
85 call assert_true(isdirectory('Xdir3/subdir')) 85 call assert_true(isdirectory('Xrecdir3/subdir'))
86 call assert_equal(['a', 'b'], readfile('Xdir3/subdir/Xfile')) 86 call assert_equal(['a', 'b'], readfile('Xrecdir3/subdir/Xfile'))
87 call assert_true(isdirectory('Xdir4')) 87 call assert_true(isdirectory('Xrecdir4'))
88 call assert_true(isdirectory('Xdir3/Xlink')) 88 call assert_true(isdirectory('Xrecdir3/Xreclink'))
89 call assert_equal(['a', 'b'], readfile('Xdir4/Xfile')) 89 call assert_equal(['a', 'b'], readfile('Xrecdir4/Xfile'))
90 90
91 call assert_equal(0, delete('Xdir3', 'rf')) 91 call assert_equal(0, delete('Xrecdir3', 'rf'))
92 call assert_false(isdirectory('Xdir3')) 92 call assert_false(isdirectory('Xrecdir3'))
93 call assert_equal(-1, delete('Xdir3', 'd')) 93 call assert_equal(-1, delete('Xrecdir3', 'd'))
94 " symlink is deleted, not the directory it points to 94 " symlink is deleted, not the directory it points to
95 call assert_true(isdirectory('Xdir4')) 95 call assert_true(isdirectory('Xrecdir4'))
96 call assert_equal(['a', 'b'], readfile('Xdir4/Xfile')) 96 call assert_equal(['a', 'b'], readfile('Xrecdir4/Xfile'))
97 call assert_equal(0, delete('Xdir4/Xfile')) 97 call assert_equal(0, delete('Xrecdir4/Xfile'))
98 call assert_equal(0, delete('Xdir4', 'd')) 98 call assert_equal(0, delete('Xrecdir4', 'd'))
99 99
100 bwipe Xdir3/Xfile 100 bwipe Xrecdir3/Xfile
101 bwipe Xdir3/subdir/Xfile 101 bwipe Xrecdir3/subdir/Xfile
102 bwipe Xdir4/Xfile 102 bwipe Xrecdir4/Xfile
103 endfunc 103 endfunc
104 104
105 func Test_delete_errors() 105 func Test_delete_errors()
106 call assert_fails('call delete('''')', 'E474:') 106 call assert_fails('call delete('''')', 'E474:')
107 call assert_fails('call delete(''foo'', 0)', 'E15:') 107 call assert_fails('call delete(''foo'', 0)', 'E15:')