More test output

unoconv · Oct 8, 2024 · 8d2cd5f · 8d2cd5f
1 parent 7b5924b
commit 8d2cd5f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -18,7 +18,7 @@ jobs:
         os: [ubuntu-20.04, ubuntu-22.04]
       fail-fast: true
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install Package
       run: |
         python -m pip install virtualenv
@@ -33,4 +33,4 @@ jobs:
     - name: Test with pytest
       run: |
         source ve/bin/activate
-        make test
+        pytest -s
diff --git a/src/unoserver/server.py b/src/unoserver/server.py
@@ -97,7 +97,9 @@ def signal_handler(signum, frame):
                     raise
 
             if self.xmlrcp_server is not None:
+                logger.error("A")
                 self.stop()  # Ensure the server stops
+                logger.error("B")
 
         signal.signal(signal.SIGTERM, signal_handler)
         signal.signal(signal.SIGINT, signal_handler)
@@ -115,7 +117,9 @@ def signal_handler(signum, frame):
         # Check if it succeeded
         if not self.xmlrcp_thread.is_alive():
             logger.info("Failed to start servers")
+            logger.error("C")
             self.stop()
+            logger.error("D")
             return None
 
         return self.libreoffice_process
@@ -304,23 +308,31 @@ def main():
             logger.error(f"Looks like LibreOffice died. PID: {pid}")
 
         # The RPC thread needs to be stopped before the process can exit
+        logger.error("E")
         server.stop()
+        logger.error("F")
+
+        logger.error("OK?")
 
         if args.libreoffice_pid_file:
             # Remove the PID file
             os.unlink(args.libreoffice_pid_file)
 
         try:
             # Make sure it's really dead
+            logger.error("Hmm?")
             os.kill(pid, 0)
+            logger.error("OK!")
 
             if server.intentional_exit:
                 return 0
             else:
+                logger.error("NO!")
                 return 1
         except OSError as e:
             if e.errno == 3:
                 # All good, it was already dead.
+                logger.error("Yes")
                 return 0
             raise