Merge pull request Open-MSS#2974 from Open-MSS/merge_stable_to_develop

Merge stable to develop

Author: ReimarBauer

.github/workflows/lint.yml

@@ -74,7 +74,7 @@ jobs:
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4
       - name: Ensure SHA pinned actions
-        uses: zgosalvez/github-actions-ensure-sha-pinned-actions@fc87bb5b5a97953d987372e74478de634726b3e5 # v3
+        uses: zgosalvez/github-actions-ensure-sha-pinned-actions@6124774845927d14c601359ab8138699fa5b70c3 # v3
         with:
           allowlist: |
             Open-MSS/

.github/workflows/update-pixi-lockfile.yml

@@ -28,7 +28,7 @@ jobs:
           set -o pipefail
           pixi update --json | pixi exec pixi-diff-to-markdown >> diff.md
       - name: Create or update pull request
-        uses: peter-evans/create-pull-request@22a9089034f40e5a961c8808d113e2c98fb63676 # v7
+        uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725 # v7
         with:
           token: ${{ secrets.PAT }}
           branch: automation/update-pixi-lockfile/${{ matrix.base_branch }}

docs/conf_sso_test_msscolab.rst

@@ -103,7 +103,7 @@ When this is the first time you setup a mscolab server, you have to initialize t
 
 .. code:: text
 
-    $ mscolab db --init
+    $ mscolab start
 
 .. note::
    An existing database maybe needs a migration, have a look for this on our documentation.

docs/development.rst

@@ -171,10 +171,10 @@ You can view the default configuration of MSColab in the file `mslib/mscolab/con
 If you want to change any values of the configuration, please take a look at the "Configuring Your MSColab Server"
 section in :ref:`mscolab`
 
-When using for the first time you need to initialise your database. Use the command :code:`mscolab db --init`
+When using for the first time you need to initialise your database. Use the command :code:`mscolab start`
 to initialise it. The default database is a sqlite3 database.
-You can add some dummy data to your database by using the command :code:`mscolab db --seed`.
-The content of the dummy data can be found in the file `mslib/mscolab/seed.py`.
+If you want to play around with example data, you can import it using `mscolab db --seed`.
+The content of the example data can be found in the file `mslib/mscolab/seed.py`.
 
 To start your server use the command :code:`mscolab start`. This would start the MSColab server on port 8083.
 Going to http://localhost:8083/status should now show "MSColab server". This means your server has started successfully.

docs/mscolab.rst

@@ -30,7 +30,7 @@ Make a copy of the above file, rename it to mscolab_auth.py, make the necessary
 Steps to Run MSColab Server
 ---------------------------
   - The MSColab server comes included in the MSS python package.
-  - Once MSS is installed, if you're running the mscolab server for the first time, run the command :code:`mscolab db --init` to initialise your database.
+  - When you run the MSColab server for the first time after installing MSS, the database is initialized.
   - To start the server run :code:`mscolab start`.
   - If you ever want to reset or add dummy data to your database you can use the commands :code:`mscolab db --reset` and :code:`mscolab db --seed` respectively.
 

mslib/msui/flighttrack.py

@@ -52,7 +52,6 @@
 from mslib.utils import thermolib
 from mslib.utils.verify_waypoint_data import verify_waypoint_data
 from mslib.utils.config import config_loader, save_settings_qsettings, load_settings_qsettings
-from mslib.utils.config import MSUIDefaultConfig as mss_default
 from mslib.utils.qt import variant_to_string, variant_to_float
 from mslib.msui.performance_settings import DEFAULT_PERFORMANCE
 
@@ -183,7 +182,8 @@ class WaypointsTableModel(QtCore.QAbstractTableModel):
     # Signal emitted when a waypoint is moved, inserted or deleted
     changeMessageSignal = QtCore.pyqtSignal(str)
 
-    def __init__(self, name="", filename=None, waypoints=None, mscolab_mode=False, data_dir=mss_default.mss_dir,
+    def __init__(self, name="", filename=None, waypoints=None, mscolab_mode=False,
+                 data_dir=config_loader(dataset="mss_dir"),
                  xml_content=None):
         super().__init__()
         self.name = name  # a name for this flight track

tests/fixtures.py

@@ -124,7 +124,7 @@ def mscolab_session_server(mscolab_session_app, mscolab_session_managers):
     with _running_eventlet_server(mscolab_session_app) as url:
         # Wait until the Flask-SocketIO server is ready for connections
         sio = socketio.Client()
-        sio.connect(url, retry=True)
+        sio.connect(url, retry=True, wait_timeout=60)
         sio.disconnect()
         del sio
         yield url
@@ -186,32 +186,62 @@ def mswms_server(mswms_app):
         yield url
 
 
+def _start_eventlet_server(host, port_queue, app):
+    """
+    Starts the Eventlet server and sends the chosen port back to the parent process.
+    """
+    sock = eventlet.listen((host, 0))
+    port = sock.getsockname()[1]
+    port_queue.put(port)
+    eventlet.wsgi.server(sock, app, log_output=False)
+
+
 @contextmanager
 def _running_eventlet_server(app):
     """Context manager that starts the app in an eventlet server and returns its URL."""
     scheme = "http"
     host = "127.0.0.1"
-    socket = eventlet.listen((host, 0))
-    port = socket.getsockname()[1]
-    url = f"{scheme}://{host}:{port}"
-    app.config['URL'] = url
+
     if "fork" not in multiprocessing.get_all_start_methods():
         pytest.skip("requires the multiprocessing start_method 'fork', which is unavailable on this system")
+
     ctx = multiprocessing.get_context("fork")
-    process = ctx.Process(target=eventlet.wsgi.server, args=(socket, app), daemon=True)
+    # We are using a queue to retrieve the port selected in the child process.
+    port_queue = ctx.Queue()
+
+    process = ctx.Process(target=_start_eventlet_server, args=(host, port_queue, app), daemon=True)
     try:
         process.start()
+        # Retrieve the port from the queue
+        try:
+            port = port_queue.get(timeout=10)
+        except multiprocessing.queues.Empty:
+            raise RuntimeError("Could not retrieve port from server process")
+
+        url = f"{scheme}://{host}:{port}"
+        app.config['URL'] = url
+
         start_time = time.time()
         sleep_time = 0.01
-        while not is_url_response_ok(urllib.parse.urljoin(url, "index")):
-            if (time.time() - start_time) > 5:
-                raise RuntimeError(f"Server did not start within 5 seconds at {url}")
+        time_out = 20
+        # we check only for the root url, index.html may take longer
+        readiness_url = urllib.parse.urljoin(url, "/")
+        while not is_url_response_ok(readiness_url):
+            if not process.is_alive():
+                # show the exitcode for further debugging
+                raise RuntimeError(f"Server process exited early with code {process.exitcode} at {url}")
+            if (time.time() - start_time) > time_out:
+                raise RuntimeError(f"Server did not start within {time_out} seconds at {url}")
             time.sleep(sleep_time)
             sleep_time *= 2
             if sleep_time > 1:
                 sleep_time = 1
         yield url
     finally:
         process.terminate()
-        process.join(10)
+        process.join(timeout=10)
+        if process.is_alive():
+            # when it is still alive after 10 seconds, kill it
+            process.kill()
+            process.join(timeout=5)
         process.close()