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

{matlab_proxy-0.24.1.dist-info → matlab_proxy-0.25.0.dist-info}/RECORD

@@ -1,20 +1,20 @@
 matlab_proxy/__init__.py,sha256=6cwi8buKCMtw9OeWaOYUHEoqwl5MyJ_s6GxgNuqPuNg,1673
-matlab_proxy/app.py,sha256=7BsHSM3PxTjN6eN10HLj74Y1wtu-Gl92g1RLbaTGz9U,34698
-matlab_proxy/app_state.py,sha256=KO2aczGbTnIMoXVqHJEriEyeapYHU_sDXifwA5U3kTw,72077
-matlab_proxy/constants.py,sha256=L9fhXdcGH7Eu56h0aB_TNm3d6aNFr2nP6-HyQJ96TAA,1175
+matlab_proxy/app.py,sha256=-lqRLDnDVdz01tPTzE58mRfxxqLKSUptXsI746a6i_k,34566
+matlab_proxy/app_state.py,sha256=jiPSjLZt4UHRElGaYMHf2o6kJXhliwER61mQZeezX0o,73407
+matlab_proxy/constants.py,sha256=So0UJC1QGvP4-nJWhau-xOlzBEdDpdExynzzbvEhtqk,1189
 matlab_proxy/default_configuration.py,sha256=tBHaEq_bYsX2uC9pPA9mi_8M6o94ij-rxq8mbvcYpFc,1874
 matlab_proxy/devel.py,sha256=nR6XPVBUEdQ-RZGtYvX1YHTp8gj9cuw5Hp8ahasMBc8,14310
-matlab_proxy/settings.py,sha256=ni-9zNbWF3cy4v0X8vAwAiM5WcC8U_t3a-s7GXIkyBA,26723
+matlab_proxy/settings.py,sha256=31WrxQjqJWpvwU_4dehmkadaj8Vvn-8p8SZljFQDd8s,28540
 matlab_proxy/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 matlab_proxy/gui/favicon.ico,sha256=7w7Ki1uQP2Rgwc64dOV4-NrTu97I3WsZw8OvRSoY1A0,130876
-matlab_proxy/gui/index.html,sha256=6SxjZB0znU7vcLRnk4avZIzdOqlFBFt-zaNC8qhxIr0,720
+matlab_proxy/gui/index.html,sha256=MAmmegXIfx13SVifeeQIptqktZuWc8fxzpdljx8QsfM,720
 matlab_proxy/gui/manifest.json,sha256=NwDbrALM5auYyj2bbEf4aGwAUDqNl1FzMFQpPiG2Ty4,286
 matlab_proxy/gui/robots.txt,sha256=kNJLw79pisHhc3OVAimMzKcq3x9WT6sF9IS4xI0crdI,67
 matlab_proxy/gui/static/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 matlab_proxy/gui/static/css/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 matlab_proxy/gui/static/css/index.BSVLACuY.css,sha256=LzuRvV10Z0pF0ugGSnj5zKJvT4AHwwBbCd-wSH4mHjg,305333
 matlab_proxy/gui/static/js/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-matlab_proxy/gui/static/js/index.Cm14Eqsb.js,sha256=mcaB_Rp1rvj4mdHLEWC3s3dZhDKTBuYOFXSg8e-B68o,280210
+matlab_proxy/gui/static/js/index.qK3VCGVb.js,sha256=v0SfcphW6I8hwDZWViAqDFWp9uHbgKBIeVN9jAP1kd0,279950
 matlab_proxy/gui/static/media/MATLAB-env-blur.NupTbPv_.png,sha256=QpmQTLDvBu2-b7ev83Rvpt0Q72R6wdQGkuJMPPpjv7M,220290
 matlab_proxy/gui/static/media/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 matlab_proxy/gui/static/media/glyphicons-halflings-regular.BKjkU69z.woff,sha256=omOU9-3hAMoRjv8u2ghZYnWpg5uVnCJuFUOVV6WoB0I,23424
