# HG changeset patch # User Bram Moolenaar # Date 1543264208 -3600 # Node ID cd6daebf47ae55958010be9aacdd0bb8193d9018 # Parent 7343c39b290e94dac193117ecd80ab2d4b2cb201 patch 8.1.0549: netbeans test depends on README.txt contents commit https://github.com/vim/vim/commit/10efcd5b0259659cd9a152a7a342deb5d56a8eb5 Author: Bram Moolenaar Date: Mon Nov 26 21:22:07 2018 +0100 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. diff --git a/src/testdir/test_netbeans.py b/src/testdir/test_netbeans.py --- a/src/testdir/test_netbeans.py +++ b/src/testdir/test_netbeans.py @@ -42,7 +42,7 @@ class ThreadedTCPRequestHandler(socketse myfile.write(received) response = '' - if received.find('README.txt') > 0: + if received.find('XREADME.txt') > 0: name = received.split('"')[1] response = '5:putBufferNumber!33 "' + name + '"\n' response += '5:setDot!1 3/19\n' diff --git a/src/testdir/test_netbeans.vim b/src/testdir/test_netbeans.vim --- a/src/testdir/test_netbeans.vim +++ b/src/testdir/test_netbeans.vim @@ -20,13 +20,14 @@ endfunc func Nb_basic(port) call delete("Xnetbeans") call writefile([], "Xnetbeans") + call writefile(repeat(['abcdefghijklmnopqrstuvwxyz'], 5), "XREADME.txt") exe 'nbstart :localhost:' . a:port . ':bunny' call assert_true(has("netbeans_enabled")) call WaitFor('len(readfile("Xnetbeans")) > 2') - split +$ README.txt + split +$ XREADME.txt - " Opening README.txt will result in a setDot command + " Opening XREADME.txt will result in a setDot command call WaitFor('len(readfile("Xnetbeans")) > 4') call WaitFor('getcurpos()[1] == 3') let pos = getcurpos() @@ -41,11 +42,12 @@ func Nb_basic(port) call assert_equal('AUTH bunny', lines[0]) call assert_equal('0:version=0 "2.5"', lines[1]) call assert_equal('0:startupDone=0', lines[2]) - call assert_equal('0:fileOpened=0 "README.txt" T F', substitute(lines[3], '".*/', '"', '')) + call assert_equal('0:fileOpened=0 "XREADME.txt" T F', substitute(lines[3], '".*/', '"', '')) call assert_equal('0:disconnect=1', lines[6]) call delete("Xnetbeans") + call delete("XREADME.txt") endfunc func Test_nb_basic() diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -793,6 +793,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 549, +/**/ 548, /**/ 547,