patch 8.2.2112: running tests may leave some files behind

Problem:    Running tests may leave some files behind.
Solution:   Delete the right files.  Fix a few typos. (Dominique Pellé,
            closes #7436

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 450aae48e944de9c5e3ecb3fa1a5a96253ed2bff..2415e4da6a1dfb9135ead21cd3d6b33fcdf6a43f 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -722,7 +722,7 @@ func Test_ts_file()
   call assert_equal('typescript', &filetype)
   bwipe!
 
-  call delete('Xfile.hook')
+  call delete('Xfile.ts')
   filetype off
 endfunc
 

diff --git a/src/testdir/test_messages.vim b/src/testdir/test_messages.vim
index 158e94bc5afef17d0a727c9d710962289307dc8d..4f8c75112fda96d47522396ca0a4abc84906b4ba 100644 (file)
--- a/src/testdir/test_messages.vim
+++ b/src/testdir/test_messages.vim
@@ -323,7 +323,7 @@ func Test_quit_long_message()
 
   " clean up
   call StopVimInTerminal(buf)
-  call delete('Xtest_diff_rnu')
+  call delete('Xtest_quit_message')
 endfunc
 
 " vim: shiftwidth=2 sts=2 expandtab

diff --git a/src/testdir/test_mksession.vim b/src/testdir/test_mksession.vim
index c2b8fb955c98f4c8658d21aa0af9453608e8c78c..723eb8ed2db3e959ce8b7718e2beb1876756b8d3 100644 (file)
--- a/src/testdir/test_mksession.vim
+++ b/src/testdir/test_mksession.vim
@@ -381,7 +381,7 @@ func Test_mksession_terminal_no_restore_cmdarg()
   let term_cmd = ''
   for line in lines
     if line =~ '^terminal'
-      call assert_report('session must not restore teminal')
+      call assert_report('session must not restore terminal')
     endif
   endfor
 
@@ -398,7 +398,7 @@ func Test_mksession_terminal_no_restore_funcarg()
   let term_cmd = ''
   for line in lines
     if line =~ '^terminal'
-      call assert_report('session must not restore teminal')
+      call assert_report('session must not restore terminal')
     endif
   endfor
 
@@ -416,7 +416,7 @@ func Test_mksession_terminal_no_restore_func()
   let term_cmd = ''
   for line in lines
     if line =~ '^terminal'
-      call assert_report('session must not restore teminal')
+      call assert_report('session must not restore terminal')
     endif
   endfor
 
@@ -434,7 +434,7 @@ func Test_mksession_terminal_no_ssop()
   let term_cmd = ''
   for line in lines
     if line =~ '^terminal'
-      call assert_report('session must not restore teminal')
+      call assert_report('session must not restore terminal')
     endif
   endfor
 
@@ -940,6 +940,7 @@ func Test_altfile()
   call assert_equal('Xtwoalt', bufname('#'))
   only
   bwipe!
+  call delete('Xtest_altfile')
 endfunc
 
 " vim: shiftwidth=2 sts=2 expandtab

diff --git a/src/version.c b/src/version.c
index 07dc6a20dcaea75776a8982aa692ea8e627ba3ee..f4415817bddd17e652a5ebbe5add7bda4d441a65 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 */
+/**/
+    2112,
 /**/
     2111,
 /**/