commit ae1bd87fe84bfb31379bc5da351bca56a3d3b571
author ichizok <gclient.gaap@gmail.com> Thu Jan 20 14:57:29 2022 +0000
committer Bram Moolenaar <Bram@vim.org> Thu Jan 20 14:57:29 2022 +0000
tree c2ddc317dba707c0a90991ab3153f355151c4e53
parent 726f7f91fd17e3e7eb39614a20d10ea83c134df0

patch 8.2.4157: terminal test fails because Windows sets the title

Problem:    Terminal test fails because Windows sets the title.
Solution:   Add the "vterm_title" testing override and use it in the test.
            (Ozaki Kiichi, closes #9556)

src/globals.h

diff --git a/src/globals.h b/src/globals.h
index 94da8e0..7e0c1e5 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -1642,6 +1642,7 @@
 EXTERN int  no_query_mouse_for_testing INIT(= FALSE);
 EXTERN int  ui_delay_for_testing INIT(= 0);
 EXTERN int  reset_term_props_on_termresponse INIT(= FALSE);
+EXTERN int  disable_vterm_title_for_testing INIT(= FALSE);
 EXTERN long override_sysinfo_uptime INIT(= -1);
 EXTERN int  override_autoload INIT(= FALSE);
 

src/terminal.c

diff --git a/src/terminal.c b/src/terminal.c
index f32d3ad..43a216f 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -3088,6 +3088,8 @@
     switch (prop)
     {
 	case VTERM_PROP_TITLE:
+	    if (disable_vterm_title_for_testing)
+		break;
 	    strval = vim_strnsave((char_u *)value->string.str,
 							    value->string.len);
 	    if (strval == NULL)

src/testdir/test_terminal.vim

diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 45a3646..4ef977b 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -14,6 +14,7 @@
 let $PROMPT_COMMAND=''
 
 func Test_terminal_basic()
+  call test_override('vterm_title', 1)
   au TerminalOpen * let b:done = 'yes'
   let buf = Run_shell_in_terminal({})
 
@@ -37,6 +38,7 @@
   call assert_equal("", bufname(buf))
 
   au! TerminalOpen
+  call test_override('ALL', 0)
   unlet g:job
 endfunc
 

src/testing.c

diff --git a/src/testing.c b/src/testing.c
index 3482682..4d2a942 100644
--- a/src/testing.c
+++ b/src/testing.c
@@ -1053,6 +1053,8 @@
 	    ui_delay_for_testing = val;
 	else if (STRCMP(name, (char_u *)"term_props") == 0)
 	    reset_term_props_on_termresponse = val;
+	else if (STRCMP(name, (char_u *)"vterm_title") == 0)
+	    disable_vterm_title_for_testing = val;
 	else if (STRCMP(name, (char_u *)"uptime") == 0)
 	    override_sysinfo_uptime = val;
 	else if (STRCMP(name, (char_u *)"autoload") == 0)

src/version.c

diff --git a/src/version.c b/src/version.c
index 6eb853f..b79f066 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4157,
+/**/
     4156,
 /**/
     4155,