patch 7.4.2041

Problem:    Netbeans file authentication not tested.
Solution:   Add a test.

diff --git a/src/testdir/test_netbeans.vim b/src/testdir/test_netbeans.vim
index 055db22219b66419a90926aa9a8f806f7ed1f1cc..d4791683896764e421dbe724ad570a42faadcb3e 100644 (file)
--- a/src/testdir/test_netbeans.vim
+++ b/src/testdir/test_netbeans.vim
@@ -49,3 +49,28 @@ func Test_nb_basic()
   call ch_log('Test_nb_basic')
   call s:run_server('Nb_basic')
 endfunc
+
+func Nb_file_auth(port)
+  call assert_fails('nbstart =notexist', 'E660:')
+  call writefile(['host=localhost', 'port=' . a:port, 'auth=bunny'], 'Xnbauth')
+  call setfperm('Xnbauth', "rw-r--r--")
+  call assert_fails('nbstart =Xnbauth', 'E668:')
+  call setfperm('Xnbauth', "rw-------")
+  exe 'nbstart :localhost:' . a:port . ':bunny'
+  call assert_true(has("netbeans_enabled"))
+
+  call WaitFor('len(readfile("Xnetbeans")) > 2')
+  nbclose
+  let lines = readfile("Xnetbeans")
+  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 delete("Xnbauth")
+  call delete("Xnetbeans")
+endfunc
+
+func Test_nb_file_auth()
+  call ch_log('Test_nb_file_auth')
+  call s:run_server('Nb_file_auth')
+endfunc

diff --git a/src/version.c b/src/version.c
index 9baf99e506ef0fc5f6d3592965ea274b83290eda..72b478932deed4b8f69721f32c1c2b28a49505b4 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2041,
 /**/
     2040,
 /**/