Mercurial > vim
changeset 23118:24326797a9aa v8.2.2105
patch 8.2.2105: sound test is a bit flaky
Commit: https://github.com/vim/vim/commit/7b130b9738c3d3975721ce9b84f91320e8d4857c
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Dec 6 21:43:44 2020 +0100
patch 8.2.2105: sound test is a bit flaky
Problem: Sound test is a bit flaky.
Solution: Use WaitForAssert(). (Dominique Pell?, closes https://github.com/vim/vim/issues/7429)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 06 Dec 2020 21:45:04 +0100 |
| parents | 272ccb8eee63 |
| children | 2c01f0efcb8b |
| files | src/testdir/test_sound.vim src/version.c |
| diffstat | 2 files changed, 10 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_sound.vim +++ b/src/testdir/test_sound.vim @@ -1,5 +1,7 @@ " Tests for the sound feature +source shared.vim + if !has('sound') throw 'Skipped: sound feature not available' endif @@ -13,6 +15,7 @@ func Test_play_event() if has('win32') throw 'Skipped: Playing event with callback is not supported on Windows' endif + let g:id = 0 let id = 'bell'->sound_playevent('PlayCallback') if id == 0 throw 'Skipped: bell event not available' @@ -20,8 +23,7 @@ func Test_play_event() " Stop it quickly, avoid annoying the user. sleep 20m eval id->sound_stop() - sleep 30m - call assert_equal(id, g:id) + call WaitForAssert({-> assert_equal(id, g:id)}) call assert_equal(1, g:result) " sound was aborted endfunc @@ -37,17 +39,15 @@ func Test_play_silent() " play until the end let id2 = fname->sound_playfile('PlayCallback') call assert_true(id2 > 0) - sleep 500m - call assert_equal(id2, g:id) + call WaitForAssert({-> assert_equal(id2, g:id)}) call assert_equal(0, g:result) let id2 = sound_playfile(fname, 'PlayCallback') call assert_true(id2 > 0) sleep 20m call sound_clear() - sleep 30m - call assert_equal(id2, g:id) - call assert_equal(1, g:result) + call WaitForAssert({-> assert_equal(id2, g:id)}) + call assert_equal(1, g:result) " sound was aborted " recursive use was causing a crash func PlayAgain(id, fname) @@ -59,8 +59,7 @@ func Test_play_silent() call assert_true(id3 > 0) sleep 50m call sound_clear() - sleep 30m - call assert_true(g:id_again > 0) + call WaitForAssert({-> assert_true(g:id > 0)}) endfunc " vim: shiftwidth=2 sts=2 expandtab