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 #4189)

diff --git a/src/testdir/test_python2.vim b/src/testdir/test_python2.vim
index 97b44f2ebad5f9cfacf9bf11a350997b106c750d..632f7a872fdec85b9da1a9c7c2663167fe627c7e 100644 (file)
--- a/src/testdir/test_python2.vim
+++ b/src/testdir/test_python2.vim
@@ -89,32 +89,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/testdir/test_python3.vim b/src/testdir/test_python3.vim
index bc05f68ce2ce515ad7ea9e7db80cd950413ed65b..514661ee25a72257b99e1028d85ac6eba34d9a1c 100644 (file)
--- a/src/testdir/test_python3.vim
+++ b/src/testdir/test_python3.vim
@@ -89,32 +89,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()

diff --git a/src/version.c b/src/version.c
index 1921131926681b39e4cbc0a499c9cec93cb592b1..01268b1e275c0e1954c7d80ad537088bb2223688 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -775,6 +775,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1074,
 /**/
     1073,
 /**/