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)

diff --git a/runtime/doc/testing.txt b/runtime/doc/testing.txt
index 0459aa3042b78f5e2fd712c1ef194b81486b8c47..2811568fc64c9799aeee508504e5b016e00e4dda 100644 (file)
--- a/runtime/doc/testing.txt
+++ b/runtime/doc/testing.txt
@@ -208,6 +208,8 @@ test_override({name}, {val})                                *test_override()*
                ui_delay     time in msec to use in ui_delay(); overrules a
                             wait time of up to 3 seconds for messages
                uptime       overrules sysinfo.uptime
+               vterm_title  setting the window title by a job running in a
+                            terminal window
                ALL          clear all overrides ({val} is not used)
 
                "starting" is to be used when a test should behave like

diff --git a/src/globals.h b/src/globals.h
index 94da8e0c51e3377088f7ec491d109d43cf39f8dd..7e0c1e55fa1fd862cf2145efbdb0eea152aa9578 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -1642,6 +1642,7 @@ EXTERN int  nfa_fail_for_testing INIT(= FALSE);
 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);
 

diff --git a/src/terminal.c b/src/terminal.c
index f32d3adea3497ef85a992afba2a2a350ce833afa..43a216f951af02eccce2e2cad74ceb57295f33bb 100644 (file)
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -3088,6 +3088,8 @@ handle_settermprop(
     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)

diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 45a364666020dd61ff0ee590c6260bc25b0c859a..4ef977bbeda69938345b9a5868fcab65c2d20bfb 100644 (file)
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -14,6 +14,7 @@ let s:python = PythonProg()
 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 @@ func Test_terminal_basic()
   call assert_equal("", bufname(buf))
 
   au! TerminalOpen
+  call test_override('ALL', 0)
   unlet g:job
 endfunc
 

diff --git a/src/testing.c b/src/testing.c
index 34826826fccd5de9a3383c22e8a9268b39eaa86f..4d2a942675110f96be24c6b8a499e6f623179397 100644 (file)
--- a/src/testing.c
+++ b/src/testing.c
@@ -1053,6 +1053,8 @@ f_test_override(typval_T *argvars, typval_T *rettv UNUSED)
            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)

diff --git a/src/version.c b/src/version.c
index 6eb853f45c0287487e3f75ab25fd4f9c2e428c8c..b79f066f51850eb68e5719bd1af1b8bd2d077e83 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4157,
 /**/
     4156,
 /**/