Re: keytest.py

[Kornel Benko]

Am Dienstag, 25. April 2017 um 11:48:14, schrieb Kornel Benko <kor...@lyx.org>
> Am Dienstag, 25. April 2017 um 09:33:24, schrieb Kornel Benko <kor...@lyx.org>
> ...
> > -    xvpar.extend(["-window", lyx_window_name, "-delay", actual_delay, 
> > "-text", keystr])
> > +#    xvpar.extend(["-window", lyx_window_name, "-delay", actual_delay, 
> > "-text", keystr])
> > +    xvpar.extend(["-delay", actual_delay,  "-text", keystr])
>
> Using only this part, I still get 3 extra Tab emits. All tests pass, but
> the test-times increases in following cases:
>
> 12: +6
> logo: +9
> re-05: +10
>

Although I adopted the change (getting rid of '"-window", lyx_window_name' 
parameter for xvkbd), further tests
showed that the mentioned errors are back. Inserting the parameter again, tests 
pass.

Tested back and forth, this behaviour was reliable.
Also the using of (now not needed) parameter '-wait_idle' for xvkbd_hacked can 
be removed.

        Kornel
diff --git a/development/autotests/keytest.py b/development/autotests/keytest.py
index f9e64bd..7dd86a6 100755
--- a/development/autotests/keytest.py
+++ b/development/autotests/keytest.py
@@ -207,7 +207,6 @@ def lyx_dead():
 def sendKeystringLocal(keystr, LYX_PID):

     # print "sending keystring "+keystr+"\n"
-
     if not re.match(".*\w.*", keystr):
         print('print .' + keystr + '.\n')
         keystr = 'a'
@@ -239,10 +238,7 @@ def sendKeystringLocal(keystr, LYX_PID):
         xvpar.extend(["-no-jump-pointer"])
     else:
         xvpar.extend(["-xsendevent"])
-    if xvkbd_hacked:
-        xvpar.extend(["-wait_idle", lyx_pid])
-    #xvpar.extend(["-window", lyx_window_name, "-delay", actual_delay, "-text", keystr])
-    xvpar.extend(["-delay", actual_delay, "-text", keystr])
+    xvpar.extend(["-window", lyx_window_name, "-delay", actual_delay, "-text", keystr])

     print("Sending \"" + keystr + "\"\n")
     subprocess.call(xvpar, stdout = FNULL, stderr = FNULL)
@@ -337,7 +333,6 @@ xvkbd_exe = os.environ.get('XVKBD_EXE')
 if xvkbd_exe is None:
     xvkbd_exe = "xvkbd"

-xvkbd_hacked = os.environ.get('XVKBD_HACKED') != None
 qt_frontend = os.environ.get('QT_FRONTEND')
 if qt_frontend is None:
     qt_frontend = 'QT4'
@@ -470,17 +465,17 @@ while not failed:
         print("result=" + str(result) + ", failed=" + str(failed))
     elif c[0:7] == 'TestEnd':
 #        time.sleep(0.5)
-        if not lyx_exists():
+        if lyx_dead():
             print("LyX instance not found because of crash or assert !\n")
             failed = True
         else:
             print("Forcing quit of lyx instance: " + str(lyx_pid) + "...\n")
             # \Ax Enter command line is sometimes blocked
 	    # \[Escape] works after this
-	    sendKeystringLocal("\Ax\[Escape]", lyx_pid)
+	    sendKeystring("\Ax\[Escape]", lyx_pid)
 	    # now we should be outside any dialog
 	    # and so the function lyx-quit should work
-            sendKeystringLocal("\Cq", lyx_pid)
+            sendKeystring("\Cq", lyx_pid)
             time.sleep(0.5)
             if lyx_sleeping():
                 # probably waiting for Save/Discard/Abort, we select 'Discard'

signature.asc
Description: This is a digitally signed message part.