[Libreoffice-commits] core.git: uitest/libreoffice

[Stephan Bergmann (via logerrit)]

 uitest/libreoffice/connection.py |   16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

New commits:
commit 8b898063f718b51732c8b47b6f7704fd8659d2a9
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Apr 7 11:51:21 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Apr 7 15:35:15 2020 +0200

    Revert "UITest: Actually time-out the wait"
    
    This reverts commit 150b67b57bd25ba9c8ec9c28c7aed3cc0b557bfd.
    
    Reason for revert:  With the above change, a hung soffice process would cause
    the UITest that spawned it to fail, but that would not terminate the hung
    soffice process.  This is especially problematic for Gerrit Jenkins builds,
    where a leftover hung soffice process from a previous build will typically cause
    unrelated subsequent builds to fail.  So:  For a manual developer build, it is
    arguably better to leave the hung UITest in the hung state (both the python and
    the soffice process) to be able to debug it.  And for an automated Gerrit
    Jenkins build it is even vital that the hung UITest hangs the build, so that
    Jenkins will eventually abort it and lode's bin/kill-wrapper will reliably kill
    any remaining processes, incl. the hung soffice process.  (But of course it is
    unfortunate that we now get less feedback from a hung UITest.)
    
    Change-Id: I6cc577dda362d3cb71846decae9c2bb6bed90b6b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91717
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/uitest/libreoffice/connection.py b/uitest/libreoffice/connection.py
index 3dbae4cca355..cb3ae1a0128e 100644
--- a/uitest/libreoffice/connection.py
+++ b/uitest/libreoffice/connection.py
@@ -9,7 +9,6 @@ import subprocess
 import time
 import uuid
 import os
-import sys
 
 try:
     import pyuno
@@ -131,17 +130,10 @@ class OfficeConnection:
             else:
                 self.soffice.terminate()
 
-
-            try:
-                if sys.version_info >= (3,3):
-                    ret = self.soffice.wait(30) # will throw when timed out
-                else:
-                    ret = self.soffice.wait() # no timeout in python that old
-            finally:
-                self.xContext = None
-                self.socket = None
-                self.soffice = None
-
+            ret = self.soffice.wait()
+            self.xContext = None
+            self.socket = None
+            self.soffice = None
             if ret != 0:
                 raise Exception("Exit status indicates failure: " + str(ret))