vim-patch:9.0.0539: long message test can be flaky (#20282)

Problem:    Long message test can be flaky.
Solution:   Wait for more prompt instead of ruler.
21d393a12b

Comment N/A lines out instead of deleting in buftype tests.
This commit is contained in:
zeertzjq
2022-09-22 20:18:06 +08:00
committed by GitHub
parent 7fc5f6605f
commit a7f6f0e2dd
3 changed files with 8 additions and 1 deletions

View File

@@ -533,7 +533,9 @@ func Test_BufReadCmdNofile()
\ 'acwrite', \ 'acwrite',
\ 'quickfix', \ 'quickfix',
\ 'help', \ 'help',
"\ 'terminal',
\ 'prompt', \ 'prompt',
"\ 'popup',
\ ] \ ]
new somefile new somefile
exe 'set buftype=' .. val exe 'set buftype=' .. val
@@ -650,7 +652,9 @@ func Test_BufEnter()
\ 'acwrite', \ 'acwrite',
\ 'quickfix', \ 'quickfix',
\ 'help', \ 'help',
"\ 'terminal',
\ 'prompt', \ 'prompt',
"\ 'popup',
\ ] \ ]
new somefile new somefile
exe 'set buftype=' .. val exe 'set buftype=' .. val

View File

@@ -1898,7 +1898,9 @@ func Test_bufadd_bufload()
\ ['acwrite', 1], \ ['acwrite', 1],
\ ['quickfix', 0], \ ['quickfix', 0],
\ ['help', 1], \ ['help', 1],
"\ ['terminal', 0],
\ ['prompt', 0], \ ['prompt', 0],
"\ ['popup', 0],
\ ] \ ]
bwipe! XotherName bwipe! XotherName
let buf = bufadd('XotherName') let buf = bufadd('XotherName')

View File

@@ -358,7 +358,8 @@ func Test_quit_long_message()
echom range(9999)->join("\x01") echom range(9999)->join("\x01")
END END
call writefile(content, 'Xtest_quit_message') call writefile(content, 'Xtest_quit_message')
let buf = RunVimInTerminal('-S Xtest_quit_message', #{rows: 6}) let buf = RunVimInTerminal('-S Xtest_quit_message', #{rows: 6, wait_for_ruler: 0})
call WaitForAssert({-> assert_match('^-- More --', term_getline(buf, 6))})
call term_sendkeys(buf, "q") call term_sendkeys(buf, "q")
call VerifyScreenDump(buf, 'Test_quit_long_message', {}) call VerifyScreenDump(buf, 'Test_quit_long_message', {})