@@ -38,7 +38,7 @@ matlab_proxy/gui/static/media/trigger-error.QEdsGL-m.svg,sha256=3zzT0uTrl4M_HlAj
 matlab_proxy/gui/static/media/trigger-ok.Dzg8OIrk.svg,sha256=mD-7N9cc4ARdMBFcplnogJv6nA4Yh3jQuYbZDUi18LU,4997
 matlab_proxy/icons/matlab.svg,sha256=xh5uYebQd8I-ISvenjU9A-PkClzW_lU9wvm3doXOFKM,13366
 matlab_proxy/matlab/evaluateUserMatlabCode.m,sha256=R8w6nPdGtadR4UUFJaspcrGQL7cJwUItdrfc531w3bM,2420
-matlab_proxy/matlab/startup.m,sha256=Rgb1Y3F2pFgByKAaXxWWcYOA2594D7V2HXuyuVmGYjs,653
+matlab_proxy/matlab/startup.m,sha256=UcA4i2lAMytwBsO783uPIQoP5Pzw1R0xrUywbBBtTjw,533
 matlab_proxy/util/__init__.py,sha256=JkVIsTOae5giDK0cQ7jcxQSHa8zo1umdq-1C0grDZwk,11712
 matlab_proxy/util/event_loop.py,sha256=sX_0tKlirCY5ImLxkss_XO4Ksj65u6JHtwMj25oGL94,1816
 matlab_proxy/util/list_servers.py,sha256=M93coVZjyQCdIvCCxsNOU_XDWNjBSysOJ5tWXaTjP8Y,1369
@@ -48,11 +48,11 @@ matlab_proxy/util/windows.py,sha256=_5gl2IyHIfw8-D3_G5uHkycZVGGFVXtjkd6_aP3g2Ts,
 matlab_proxy/util/mwi/__init__.py,sha256=zI-X1lafr8H3j17PyA0oSZ0q5nINfK-WDA7VmJKmSAQ,158
 matlab_proxy/util/mwi/custom_http_headers.py,sha256=kfDjSnEXEVzoF2pZuEn76LKayeD2WKoQEDu2Y9EMOAo,7154
 matlab_proxy/util/mwi/download.py,sha256=-GJj3yOsL4vF_9baqRXkgBI-vu_OwjZMQVkJXFS8GMc,4965
-matlab_proxy/util/mwi/environment_variables.py,sha256=sOfmL8PjQONgkJdegdotLbsqHsWJDsjS7kak0TJtVKU,7441
-matlab_proxy/util/mwi/exceptions.py,sha256=3jklFU6br2_pSSsATCRDY3A5fTzk6ekJ4M69sunwxBk,5114
+matlab_proxy/util/mwi/environment_variables.py,sha256=ffKEm56nt18CKYLaTihfAyqhzgYRdtNfHSu3e1Fw1yg,6568
+matlab_proxy/util/mwi/exceptions.py,sha256=8o4PZmira_ZonnOROzu8ERIiSn9y-456JO89gqjCags,5446
 matlab_proxy/util/mwi/logger.py,sha256=GoisSphy3Jyi5-6-X0WRl1YkdrKx2xzjSxBN_w3oTU8,3802
 matlab_proxy/util/mwi/token_auth.py,sha256=UbIWqo7qADaZdijFvorLYsZbxzaB8TycGP8nk305ru0,9997
-matlab_proxy/util/mwi/validators.py,sha256=iXPR7b3jtnwx2i15YxKQgmOm2pt3ujJeMGYNxY0oGGw,12633
+matlab_proxy/util/mwi/validators.py,sha256=dg2OXL686vWie_JoTNpFSje2m_UqdpvpTVHJl5tmxSo,13247
 matlab_proxy/util/mwi/embedded_connector/__init__.py,sha256=Vfl2hNC7V1IwoK9_wrwfENs4BC8P-Mvvqh4BNGi2n48,119
 matlab_proxy/util/mwi/embedded_connector/helpers.py,sha256=kpIgJN0AqYLeX56UylWgB0t07fg8sh0RhIlUH_8JitM,3654
 matlab_proxy/util/mwi/embedded_connector/request.py,sha256=RXoVvrm5fibVb2A6EZnkMWwAQkYX3J5kqDTGQDZo9p0,4316
