# HG changeset patch # User Christian Brabandt # Date 1517592606 -3600 # Node ID 36c503100cb37772b68fcadaf7204731d8ee9631 # Parent c3034ab2138710618bc90d1ed63a4cfc36c58618 patch 8.0.1452: terminal test fails on some systems commit https://github.com/vim/vim/commit/d4a282f7a5efb2bf28fbd947251e512f08563738 Author: Bram Moolenaar Date: Fri Feb 2 18:22:31 2018 +0100 patch 8.0.1452: terminal test fails on some systems Problem: Terminal test fails on some systems. (jonathonf) Solution: Use "cat" instead of Python to produce the input. Add a delay. (closes #2607) diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -815,17 +815,25 @@ func Test_terminal_response_to_control_s let buf = Run_shell_in_terminal({}) call term_wait(buf) - call term_sendkeys(buf, s:python . " -c 'import sys;sys.stdout.write(\"\\x1b[6n\")'\") + 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) - call term_wait(buf, 100) - " wait for output from tty to display + sleep 200m call term_wait(buf) - call assert_match(';\d\+R', term_getline(buf, 2)) + + " 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 diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1452, +/**/ 1451, /**/ 1450,