To: vim_dev@googlegroups.com Subject: Patch 8.0.1536 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1536 Problem: Quotestar test is flaky when using the GUI. Solution: Add check that the star register arrived at the server. Increase timeouts. Files: src/testdir/test_quotestar.vim *** ../vim-8.0.1535/src/testdir/test_quotestar.vim 2017-11-04 19:24:24.754197129 +0100 --- src/testdir/test_quotestar.vim 2018-02-24 17:40:25.116899292 +0100 *************** *** 65,88 **** " Takes a short while for the server to be active. call WaitFor('serverlist() =~ "' . name . '"') - call assert_match(name, serverlist()) " Wait for the server to be up and answering requests. One second is not " always sufficient. call WaitFor('remote_expr("' . name . '", "v:version", "", 2) != ""') ! " Clear the *-register of this vim instance. ! let @* = '' ! ! " Try to change the *-register of the server. call remote_foreground(name) call remote_send(name, ":let @* = 'yes'\") ! call WaitFor('remote_expr("' . name . '", "@*", "", 1) == "yes"') ! call assert_equal('yes', remote_expr(name, "@*", "", 2)) " Check that the *-register of this vim instance is changed as expected. ! call WaitFor('@* == "yes"') ! call assert_equal('yes', @*) " Handle the large selection over 262040 byte. let length = 262044 --- 65,87 ---- " Takes a short while for the server to be active. call WaitFor('serverlist() =~ "' . name . '"') " Wait for the server to be up and answering requests. One second is not " always sufficient. call WaitFor('remote_expr("' . name . '", "v:version", "", 2) != ""') ! " Clear the *-register of this vim instance and wait for it to be picked up ! " by the server. ! let @* = 'no' call remote_foreground(name) + call WaitFor('remote_expr("' . name . '", "@*", "", 1) == "no"', 3000) + + " Set the * register on the server. call remote_send(name, ":let @* = 'yes'\") ! call WaitFor('remote_expr("' . name . '", "@*", "", 1) == "yes"', 3000) " Check that the *-register of this vim instance is changed as expected. ! call WaitFor('@* == "yes"', 3000) " Handle the large selection over 262040 byte. let length = 262044 *** ../vim-8.0.1535/src/version.c 2018-02-24 16:51:26.783025245 +0100 --- src/version.c 2018-02-24 17:17:36.301280684 +0100 *************** *** 780,781 **** --- 780,783 ---- { /* Add new patch number below this line */ + /**/ + 1536, /**/ -- A special law prohibits unmarried women from parachuting on Sunday or she shall risk arrest, fine, and/or jailing. [real standing law in Florida, United States of America] /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///