Long time no use of the autotests machinery, needs an update.

[features.git] / development / autotests / keytest.py

diff --git a/development/autotests/keytest.py b/development/autotests/keytest.py
index 27b6d484b7457c90d54b8986d282b31c2776ef7f..608ce7357b193542d98448eb3d208866ebddd020 100755 (executable)
--- a/development/autotests/keytest.py
+++ b/development/autotests/keytest.py
@@ -151,22 +151,13 @@ class CommandSourceFromFile(CommandSource):
         self.i = self.i + 1
         return line
 
+
 def lyx_exists():
     if lyx_pid is None:
         return False
     fname = '/proc/' + lyx_pid + '/status'
     return os.path.exists(fname)
 
-def lyx_sleeping():
-    fname = '/proc/' + lyx_pid + '/status'
-    f = open(fname, 'r')
-    lines = f.readlines()
-    sleeping = lines[1].find('(sleeping)') > 0
-
-    # print 'LYX_STATE', lines[1] , 'SLEEPING=', sleeping
-
-    return sleeping
-
 
 # Interruptible os.system()
 def intr_system(cmd, ignore_err = False):
@@ -179,6 +170,12 @@ def intr_system(cmd, ignore_err = False):
     return ret
 
 
+# Return true if LyX (identified via lyx_pid) is sleeping
+def lyx_sleeping():
+    fname = '/proc/' + lyx_pid + '/status'
+    return intr_system("grep 'State.*sleeping' " + fname)
+
+
 def sendKeystring(keystr, LYX_PID):
 
     # print "sending keystring "+keystr+"\n"
@@ -351,8 +348,10 @@ while not failed:
         count = 5
         while count > 0:
             lyx_pid=os.popen("pidof " + lyx).read().rstrip()
+            print 'lyx_pid=' + lyx_pid, '\n'
             if lyx_pid != "":
                 lyx_window_name=os.popen("wmctrl -l -p | grep ' " + str(lyx_pid) +  " ' | cut -d ' ' -f 1").read().rstrip()
+                print 'lyx_win=' + lyx_window_name, '\n'
                 if lyx_window_name != "":
                     break
             else: