diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-04-13 20:39:15 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-04-13 20:39:15 +0200 |
| commit | 9c35d05f45e545825a15da07cc2f1c893c3789ee (patch) | |
| tree | adb327208e628b35de0dddad284c28208b57ea6c | |
| parent | ca57ab54d759a3e265b19bbe31b57dfed00bbdd0 (diff) | |
patch 8.1.1166: gettitle test can still fail when another Vim is runningv8.1.1166
Problem: Gettitle test can still fail when another Vim is running.
Solution: Accept any server name number. (Dominique Pelle, closes #4252)
| -rw-r--r-- | src/testdir/test_terminal.vim | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index 41a048a5b0..f81bcd3212 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -1904,14 +1904,15 @@ func Test_term_gettitle() let term = term_start([GetVimProg(), '--clean', '-c', 'set noswapfile']) if has('autoservername') - call WaitForAssert({-> assert_equal('[No Name] - VIM1', term_gettitle(term)) }) + call WaitForAssert({-> assert_match('^\[No Name\] - VIM\d\+$', term_gettitle(term)) }) + call term_sendkeys(term, ":e Xfoo\r") + call WaitForAssert({-> assert_match('^Xfoo (.*[/\\]testdir) - VIM\d\+$', term_gettitle(term)) }) else call WaitForAssert({-> assert_equal('[No Name] - VIM', term_gettitle(term)) }) + call term_sendkeys(term, ":e Xfoo\r") + call WaitForAssert({-> assert_match('^Xfoo (.*[/\\]testdir) - VIM$', term_gettitle(term)) }) endif - call term_sendkeys(term, ":e Xfoo\r") - call WaitForAssert({-> assert_match('Xfoo (.*[/\\]testdir) - VIM', term_gettitle(term)) }) - call term_sendkeys(term, ":set titlestring=foo\r") call WaitForAssert({-> assert_equal('foo', term_gettitle(term)) }) diff --git a/src/version.c b/src/version.c index 881c67aa0d..cd7bb3f568 100644 --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1166, +/**/ 1165, /**/ 1164, |