diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-04-06 20:22:06 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-04-06 20:22:06 +0200 |
| commit | 3680bab7e797444a7f41646888d9dd04b01c3816 (patch) | |
| tree | 2d2d87926ac6cc5afece9faf3e75d30c9e1bf652 | |
| parent | 51ad4eaa22e15cf1fe6c45d82c7e1371e00401a4 (diff) | |
patch 8.0.1667: terminal window tests are flakyv8.0.1667
Problem: Terminal window tests are flaky.
Solution: Increase the waiting time for Vim to start.
| -rw-r--r-- | src/testdir/screendump.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/testdir/screendump.vim b/src/testdir/screendump.vim index d4fae07425..764345a98c 100644 --- a/src/testdir/screendump.vim +++ b/src/testdir/screendump.vim @@ -59,8 +59,9 @@ func RunVimInTerminal(arguments, options) let buf = term_start(cmd, {'curwin': 1, 'term_rows': rows, 'term_cols': cols}) call assert_equal([rows, cols], term_getsize(buf)) - " Wait for the ruler (in the status line) to be shown. - call WaitFor({-> len(term_getline(buf, rows)) >= cols - 1}) + " Wait for "All" of the ruler in the status line to be shown. + " This can be quite slow (e.g. when using valgrind), wait up to 4 seconds. + call WaitFor({-> len(term_getline(buf, rows)) >= cols - 1}, 4000) return buf endfunc diff --git a/src/version.c b/src/version.c index 44fb030fc9..c625b05c16 100644 --- a/src/version.c +++ b/src/version.c @@ -763,6 +763,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1667, +/**/ 1666, /**/ 1665, |