Skip to content

Commit 3b0d70f

Browse files
brammoolbrammool
committed
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.
1 parent 4f1b083 commit 3b0d70f

25 files changed

Lines changed: 532 additions & 531 deletions

‎src/testdir/test_autocmd.vim‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -717,14 +717,14 @@ func Test_BufEnter()
717717
call assert_equal('++', g:val)
718718

719719
" Also get BufEnter when editing a directory
720-
call mkdir('Xdir')
721-
split Xdir
720+
call mkdir('Xbufenterdir')
721+
split Xbufenterdir
722722
call assert_equal('+++', g:val)
723723

724724
" On MS-Windows we can't edit the directory, make sure we wipe the right
725725
" buffer.
726-
bwipe! Xdir
727-
call delete('Xdir', 'd')
726+
bwipe! Xbufenterdir
727+
call delete('Xbufenterdir', 'd')
728728
au! BufEnter
729729

730730
" Editing a "nofile" buffer doesn't read the file but does trigger BufEnter
@@ -2723,16 +2723,16 @@ func Test_throw_in_BufWritePre()
27232723
endfunc
27242724

27252725
func Test_autocmd_in_try_block()
2726-
call mkdir('Xdir')
2726+
call mkdir('Xintrydir')
27272727
au BufEnter * let g:fname = expand('%')
27282728
try
2729-
edit Xdir/
2729+
edit Xintrydir/
27302730
endtry
2731-
call assert_match('Xdir', g:fname)
2731+
call assert_match('Xintrydir', g:fname)
27322732

27332733
unlet g:fname
27342734
au! BufEnter
2735-
call delete('Xdir', 'rf')
2735+
call delete('Xintrydir', 'rf')
27362736
endfunc
27372737

27382738
func Test_autocmd_SafeState()

‎src/testdir/test_cd.vim‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -69,34 +69,34 @@ endfunc
6969
" Test for chdir()
7070
func Test_chdir_func()
7171
let topdir = getcwd()
72-
call mkdir('Xdir/y/z', 'p')
72+
call mkdir('Xchdir/y/z', 'p')
7373

7474
" Create a few tabpages and windows with different directories
7575
new
76-
cd Xdir
76+
cd Xchdir
7777
tabnew
7878
tcd y
7979
below new
8080
below new
8181
lcd z
8282

8383
tabfirst
84-
call assert_match('^\[global\] .*/Xdir$', trim(execute('verbose pwd')))
84+
call assert_match('^\[global\] .*/Xchdir$', trim(execute('verbose pwd')))
8585
call chdir('..')
8686
call assert_equal('y', fnamemodify(getcwd(1, 2), ':t'))
8787
call assert_equal('z', fnamemodify(3->getcwd(2), ':t'))
8888
tabnext | wincmd t
8989
call assert_match('^\[tabpage\] .*/y$', trim(execute('verbose pwd')))
9090
eval '..'->chdir()
91-
call assert_equal('Xdir', fnamemodify(getcwd(1, 2), ':t'))
92-
call assert_equal('Xdir', fnamemodify(getcwd(2, 2), ':t'))
91+
call assert_equal('Xchdir', fnamemodify(getcwd(1, 2), ':t'))
92+
call assert_equal('Xchdir', fnamemodify(getcwd(2, 2), ':t'))
9393
call assert_equal('z', fnamemodify(getcwd(3, 2), ':t'))
9494
call assert_equal('testdir', fnamemodify(getcwd(1, 1), ':t'))
9595
3wincmd w
9696
call assert_match('^\[window\] .*/z$', trim(execute('verbose pwd')))
9797
call chdir('..')
98-
call assert_equal('Xdir', fnamemodify(getcwd(1, 2), ':t'))
99-
call assert_equal('Xdir', fnamemodify(getcwd(2, 2), ':t'))
98+
call assert_equal('Xchdir', fnamemodify(getcwd(1, 2), ':t'))
99+
call assert_equal('Xchdir', fnamemodify(getcwd(2, 2), ':t'))
100100
call assert_equal('y', fnamemodify(getcwd(3, 2), ':t'))
101101
call assert_equal('testdir', fnamemodify(getcwd(1, 1), ':t'))
102102

@@ -110,20 +110,20 @@ func Test_chdir_func()
110110

111111
only | tabonly
112112
call chdir(topdir)
113-
call delete('Xdir', 'rf')
113+
call delete('Xchdir', 'rf')
114114
endfunc
115115

116116
" Test for changing to the previous directory '-'
117117
func Test_prev_dir()
118118
let topdir = getcwd()
119-
call mkdir('Xdir/a/b/c', 'p')
119+
call mkdir('Xprevdir/a/b/c', 'p')
120120

