matlab-proxy 0.24.2__py3-none-any.whl → 0.25.0__py3-none-any.whl

tests/unit/test_app_state.py

@@ -43,6 +43,7 @@ def sample_settings_fixture(tmp_path):
         "warnings": [],
         "matlab_config_file": tmp_file,
         "is_xvfb_available": True,
+        "is_windowmanager_available": True,
         "mwi_server_url": "dummy",
         "mwi_logs_root_dir": Path(settings.get_mwi_config_folder(dev=True)),
         "app_port": 12345,
@@ -55,12 +56,12 @@ def sample_settings_fixture(tmp_path):
 
 
 @pytest.fixture
-def app_state_fixture(sample_settings_fixture, loop):
+def app_state_fixture(sample_settings_fixture, event_loop):
     """A pytest fixture which returns an instance of AppState class with no errors.
 
     Args:
         sample_settings_fixture (dict): A dictionary of sample settings to be used by
-        loop : A pytest builtin fixture
+        event_loop : A pytest builtin fixture
 
     Returns:
         AppState: An object of the AppState class
@@ -71,7 +72,7 @@ def app_state_fixture(sample_settings_fixture, loop):
 
     yield app_state
 
-    loop.run_until_complete(app_state.stop_server_tasks())
+    event_loop.run_until_complete(app_state.stop_server_tasks())
 
 
 @pytest.fixture
@@ -108,13 +109,13 @@ def app_state_with_token_auth_fixture(
 
 
 @pytest.fixture
-def mocker_os_patching_fixture(mocker, platform, loop):
+def mocker_os_patching_fixture(mocker, platform, event_loop):
     """A pytest fixture which patches the is_* functions in system.py module
 
     Args:
         mocker : Built in pytest fixture
         platform (str): A string representing "windows", "linux" or "mac"
-        loop : A pytest builtin fixture
+        event_loop : A pytest builtin fixture
 
     Returns:
         mocker: Built in pytest fixture with patched calls to system.py module.
@@ -123,7 +124,7 @@ def mocker_os_patching_fixture(mocker, platform, loop):
     mocker.patch("matlab_proxy.app_state.system.is_windows", return_value=False)
     mocker.patch("matlab_proxy.app_state.system.is_mac", return_value=False)
     mocker.patch("matlab_proxy.app_state.system.is_posix", return_value=False)
-    mocker.patch("matlab_proxy.app_state.util.get_event_loop", return_value=loop)
+    mocker.patch("matlab_proxy.app_state.util.get_event_loop", return_value=event_loop)
 
     if platform == "linux":
         mocker.patch("matlab_proxy.app_state.system.is_linux", return_value=True)
@@ -820,7 +821,7 @@ async def test_decrement_timer_runs_out(sample_settings_fixture, mocker):
     app_state.processes = {"matlab": None, "xvfb": None}
     app_state.licensing = {"type": "existing_license"}
 
-    # mock util.get_event_loop() to return a new loop for the test to assert
+    # mock util.get_event_loop() to return a new event_loop for the test to assert
     mock_loop = asyncio.new_event_loop()
     mocker.patch("matlab_proxy.app_state.util.get_event_loop", return_value=mock_loop)
 

tests/unit/test_non_dev_mode.py

@@ -1,4 +1,4 @@
-# Copyright 2020-2022 The MathWorks, Inc.
+# Copyright 2020-2025 The MathWorks, Inc.
 
 import os
 import shutil
