From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 13 Apr 2019 18:39:15 +0000 (+0200)
Subject: patch 8.1.1166: gettitle test can still fail when another Vim is running
X-Git-Tag: v8.1.1166
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9c35d05f45e545825a15da07cc2f1c893c3789ee;p=thirdparty%2Fvim.git

patch 8.1.1166: gettitle test can still fail when another Vim is running

Problem:    Gettitle test can still fail when another Vim is running.
Solution:   Accept any server name number. (Dominique Pelle, closes #4252)
---

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
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1166,
 /**/
     1165,
 /**/