Updates integration tests to account for matlab-proxy's token authentication.

Author: pranaverma92

tests/integration/integration_tests_with_license/conftest.py

@@ -80,7 +80,6 @@ def matlab_proxy_fixture(module_monkeypatch, request):
     mwi_base_url = "/matlab-test"
     module_monkeypatch.setenv(mwi_env.get_env_name_testing(), "false")
     module_monkeypatch.setenv(mwi_env.get_env_name_development(), "false")
-    module_monkeypatch.setenv(mwi_env.get_env_name_enable_mwi_auth_token(), "false")
 
     # Start matlab-proxy-app for testing
     input_env = {

tests/integration/integration_tests_with_license/test_http_end_points.py

@@ -10,7 +10,7 @@
 import requests
 import re
 from requests.adapters import HTTPAdapter, Retry
-from urllib.parse import urlparse
+from urllib.parse import urlparse, parse_qs
 from logging_util import create_test_logger
 
 _logger = create_test_logger(
@@ -66,6 +66,14 @@ def __enter__(self):
 
         utils.wait_server_info_ready(self.mwi_app_port)
         parsed_url = urlparse(utils.get_connection_string(self.mwi_app_port))
+
+        self.headers = {
+            "mwi_auth_token": (
+                parse_qs(parsed_url.query)["mwi_auth_token"][0]
+                if "mwi_auth_token" in parse_qs(parsed_url.query)
+                else ""
+            )
+        }
         self.connection_scheme = parsed_url.scheme
         self.url = parsed_url.scheme + "://" + parsed_url.netloc + parsed_url.path
         return self
@@ -89,7 +97,7 @@ def _move(source, destination):
         _logger.exception(err)
 
 
-def _send_http_get_request(uri, connection_scheme, http_endpoint=""):
+def _send_http_get_request(uri, connection_scheme, headers, http_endpoint=""):
     """Send HTTP request to matlab-proxy server.
     Returns HTTP response JSON"""
 
@@ -99,20 +107,24 @@ def _send_http_get_request(uri, connection_scheme, http_endpoint=""):
     with requests.Session() as s:
         retries = Retry(total=10, backoff_factor=0.1)
         s.mount(f"{connection_scheme}://", HTTPAdapter(max_retries=retries))
-        response = s.get(request_uri, verify=False)
+        response = s.get(request_uri, headers=headers, verify=False)
         json_response = json.loads(response.text)
 
     return json_response
 
 
-def _check_matlab_status(connection_scheme, status, uri):
+def _check_matlab_status(matlab_proxy_app_fixture, status):
+    uri = matlab_proxy_app_fixture.url
+    connection_scheme = matlab_proxy_app_fixture.connection_scheme
+    headers = matlab_proxy_app_fixture.headers
+
     matlab_status = None
 
     start_time = time.time()
     while matlab_status != status and (time.time() - start_time < MAX_TIMEOUT):
         time.sleep(1)
         res = _send_http_get_request(
-            uri, connection_scheme, http_endpoint="/get_status"
+            uri, connection_scheme, headers, http_endpoint="/get_status"
         )
         matlab_status = res["matlab"]["status"]
 
@@ -146,11 +158,7 @@ def test_matlab_is_up(matlab_proxy_app_fixture):
         matlab_proxy_app_fixture: A pytest fixture which yields a real matlab server to be used by tests.
     """
 
-    status = _check_matlab_status(
-        matlab_proxy_app_fixture.connection_scheme,
-        "up",
-        matlab_proxy_app_fixture.url,
-    )
+    status = _check_matlab_status(matlab_proxy_app_fixture, "up")
     assert status == "up"
 
 
@@ -162,12 +170,7 @@ def test_stop_matlab(matlab_proxy_app_fixture):
         matlab_proxy_app_fixture: A pytest fixture which yields a real matlab server to be used by tests.
     """
 
-    _logger.info("Testing stopping")
-    status = _check_matlab_status(
-        matlab_proxy_app_fixture.connection_scheme,
-        "up",
-        matlab_proxy_app_fixture.url,
-    )
+    status = _check_matlab_status(matlab_proxy_app_fixture, "up")
     assert status == "up"
 
     http_endpoint_to_test = "/stop_matlab"
@@ -179,15 +182,10 @@ def test_stop_matlab(matlab_proxy_app_fixture):
             f"{matlab_proxy_app_fixture.connection_scheme}://",
             HTTPAdapter(max_retries=retries),
         )
-        s.delete(stop_url, verify=False)
+        s.delete(stop_url, headers=matlab_proxy_app_fixture.headers, verify=False)
 
-    status = _check_matlab_status(
-        matlab_proxy_app_fixture.connection_scheme,
-        "down",
-        matlab_proxy_app_fixture.url,
-    )
+    status = _check_matlab_status(matlab_proxy_app_fixture, "down")
     assert status == "down"
-    _logger.info("stop_matlab test passed")
 
 
 async def test_print_message(matlab_proxy_app_fixture):
@@ -198,9 +196,7 @@ async def test_print_message(matlab_proxy_app_fixture):
 
     """
     # Checks if matlab proxy is in "up" state or not
-    status = _check_matlab_status(
-        matlab_proxy_app_fixture.connection_scheme, "up", matlab_proxy_app_fixture.url
-    )
+    status = _check_matlab_status(matlab_proxy_app_fixture, "up")
     assert status == "up"
 
     uri_regex = f"{matlab_proxy_app_fixture.connection_scheme}://[a-zA-Z0-9\-_.]+:{matlab_proxy_app_fixture.mwi_app_port}{matlab_proxy_app_fixture.mwi_base_url}"

tests/integration/integration_tests_without_license/conftest.py

@@ -5,6 +5,7 @@
 import requests
 from logging_util import create_test_logger
 import os
+from urllib.parse import urlparse, parse_qs
 
 _logger = create_test_logger(
     __name__, log_file_path=os.getenv("MWI_INTEG_TESTS_LOG_FILE_PATH")
@@ -26,6 +27,28 @@ class object: Object of class MonkeyPatch
         yield mp
 
 
+@pytest.fixture
+def parse_matlab_proxy_url():
+    # Get the base URL from a utility function or environment variable
+    mwi_app_port = os.environ["MWI_APP_PORT"]
+
+    # Construct the parameters dictionary
+    parsed_url = urlparse(utils.get_connection_string(mwi_app_port))
+
+    headers = {
+        "mwi_auth_token": (
+            ["mwi_auth_token"][0]
+            if "mwi_auth_token" in parse_qs(parsed_url.query)
+            else ""
+        )
+    }
+
+    connection_scheme = parsed_url.scheme
+
+    # Return the base URL and parameters as a tuple
+    return parsed_url, headers, connection_scheme
+
+
 @pytest.fixture(scope="module", autouse=True)
 def start_matlab_proxy_fixture(module_monkeypatch):
     """Starts the matlab proxy process"""
@@ -39,7 +62,6 @@ def start_matlab_proxy_fixture(module_monkeypatch):
     input_env = {
         "MWI_APP_PORT": mwi_app_port,
         "MWI_BASE_URL": mwi_base_url,
-        "MWI_ENABLE_TOKEN_AUTH": "false",
     }
 
     import matlab_proxy

tests/integration/integration_tests_without_license/test_matlab_is_down_if_unlicensed.py

@@ -8,15 +8,11 @@
 from urllib.parse import urlparse
 
 
-def test_matlab_down():
+def test_matlab_down(parse_matlab_proxy_url):
     """Test that matlab is down and no license is picked up"""
 
-    mwi_app_port = os.environ["MWI_APP_PORT"]
+    parsed_url, headers, connection_scheme = parse_matlab_proxy_url
     http_endpoint = "/get_status"
-
-    parsed_url = urlparse(utils.get_connection_string(mwi_app_port))
-
-    connection_scheme = parsed_url.scheme
     uri = (
         connection_scheme + "://" + parsed_url.netloc + parsed_url.path + http_endpoint
     )
@@ -26,7 +22,7 @@ def test_matlab_down():
     with requests.Session() as s:
         retries = Retry(total=10, backoff_factor=0.1)
         s.mount(f"{connection_scheme}://", HTTPAdapter(max_retries=retries))
-        response = s.get(uri, verify=False)
+        response = s.get(uri, headers=headers, verify=False)
         json_response = json.loads(response.text)
 
     matlab_status = json_response["matlab"]["status"]