patch 9.1.0587: tests: Test_gui_lowlevel_keyevent is still flaky

Problem:  tests: Test_gui_lowlevel_keyevent is still flaky
          (after v9.1.0571)
Solution: skip generating key event for Ctrl-C,
          remove the test_is_flaky variable again (Ken Takata)

v9.1.0571 was not enough.
Ctrl-C interruption may occur before the preceding events are processed.
Exclude Ctrl-C to avoid the flakiness.

closes: #15224

Signed-off-by: Ken Takata <kentkt@csc.jp>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim
index eefebff48bdbfc6edd05a6a8db5241ce952e7e6e..ae65310627014155e771ea1a3446abbaf5a129a1 100644 (file)
--- a/src/testdir/test_gui.vim
+++ b/src/testdir/test_gui.vim
@@ -1706,10 +1706,10 @@ endfunc
 func Test_gui_lowlevel_keyevent()
   CheckMSWindows
   new
-  let g:test_is_flaky = 1
 
   " Test for <Ctrl-A> to <Ctrl-Z> keys
-  for kc in range(65, 90)
+  " FIXME: <Ctrl-C> is excluded for now.  It makes the test flaky.
+  for kc in range(65, 66) + range(68, 90)
     call SendKeys([0x11, kc])
     try
       let ch = getcharstr()

diff --git a/src/version.c b/src/version.c
index 428cd04f2725299d5622bfada955d11b1a74dae2..9ce9c8f7af8bdf8eb8e6f2009be5c8ee50407e39 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    587,
 /**/
     586,
 /**/