diff options
| author | Christian Brabandt <cb@256bit.org> | 2023-09-05 20:40:25 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2023-09-05 20:40:25 +0200 |
| commit | 1c7397f3f1e168541f88bb1bbd93a9f0b1235852 (patch) | |
| tree | 580ef190c154655da7f4692bb59a1542224b66ba | |
| parent | f6d28fe2c95c678cc3202cc5dc825a3fcc709e93 (diff) | |
patch 9.0.1874: CI may fail in test_recover_empty_swapv9.0.1874
Problem: CI may fail in test_recover_empty_swap
Solution: Set directory option
Fix failing Test_recover_empty_swap test
:recover by default not only looks in the current directory, but also in
~/tmp for files to recover. If it finds some files to recover, it will
interactively prompt for a file to recover. However, prompting doesn't
work when running the test suite (and even if it would, there is no one
that can answer the prompt).
So it doesn't really make sense during testing, to inspect different
directories for swap files and prompt and wait (which will lead to a
timeout and therefore a failing test).
So set the 'directory' option temporarily to the current directory only
and reset it back once the test finishes.
closes: #13038
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | src/testdir/test_recover.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/testdir/test_recover.vim b/src/testdir/test_recover.vim index 8af1397365..a084ef4638 100644 --- a/src/testdir/test_recover.vim +++ b/src/testdir/test_recover.vim @@ -161,6 +161,7 @@ endfunc func Test_recover_empty_swap_file() CheckUnix call writefile([], '.Xfile1.swp', 'D') + set dir=. let msg = execute('recover Xfile1') call assert_match('Unable to read block 0 from .Xfile1.swp', msg) call assert_equal('Xfile1', @%) @@ -173,6 +174,7 @@ func Test_recover_empty_swap_file() " :recover from an empty buffer call assert_fails('recover', 'E305:') + set dir&vim endfunc " Test for :recover using a corrupted swap file diff --git a/src/version.c b/src/version.c index 2faa9e668e..061e18b4c3 100644 --- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1874, +/**/ 1873, /**/ 1872, |