mirror of
https://github.com/vim/vim
synced 2025-07-15 16:51:57 +00:00
patch 9.1.1523: tests: test_clipmethod fails in non X11 environment
Problem: tests: test_clipmethod fails in non X11 environment Solution: test that $DISPLAY is available related: #17677 Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
@ -34,7 +34,9 @@ func Test_clipmethod_order()
|
||||
:wlrestore 1239
|
||||
clipreset
|
||||
|
||||
if exists("$DISPLAY")
|
||||
call assert_equal("x11", v:clipmethod)
|
||||
endif
|
||||
|
||||
:xrestore 1239
|
||||
clipreset
|
||||
@ -49,9 +51,11 @@ func Test_clipmethod_order()
|
||||
call assert_equal("wayland", v:clipmethod)
|
||||
call assert_equal(1, has('clipboard_working'))
|
||||
|
||||
if exists("$DISPLAY")
|
||||
set cpm=x11
|
||||
|
||||
call assert_equal("x11", v:clipmethod)
|
||||
endif
|
||||
|
||||
set cpm=wayland
|
||||
|
||||
@ -101,7 +105,9 @@ func Test_clipreset_switches()
|
||||
wlrestore!
|
||||
|
||||
call assert_equal("", v:wayland_display)
|
||||
if exists("$DISPLAY")
|
||||
call assert_equal("x11", v:clipmethod)
|
||||
endif
|
||||
|
||||
" Do the same but kill a X11 server
|
||||
|
||||
@ -150,20 +156,23 @@ func Test_clipreset_switches()
|
||||
let l:job = job_start(l:cmd, { 'stoponexit': 'kill', 'out_io': 'null'})
|
||||
|
||||
call WaitForAssert({-> assert_equal("run", job_status(l:job))})
|
||||
if exists("$DISPLAY")
|
||||
call WaitForAssert({-> assert_match(l:name, serverlist())})
|
||||
endif
|
||||
|
||||
" Change x server to the one that will be killed, then block until
|
||||
" v:clipmethod is none.
|
||||
if exists("$DISPLAY")
|
||||
call remote_send(l:name, ":xrestore " .. l:xdisplay ..
|
||||
\ ' | call DoIt()' .. "\<CR>")
|
||||
|
||||
call EndXServer(l:xdisplay)
|
||||
|
||||
call WaitFor({-> filereadable('Xtest')})
|
||||
|
||||
" For some reason readfile sometimes returns an empty list despite the file
|
||||
" existing, this why WaitForAssert() is used.
|
||||
call WaitForAssert({-> assert_equal(['SUCCESS'], readfile('Xtest'))}, 1000)
|
||||
endif
|
||||
endfunc
|
||||
|
||||
" vim: shiftwidth=2 sts=2 expandtab
|
||||
|
@ -719,6 +719,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
1523,
|
||||
/**/
|
||||
1522,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user