@@ -76,7 +76,7 @@ matlab_proxy_manager/web/watcher.py,sha256=89JHjBAQtOrllstaJFxqrjHwckpRmu3qfUqeq
 tests/integration/__init__.py,sha256=ttzJ8xKWGxOJZz56qOiWOn6sp5LGomkZMn_w4KJLRMU,42
 tests/integration/integration_tests_with_license/__init__.py,sha256=vVYZCur-QhmIGCxUmn-WZjIywtDQidaLDmlmrRHRlgY,37
 tests/integration/integration_tests_with_license/conftest.py,sha256=sCaIXB8d4vf05C7JWSVA7g5gnPjbpRq3dftuBpWyp1s,1599
-tests/integration/integration_tests_with_license/test_http_end_points.py,sha256=51r3foIshg80NLgvsxaQUxlnnZiKs0O6gLvdF3Y7sWk,14448
+tests/integration/integration_tests_with_license/test_http_end_points.py,sha256=SDqYARwZKNXDS8-GzRKZvttCbmjq5ETwduN61ZVgOk8,14441
 tests/integration/integration_tests_without_license/__init__.py,sha256=vVYZCur-QhmIGCxUmn-WZjIywtDQidaLDmlmrRHRlgY,37
 tests/integration/integration_tests_without_license/conftest.py,sha256=n-oppKWxavyy1O0J6DywO3DnOHuYc7yUZRXm3Bt4szU,3526
 tests/integration/integration_tests_without_license/test_matlab_is_down_if_unlicensed.py,sha256=tkdyhfZBpfJpbnEzjURyV-GE0p43YxOa9xooJf-JoM4,1653
@@ -85,30 +85,30 @@ tests/integration/utils/integration_tests_utils.py,sha256=IbJ9CedFHiz3k85FBY-8Gw
 tests/integration/utils/licensing.py,sha256=rEBjvMXO8R3mL6KnePu2lojmOsjD4GXl9frf9N0Wacs,4842
 tests/unit/__init__.py,sha256=KfwQxxM5a1kMRtNbhz8tb7YfHp8e2d0tNLB55wYvDS8,37
 tests/unit/conftest.py,sha256=FIL7bhw2-9B5OEspqt9toZ2ZlN18pOsPEFjeQmVNcSk,1916
-tests/unit/test_app.py,sha256=pM8zVyXWLx8nP8RePusXH4admEBYKc5JC8eE2t8xIQE,38487
-tests/unit/test_app_state.py,sha256=HuRs4ofCviS_N8Nj71_KkB3OrEf8aqHsA0SZlUreQPc,37110
+tests/unit/test_app.py,sha256=VZt64uhdhsdmZL3Pb9LGtxxgt0H18mzRZRzSyiud6nQ,40028
+tests/unit/test_app_state.py,sha256=ZhywxbZb9HCxLQjgW1QEHccaydCeGKX20YOFFjpKWYM,38047
 tests/unit/test_constants.py,sha256=2nXxTmDP8utr8krsfZ4c_Bh4_mWPcDO5uI8MXeq4Usg,158
 tests/unit/test_ddux.py,sha256=a2J2iM8j_nnfJVuMI38p5AjwrRdoMj3N88gFgS2I4hg,713
 tests/unit/test_devel.py,sha256=A-1iVhSSwmywaW65QIRcUS2Fk7nJxceCcCm7CJtNdEc,7982
-tests/unit/test_non_dev_mode.py,sha256=0v27y27SLOWvw6jf_GhLLNg-RMsZS_OyGAnqoQYPpSA,5515
-tests/unit/test_settings.py,sha256=eBlV-ME_O8oLoOjJqqYTDTXJs-0smnM0oIMwHZEjUbo,17727
+tests/unit/test_non_dev_mode.py,sha256=Jqs5W-ax6WNM9v5SeTjpmVsojjA95itPC8Lqhs2U3Oc,5533
+tests/unit/test_settings.py,sha256=CZDopczxa7zMC1LIpRckwnG4v2Ag4RBLqPE1TaypNYM,23271
 tests/unit/util/__init__.py,sha256=GInSQBb2SoVD5LZfmSCQa9-UZJT_UP-jNfrojkgCybU,87
