vim-patch:8.0.1200: tests switch the bell off twice

Problem:    Tests switch the bell off twice.
Solution:   Don't set 'belloff' in individual tests. (Christian Brabandt)

67418d97b4
This commit is contained in:
Justin M. Keyes 2018-02-11 15:44:26 +01:00
parent 66f5e5c7d7
commit 163b2b241b
12 changed files with 1 additions and 28 deletions

View File

@ -1,7 +1,6 @@
" A series of tests that can run in one Vim invocation. " A series of tests that can run in one Vim invocation.
" This makes testing go faster, since Vim doesn't need to restart. " This makes testing go faster, since Vim doesn't need to restart.
set belloff=all
source test_assign.vim source test_assign.vim
source test_changedtick.vim source test_changedtick.vim
source test_cursor_func.vim source test_cursor_func.vim

View File

@ -1,6 +1,5 @@
" Tests for autocommands " Tests for autocommands
set belloff=all
func! s:cleanup_buffers() abort func! s:cleanup_buffers() abort
for bnr in range(1, bufnr('$')) for bnr in range(1, bufnr('$'))

View File

@ -1,6 +1,5 @@
" Tests for editing the command line. " Tests for editing the command line.
set belloff=all
func Test_complete_tab() func Test_complete_tab()
call writefile(['testfile'], 'Xtestfile') call writefile(['testfile'], 'Xtestfile')

View File

@ -1,5 +1,4 @@
" Tests for diff mode " Tests for diff mode
set belloff=all
func Test_diff_fold_sync() func Test_diff_fold_sync()
enew! enew!

View File

@ -3,7 +3,6 @@
if !has("digraphs") || !has("multi_byte") if !has("digraphs") || !has("multi_byte")
finish finish
endif endif
set belloff=all
func! Put_Dig(chars) func! Put_Dig(chars)
exe "norm! o\<c-k>".a:chars exe "norm! o\<c-k>".a:chars

View File

@ -3,7 +3,6 @@
if exists("+t_kD") if exists("+t_kD")
let &t_kD="[3;*~" let &t_kD="[3;*~"
endif endif
set belloff=
" Needed for testing basic rightleft: Test_edit_rightleft " Needed for testing basic rightleft: Test_edit_rightleft
source view_util.vim source view_util.vim
@ -26,7 +25,6 @@ func! Test_edit_01()
" set for Travis CI? " set for Travis CI?
" set nocp noesckeys " set nocp noesckeys
new new
set belloff=backspace
" 1) empty buffer " 1) empty buffer
call assert_equal([''], getline(1,'$')) call assert_equal([''], getline(1,'$'))
" 2) delete in an empty line " 2) delete in an empty line
@ -59,7 +57,6 @@ func! Test_edit_01()
call cursor(1, 1) call cursor(1, 1)
call feedkeys("A\<del>\<esc>", 'tnix') call feedkeys("A\<del>\<esc>", 'tnix')
call assert_equal(["abc def", "ghi jkl"], getline(1, 2)) call assert_equal(["abc def", "ghi jkl"], getline(1, 2))
set belloff=
let &bs=_bs let &bs=_bs
bw! bw!
endfunc endfunc
@ -449,13 +446,11 @@ func! Test_edit_00a_CTRL_A()
new new
call setline(1, repeat([''], 5)) call setline(1, repeat([''], 5))
call cursor(1, 1) call cursor(1, 1)
set belloff=all
try try
call feedkeys("A\<NUL>", 'tnix') call feedkeys("A\<NUL>", 'tnix')
catch /^Vim\%((\a\+)\)\=:E29/ catch /^Vim\%((\a\+)\)\=:E29/
call assert_true(1, 'E29 error caught') call assert_true(1, 'E29 error caught')
endtry endtry
set belloff=
call cursor(1, 1) call cursor(1, 1)
call feedkeys("Afoobar \<esc>", 'tnix') call feedkeys("Afoobar \<esc>", 'tnix')
call cursor(2, 1) call cursor(2, 1)
@ -484,7 +479,6 @@ endfunc
func! Test_edit_CTRL_G() func! Test_edit_CTRL_G()
new new
set belloff=all
call setline(1, ['foobar', 'foobar', 'foobar']) call setline(1, ['foobar', 'foobar', 'foobar'])
call cursor(2, 4) call cursor(2, 4)
call feedkeys("ioooooooo\<c-g>k\<c-r>.\<esc>", 'tnix') call feedkeys("ioooooooo\<c-g>k\<c-r>.\<esc>", 'tnix')
@ -498,7 +492,6 @@ func! Test_edit_CTRL_G()
call assert_equal([0, 3, 7, 0], getpos('.')) call assert_equal([0, 3, 7, 0], getpos('.'))
call feedkeys("i\<c-g>j\<esc>", 'tnix') call feedkeys("i\<c-g>j\<esc>", 'tnix')
call assert_equal([0, 3, 6, 0], getpos('.')) call assert_equal([0, 3, 6, 0], getpos('.'))
set belloff=
bw! bw!
endfunc endfunc
@ -578,7 +571,6 @@ func! Test_edit_CTRL_K()
%d %d
call setline(1, 'A') call setline(1, 'A')
call cursor(1, 1) call cursor(1, 1)
set belloff=all
let v:testing = 1 let v:testing = 1
try try
call feedkeys("A\<c-x>\<c-k>\<esc>", 'tnix') call feedkeys("A\<c-x>\<c-k>\<esc>", 'tnix')
@ -586,7 +578,6 @@ func! Test_edit_CTRL_K()
" error sleeps 2 seconds, when v:testing is not set " error sleeps 2 seconds, when v:testing is not set
let v:testing = 0 let v:testing = 0
endtry endtry
set belloff=
call delete('Xdictionary.txt') call delete('Xdictionary.txt')
if has("multi_byte") && !has("nvim") if has("multi_byte") && !has("nvim")
@ -828,7 +819,6 @@ func! Test_edit_CTRL_T()
%d %d
call setline(1, 'mad') call setline(1, 'mad')
call cursor(1, 1) call cursor(1, 1)
set belloff=all
let v:testing = 1 let v:testing = 1
try try
call feedkeys("A\<c-x>\<c-t>\<esc>", 'tnix') call feedkeys("A\<c-x>\<c-t>\<esc>", 'tnix')
@ -836,7 +826,6 @@ func! Test_edit_CTRL_T()
" error sleeps 2 seconds, when v:testing is not set " error sleeps 2 seconds, when v:testing is not set
let v:testing = 0 let v:testing = 0
endtry endtry
set belloff=
call assert_equal(['mad'], getline(1, '$')) call assert_equal(['mad'], getline(1, '$'))
call delete('Xthesaurus') call delete('Xthesaurus')
bw! bw!
@ -1009,7 +998,6 @@ endfunc
func! Test_edit_LEFT_RIGHT() func! Test_edit_LEFT_RIGHT()
" Left, Shift-Left, Right, Shift-Right " Left, Shift-Left, Right, Shift-Right
new new
set belloff=all
call setline(1, ['abc def ghi', 'ABC DEF GHI', 'ZZZ YYY XXX']) call setline(1, ['abc def ghi', 'ABC DEF GHI', 'ZZZ YYY XXX'])
let _ww=&ww let _ww=&ww
set ww= set ww=
@ -1051,7 +1039,6 @@ func! Test_edit_LEFT_RIGHT()
call feedkeys("A\<s-right>\<esc>", 'tnix') call feedkeys("A\<s-right>\<esc>", 'tnix')
call assert_equal([0, 3, 1, 0], getpos('.')) call assert_equal([0, 3, 1, 0], getpos('.'))
let &ww = _ww let &ww = _ww
set belloff=
bw! bw!
endfunc endfunc
@ -1111,7 +1098,6 @@ func! Test_edit_MOUSE()
endfunc endfunc
func! Test_edit_PAGEUP_PAGEDOWN() func! Test_edit_PAGEUP_PAGEDOWN()
set belloff=all
10new 10new
call setline(1, repeat(['abc def ghi'], 30)) call setline(1, repeat(['abc def ghi'], 30))
call cursor(1, 1) call cursor(1, 1)
@ -1207,12 +1193,10 @@ func! Test_edit_PAGEUP_PAGEDOWN()
call assert_equal([0, 30, 11, 0], getpos('.')) call assert_equal([0, 30, 11, 0], getpos('.'))
call feedkeys("A\<S-Down>\<esc>", 'tnix') call feedkeys("A\<S-Down>\<esc>", 'tnix')
call assert_equal([0, 30, 11, 0], getpos('.')) call assert_equal([0, 30, 11, 0], getpos('.'))
set startofline belloff=
bw! bw!
endfunc endfunc
func! Test_edit_forbidden() func! Test_edit_forbidden()
set belloff=error,esc
new new
" 1) edit in the sandbox is not allowed " 1) edit in the sandbox is not allowed
call setline(1, 'a') call setline(1, 'a')
@ -1269,7 +1253,6 @@ func! Test_edit_forbidden()
set norevins nofkmap set norevins nofkmap
endtry endtry
endif endif
set belloff=
bw! bw!
endfunc endfunc

