Updates timeouts for processes started by jupyter-matlab-proxy to match timeouts from matlab-proxy.

Author: diningPhilosopher64

pyproject.toml

@@ -46,7 +46,7 @@ dependencies = [
     "jupyter-server-proxy",
     "simpervisor>=1.0.0",
     "jupyter-contrib-nbextensions",
-    "matlab-proxy>=0.8.0",
+    "matlab-proxy>=0.9.1",
     "psutil",
     "requests",
 ]

src/jupyter_matlab_kernel/kernel.py

@@ -13,6 +13,11 @@
 from requests.exceptions import HTTPError
 
 from jupyter_matlab_kernel import mwi_comm_helpers
+from matlab_proxy import util as mwi_util
+from matlab_proxy import settings as mwi_settings
+
+
+_MATLAB_STARTUP_TIMEOUT = mwi_settings.get_process_startup_timeout()
 
 
 class MATLABConnectionError(Exception):
@@ -142,7 +147,7 @@ def start_matlab_proxy():
     # Thus we need to go one level higher to acquire the process id of the jupyter server.
     # Note: conda environments do not require this, and for these environments sys.prefix == sys.base_prefix
     is_virtual_env = sys.prefix != sys.base_prefix
-    if sys.platform == "win32" and is_virtual_env:
+    if mwi_util.system.is_windows() and is_virtual_env:
         jupyter_server_pid = psutil.Process(jupyter_server_pid).ppid()
 
     nb_server = dict()
@@ -465,10 +470,9 @@ def perform_startup_checks(self):
 
         # Wait until MATLAB is started before sending requests.
         timeout = 0
-        MATLAB_STARTUP_MAX_TIMEOUT = 120
         while (
             self.matlab_status != "up"
-            and timeout != MATLAB_STARTUP_MAX_TIMEOUT
+            and timeout != _MATLAB_STARTUP_TIMEOUT
             and not self.matlab_proxy_has_error
         ):
             if self.is_matlab_licensed:
@@ -496,7 +500,7 @@ def perform_startup_checks(self):
         # If MATLAB is not available after 15 seconds of licensing information
         # being available either through user input or through matlab-proxy cache,
         # then display connection error to the user.
-        if timeout == MATLAB_STARTUP_MAX_TIMEOUT or self.matlab_proxy_has_error:
+        if timeout == _MATLAB_STARTUP_TIMEOUT or self.matlab_proxy_has_error:
             raise MATLABConnectionError
 
     def display_output(self, out):

tests/e2e/playwright.config.ts

@@ -25,7 +25,7 @@ const config = {
     webServer: {
         command: webserverCommand,
         url: BASE_URL + '/api',
-        timeout: 120 * 1000,
+        timeout: 600 * 1000, // This value should be the same as the one we get from matlab_proxy.settings.get_process_startup_timeout()
         reuseExistingServer: !process.env.CI
     },
 

tests/integration/conftest.py

@@ -6,6 +6,10 @@
 import pytest
 import requests
 
+from matlab_proxy import settings as mwi_settings
+
+_MATLAB_STARTUP_TIMEOUT = mwi_settings.get_process_startup_timeout()
+
 
 @pytest.fixture(autouse=True, scope="module")
 def matlab_proxy_fixture(module_monkeypatch):
@@ -50,7 +54,7 @@ def matlab_proxy_fixture(module_monkeypatch):
     integration_test_utils.poll_web_service(
         matlab_proxy_url,
         step=5,
-        timeout=120,
+        timeout=_MATLAB_STARTUP_TIMEOUT,
         ignore_exceptions=(
             requests.exceptions.ConnectionError,
             requests.exceptions.SSLError,
@@ -122,6 +126,5 @@ def __get_matlab_config_file():
     Returns:
         string: MATLAB config file path
     """
-    from matlab_proxy import settings
 
-    return settings.get()["matlab_config_file"]
+    return mwi_settings.get()["matlab_config_file"]

tests/integration/integration_test_utils.py

@@ -8,6 +8,10 @@
 
 import requests
 
+from matlab_proxy.settings import get_process_startup_timeout
+
+MATLAB_STARTUP_TIMEOUT = get_process_startup_timeout()
+
 
 def perform_basic_checks():
     """
@@ -85,18 +89,13 @@ def wait_matlab_proxy_ready(matlab_proxy_url):
 
     from jupyter_matlab_kernel import mwi_comm_helpers
 
-    # Timeout for polling the matlab-proxy http endpoints.
-    # matlab-proxy takes more time to be 'up' in machines
-    # other than Linux
-    MAX_TIMEOUT = 120 if system.is_linux() else 300
-
     is_matlab_licensed = False
     matlab_status = "down"
     start_time = time.time()
 
     # Poll for matlab-proxy to be up
     while matlab_status in ["down", "starting"] and (
-        time.time() - start_time < MAX_TIMEOUT
+        time.time() - start_time < MATLAB_STARTUP_TIMEOUT
     ):
         time.sleep(1)
         try:

tests/unit/test_jupyter_server_proxy.py

@@ -55,7 +55,7 @@ def test_get_env_with_token_auth_disabled(monkeypatch):
     assert r.get(mwi_env.get_env_name_mwi_auth_token()) == None
 
 
-def test_setup_matlab(monkeypatch):
+def test_setup_matlab():
     """Tests for a valid Server Process Configuration Dictionary
 
     This test checks if the jupyter proxy returns the expected Server Process Configuration