commit 5bf46e978619ff602a7c63dd98e19de8248236b3
author Bram Moolenaar <Bram@vim.org> Sat Nov 09 18:06:04 2019 +0100
committer Bram Moolenaar <Bram@vim.org> Sat Nov 09 18:06:04 2019 +0100
tree d2289eb60b0c3bd04c91a06e626e8f606ef7453d
parent 1e15e61188e14ba67060c09d4c74e9b587016230

patch 8.1.2276: MS-Windows: session test leaves files behind

Problem:    MS-Windows: session test leaves files behind.
Solution:   Wipe out buffers before deleting the directory. (closes #5187)

src/testdir/test_mksession.vim

diff --git a/src/testdir/test_mksession.vim b/src/testdir/test_mksession.vim
index d713da7..a3712a3 100644
--- a/src/testdir/test_mksession.vim
+++ b/src/testdir/test_mksession.vim
@@ -276,8 +276,8 @@
   call assert_equal('Xtabdir3', fnamemodify(getcwd(-1, 3), ':t'))
   call assert_equal('Xtabdir3', fnamemodify(getcwd(1, 3), ':t'))
   call assert_equal('Xwindir3', fnamemodify(getcwd(2, 3), ':t'))
-  only | tabonly
-  exe 'cd ' . save_cwd
+  %bwipe
+  call chdir(save_cwd)
   call delete("Xtopdir", "rf")
 endfunc
 
@@ -623,6 +623,7 @@
 
 " Test for changing directory to the session file directory
 func Test_mksession_sesdir()
+  let save_cwd = getcwd()
   call mkdir('Xproj')
   mksession! Xproj/Xtest_mks1.out
   set sessionoptions-=curdir
@@ -633,7 +634,8 @@
   call assert_equal('testdir', fnamemodify(getcwd(), ':t'))
   source Xproj/Xtest_mks2.out
   call assert_equal('Xproj', fnamemodify(getcwd(), ':t'))
-  cd ..
+  call chdir(save_cwd)
+  %bwipe
 
   set sessionoptions&
   call delete('Xproj', 'rf')

src/version.c

diff --git a/src/version.c b/src/version.c
index 44149ff..fc6808b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2276,
+/**/
     2275,
 /**/
     2274,