Skip to content

Commit 10efcd5

Browse files
committed
patch 8.1.0549: netbeans test depends on README.txt contents
Problem: Netbeans test depends on README.txt contents. Solution: Use a generated file instead.
1 parent 1341024 commit 10efcd5

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

src/testdir/test_netbeans.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def handle(self):
4242
myfile.write(received)
4343

4444
response = ''
45-
if received.find('README.txt') > 0:
45+
if received.find('XREADME.txt') > 0:
4646
name = received.split('"')[1]
4747
response = '5:putBufferNumber!33 "' + name + '"\n'
4848
response += '5:setDot!1 3/19\n'

src/testdir/test_netbeans.vim

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,14 @@ endfunc
2020
func Nb_basic(port)
2121
call delete("Xnetbeans")
2222
call writefile([], "Xnetbeans")
23+
call writefile(repeat(['abcdefghijklmnopqrstuvwxyz'], 5), "XREADME.txt")
2324
exe 'nbstart :localhost:' . a:port . ':bunny'
2425
call assert_true(has("netbeans_enabled"))
2526

2627
call WaitFor('len(readfile("Xnetbeans")) > 2')
27-
split +$ README.txt
28+
split +$ XREADME.txt
2829

29-
" Opening README.txt will result in a setDot command
30+
" Opening XREADME.txt will result in a setDot command
3031
call WaitFor('len(readfile("Xnetbeans")) > 4')
3132
call WaitFor('getcurpos()[1] == 3')
3233
let pos = getcurpos()
@@ -41,11 +42,12 @@ func Nb_basic(port)
4142
call assert_equal('AUTH bunny', lines[0])
4243
call assert_equal('0:version=0 "2.5"', lines[1])
4344
call assert_equal('0:startupDone=0', lines[2])
44-
call assert_equal('0:fileOpened=0 "README.txt" T F', substitute(lines[3], '".*/', '"', ''))
45+
call assert_equal('0:fileOpened=0 "XREADME.txt" T F', substitute(lines[3], '".*/', '"', ''))
4546

4647
call assert_equal('0:disconnect=1', lines[6])
4748

4849
call delete("Xnetbeans")
50+
call delete("XREADME.txt")
4951
endfunc
5052

5153
func Test_nb_basic()

src/version.c

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

793793
static int included_patches[] =
794794
{ /* Add new patch number below this line */
795+
/**/
796+
549,
795797
/**/
796798
548,
797799
/**/

0 commit comments

Comments
 (0)