Skip to content

Commit 41a834d

Browse files
committed
patch 8.2.2240: clientserver test fails if full path is used
Problem: Clientserver test fails if full path is used. Solution: Ignore the path preceding the file name.
1 parent dcc58e0 commit 41a834d

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

src/testdir/test_clientserver.vim

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,19 +134,19 @@ func Test_client_server()
134134

135135
" Edit multiple files using --remote
136136
call system(cmd .. ' --remote Xfile1 Xfile2 Xfile3')
137-
call assert_equal("Xfile1\nXfile2\nXfile3\n", remote_expr(name, 'argv()'))
137+
call assert_match(".*Xfile1\n.*Xfile2\n.*Xfile3\n", remote_expr(name, 'argv()'))
138138
eval name->remote_send(":%bw!\<CR>")
139139

140140
" Edit files in separate tab pages
141141
call system(cmd .. ' --remote-tab Xfile1 Xfile2 Xfile3')
142142
call WaitForAssert({-> assert_equal('3', remote_expr(name, 'tabpagenr("$")'))})
143-
call assert_equal('Xfile2', remote_expr(name, 'bufname(tabpagebuflist(2)[0])'))
143+
call assert_match('.*\<Xfile2', remote_expr(name, 'bufname(tabpagebuflist(2)[0])'))
144144
eval name->remote_send(":%bw!\<CR>")
145145

146146
" Edit a file using --remote-wait
147147
eval name->remote_send(":source $VIMRUNTIME/plugin/rrhelper.vim\<CR>")
148148
call system(cmd .. ' --remote-wait +enew Xfile1')
149-
call assert_equal("Xfile1", remote_expr(name, 'bufname("#")'))
149+
call assert_match('.*\<Xfile1', remote_expr(name, 'bufname("#")'))
150150
eval name->remote_send(":%bw!\<CR>")
151151

152152
" Edit files using --remote-tab-wait

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -750,6 +750,8 @@ static char *(features[]) =
750750

751751
static int included_patches[] =
752752
{ /* Add new patch number below this line */
753+
/**/
754+
2240,
753755
/**/
754756
2239,
755757
/**/

0 commit comments

Comments
 (0)