-tests/unit/util/test_mw.py,sha256=YC4mjn6G6_XuHELt8uW9F6g2K0_fWtQl1R0kWFvWbAo,18565
-tests/unit/util/test_util.py,sha256=gecUFSVIg4a9s3Ljl0A7eSSY5jN4vH668CbjnTpi198,7431
+tests/unit/util/test_mw.py,sha256=hweBw3ijcdh_2QdECjAWNkmh_7P5Df728cgD51DFkT8,18571
+tests/unit/util/test_util.py,sha256=n-xSkwdqXfq550jWYsmjhGjx6L98URhWeLJLKhGekOw,7476
 tests/unit/util/mwi/__init__.py,sha256=pl5jqyCHEwZEviiL8OC-SHulb1rBecstQCFF6qVjL9Y,37
 tests/unit/util/mwi/test_custom_http_headers.py,sha256=UfrhclS0j6WhShtg1ki2oF1kK8JqRC29uevH4tuDqF4,11182
 tests/unit/util/mwi/test_download.py,sha256=jYwPJFYGrPKqnkIJW42XYSe1fowmzChAkOx0k0xVldo,4779
 tests/unit/util/mwi/test_logger.py,sha256=S0Q5TirFxysrH2YSxRzGY9mWoWB83hG3q3XpGENCpcw,3150
-tests/unit/util/mwi/test_token_auth.py,sha256=-eBsaQ5JC7pyd9PXt48Rqs4cWjg6I-eOkp_gFVEwYhk,10538
-tests/unit/util/mwi/test_validators.py,sha256=lJy9rEXCULRrp9wxv9KXUjtlTFbchqTefxGLUg_n3S8,11452
+tests/unit/util/mwi/test_token_auth.py,sha256=0gp41Y7zZFqeFDCA0V3Arv_CqnQKo5RZqijIccvezYM,10562
+tests/unit/util/mwi/test_validators.py,sha256=GvLP3lSvoOQAjoclYunKPfxPIagUsnVGHRskHELResE,11765
 tests/unit/util/mwi/embedded_connector/__init__.py,sha256=pl5jqyCHEwZEviiL8OC-SHulb1rBecstQCFF6qVjL9Y,37
 tests/unit/util/mwi/embedded_connector/test_helpers.py,sha256=vYTWNUTuDeaygo16JGMTvWeI_CLOnvPkwNJmLndvJhE,890
 tests/unit/util/mwi/embedded_connector/test_request.py,sha256=PR-jddnXDEiip-lD7A_QSvRwEkwo3eQ8owZlk-r9vnk,1867
 tests/utils/__init__.py,sha256=ttzJ8xKWGxOJZz56qOiWOn6sp5LGomkZMn_w4KJLRMU,42
 tests/utils/logging_util.py,sha256=VBy_NRvwau3C_CVTBjK5RMROrQimnJYHO2U0aKSZiRw,2234
-matlab_proxy-0.24.1.dist-info/LICENSE.md,sha256=oF0h3UdSF-rlUiMGYwi086ZHqelzz7yOOk9HFDv9ELo,2344
-matlab_proxy-0.24.1.dist-info/METADATA,sha256=4MRz3xe4BjJtlDV-2KJ07wl-lP-QsE-o64F2u5FZk4U,10199
-matlab_proxy-0.24.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-matlab_proxy-0.24.1.dist-info/entry_points.txt,sha256=ZAlCUsgKzGcAeQaMZOq31FrTB5tQ8Ypq8Op_8U600-A,305
-matlab_proxy-0.24.1.dist-info/top_level.txt,sha256=KF-347aoRGsfHTpiSqfIPUZ95bzK5-oMIu8S_TUcu-w,40
-matlab_proxy-0.24.1.dist-info/RECORD,,
+matlab_proxy-0.25.0.dist-info/LICENSE.md,sha256=oF0h3UdSF-rlUiMGYwi086ZHqelzz7yOOk9HFDv9ELo,2344
+matlab_proxy-0.25.0.dist-info/METADATA,sha256=8vT3BKQB6VLmlygF55mESkydtp0j3BkvJprloc0MGWM,10505
+matlab_proxy-0.25.0.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+matlab_proxy-0.25.0.dist-info/entry_points.txt,sha256=3wztwXpt6wdGfTwscc4qHbCeWzi0E2XhyJbMDndyQKc,304
+matlab_proxy-0.25.0.dist-info/top_level.txt,sha256=KF-347aoRGsfHTpiSqfIPUZ95bzK5-oMIu8S_TUcu-w,40
+matlab_proxy-0.25.0.dist-info/RECORD,,

