8ee95301e6
- use bugurl from /etc/os-release for compiled-by and modified-by options - use bcond macros where it is possible to minimize usage of %%define - unify buildroot/RPM_BUILD_ROOT usage - introduce flakytests rpm condition, so we can remove flaky tests only in CI - order configure options alphabetically and add some comments about their usage
53 lines
1.7 KiB
Diff
53 lines
1.7 KiB
Diff
diff --git a/src/testdir/test_clientserver.vim b/src/testdir/test_clientserver.vim
|
|
index 5f2e887..f928344 100644
|
|
--- a/src/testdir/test_clientserver.vim
|
|
+++ b/src/testdir/test_clientserver.vim
|
|
@@ -202,48 +202,6 @@ func Test_client_server()
|
|
endif
|
|
endfunc
|
|
|
|
-func Test_client_server_stopinsert()
|
|
- " test does not work on MS-Windows
|
|
- CheckNotMSWindows
|
|
- CheckNotMac
|
|
- let g:test_is_flaky = 1
|
|
- let cmd = GetVimCommand()
|
|
- if cmd == ''
|
|
- throw 'GetVimCommand() failed'
|
|
- endif
|
|
- call Check_X11_Connection()
|
|
- let fname = 'Xclientserver_stop.txt'
|
|
- let name = 'XVIMTEST2'
|
|
- call writefile(['one two three'], fname, 'D')
|
|
-
|
|
- let cmd .= ' -c "set virtualedit=onemore"'
|
|
- let cmd .= ' -c "call cursor(1, 14)"'
|
|
- let cmd .= ' -c "startinsert"'
|
|
- let cmd .= ' --servername ' . name
|
|
- let cmd .= ' ' .. fname
|
|
- let job = job_start(cmd, {'stoponexit': 'kill', 'out_io': 'null'})
|
|
- call WaitForAssert({-> assert_equal("run", job_status(job))})
|
|
-
|
|
- " Takes a short while for the server to be active.
|
|
- " When using valgrind it takes much longer.
|
|
- call WaitForAssert({-> assert_match(name, serverlist())})
|
|
-
|
|
- call remote_expr(name, 'execute("stopinsert")')
|
|
-
|
|
- call WaitForAssert({-> assert_equal('n', name->remote_expr("mode(1)"))})
|
|
- cal WaitForAssert({-> assert_equal('13', name->remote_expr("col('.')"))})
|
|
-
|
|
- eval name->remote_send(":qa!\<CR>")
|
|
- try
|
|
- call WaitForAssert({-> assert_equal("dead", job_status(job))})
|
|
- finally
|
|
- if job_status(job) != 'dead'
|
|
- call assert_report('Server did not exit')
|
|
- call job_stop(job, 'kill')
|
|
- endif
|
|
- endtry
|
|
-endfunc
|
|
-
|
|
" Test if socket server and X11 backends can be chosen and work properly.
|
|
func Test_client_server_x11_and_socket_server()
|
|
CheckNotMSWindows
|