View File

@ -2,7 +2,6 @@
source shared.vim source shared.vim
set belloff=all
func! Setup_NewWindow() func! Setup_NewWindow()
10new 10new
call setline(1, range(1,100)) call setline(1, range(1,100))

View File

@ -22,7 +22,7 @@ endfunc
" blocks. " blocks.
func Test_swap_file() func Test_swap_file()
set directory=. set directory=.
set fileformat=unix undolevels=-1 belloff=all set fileformat=unix undolevels=-1
edit! Xtest edit! Xtest
let text = "\tabcdefghijklmnoparstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnoparstuvwxyz0123456789" let text = "\tabcdefghijklmnoparstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnoparstuvwxyz0123456789"
let i = 1 let i = 1

View File

@ -1,6 +1,5 @@
" Test for the search command " Test for the search command
set belloff=all
func Test_search_cmdline() func Test_search_cmdline()
" See test/functional/legacy/search_spec.lua " See test/functional/legacy/search_spec.lua
throw 'skipped: Nvim does not support test_override()' throw 'skipped: Nvim does not support test_override()'

View File

@ -3,7 +3,6 @@
" undo-able pieces. Do that by setting 'undolevels'. " undo-able pieces. Do that by setting 'undolevels'.
" Also tests :earlier and :later. " Also tests :earlier and :later.
set belloff=all
func Test_undotree() func Test_undotree()
exe "normal Aabc\<Esc>" exe "normal Aabc\<Esc>"
set ul=100 set ul=100

View File

@ -1,7 +1,6 @@
" Tests for user defined commands " Tests for user defined commands
" Test for <mods> in user defined commands " Test for <mods> in user defined commands
set belloff=all
function Test_cmdmods() function Test_cmdmods()
let g:mods = '' let g:mods = ''

View File

@ -3,7 +3,6 @@ if !has('visual')
finish finish
endif endif
set belloff=all
func Test_block_shift_multibyte() func Test_block_shift_multibyte()
" Uses double-wide character. " Uses double-wide character.