Permalink
Browse files

patch 8.0.0511: message for skipping client-server tests is unclear

Problem:    Menuage for skipping client-server tests is unclear.
Solution:   Be more specific about what's missing (Hirohito Higashi, Kazunobu
            Kuriyama)
  • Loading branch information...
brammool committed Mar 25, 2017
1 parent 8a0141d commit a683ec44c34f0717dcc6a0c03493ba39b879ac38
Showing with 13 additions and 5 deletions.
  1. +5 −3 src/testdir/test_clientserver.vim
  2. +6 −2 src/testdir/test_quotestar.vim
  3. +2 −0 src/version.c
@@ -11,13 +11,15 @@ func Test_client_server()
if cmd == ''
return
endif
- if has('unix')
+ if has('x11')
+ if empty($DISPLAY)
+ throw 'Skipped: $DISPLAY is not set'
+ endif
try
call remote_send('xxx', '')
catch
if v:exception =~ 'E240:'
- " No connection to the X server, give up.
- return
+ throw 'Skipped: no connection to the X server'
endif
" ignore other errors
endtry
@@ -118,8 +118,12 @@ func Test_quotestar()
if has('macunix')
let skipped = Do_test_quotestar_for_macunix()
- elseif !empty("$DISPLAY")
- let skipped = Do_test_quotestar_for_x11()
+ elseif has('x11')
+ if empty($DISPLAY)
+ let skipped = "Test can only run when $DISPLAY is set."
+ else
+ let skipped = Do_test_quotestar_for_x11()
+ endif
else
let skipped = "Test is not implemented yet for this platform."
endif
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 511,
/**/
510,
/**/

0 comments on commit a683ec4

Please sign in to comment.