Made the --daemon argument work again

CHANGES.rst

@@ -1,7 +1,7 @@
 2.0b2 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Made the --daemon parameter work again
 
 
 2.0b1 (2023-08-18)

src/unoserver/server.py

@@ -3,6 +3,7 @@
 import os
 import signal
 import subprocess
+import sys
 import tempfile
 import threading
 import platform
@@ -189,6 +190,12 @@ def main():
     )
     args = parser.parse_args()
 
+    if args.daemon:
+        cmd = sys.argv
+        cmd.remove("--daemon")
+        proc = subprocess.Popen(cmd)
+        return proc.pid
+
     with tempfile.TemporaryDirectory() as tmpuserdir:
         user_installation = Path(tmpuserdir).as_uri()
 
@@ -220,9 +227,6 @@ def main():
             with open(args.libreoffice_pid_file, "wt") as upf:
                 upf.write(f"{pid}")
 
-        if args.daemon:
-            return os.getpid()
-
         process.wait()
 
         if args.libreoffice_pid_file:

tests/test_integration.py

@@ -213,7 +213,7 @@ def test_convert_not_local():
 
             with open(outfile.name, "rb") as testfile:
                 start = testfile.readline()
-                assert start == b"%PDF-1.5\n" or start == b"%PDF-1.6\n"
+                assert start.startswith(b"%PDF-1.")
 
     finally:
         # Now kill the process
@@ -251,7 +251,7 @@ def test_compare_not_local():
 
             with open(outfile.name, "rb") as testfile:
                 start = testfile.readline()
-                assert start == b"%PDF-1.5\n" or start == b"%PDF-1.6\n"
+                assert start.startswith(b"%PDF-1.")
 
     finally:
         # Now kill the process