[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - uitest/libreoffice

[Henry Castro (via logerrit)]

 uitest/libreoffice/connection.py |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 681152d8f6c84708f8e8b31a5a99d3485f36b9a7
Author: Henry Castro 
AuthorDate: Thu Sep 21 07:55:26 2023 -0400
Commit: Henry Castro 
CommitDate: Thu Sep 21 16:02:10 2023 +0200

uitest: flush print messages

Signed-off-by: Henry Castro 
Change-Id: I87098a438d476529aa25b6608408d07bbc98ce0d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157145

diff --git a/uitest/libreoffice/connection.py b/uitest/libreoffice/connection.py
index 101a5385fd4a..e3b76b4baf44 100644
--- a/uitest/libreoffice/connection.py
+++ b/uitest/libreoffice/connection.py
@@ -16,9 +16,9 @@ try:
 import pyuno
 import uno
 except ImportError:
-print("pyuno not found: try to set PYTHONPATH and URE_BOOTSTRAP variables")
-print("PYTHONPATH=/installation/opt/program")
-print("URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc")
+print("pyuno not found: try to set PYTHONPATH and URE_BOOTSTRAP 
variables", flush=True)
+print("PYTHONPATH=/installation/opt/program", flush=True)
+print("URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc", 
flush=True)
 raise
 
 def signal_handler(signal_num, frame):
@@ -104,7 +104,7 @@ class OfficeConnection:
 xUnoResolver = xLocalContext.ServiceManager.createInstanceWithContext(
 "com.sun.star.bridge.UnoUrlResolver", xLocalContext)
 url = "uno:" + socket + ";urp;StarOffice.ComponentContext"
-print("OfficeConnection: connecting to: " + url)
+print("OfficeConnection: connecting to: " + url, flush=True)
 while True:
 if self.soffice and self.soffice.poll() is not None:
 raise Exception("soffice has stopped.")
@@ -113,7 +113,7 @@ class OfficeConnection:
 xContext = xUnoResolver.resolve(url)
 return xContext
 except 
pyuno.getClass("com.sun.star.connection.NoConnectException"):
-print("NoConnectException: sleeping...")
+print("NoConnectException: sleeping...", flush=True)
 time.sleep(1)
 
 def tearDown(self):
@@ -126,17 +126,17 @@ class OfficeConnection:
 if self.soffice:
 if self.xContext:
 try:
-print("tearDown: calling terminate()...")
+print("tearDown: calling terminate()...", flush=True)
 xMgr = self.xContext.ServiceManager
 xDesktop = xMgr.createInstanceWithContext(
 "com.sun.star.frame.Desktop", self.xContext)
 xDesktop.terminate()
-print("...done")
+print("...done", flush=True)
 except 
pyuno.getClass("com.sun.star.beans.UnknownPropertyException"):
-print("caught while TearDown:\n", traceback.format_exc())
+print("caught while TearDown:\n", traceback.format_exc(), 
flush=True)
 pass  # ignore, also means disposed
 except pyuno.getClass("com.sun.star.lang.DisposedException"):
-print("caught while TearDown:\n", traceback.format_exc())
+print("caught while TearDown:\n", traceback.format_exc(), 
flush=True)
 pass  # ignore
 else:
 self.soffice.terminate()

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - uitest/libreoffice

[Henry Castro (via logerrit)]

 uitest/libreoffice/connection.py |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit c66683be225ee709095178489ad766d8b18c4040
Author: Henry Castro 
AuthorDate: Thu Sep 21 07:40:36 2023 -0400
Commit: Henry Castro 
CommitDate: Thu Sep 21 16:01:43 2023 +0200

uitest: add signal_handler function

install signal handler to analyze if the
soffice bootstrap has some issues.

Signed-off-by: Henry Castro 
Change-Id: I8b05b9c24bf531f4162554433180d80526cb2983
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157144

diff --git a/uitest/libreoffice/connection.py b/uitest/libreoffice/connection.py
index 40c4757406ab..101a5385fd4a 100644
--- a/uitest/libreoffice/connection.py
+++ b/uitest/libreoffice/connection.py
@@ -10,6 +10,7 @@ import time
 import traceback
 import uuid
 import os
+import signal
 
 try:
 import pyuno
@@ -20,6 +21,9 @@ except ImportError:
 print("URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc")
 raise
 
+def signal_handler(signal_num, frame):
+signal_name = signal.Signals(signal_num).name
+print(f'Signal handler called with signal {signal_name} ({signal_num})', 
flush=True)
 
 class OfficeConnection:
 def __init__(self, args):
@@ -33,6 +37,9 @@ class OfficeConnection:
 If the connection method is path the instance will be created as a
 new subprocess. If the connection method is connect the instance tries
 to connect to an existing instance with the specified socket string """
+signal.signal(signal.SIGCHLD, signal_handler)
+signal.signal(signal.SIGPIPE, signal_handler)
+
 (method, sep, rest) = self.args["--soffice"].partition(":")
 if sep != ":":
 raise Exception("soffice parameter does not specify method")