diff options
| author | Daniel Hahler <git@thequod.de> | 2019-08-11 13:18:29 +0200 |
|---|---|---|
| committer | Daniel Hahler <git@thequod.de> | 2019-08-11 13:23:30 +0200 |
| commit | 143b02c573ffafbc04301ee539150ec0c936a3e9 (patch) | |
| tree | 6751b9017116c78f01d51ff702000fd58fc982a5 | |
| parent | 0a98765b44927e689af20a8d2484bec2ac17900d (diff) | |
| download | rneovim-143b02c573ffafbc04301ee539150ec0c936a3e9.tar.gz rneovim-143b02c573ffafbc04301ee539150ec0c936a3e9.tar.bz2 rneovim-143b02c573ffafbc04301ee539150ec0c936a3e9.zip | |
vim-patch:8.1.1461: tests do not run or are not reliable on some systems
Problem: Tests do not run or are not reliable on some systems.
Solution: Use "findstr" instead of "grep" on MS-Windows. Clear
PROMPT_COMMAND in the terminal test. Delete temp file. Wait for
output after executing a debug command. (Yegappan Lakshmanan,
closes vim/vim#4479)
https://github.com/vim/vim/commit/ddd3308782e931a2c390d692cb23c40d8169bd6f
Ignored changes to testdir/test_terminal.vim.
| -rw-r--r-- | src/nvim/testdir/test_debugger.vim | 16 | ||||
| -rw-r--r-- | src/nvim/testdir/test_environ.vim | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test_filetype.vim | 6 | ||||
| -rw-r--r-- | src/nvim/testdir/test_source.vim | 1 |
4 files changed, 15 insertions, 10 deletions
diff --git a/src/nvim/testdir/test_debugger.vim b/src/nvim/testdir/test_debugger.vim index c923b22836..bb87ef9c58 100644 --- a/src/nvim/testdir/test_debugger.vim +++ b/src/nvim/testdir/test_debugger.vim @@ -52,16 +52,16 @@ func Test_Debugger() let buf = RunVimInTerminal('-S Xtest.vim', {}) " Start the Vim debugger - call RunDbgCmd(buf, ':debug echo Foo()') + call RunDbgCmd(buf, ':debug echo Foo()', ['cmd: echo Foo()']) " Create a few stack frames by stepping through functions - call RunDbgCmd(buf, 'step') - call RunDbgCmd(buf, 'step') - call RunDbgCmd(buf, 'step') - call RunDbgCmd(buf, 'step') - call RunDbgCmd(buf, 'step') - call RunDbgCmd(buf, 'step') - call RunDbgCmd(buf, 'step') + call RunDbgCmd(buf, 'step', ['line 1: let var1 = 1']) + call RunDbgCmd(buf, 'step', ['line 2: let var2 = Bar(var1) + 9']) + call RunDbgCmd(buf, 'step', ['line 1: let var1 = 2 + a:var']) + call RunDbgCmd(buf, 'step', ['line 2: let var2 = Bazz(var1) + 4']) + call RunDbgCmd(buf, 'step', ['line 1: try']) + call RunDbgCmd(buf, 'step', ['line 2: let var1 = 3 + a:var']) + call RunDbgCmd(buf, 'step', ['line 3: let var3 = "another var"']) " check backtrace call RunDbgCmd(buf, 'backtrace', [ diff --git a/src/nvim/testdir/test_environ.vim b/src/nvim/testdir/test_environ.vim index 094c4ce36f..76ffe5631b 100644 --- a/src/nvim/testdir/test_environ.vim +++ b/src/nvim/testdir/test_environ.vim @@ -36,7 +36,7 @@ func Test_external_env() call setenv('FOO', v:null) if has('win32') - let result = system('set | grep ^FOO=') + let result = system('set | findstr ^FOO=') else let result = system('env | grep ^FOO=') endif diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim index e6d4933797..a9ade9155a 100644 --- a/src/nvim/testdir/test_filetype.vim +++ b/src/nvim/testdir/test_filetype.vim @@ -522,7 +522,11 @@ func CheckItems(checks) catch call assert_report('cannot edit "' . names[i] . '": ' . v:exception) endtry - call assert_equal(ft, &filetype, 'with file name: ' . names[i]) + if &filetype == '' && &readonly + " File exists but not able to edit it (permission denied) + else + call assert_equal(ft, &filetype, 'with file name: ' . names[i]) + endif bwipe! endfor endfor diff --git a/src/nvim/testdir/test_source.vim b/src/nvim/testdir/test_source.vim index 5166bafb15..09baec0b7d 100644 --- a/src/nvim/testdir/test_source.vim +++ b/src/nvim/testdir/test_source.vim @@ -44,4 +44,5 @@ func Test_source_sandbox() call assert_equal('hello', getline(1)) call assert_fails('sandbox source! Xsourcehello', 'E48:') bwipe! + call delete('Xsourcehello') endfunc |