Permalink
Browse files

patch 8.0.0480: the remote_peek() test fails on MS-Windows

Problem:    The remote_peek() test fails on MS-Windows.
Solution:   Check for pending messages. Also report errors in the first run if
            a flaky test fails twice.
  • Loading branch information...
brammool committed Mar 18, 2017
1 parent 6caf606 commit 15e737f768542fcc516296b5c158e14cc7ba7feb
Showing with 22 additions and 0 deletions.
  1. +11 −0 src/os_mswin.c
  2. +9 −0 src/testdir/runtest.vim
  3. +2 −0 src/version.c
View
@@ -2526,6 +2526,7 @@ serverGetReply(HWND server, int *expr_res, int remove, int wait)
int i;
char_u *reply;
reply_T *rep;
+ int did_process = FALSE;
/* When waiting, loop until the message waiting for is received. */
for (;;)
@@ -2562,7 +2563,17 @@ serverGetReply(HWND server, int *expr_res, int remove, int wait)
/* If we got here, we didn't find a reply. Return immediately if the
* "wait" parameter isn't set. */
if (!wait)
+ {
+ /* Process pending messages once. Without this, looping on
+ * remote_peek() would never get the reply. */
+ if (!did_process)
+ {
+ did_process = TRUE;
+ serverProcessPendingMessages();
+ continue;
+ }
break;
+ }
/* We need to wait for a reply. Enter a message loop until the
* "reply_received" flag gets set. */
View
@@ -250,8 +250,17 @@ for s:test in sort(s:tests)
call add(s:messages, 'Found errors in ' . s:test . ':')
call extend(s:messages, v:errors)
call add(s:messages, 'Flaky test failed, running it again')
+ let first_run = v:errors
+
let v:errors = []
call RunTheTest(s:test)
+ if len(v:errors) > 0
+ let second_run = v:errors
+ let v:errors = ['First run:']
+ call extend(v:errors, first_run)
+ call add(v:errors, 'Second run:')
+ call extend(v:errors, second_run)
+ endif
endif
call AfterTheTest()
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 480,
/**/
479,
/**/

0 comments on commit 15e737f

Please sign in to comment.