patch 8.2.1273: MS-Windows: terminal test may leave file behind

Problem:    MS-Windows: terminal test may leave file behind.
Solution:   Wait a moment for process to end before deleting the file.
            (Taro Muraoka, closes #6513)

diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 067fa0f0934dd2c49c36b68d5995be225d76e646..fcc11565cdfa121358bcef6945476b9ab125e2fb 100644 (file)
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -808,6 +808,13 @@ func Test_terminal_redir_file()
   endif
   let g:job = term_getjob(buf)
   call WaitForAssert({-> assert_equal("dead", job_status(g:job))})
+
+  if has('win32')
+    " On Windows we cannot delete a file being used by a process.  When
+    " job_status() returns "dead", the process remains for a short time.
+    " Just wait for a moment.
+    sleep 50m
+  endif
   call delete('Xfile')
   bwipe
 

diff --git a/src/version.c b/src/version.c
index 36951df40e5ebc722436533872d38b68cb11dadc..ed8f6c468551a28dd42f1f3aff61c1df2021c2ed 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1273,
 /**/
     1272,
 /**/