# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1497105903 -7200
# Node ID 370e833dcd4d1c36dcb0d538bec820d7661e7c70
# Parent  e7c087f651fa6889f2ff5e17f789a79e645db724
patch 8.0.0632: the quotestar test is still a bit flaky

commit https://github.com/vim/vim/commit/1c13c0fe3e7b15750464ffbc39a4648aa5c639be
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Jun 10 16:30:32 2017 +0200

    patch 8.0.0632: the quotestar test is still a bit flaky

    Problem:    The quotestar test is still a bit flaky.
    Solution:   Kill any existing server to make the retry work.  Wait for the
                register to be filled.

diff --git a/src/testdir/test_quotestar.vim b/src/testdir/test_quotestar.vim
--- a/src/testdir/test_quotestar.vim
+++ b/src/testdir/test_quotestar.vim
@@ -50,6 +50,15 @@ func Do_test_quotestar_for_x11()
   endtry
 
   let name = 'XVIMCLIPBOARD'
+
+  " Make sure a previous server has exited
+  try
+    call remote_send(name, ":qa!\<CR>")
+    call WaitFor('serverlist() !~ "' . name . '"')
+  catch /E241:/
+  endtry
+  call assert_notmatch(name, serverlist())
+
   let cmd .= ' --servername ' . name
   let g:job = job_start(cmd, {'stoponexit': 'kill', 'out_io': 'null'})
   call WaitFor('job_status(g:job) == "run"')
@@ -76,6 +85,7 @@ func Do_test_quotestar_for_x11()
   call assert_equal('yes', remote_expr(name, "@*", "", 2))
 
   " Check that the *-register of this vim instance is changed as expected.
+  call WaitFor('@* == "yes"')
   call assert_equal('yes', @*)
 
   if has('unix') && has('gui') && !has('gui_running')
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    632,
+/**/
     631,
 /**/
     630,