Commit: patch 9.2.0782: tests: missing cleanup in test_mksession.vim

[Christian Brabandt]

patch 9.2.0782: tests: missing cleanup in test_mksession.vim

Commit: https://github.com/vim/vim/commit/834b8d218f1db92e587ecd449e5ce88b41fbe256
Author: Illia Bobyr <illia...@gmail.com>
Date: Fri Jul 3 16:24:57 2026 +0000

patch 9.2.0782: tests: missing cleanup in test_mksession.vim

Problem: Some test_mksession tests do not cleanup all the state
Solution: Add commands to clean up state introduced by the test
(Illia Bobyr)

Before this change the following 4 tests were failing when executed
individually:

Test_mksession_arglocal_localdir
Test_mksession_buffer_count
Test_mksession_one_buffer_two_windows
Test_mksession_winminheight

As in
```
TEST_FILTER=winminheight make test_mksession
```
Yet, when ran as part of the whole test suite they succeeded.

This was due to some state leaking from one test into another.

I think this is bad, as it can confuse someone making changes in the
relevant area.

`Test_mksession_winminheight` is actually still broken a bit, and
requires `winheight` and `winwidth` set at the beginning of the test,
rather than later, when it actually matters. This exposes a subtle bug
in the session restore script. I have a patch in a separate commit.

closes: #20691

Signed-off-by: Illia Bobyr <illia...@gmail.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/src/testdir/test_mksession.vim b/src/testdir/test_mksession.vim
index 958c11801..8f3551824 100644
--- a/src/testdir/test_mksession.vim
+++ b/src/testdir/test_mksession.vim
@@ -29,6 +29,9 @@ func Test__mksession_arglocal()
endfunc

