diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-07-21 21:48:58 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-07-21 21:48:58 +0200 |
| commit | 420952175a652372affc78c0017d6049f20063c3 (patch) | |
| tree | de929ef0149a7475eb00fbb8b90d7c354764bf82 | |
| parent | c71f36a889897aca4ac2ad3828926e3801728336 (diff) | |
patch 8.2.1264: terminal getwinpos() test is a bit flakyv8.2.1264
Problem: Terminal getwinpos() test is a bit flaky.
Solution: Call getwinpos() a bit later.
| -rw-r--r-- | src/testdir/test_terminal3.vim | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/testdir/test_terminal3.vim b/src/testdir/test_terminal3.vim index 8405cd16a4..76e8a10543 100644 --- a/src/testdir/test_terminal3.vim +++ b/src/testdir/test_terminal3.vim @@ -527,11 +527,9 @@ func Test_terminal_getwinpos() wincmd j set splitright - call writefile([ - \ 'echo getwinpos()', - \ ], 'XTest_getwinpos') - let buf = RunVimInTerminal('-S XTest_getwinpos', {'cols': 60}) - call TermWait(buf) + let buf = RunVimInTerminal('', {'cols': 60}) + call TermWait(buf, 100) + call term_sendkeys(buf, ":echo getwinpos(500)\<CR>") " Find the output of getwinpos() in the bottom line. let rows = term_getsize(buf)[0] @@ -557,7 +555,6 @@ func Test_terminal_getwinpos() call TermWait(buf) call term_sendkeys(buf, ":q\<CR>") call StopVimInTerminal(buf) - call delete('XTest_getwinpos') exe buf . 'bwipe!' set splitright& only! diff --git a/src/version.c b/src/version.c index a26908213c..9b6f1b41a3 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1264, +/**/ 1263, /**/ 1262, |