patch 9.0.1008: test for swapfilelist() fails on MS-Windows
Problem: Test for swapfilelist() fails on MS-Windows.
Solution: Only check the tail of the path. Mark a test as flaky.
diff --git a/src/testdir/test_swap.vim b/src/testdir/test_swap.vim
index c776ca5..7532655 100644
--- a/src/testdir/test_swap.vim
+++ b/src/testdir/test_swap.vim
@@ -111,16 +111,18 @@
let fname = s:swapname()
call assert_match('Xswapinfo', fname)
+ " Check the tail appears in the list from swapfilelist(). The path depends
+ " on the system.
+ let tail = fnamemodify(fname, ":t")->fnameescape()
let nr = 0
for name in swapfilelist()
- if name =~ '[\\/]' .. fname .. '$'
+ if name =~ tail .. '$'
let nr += 1
endif
endfor
- call assert_equal(1, nr)
+ call assert_equal(1, nr, 'not found in ' .. string(swapfilelist()))
let info = fname->swapinfo()
-
let ver = printf('VIM %d.%d', v:version / 100, v:version % 100)
call assert_equal(ver, info.version)
diff --git a/src/testdir/test_vimscript.vim b/src/testdir/test_vimscript.vim
index a23bac3..5599754 100644
--- a/src/testdir/test_vimscript.vim
+++ b/src/testdir/test_vimscript.vim
@@ -5977,6 +5977,9 @@
" interrupt right before a catch is invoked in a script
func Test_ignore_catch_after_intr_1()
+ " for unknown reasons this test sometimes fails on MS-Windows.
+ let g:test_is_flaky = 1
+
XpathINIT
let lines =<< trim [CODE]
try
diff --git a/src/version.c b/src/version.c
index 4a15f43..ce1aba0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1008,
+/**/
1007,
/**/
1006,