{matlab_proxy-0.24.1.dist-info → matlab_proxy-0.25.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.45.1)
+Generator: setuptools (75.3.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{matlab_proxy-0.24.1.dist-info → matlab_proxy-0.25.0.dist-info}/entry_points.txt

@@ -5,4 +5,3 @@ matlab-proxy-manager-app = matlab_proxy_manager.web.app:main
 
 [matlab_proxy_configs]
 default_configuration_matlab_proxy = matlab_proxy.default_configuration:config
-

tests/integration/integration_tests_with_license/test_http_end_points.py

@@ -1,4 +1,4 @@
-# Copyright 2023-2024 The MathWorks, Inc.
+# Copyright 2023-2025 The MathWorks, Inc.
 
 """
 Contains integration tests which exercise HTTP endpoints of interest exposed by matlab-proxy-app
@@ -246,24 +246,23 @@ class RealMATLABServer:
 # Fixtures
 @pytest.fixture
 def matlab_proxy_app_fixture(
-    loop,
+    event_loop,
 ):
     """A pytest fixture which yields a real matlab server to be used by tests.
 
     Args:
-        loop (Event event_loop): The built-in event event_loop provided by pytest.
+        event_loop (Event loop): The built-in event loop provided by pytest.
 
     Yields:
         real_matlab_server : A real matlab web server used by tests.
     """
 
     try:
-        with RealMATLABServer(loop) as matlab_proxy_app:
+        with RealMATLABServer(event_loop) as matlab_proxy_app:
             yield matlab_proxy_app
     except ProcessLookupError as e:
         _logger.debug("ProcessLookupError found in matlab proxy app fixture")
         _logger.debug(e)
-        pass
 
 
 @pytest.fixture

tests/unit/test_app.py

@@ -1,4 +1,4 @@
-# Copyright 2020-2024 The MathWorks, Inc.
+# Copyright 2020-2025 The MathWorks, Inc.
 
 import asyncio
 import datetime
@@ -9,13 +9,18 @@ import time
 from datetime import timedelta, timezone
 from http import HTTPStatus
 
-import aiohttp
 import pytest
-import tests.unit.test_constants as test_constants
+from aiohttp import WSMsgType
+from aiohttp.web import WebSocketResponse
+from multidict import CIMultiDict
 
+import tests.unit.test_constants as test_constants
 from matlab_proxy import app, util
+from matlab_proxy.app import matlab_view
 from matlab_proxy.util.mwi import environment_variables as mwi_env
 from matlab_proxy.util.mwi.exceptions import EntitlementError, MatlabInstallError
+from tests.unit.fixtures.fixture_auth import patch_authenticate_access_decorator
+from tests.unit.mocks.mock_client import MockWebSocketClient
 
 
 @pytest.mark.parametrize(
@@ -61,7 +66,7 @@ def test_configure_no_proxy_in_env(monkeypatch, no_proxy_user_configuration):
     )
 
 
-def test_create_app(loop):
+def test_create_app(event_loop):
     """Test if aiohttp server is being created successfully.
 
     Checks if the aiohttp server is created successfully, routes, startup and cleanup
@@ -75,7 +80,7 @@ def test_create_app(loop):
     # Verify app server has a cleanup task
     # By default there is 1 for clean up task
     assert len(test_server.on_cleanup) > 1
-    loop.run_until_complete(test_server["state"].stop_server_tasks())
+    event_loop.run_until_complete(test_server["state"].stop_server_tasks())
 
 
 def get_email():
@@ -245,9 +250,33 @@ class FakeServer:
         self.loop.run_until_complete(self.server.cleanup())
 
 
+@pytest.fixture
+def mock_request(mocker):
+    """Creates a mock request with required attributes"""
+    req = mocker.MagicMock()
+    req.app = {
+        "state": mocker.MagicMock(matlab_port=8000),
+        "settings": {"matlab_protocol": "http", "mwapikey": "test-key"},
+    }
+    req.headers = CIMultiDict()
+    req.cookies = {}
+    return req
+
+
+@pytest.fixture(name="mock_websocket_messages")
+def mock_messages(mocker):
+    # Mock WebSocket messages
+    return [
+        mocker.MagicMock(type=WSMsgType.TEXT, data="test message"),
+        mocker.MagicMock(type=WSMsgType.BINARY, data=b"test binary"),
+        mocker.MagicMock(type=WSMsgType.PING),
+        mocker.MagicMock(type=WSMsgType.PONG),
+    ]
+
+
 @pytest.fixture(name="test_server")
 def test_server_fixture(
-    loop,
+    event_loop,
     aiohttp_client,
     monkeypatch,
 ):
@@ -263,7 +292,7 @@ def test_server_fixture(
     # Disabling the authentication token mechanism explicitly
     monkeypatch.setenv(mwi_env.get_env_name_enable_mwi_auth_token(), "False")
     try:
-        with FakeServer(loop, aiohttp_client) as test_server:
+        with FakeServer(event_loop, aiohttp_client) as test_server:
             yield test_server
     except ProcessLookupError:
         pass
@@ -306,8 +335,6 @@ async def test_get_env_config(test_server):
         test_server (aiohttp_client): A aiohttp_client server for sending GET request.
     """
     expected_json_structure = {
-        "useMOS": False,
-        "useMRE": False,
         "authentication": {"enabled": False, "status": False},
         "matlab": {
             "status": "up",
@@ -350,7 +377,7 @@ async def test_start_matlab_route(test_server):
     await __check_for_matlab_status(test_server, "starting")
 
 
-async def __check_for_matlab_status(test_server, status):
+async def __check_for_matlab_status(test_server, status, sleep_interval=0.5):
     """Helper function to check if the status of MATLAB returned by the server is either of the values mentioned in statuses
 
     Args:
@@ -369,7 +396,7 @@ async def __check_for_matlab_status(test_server, status):
             break
         else:
             count += 1
-            await asyncio.sleep(0.5)
+            await asyncio.sleep(sleep_interval)
             if count > test_constants.FIVE_MAX_TRIES:
                 raise ConnectionError
 
@@ -592,19 +619,6 @@ async def test_matlab_proxy_http_post_request(proxy_payload, test_server):
             raise ConnectionError
 
 
-# While acceessing matlab-proxy directly, the web socket request looks like
-#     {
-#         "connection": "Upgrade",
-#         "Upgrade": "websocket",
-#     }
-# whereas while accessing matlab-proxy with nginx as the reverse proxy, the nginx server
-# modifies the web socket request to
-#     {
-#         "connection": "upgrade",
-#         "upgrade": "websocket",
-#     }
-
-
 async def test_set_licensing_info_put_nlm(test_server):
     """Test to check endpoint : "/set_licensing_info"
 
@@ -641,35 +655,70 @@ async def test_set_licensing_info_put_invalid_license(test_server):
     assert resp.status == HTTPStatus.BAD_REQUEST
 
 
+# While acceessing matlab-proxy directly, the web socket request looks like
+#     {
+#         "connection": "Upgrade",
+#         "Upgrade": "websocket",
+#     }
+# whereas while accessing matlab-proxy with nginx as the reverse proxy, the nginx server
+# modifies the web socket request to
+#     {
+#         "connection": "upgrade",
+#         "upgrade": "websocket",
+#     }
 @pytest.mark.parametrize(
     "headers",
     [
-        {
-            "connection": "Upgrade",
-            "Upgrade": "websocket",
-        },
-        {
-            "connection": "upgrade",
-            "upgrade": "websocket",
-        },
+        CIMultiDict(
+            {
+                "connection": "Upgrade",
+                "Upgrade": "websocket",
+            }
+        ),
+        CIMultiDict(
+            {
+                "connection": "upgrade",
+                "upgrade": "websocket",
+            }
+        ),
     ],
     ids=["Uppercase header", "Lowercase header"],
 )
-async def test_matlab_proxy_web_socket(test_server, headers):
-    """Test to check if test_server proxies web socket request to fake matlab server
+async def test_matlab_view_websocket_success(
+    mocker,
+    mock_request,
+    mock_websocket_messages,
+    headers,
+    patch_authenticate_access_decorator,
+):
+    """Test successful websocket connection and message forwarding"""
 
-    Args:
-        test_server (aiohttp_client): Test Server to send HTTP Requests.
-    """
+    # Configure request for WebSocket
+    mock_request.headers = headers
+    mock_request.method = "GET"
+    mock_request.path_qs = "/test"
 
-    await wait_for_matlab_to_be_up(test_server, test_constants.ONE_SECOND_DELAY)
-    resp = await test_server.ws_connect("/http_ws_request.html/", headers=headers)
-    text = await resp.receive()
-    websocket_response_string = (
-        "Hello world"  # This string is set by the web_socket_handler in devel.py
+    # Mock WebSocket setup
+    mock_ws_server = mocker.MagicMock(spec=WebSocketResponse)
+    mocker.patch(
+        "matlab_proxy.app.aiohttp.web.WebSocketResponse", return_value=mock_ws_server
+    )
+
+    # Mock WebSocket client
+    mock_ws_client = MockWebSocketClient(messages=mock_websocket_messages)
+    mocker.patch(
+        "matlab_proxy.app.aiohttp.ClientSession.ws_connect", return_value=mock_ws_client
     )
-    assert text.type == aiohttp.WSMsgType.TEXT
-    assert text.data == websocket_response_string
+
+    # Execute
+    result = await matlab_view(mock_request)
+
+    # Assertions
+    assert result == mock_ws_server
+    assert mock_ws_server.send_str.call_count == 1
+    assert mock_ws_server.send_bytes.call_count == 1
+    assert mock_ws_server.ping.call_count == 1
+    assert mock_ws_server.pong.call_count == 1
 
 
 async def test_set_licensing_info_put_mhlm(test_server):
@@ -992,7 +1041,7 @@ async def test_set_licensing_mhlm_single_entitlement(
     assert resp_json["licensing"]["entitlementId"] == "Entitlement3"
 
     # validate that MATLAB has started correctly
-    await __check_for_matlab_status(test_server, "up")
+    await __check_for_matlab_status(test_server, "up", sleep_interval=2)
 
     # test-cleanup: unset licensing
     # without this, we can leave test drool related to cached license file

tests/unit/test_app_state.py

@@ -1,4 +1,4 @@
-# Copyright 2023-2024 The MathWorks, Inc.
+# Copyright 2023-2025 The MathWorks, Inc.
 
 import asyncio
 import json
@@ -13,7 +13,11 @@ from matlab_proxy import settings
 from matlab_proxy import settings
 from matlab_proxy.app_state import AppState
 from matlab_proxy.constants import MWI_AUTH_TOKEN_NAME_FOR_HTTP
-from matlab_proxy.util.mwi.exceptions import LicensingError, MatlabError
+from matlab_proxy.util.mwi.exceptions import (
+    LicensingError,
+    MatlabError,
+    MatlabInstallError,
+)
 from matlab_proxy.constants import (
     CONNECTOR_SECUREPORT_FILENAME,
     USER_CODE_OUTPUT_FILE_NAME,
@@ -39,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,
@@ -51,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
@@ -67,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
@@ -104,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.
@@ -119,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)
@@ -611,6 +616,29 @@ async def test_start_matlab_without_xvfb(app_state_fixture, mocker):
     assert app_state_fixture.processes["matlab"] is mock_matlab
 
 
+async def test_start_matlab_without_xvfb_and_matlab(app_state_fixture):
+    """Test to check if MATLAB doesn't start and sets the error variable to MatlabInstallError when
+    there is not MATLAB on system PATH
+
+    Args:
+        app_state_fixture (AppState): Object of AppState class with defaults set
+    """
+    # Arrange
+    app_state_fixture.settings["is_xvfb_available"] = False
+    app_state_fixture.settings["matlab_cmd"] = None
+
+    # Act
+    await app_state_fixture.start_matlab()
+
+    # Assert
+    # Check if Xvfb has not started
+    assert app_state_fixture.processes["xvfb"] is None
+    # Check if Matlab has not started
+    assert app_state_fixture.processes["matlab"] is None
+    # Check if MatlabInstallError is set as the error
+    assert isinstance(app_state_fixture.error, MatlabInstallError)
+
+
 @pytest.mark.parametrize(
     "is_desktop, client_id, is_client_id_present, expected_is_active_client",
     [
@@ -793,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