Revert "UITest: Actually time-out the wait"

This reverts commit 150b67b57b.

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@redhat.com>
This commit is contained in:
Stephan Bergmann
2020-04-07 15:35:15 +02:00
parent 21eb6c98bc
commit 8b898063f7
+4 -12
View File
@@ -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))