121121
" Create a few tabpages and windows with different directories
122122
new | only
123123
tabnew | new
124124
tabnew
125125
tabfirst
126-
cd Xdir
126+
cd Xprevdir
127127
tabnext | wincmd t
128128
tcd a
129129
wincmd w
@@ -143,7 +143,7 @@ func Test_prev_dir()
143143

144144
" Check the directory of all the windows
145145
tabfirst
146-
call assert_equal('Xdir', fnamemodify(getcwd(), ':t'))
146+
call assert_equal('Xprevdir', fnamemodify(getcwd(), ':t'))
147147
tabnext | wincmd t
148148
call assert_equal('a', fnamemodify(getcwd(), ':t'))
149149
wincmd w
@@ -163,7 +163,7 @@ func Test_prev_dir()
163163

164164
" Check the directory of all the windows
165165
tabfirst
166-
call assert_equal('Xdir', fnamemodify(getcwd(), ':t'))
166+
call assert_equal('Xprevdir', fnamemodify(getcwd(), ':t'))
167167
tabnext | wincmd t
168168
call assert_equal('a', fnamemodify(getcwd(), ':t'))
169169
wincmd w
@@ -173,7 +173,7 @@ func Test_prev_dir()
173173

174174
only | tabonly
175175
call chdir(topdir)
176-
call delete('Xdir', 'rf')
176+
call delete('Xprevdir', 'rf')
177177
endfunc
178178

179179
func Test_lcd_split()

‎src/testdir/test_channel.vim‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2281,9 +2281,9 @@ func Test_zz_ch_log()
22812281
let text = readfile('Xlog')
22822282
call assert_match("hello there", text[1])
22832283
call assert_match("%s%s", text[2])
2284-
call mkdir("Xdir1")
2285-
call assert_fails("call ch_logfile('Xdir1')", 'E484:')
2286-
cal delete("Xdir1", 'd')
2284+
call mkdir("Xchlogdir1")
2285+
call assert_fails("call ch_logfile('Xchlogdir1')", 'E484:')
2286+
cal delete("Xchlogdir1", 'd')
22872287
call delete('Xlog')
22882288
endfunc
22892289

‎src/testdir/test_checkpath.vim‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,28 @@
22

33
" Test for 'include' without \zs or \ze
44
func Test_checkpath1()
5-
call mkdir("Xdir1/dir2", "p")
6-
call writefile(['#include "bar.a"'], 'Xdir1/dir2/foo.a')
7-
call writefile(['#include "baz.a"'], 'Xdir1/dir2/bar.a')
8-
call writefile(['#include "foo.a"'], 'Xdir1/dir2/baz.a')
5+
call mkdir("Xcheckdir1/dir2", "p")
6+
call writefile(['#include "bar.a"'], 'Xcheckdir1/dir2/foo.a')
7+
call writefile(['#include "baz.a"'], 'Xcheckdir1/dir2/bar.a')
8+
call writefile(['#include "foo.a"'], 'Xcheckdir1/dir2/baz.a')
99
call writefile(['#include <foo.a>'], 'Xbase.a')
1010

1111
edit Xbase.a
12-
set path=Xdir1/dir2
12+
set path=Xcheckdir1/dir2
1313
let res = split(execute("checkpath!"), "\n")
1414
call assert_equal([
1515
\ '--- Included files in path ---',
16-
\ 'Xdir1/dir2/foo.a',
17-
\ 'Xdir1/dir2/foo.a -->',
18-
\ ' Xdir1/dir2/bar.a',
19-
\ ' Xdir1/dir2/bar.a -->',
20-
\ ' Xdir1/dir2/baz.a',
21-
\ ' Xdir1/dir2/baz.a -->',
16+
\ 'Xcheckdir1/dir2/foo.a',
17+
\ 'Xcheckdir1/dir2/foo.a -->',
18+
\ ' Xcheckdir1/dir2/bar.a',
19+
\ ' Xcheckdir1/dir2/bar.a -->',
20+
\ ' Xcheckdir1/dir2/baz.a',
21+
\ ' Xcheckdir1/dir2/baz.a -->',
2222
\ ' "foo.a" (Already listed)'], res)
2323

2424
enew
2525
call delete("./Xbase.a")
26-
call delete("Xdir1", "rf")
26+
call delete("Xcheckdir1", "rf")
2727
set path&
2828
endfunc
2929

@@ -33,31 +33,31 @@ endfunc
3333

