To: vim_dev@googlegroups.com Subject: Patch 8.0.1452 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1452 Problem: Terminal test fails on some systems. (jonathonf) Solution: Use "cat" instead of Python to produce the input. Add a delay. (closes #2607) Files: src/testdir/test_terminal.vim *** ../vim-8.0.1451/src/testdir/test_terminal.vim 2018-01-30 22:31:13.755952680 +0100 --- src/testdir/test_terminal.vim 2018-02-02 18:18:59.613257463 +0100 *************** *** 815,831 **** let buf = Run_shell_in_terminal({}) call term_wait(buf) ! call term_sendkeys(buf, s:python . " -c 'import sys;sys.stdout.write(\"\\x1b[6n\")'\") " wait for the response of control sequence from libvterm (and send it to tty) ! call term_wait(buf, 100) ! " wait for output from tty to display call term_wait(buf) ! call assert_match(';\d\+R', term_getline(buf, 2)) call term_sendkeys(buf, "\") call term_wait(buf) call Stop_shell_in_terminal(buf) exe buf . 'bwipe' unlet g:job endfunc --- 815,839 ---- let buf = Run_shell_in_terminal({}) call term_wait(buf) ! new ! call setline(1, "\x1b[6n") ! write! Xescape ! bwipe ! call term_sendkeys(buf, "cat Xescape\") ! " wait for the response of control sequence from libvterm (and send it to tty) ! sleep 200m call term_wait(buf) ! ! " Wait for output from tty to display, below an empty line. ! " It should show \e3;1R, but only 1R may show up ! call assert_match('\<\d\+R', term_getline(buf, 3)) call term_sendkeys(buf, "\") call term_wait(buf) call Stop_shell_in_terminal(buf) exe buf . 'bwipe' + call delete('Xescape') unlet g:job endfunc *** ../vim-8.0.1451/src/version.c 2018-01-31 21:48:25.228668790 +0100 --- src/version.c 2018-02-02 18:21:03.909160547 +0100 *************** *** 773,774 **** --- 773,776 ---- { /* Add new patch number below this line */ + /**/ + 1452, /**/ -- GALAHAD: No look, really, this isn't nescess ... PIGLET: We must examine you. GALAHAD: There's nothing wrong with ... that. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// 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 ///