From be762a1b6f63c574b1090e4aad9044fb41533330 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sun, 31 Mar 2019 11:10:03 -0400 Subject: [PATCH] vim-patch:8.1.1074: Python test doesn't wipe out hidden buffer Problem: Python test doesn't wipe out hidden buffer. Solution: Wipe out the buffer. (Ben Jackson, closes vim/vim#4189) https://github.com/vim/vim/commit/bfd36036700ab2d4c9de48e37f222f4a4dd7b3b0 --- src/nvim/testdir/test_python2.vim | 13 +++++++++---- src/nvim/testdir/test_python3.vim | 13 +++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/nvim/testdir/test_python2.vim b/src/nvim/testdir/test_python2.vim index 448785db6d..0c5809f7a4 100644 --- a/src/nvim/testdir/test_python2.vim +++ b/src/nvim/testdir/test_python2.vim @@ -70,32 +70,37 @@ func _SetUpHiddenBuffer() call assert_equal( line( '.' ), 11 ) endfunc +func _CleanUpHiddenBuffer() + bwipe! hidden + bwipe! +endfunc + func Test_Write_To_HiddenBuffer_Does_Not_Fix_Cursor_Clear() call _SetUpHiddenBuffer() py vim.buffers[ int( vim.eval( 'bufnr("hidden")' ) ) ][:] = None call assert_equal( line( '.' ), 11 ) - bwipe! + call _CleanUpHiddenBuffer() endfunc func Test_Write_To_HiddenBuffer_Does_Not_Fix_Cursor_List() call _SetUpHiddenBuffer() py vim.buffers[ int( vim.eval( 'bufnr("hidden")' ) ) ][:] = [ 'test' ] call assert_equal( line( '.' ), 11 ) - bwipe! + call _CleanUpHiddenBuffer() endfunc func Test_Write_To_HiddenBuffer_Does_Not_Fix_Cursor_Str() call _SetUpHiddenBuffer() py vim.buffers[ int( vim.eval( 'bufnr("hidden")' ) ) ][0] = 'test' call assert_equal( line( '.' ), 11 ) - bwipe! + call _CleanUpHiddenBuffer() endfunc func Test_Write_To_HiddenBuffer_Does_Not_Fix_Cursor_ClearLine() call _SetUpHiddenBuffer() py vim.buffers[ int( vim.eval( 'bufnr("hidden")' ) ) ][0] = None call assert_equal( line( '.' ), 11 ) - bwipe! + call _CleanUpHiddenBuffer() endfunc func _SetUpVisibleBuffer() diff --git a/src/nvim/testdir/test_python3.vim b/src/nvim/testdir/test_python3.vim index d5b1cb1b34..d090dcc99c 100644 --- a/src/nvim/testdir/test_python3.vim +++ b/src/nvim/testdir/test_python3.vim @@ -70,32 +70,37 @@ func _SetUpHiddenBuffer() call assert_equal( line( '.' ), 11 ) endfunc +func _CleanUpHiddenBuffer() + bwipe! hidden + bwipe! +endfunc + func Test_Write_To_HiddenBuffer_Does_Not_Fix_Cursor_Clear() call _SetUpHiddenBuffer() py3 vim.buffers[ int( vim.eval( 'bufnr("hidden")' ) ) ][:] = None call assert_equal( line( '.' ), 11 ) - bwipe! + call _CleanUpHiddenBuffer() endfunc func Test_Write_To_HiddenBuffer_Does_Not_Fix_Cursor_List() call _SetUpHiddenBuffer() py3 vim.buffers[ int( vim.eval( 'bufnr("hidden")' ) ) ][:] = [ 'test' ] call assert_equal( line( '.' ), 11 ) - bwipe! + call _CleanUpHiddenBuffer() endfunc func Test_Write_To_HiddenBuffer_Does_Not_Fix_Cursor_Str() call _SetUpHiddenBuffer() py3 vim.buffers[ int( vim.eval( 'bufnr("hidden")' ) ) ][0] = 'test' call assert_equal( line( '.' ), 11 ) - bwipe! + call _CleanUpHiddenBuffer() endfunc func Test_Write_To_HiddenBuffer_Does_Not_Fix_Cursor_ClearLine() call _SetUpHiddenBuffer() py3 vim.buffers[ int( vim.eval( 'bufnr("hidden")' ) ) ][0] = None call assert_equal( line( '.' ), 11 ) - bwipe! + call _CleanUpHiddenBuffer() endfunc func _SetUpVisibleBuffer()