matlab-proxy 0.18.1__py3-none-any.whl → 0.19.0__py3-none-any.whl

tests/unit/test_app.py

@@ -61,7 +61,7 @@ def test_configure_no_proxy_in_env(monkeypatch, no_proxy_user_configuration):
     )
 
 
-def test_create_app():
+def test_create_app(loop):
     """Test if aiohttp server is being created successfully.
 
     Checks if the aiohttp server is created successfully, routes, startup and cleanup
@@ -75,6 +75,7 @@ def test_create_app():
     # 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())
 
 
 def get_email():
@@ -311,12 +312,13 @@ async def test_get_env_config(test_server):
         "matlab": {
             "status": "up",
             "version": "R2023a",
-            "supported_versions": ["R2020b", "R2023a"],
+            "supportedVersions": ["R2020b", "R2023a"],
         },
         "doc_url": "foo",
         "extension_name": "bar",
         "extension_name_short_description": "foobar",
         "isConcurrencyEnabled": "foobar",
+        "idleTimeoutDuration": 100,
     }
     resp = await test_server.get("/get_env_config")
     assert resp.status == HTTPStatus.OK
@@ -336,23 +338,33 @@ async def test_start_matlab_route(test_server):
         test_server (aiohttp_client): A aiohttp_client server to send GET request to.
     """
     # Waiting for the matlab process to start up.
-    sleep_interval = 1
-    await wait_for_matlab_to_be_up(test_server, sleep_interval)
+    await wait_for_matlab_to_be_up(
+        test_server, test_constants.CHECK_MATLAB_STATUS_INTERVAL
+    )
 
     # Send get request to end point
     await test_server.put("/start_matlab")
 
     # Check if Matlab restarted successfully
-    await check_for_matlab_startup(test_server)
+    await __check_for_matlab_status(test_server, "starting")
+
+
+async def __check_for_matlab_status(test_server, status):
+    """Helper function to check if the status of MATLAB returned by the server is either of the values mentioned in statuses
 
+    Args:
+        test_server (aiohttp_client): A aiohttp_client server to send HTTP DELETE request.
+        statuses ([str]): Possible MATLAB statuses.
 
-async def check_for_matlab_startup(test_server):
+    Raises:
+        ConnectionError: Exception raised if the test_server is not reachable.
+    """
     count = 0
     while True:
         resp = await test_server.get("/get_status")
         assert resp.status == HTTPStatus.OK
         resp_json = json.loads(await resp.text())
-        if resp_json["matlab"]["status"] != "down":
+        if resp_json["matlab"]["status"] == status:
             break
         else:
             count += 1
@@ -365,14 +377,20 @@ async def test_stop_matlab_route(test_server):
     """Test to check endpoint : "/stop_matlab"
 
     Sends HTTP DELETE request to stop matlab and checks if matlab status is down.
+
     Args:
         test_server (aiohttp_client): A aiohttp_client server to send HTTP DELETE request.
     """
+    # Arrange
+    # Nothing to arrange
+
+    # Act
     resp = await test_server.delete("/stop_matlab")
     assert resp.status == HTTPStatus.OK
 
-    resp_json = json.loads(await resp.text())
-    assert resp_json["matlab"]["status"] == "down"
+    # Assert
+    # Check if Matlab restarted successfully
+    await __check_for_matlab_status(test_server, "stopping")
 
 
 async def test_root_redirect(test_server):
@@ -643,8 +661,7 @@ async def test_matlab_proxy_web_socket(test_server, headers):
         test_server (aiohttp_client): Test Server to send HTTP Requests.
     """
 
-    sleep_interval = 1
-    await wait_for_matlab_to_be_up(test_server, sleep_interval)
+    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 = (
@@ -703,19 +720,21 @@ async def test_set_licensing_info_delete(test_server):
 
 
 async def test_set_termination_integration_delete(test_server):
-    """Test to check endpoint : "/terminate_integration"
+    """Test to check endpoint : "/shutdown_integration"
 
-    Test which sends HTTP DELETE request to terminate integration. Checks if integration is terminated
+    Test which sends HTTP DELETE request to shutdown integration. Checks if integration is shutdown
     successfully.
     Args:
         test_server (aiohttp_client):  A aiohttp_client server to send HTTP GET request.
     """
-    try:
-        resp = await test_server.delete("/terminate_integration")
-        resp_json = json.loads(await resp.text())
-        assert resp.status == HTTPStatus.OK and resp_json["loadUrl"] == "../"
-    except ProcessLookupError:
-        pass
+    # Not awaiting the response here explicitly as the event loop is stopped in the
+    # handler function.
+    test_server.delete("/shutdown_integration")
+
+    resp = await test_server.get("/")
+
+    # Assert that the service is unavailable
+    assert resp.status == 503
 
 
 def test_get_access_url(test_server):
@@ -724,6 +743,7 @@ def test_get_access_url(test_server):
     Args:
         test_server (aiohttp.web.Application): Application Server
     """
+
     assert "127.0.0.1" in util.get_access_url(test_server.app)
 
 
@@ -866,6 +886,10 @@ async def set_licensing_info_fixture(
         "sourceId": "abc@nlm",
         "matlabVersion": "R2023a",
     }
+
+    # Waiting for the matlab process to start up.
+    await wait_for_matlab_to_be_up(test_server, test_constants.ONE_SECOND_DELAY)
+
     # Set matlab_version to None to check if the version is updated
     # after sending a request t o /set_licensing_info endpoint
     test_server.server.app["settings"]["matlab_version"] = None
@@ -967,7 +991,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_startup(test_server)
+    await __check_for_matlab_status(test_server, "up")
 
     # test-cleanup: unset licensing
     # without this, we can leave test drool related to cached license file
@@ -1020,8 +1044,7 @@ async def test_set_licensing_mhlm_multi_entitlements(
     # user hasn't selected the license yet
     resp = await test_server.get("/get_status")
     assert resp.status == HTTPStatus.OK
-    resp_json = json.loads(await resp.text())
-    assert resp_json["matlab"]["status"] == "down"
+    __check_for_matlab_status(test_server, "down")
 
     # test-cleanup: unset licensing
     resp = await test_server.delete("/set_licensing_info")