Update MATLAB launch command in the presence of MLM_LICENSE_FILE to use licmode as file. This prioritizes MLM_LICENSE_FILE inputs irrespective of whether MATLAB contains other license information.

Author: Tanmay Das

.github/workflows/run-tests-feature.yml

@@ -17,13 +17,7 @@ jobs:
   # so run number needs to be hardcoded
   call-run-tests-r000:
     uses: ./.github/workflows/run-tests.yml
-    with:
-      continue-on-error: true
   call-run-tests-r001:
     uses: ./.github/workflows/run-tests.yml
-    with:
-      continue-on-error: true
   call-run-tests-r002:
-    uses: ./.github/workflows/run-tests.yml
-    with:
-      continue-on-error: true
+    uses: ./.github/workflows/run-tests.yml

.github/workflows/run-tests.yml

@@ -7,11 +7,6 @@ on:
   # Reusable workflow
   # Trigger on workflow call
   workflow_call:
-    inputs:
-        continue-on-error:
-          required: false
-          default: false
-          type: boolean
 
 jobs:
   node_tests:
@@ -47,13 +42,16 @@ jobs:
         run: npm test
 
   python_tests:
-    continue-on-error: ${{ inputs.continue-on-error }}
     strategy:
+      # fail-fast=false runs all the jobs in strategy matrix
+      # irrespective of failures in a particular job, and marks
+      # the entire job as failed even if one job has failed
+      fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
         python-version: ['3.7', '3.8', '3.9', '3.10']
         exclude:
-        - os: [windows-latest]
+        - os: windows-latest
           # Python 3.7 in Windows does not run successfully
           python-version: '3.7'
     runs-on: ${{ matrix.os }}

matlab_proxy/settings.py

@@ -143,6 +143,18 @@ def get(config_name=matlab_proxy.get_default_config_name(), dev=False):
 
         mwi_auth_token = token_auth.generate_mwi_auth_token()
 
+        # MATLAB Proxy gives precedence to the licensing information conveyed
+        # by the user. If MLM_LICENSE_FILE is set, it should be prioritised over
+        # other ways of licensing. But existence of license_info.xml in matlab/licenses
+        # folder may cause hinderance in this workflow. So specifying -licmode as 'file'
+        # overrides license_info.xml and enforces MLM_LICENSE_FILE to be the topmost priority
+
+        # NLM Connection String provided by MLM_LICENSE_FILE environment variable
+        nlm_conn_str = mwi.validators.validate_mlm_license_file(
+            os.environ.get(mwi_env.get_env_name_network_license_manager())
+        )
+        matlab_lic_mode = ["-licmode", "file"] if nlm_conn_str else ""
+
         # All config related to matlab-proxy will be saved to user's home folder.
         # This will allow for other user's to launch the integration from the same system
         # and not have their config's overwritten.
@@ -155,6 +167,7 @@ def get(config_name=matlab_proxy.get_default_config_name(), dev=False):
                 "-nosplash",
                 "-nodesktop",
                 "-softwareopengl",
+                *matlab_lic_mode,
                 "-r",
                 f"try; run('{matlab_startup_file}'); catch ME; disp(ME.message); end;",
             ],
@@ -171,9 +184,7 @@ def get(config_name=matlab_proxy.get_default_config_name(), dev=False):
             ),
             "mwapikey": str(uuid.uuid4()),
             "matlab_protocol": "https",
-            "nlm_conn_str": mwi.validators.validate_mlm_license_file(
-                os.environ.get(mwi_env.get_env_name_network_license_manager())
-            ),
+            "nlm_conn_str": nlm_conn_str,
             "matlab_config_file": mwi_config_folder / "proxy_app_config.json",
             "ws_env": ws_env,
             "mwa_api_endpoint": f"https://login{ws_env_suffix}.mathworks.com/authenticationws/service/v4",

tests/util/test_mw.py

@@ -511,8 +511,8 @@ def test_range_matlab_connector_ports():
 
 
 @pytest.mark.skipif(
-    system.is_windows() or system.is_mac(),
-    reason="xvfb is not meant for windows and mac machines",
+    not system.is_linux(),
+    reason="Xvfb is only required on linux based operating systems",
 )
 async def test_create_xvfb_process(loop):
     """Test to check if more than 1 xvfb process can be created with -displayfd flag
@@ -521,11 +521,6 @@ async def test_create_xvfb_process(loop):
     running on unique display ports
     """
 
-    # No need to test Xvfb process creation on a Windows system.
-    # As Xvfb is meant for Posix systems.
-    if system.is_windows():
-        return
-
     # Get command to launch xvfb with -displayfd flag.
     settings_1 = settings.get(dev=True)
     settings_2 = settings.get(dev=True)