3434
" Test for 'include' with \zs and \ze
3535
func Test_checkpath2()
36-
call mkdir("Xdir1/dir2", "p")
37-
call writefile(['%inc /bar/'], 'Xdir1/dir2/foo.b')
38-
call writefile(['%inc /baz/'], 'Xdir1/dir2/bar.b')
39-
call writefile(['%inc /foo/'], 'Xdir1/dir2/baz.b')
36+
call mkdir("Xcheckdir2/dir2", "p")
37+
call writefile(['%inc /bar/'], 'Xcheckdir2/dir2/foo.b')
38+
call writefile(['%inc /baz/'], 'Xcheckdir2/dir2/bar.b')
39+
call writefile(['%inc /foo/'], 'Xcheckdir2/dir2/baz.b')
4040
call writefile(['%inc /foo/'], 'Xbase.b')
4141

4242
let &include='^\s*%inc\s*/\zs[^/]\+\ze'
4343
let &includeexpr='DotsToSlashes()'
4444

4545
edit Xbase.b
46-
set path=Xdir1/dir2
46+
set path=Xcheckdir2/dir2
4747
let res = split(execute("checkpath!"), "\n")
4848
call assert_equal([
4949
\ '--- Included files in path ---',
50-
\ 'Xdir1/dir2/foo.b',
51-
\ 'Xdir1/dir2/foo.b -->',
52-
\ ' Xdir1/dir2/bar.b',
53-
\ ' Xdir1/dir2/bar.b -->',
54-
\ ' Xdir1/dir2/baz.b',
55-
\ ' Xdir1/dir2/baz.b -->',
50+
\ 'Xcheckdir2/dir2/foo.b',
51+
\ 'Xcheckdir2/dir2/foo.b -->',
52+
\ ' Xcheckdir2/dir2/bar.b',
53+
\ ' Xcheckdir2/dir2/bar.b -->',
54+
\ ' Xcheckdir2/dir2/baz.b',
55+
\ ' Xcheckdir2/dir2/baz.b -->',
5656
\ ' foo (Already listed)'], res)
5757

5858
enew
5959
call delete("./Xbase.b")
60-
call delete("Xdir1", "rf")
60+
call delete("Xcheckdir2", "rf")
6161
set path&
6262
set include&
6363
set includeexpr&
@@ -72,32 +72,32 @@ endfunc
7272

7373
" Test for 'include' with \zs and no \ze
7474
func Test_checkpath3()
75-
call mkdir("Xdir1/dir2", "p")
76-
call writefile(['%inc bar.c'], 'Xdir1/dir2/foo.c')
77-
call writefile(['%inc baz.c'], 'Xdir1/dir2/bar.c')
78-
call writefile(['%inc foo.c'], 'Xdir1/dir2/baz.c')
79-
call writefile(['%inc foo.c'], 'Xdir1/dir2/FALSE.c')
75+
call mkdir("Xcheckdir3/dir2", "p")
76+
call writefile(['%inc bar.c'], 'Xcheckdir3/dir2/foo.c')
77+
call writefile(['%inc baz.c'], 'Xcheckdir3/dir2/bar.c')
78+
call writefile(['%inc foo.c'], 'Xcheckdir3/dir2/baz.c')
79+
call writefile(['%inc foo.c'], 'Xcheckdir3/dir2/FALSE.c')
8080
call writefile(['%inc FALSE.c foo.c'], 'Xbase.c')
8181

8282
let &include='^\s*%inc\s*\%([[:upper:]][^[:space:]]*\s\+\)\?\zs\S\+\ze'
8383
let &includeexpr='StripNewlineChar()'
8484

8585
edit Xbase.c
86-
set path=Xdir1/dir2
86+
set path=Xcheckdir3/dir2
8787
let res = split(execute("checkpath!"), "\n")
8888
call assert_equal([
8989
\ '--- Included files in path ---',
90-
\ 'Xdir1/dir2/foo.c',
91-
\ 'Xdir1/dir2/foo.c -->',
92-
\ ' Xdir1/dir2/bar.c',
93-
\ ' Xdir1/dir2/bar.c -->',
94-
\ ' Xdir1/dir2/baz.c',
95-
\ ' Xdir1/dir2/baz.c -->',
90+
\ 'Xcheckdir3/dir2/foo.c',
91+
\ 'Xcheckdir3/dir2/foo.c -->',
92+
\ ' Xcheckdir3/dir2/bar.c',
93+
\ ' Xcheckdir3/dir2/bar.c -->',
94+
\ ' Xcheckdir3/dir2/baz.c',
95+
\ ' Xcheckdir3/dir2/baz.c -->',
9696
\ ' foo.c (Already listed)'], res)
9797

9898
enew
9999
call delete("./Xbase.c")
100-
call delete("Xdir1", "rf")
100+
call delete("Xcheckdir3", "rf")
101101
set path&
102102
set include&
103103
set includeexpr&

0 commit comments

Comments
 (0)