aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 9.1.1093: tests: output of test ...win32_ctrl_z depends on python version

Browse Source 
Problem:  tests: output of test Test_terminal_eof_arg_win32_ctrl_z depends on python
          version.
Solution: Check for the expected output in both, the second last line
          and last line

It seems python 3.13 changed the output a bit and there is no longer a
trailing blank line.  So to keep compatible with python < 3.13, let's
check for the expected output in either the last line and the second
last line.

closes: #16599

Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Christian Brabandt
2025-02-09 17:22:30 +01:00
parent 2e4361bd40
commit 3cfac59f92
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/testdir/test_terminal.vim
View File

@@ -963,8 +963,10 @@ func Test_terminal_eof_arg_win32_ctrl_z()
call setline(1, ['print("hello")']) call setline(1, ['print("hello")'])
exe '1term ++eof=<C-Z> ' .. s:python exe '1term ++eof=<C-Z> ' .. s:python
call WaitForAssert({-> assert_match('\^Z', getline(line('$') - 1))}) call WaitForAssert({-> assert_match('\^Z', getline(line('$') - 1) .. getline(line('$')))})
call assert_match('\^Z', getline(line('$') - 1)) " until python 3.12 there was an extra line break, with 3.13 it was removed,
" so depending on the python version the ^Z is on the last or second-last line
call assert_match('\^Z', getline(line('$') - 1) .. getline(line('$')))
%bwipe! %bwipe!
endfunc endfunc

2
src/version.c
View File

@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1093,
/**/ /**/
1092, 1092,
/**/ /**/