Enable the test which was disabled in v0.9.1

Author: krisctl

tests/unit/jupyter_matlab_kernel/mocks/mock_jupyter_server.py

@@ -6,10 +6,10 @@
 """
 
 
-import pytest
+import os
 
+import pytest
 import requests
-import os
 from jupyter_server import serverapp
 
 PID = "server 1"
@@ -18,7 +18,7 @@
 SECURE = False
 TEST_TOKEN = "test_token"
 LICENSING = True
-AUTHORISED_HEADERS = {"Authorization": "token test_token"}
+AUTHORIZED_HEADERS = {"Authorization": "token test_token"}
 PASSWORD = ""
 
 
@@ -46,8 +46,11 @@ def fake_list_running_servers(*args, **kwargs):
         ]
 
     class MockResponse:
-        status_code = requests.codes.ok
-        text = "MWI_MATLAB_PROXY_IDENTIFIER"
+        def __init__(
+            self, status_code=requests.codes.ok, text="MWI_MATLAB_PROXY_IDENTIFIER"
+        ) -> None:
+            self.status_code = status_code
+            self.text = text
 
         @staticmethod
         def json():
@@ -58,7 +61,12 @@ def json():
             }
 
     def mock_get(*args, **kwargs):
-        return MockResponse()
+        # Return a successful matlab_proxy startup message if there is any header present,
+        # else return an unsuccessful result (via status codes other than 200)
+        if "headers" in kwargs and kwargs["headers"]:
+            return MockResponse()
+        else:
+            return MockResponse(status_code=requests.codes.unavailable)
 
     monkeypatch.setattr(serverapp, "list_running_servers", fake_list_running_servers)
     monkeypatch.setattr(os, "getppid", fake_getppid)

tests/unit/jupyter_matlab_kernel/test_kernel.py

@@ -1,15 +1,12 @@
 # Copyright 2023 The MathWorks, Inc.
 
 # This file contains tests for jupyter_matlab_kernel.kernel
-from jupyter_matlab_kernel.kernel import (
-    start_matlab_proxy,
-    MATLABConnectionError,
-)
-
+import mocks.mock_jupyter_server as MockJupyterServer
 import pytest
 from jupyter_server import serverapp
 from mocks.mock_jupyter_server import MockJupyterServerFixture
-import mocks.mock_jupyter_server as MockJupyterServer
+
+from jupyter_matlab_kernel.kernel import MATLABConnectionError, start_matlab_proxy
 
 
 def test_start_matlab_proxy_without_jupyter_server():
@@ -33,7 +30,7 @@ def test_start_matlab_proxy(MockJupyterServerFixture):
 
     url, server, headers = start_matlab_proxy()
     assert server == MockJupyterServer.BASE_URL
-    assert headers == MockJupyterServer.AUTHORISED_HEADERS
+    assert headers == MockJupyterServer.AUTHORIZED_HEADERS
     expected_url = (
         "http://localhost:"
         + MockJupyterServer.PORT
@@ -73,15 +70,14 @@ def fake_list_running_servers(*args, **kwargs):
     assert url == expected_url
 
 
-# TODO: Need to update usage of mock response in this test.
-# def test_start_matlab_proxy_jh_api_token(monkeypatch, MockJupyterServerFixture):
-#     """
-#     The test checks that start_matlab_proxy makes use of the environment variable
-#     JUPYTERHUB_API_TOKEN if it is set.
-#     """
-
-#     monkeypatch.setattr(MockJupyterServer, "TEST_TOKEN", None)
+def test_start_matlab_proxy_jh_api_token(monkeypatch, MockJupyterServerFixture):
+    """
+    The test checks that start_matlab_proxy makes use of the environment variable
+    JUPYTERHUB_API_TOKEN if it is set.
+    """
+    token = "test_jh_token"
+    monkeypatch.setattr(MockJupyterServer, "TEST_TOKEN", None)
 
-#     monkeypatch.setenv("JUPYTERHUB_API_TOKEN", "test_jh_token")
-#     _, _, headers = start_matlab_proxy()
-#     assert headers == {"Authorization": "token test_jh_token"}
+    monkeypatch.setenv("JUPYTERHUB_API_TOKEN", token)
+    _, _, headers = start_matlab_proxy()
+    assert headers == {"Authorization": f"token {token}"}