@@ -126,7 +126,7 @@ def mock_settings_get_fixture(mocker):
 
 @pytest.fixture(name="test_server")
 def test_server_fixture(
-    loop,
+    event_loop,
     aiohttp_client,
     build_frontend,
     matlab_port_setup,
@@ -140,7 +140,7 @@ def test_server_fixture(
     This fixture 'initializes' the test server with different constraints from the test server in test_app.py
 
     Args:
-        loop : Event Loop
+        event_loop : Event loop
         aiohttp_client : A built-in pytest fixture
         build_frontend: Pytest fixture which generates the directory structure of static files with some placeholder content
         matlab_port_setup: Pytest fixture which monkeypatches 'MWI_DEV' env to False. This is required for the test_server to add static content
@@ -150,7 +150,7 @@ def test_server_fixture(
         [aiohttp_client]: A aiohttp_client to send HTTP requests.
     """
 
-    with FakeServer(loop, aiohttp_client) as test_server:
+    with FakeServer(event_loop, aiohttp_client) as test_server:
         yield test_server
 
 

tests/unit/test_settings.py

@@ -543,21 +543,6 @@ def test_get_matlab_cmd_windows(mocker):
     assert ".exe" in cmd[0]  # Assert .exe suffix in matlab_executable_path
 
 
-def test_get_matlab_cmd_with_mpa_flags(mocker):
-    # Arrange
-    mocker.patch(
-        "matlab_proxy.settings.mwi_env.Experimental.is_mpa_enabled", return_value=True
-    )
-    matlab_executable_path = "/path/to/matlab"
-    code_to_execute = "disp('Test')"
-
-    # Act
-    cmd = settings._get_matlab_cmd(matlab_executable_path, code_to_execute, None)
-
-    # Assert
-    assert all(mpa_flag in cmd for mpa_flag in mwi_env.Experimental.get_mpa_flags())
-
-
 def test_get_matlab_cmd_with_startup_profiling(mocker):
     # Arrange
     mocker.patch("matlab_proxy.settings.system.is_windows", return_value=False)

tests/unit/util/mwi/test_token_auth.py

@@ -1,4 +1,4 @@
-# Copyright 2023-2024 The MathWorks, Inc.
+# Copyright 2023-2025 The MathWorks, Inc.
 
 import pytest
 from aiohttp import web
@@ -90,7 +90,7 @@ async def fake_endpoint(request):
 
 @pytest.fixture
 def fake_server_with_auth_enabled(
-    loop, aiohttp_client, monkeypatch, get_custom_auth_token_str
+    event_loop, aiohttp_client, monkeypatch, get_custom_auth_token_str
 ):
     auth_token = get_custom_auth_token_str
     auth_enablement = "True"
@@ -120,7 +120,7 @@ def fake_server_with_auth_enabled(
     aiohttp_session_setup(
         app, EncryptedCookieStorage(f, cookie_name="matlab-proxy-session")
     )
-    return loop.run_until_complete(aiohttp_client(app))
+    return event_loop.run_until_complete(aiohttp_client(app))
 
 
 async def test_set_value_with_token(
@@ -256,7 +256,7 @@ async def test_get_value_with_token_in_query_params(
 
 
 @pytest.fixture
-def fake_server_without_auth_enabled(loop, aiohttp_client, monkeypatch):
+def fake_server_without_auth_enabled(event_loop, aiohttp_client, monkeypatch):
     auth_enablement = "False"
     monkeypatch.setenv(
         mwi_env.get_env_name_enable_mwi_auth_token(), str(auth_enablement)
@@ -281,7 +281,7 @@ def fake_server_without_auth_enabled(loop, aiohttp_client, monkeypatch):
     aiohttp_session_setup(
         app, EncryptedCookieStorage(f, cookie_name="matlab-proxy-session")
     )
-    return loop.run_until_complete(aiohttp_client(app))
+    return event_loop.run_until_complete(aiohttp_client(app))
 
 
 async def test_get_value(fake_server_without_auth_enabled):

tests/unit/util/test_mw.py

@@ -1,4 +1,4 @@
-# Copyright 2020-2023 The MathWorks, Inc.
+# Copyright 2020-2025 The MathWorks, Inc.
 
 import datetime
 import random
@@ -519,7 +519,7 @@ def test_range_matlab_connector_ports():
     not system.is_linux(),
     reason="Xvfb is only required on linux based operating systems",
 )
-async def test_create_xvfb_process(loop):
+async def test_create_xvfb_process(event_loop):
     """Test to check if more than 1 xvfb process can be created with -displayfd flag
 
     Creates 2 xvfb processes with '-displayfd' flag and  checks if the processes are

tests/unit/util/test_util.py

@@ -1,4 +1,4 @@
-# Copyright 2020-2024 The MathWorks, Inc.
+# Copyright 2020-2025 The MathWorks, Inc.
 
 import asyncio
 import pytest
@@ -19,19 +19,19 @@ def test_get_supported_termination_signals():
     assert len(system.get_supported_termination_signals()) >= 1
 
 
-def test_add_signal_handlers(loop: asyncio.AbstractEventLoop):
-    """Test to check if signal handlers are being added to asyncio loop
+def test_add_signal_handlers(event_loop: asyncio.AbstractEventLoop):
+    """Test to check if signal handlers are being added to asyncio event_loop
 
     Args:
-        loop (asyncio loop): In built-in pytest fixture.
+        event_loop (asyncio event loop): built-in pytest fixture.
     """
 
-    loop = add_signal_handlers(loop)
+    event_loop = add_signal_handlers(event_loop)
 
     # In posix systems, event loop is modified with new signal handlers
     if system.is_posix():
-        assert loop._signal_handlers is not None
-        assert loop._signal_handlers.items() is not None
+        assert event_loop._signal_handlers is not None
+        assert event_loop._signal_handlers.items() is not None
 
     else:
         import signal