func Test_mksession_arglocal_localdir()
+ argglobal
+ %argdelete
+
call mkdir('Xa', 'R')
call writefile(['This is Xb'], 'Xa/Xb.txt', 'D')
let olddir = getcwd()
@@ -68,6 +71,7 @@ func Test_mksession()
tabnew
let wrap_save = &wrap
set sessionoptions=buffers splitbelow fileencoding=latin1
+ defer execute('set sessionoptions& splitbelow&')
call setline(1, [
\ 'start:',
\ 'no multibyte chAracter',
@@ -160,7 +164,6 @@ func Test_mksession()
call delete('Xtest_mks.out')
call delete(tmpfile)
let &wrap = wrap_save
- set sessionoptions&
endfunc

def Test_mksession_skiprtp()
@@ -196,7 +199,9 @@ enddef
func Test_mksession_winheight()
new
set winheight=10
+ defer execute('set winheight&')
set winminheight=2
+ defer execute('set winminheight&')
mksession! Xtest_mks.out
source Xtest_mks.out

@@ -205,6 +210,7 @@ endfunc

func Test_mksession_large_winheight()
set winheight=999
+ defer execute('set winheight&')
mksession! Xtest_mks_winheight.out
set winheight&
source Xtest_mks_winheight.out
@@ -213,6 +219,7 @@ endfunc

func Test_mksession_zero_winheight()
set winminheight=0
+ defer execute('set winminheight&')
edit SomeFile
split
wincmd _
@@ -269,6 +276,9 @@ func Test_mksession_arglist()
endfunc

func Test_mksession_one_buffer_two_windows()
+ set splitbelow
+ defer execute('set splitbelow&')
+
edit Xtest1
new Xtest2
split
@@ -377,6 +387,9 @@ func Test_mksession_blank_tabs()
endfunc

func Test_mksession_buffer_count()
+ argglobal
+ %argdelete
+
set hidden

" Edit exactly three files in the current session.
@@ -1063,9 +1076,13 @@ endfunc

" Test for mksession without options restores winminheight
func Test_mksession_winminheight()
+ set winheight=10 winwidth=10 winminheight& winminwidth&
+ defer execute('set winheight& winwidth&')
set sessionoptions-=options
+ defer execute('set sessionoptions&')
split
mksession! Xtest_mks.out
+ defer delete('Xtest_mks.out')
let found_restore = 0
let lines = readfile('Xtest_mks.out')
for line in lines
@@ -1081,12 +1098,11 @@ func Test_mksession_winminheight()
tabclose | tabclose | close
call assert_equal(1, tabpagenr('$'))
set winminheight=2 winminwidth=2
+ defer execute('set winminheight& winminwidth&')
source Xtest_mks.out
call assert_equal(3, tabpagenr('$'))
call assert_equal([2, 2], [&winminheight, &winminwidth])
tabclose | tabclose | close
- call delete('Xtest_mks.out')
- set sessionoptions& winminheight& winminwidth&
endfunc

" Test for mksession with and without options restores shortmess
@@ -1376,8 +1392,12 @@ func Test_mksession_vim9_expr_mappings()

" Load and check the plugin
const ref_txt = 'Hello from vim9 dummy plugin!'
+ let orig_packpath = &packpath
let &packpath .= ',' . base
+ let orig_runtimepath = &runtimepath
packadd dummy9
+ defer execute('let &packpath = orig_runtimepath')
+ defer execute('let &runtimepath = orig_runtimepath')
messages clear
normal dummy-test

@@ -1442,8 +1462,12 @@ func Test_mksession_legacy_expr_mappings()

" Load and check the plugin
const ref_txt = 'Hello from good old dummy plugin!'
+ let orig_packpath = &packpath
let &packpath .= ',' . base
+ let orig_runtimepath = &runtimepath
packadd dummy
+ defer execute('let &packpath = orig_runtimepath')
+ defer execute('let &runtimepath = orig_runtimepath')
messages clear
normal dummy-test

@@ -1518,6 +1542,8 @@ func Test_mksession_cursor_position()
for file in files
call delete(file)
endfor
+
+ %bwipe
endfunc

" Test sessions global and local mappings
@@ -1534,32 +1560,37 @@ func Test_mksession_localmappings()
for option in ["&", "=options", "=localoptions"]
for global in [0, 1]

- " select options
- exe "set sessionoptions" .. option
-
- " mapping
- exe "nnoremap" . (global ? " " : " <buffer> ")
- \ . "dummy-test <Cmd>silent write XDummyOutput<CR>"
- let case = $"mapping_{global ? "global" : "local"}_{option}"
-
- " test mapping
- normal dummy-test
- call assert_true(filereadable("XDummyOutput"), $"Output file was not created by {case}")
- call delete("XDummyOutput")
-
- " session
- let sessionfile = "XSession_" . case
- exe $"mksession {sessionfile}"
-
- if global && option =~ "localoptions"
- let invalid_sessions += [sessionfile]
- else
- let valid_sessions += [sessionfile]
- endif
-
- " clear mappings
- nmapclear
- nmapclear <buffer>
+ try
+ " select options
+ exe "set sessionoptions" .. option
+
+ " mapping
+ exe "nnoremap" . (global ? " " : " <buffer> ")
+ \ . "dummy-test <Cmd>silent write XDummyOutput<CR>"
+ let case = $"mapping_{global ? "global" : "local"}_{option}"
+
+ " test mapping
+ normal dummy-test
+ call assert_true(filereadable("XDummyOutput"), $"Output file was not created by {case}")
+
+ " session
+ let sessionfile = "XSession_" . case
+ exe $"mksession {sessionfile}"
+
+ if global && option =~ "localoptions"
+ let invalid_sessions += [sessionfile]
+ else
+ let valid_sessions += [sessionfile]
+ endif
+
+ finally
+ call delete("XDummyOutput")
+
+ " clear mappings
+ nmapclear
+ nmapclear <buffer>
+ set sessionoptions&
+ endtry

endfor
endfor
diff --git a/src/version.c b/src/version.c
index 7306ff970..4277e31e3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 782,
/**/
781,
/**/