mirror of
				https://github.com/vim/vim.git
				synced 2025-10-30 09:47:20 -04:00 
			
		
		
		
	patch 9.1.1613: tests: test_search leaves a few swapfiles behind
Problem:  tests: test_search leaves a few swapfiles behind
Solution: Use :bw! instead of :close to close the swapfile at the end of
          the test.
related: #17933
Signed-off-by: Christian Brabandt <cb@256bit.org>
			
			
This commit is contained in:
		| @@ -1623,7 +1623,7 @@ func Test_search_match_at_curpos() | |||||||
|   call search('.', 'c') |   call search('.', 'c') | ||||||
|   call assert_equal([3, 5], [line('.'), col('.')]) |   call assert_equal([3, 5], [line('.'), col('.')]) | ||||||
|  |  | ||||||
|   close! |   bw! | ||||||
| endfunc | endfunc | ||||||
|  |  | ||||||
| " Test for error cases with the search() function | " Test for error cases with the search() function | ||||||
| @@ -1836,7 +1836,7 @@ func Test_search_pat_not_found() | |||||||
|   call assert_fails('normal n', 'E385:') |   call assert_fails('normal n', 'E385:') | ||||||
|   call assert_fails('normal N', 'E384:') |   call assert_fails('normal N', 'E384:') | ||||||
|   set wrapscan& |   set wrapscan& | ||||||
|   close |   bw | ||||||
| endfunc | endfunc | ||||||
|  |  | ||||||
| " Test for v:searchforward variable | " Test for v:searchforward variable | ||||||
| @@ -1852,7 +1852,7 @@ func Test_searchforward_var() | |||||||
|   let v:searchforward = 1 |   let v:searchforward = 1 | ||||||
|   normal N |   normal N | ||||||
|   call assert_equal(1, line('.')) |   call assert_equal(1, line('.')) | ||||||
|   close! |   bw! | ||||||
| endfunc | endfunc | ||||||
|  |  | ||||||
| " Test for invalid regular expressions | " Test for invalid regular expressions | ||||||
| @@ -1913,7 +1913,7 @@ func Test_search_in_visual_area() | |||||||
|   call assert_equal([2, 5], [line('.'), col('.')]) |   call assert_equal([2, 5], [line('.'), col('.')]) | ||||||
|   exe "normal 2GVj$?\\%Vbar\<CR>\<Esc>" |   exe "normal 2GVj$?\\%Vbar\<CR>\<Esc>" | ||||||
|   call assert_equal([3, 5], [line('.'), col('.')]) |   call assert_equal([3, 5], [line('.'), col('.')]) | ||||||
|   close! |   bw! | ||||||
| endfunc | endfunc | ||||||
|  |  | ||||||
| " Test for searching with 'smartcase' and 'ignorecase' | " Test for searching with 'smartcase' and 'ignorecase' | ||||||
| @@ -1941,7 +1941,7 @@ func Test_search_smartcase() | |||||||
|   call assert_equal([2, 4], [line('.'), col('.')]) |   call assert_equal([2, 4], [line('.'), col('.')]) | ||||||
|  |  | ||||||
|   set ignorecase& smartcase& |   set ignorecase& smartcase& | ||||||
|   close! |   bw! | ||||||
| endfun | endfun | ||||||
|  |  | ||||||
| " Test 'smartcase' with utf-8. | " Test 'smartcase' with utf-8. | ||||||
| @@ -2039,7 +2039,7 @@ func Test_search_offset() | |||||||
|   exe "normal /four/e+1\<CR>" |   exe "normal /four/e+1\<CR>" | ||||||
|   call assert_equal([2, 10], [line('.'), col('.')]) |   call assert_equal([2, 10], [line('.'), col('.')]) | ||||||
|  |  | ||||||
|   close! |   bw! | ||||||
| endfunc | endfunc | ||||||
|  |  | ||||||
| " Test for searching for matching parenthesis using % | " Test for searching for matching parenthesis using % | ||||||
| @@ -2065,7 +2065,7 @@ func Test_search_match_paren() | |||||||
|   normal 20|% |   normal 20|% | ||||||
|   call assert_equal(4, col('.')) |   call assert_equal(4, col('.')) | ||||||
|   set virtualedit& |   set virtualedit& | ||||||
|   close! |   bw! | ||||||
| endfunc | endfunc | ||||||
|  |  | ||||||
| " Test for searching a pattern and stopping before a specified line | " Test for searching a pattern and stopping before a specified line | ||||||
| @@ -2078,7 +2078,7 @@ func Test_search_stopline() | |||||||
|   call cursor(4, 1) |   call cursor(4, 1) | ||||||
|   call assert_equal(0, search('vim', 'bn', 2)) |   call assert_equal(0, search('vim', 'bn', 2)) | ||||||
|   call assert_equal(1, search('vim', 'bn', 1)) |   call assert_equal(1, search('vim', 'bn', 1)) | ||||||
|   close! |   bw! | ||||||
| endfunc | endfunc | ||||||
|  |  | ||||||
| func Test_incsearch_highlighting_newline() | func Test_incsearch_highlighting_newline() | ||||||
|   | |||||||
| @@ -719,6 +719,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 */ | ||||||
|  | /**/ | ||||||
|  |     1613, | ||||||
| /**/ | /**/ | ||||||
|     1612, |     1612, | ||||||
| /**/ | /**/ | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user