Fix logging bug in dragon_install

doc/changelog.md

@@ -13,6 +13,7 @@ Jump to:
 
 Description
 
+- Fix dragon build logging bug
 - Merge core refactor into MLI feature branch
 - Implement asynchronous notifications for shared data
 - Quick bug fix in _validate

smartsim/_core/_cli/scripts/dragon_install.py

@@ -251,8 +251,15 @@ def filter_assets(
         asset = next((asset for asset in assets if _platform_filter(asset.name)), None)
 
     if not asset:
+        # there is a mismatch between the platform and the asset
         asset = assets[0]
-        logger.warning(f"Platform-specific package not found. Using {asset.name}")
+        if "crayex" in asset.name.lower():
+            # non-Cray platform, Cray EX asset
+            logger.warning(f"Platform does not support Cray EX assets")
+            asset = None
+        else:
+            # Cray platform, non Cray EX asset
+            logger.warning(f"Platform-specific package not found. Using {asset.name}")
 
     return asset
 
@@ -267,9 +274,9 @@ def retrieve_asset_info(request: DragonInstallRequest) -> GitReleaseAsset:
 
     platform_result = check_platform()
     if not platform_result.is_cray:
-        logger.warning("Installing Dragon without HSTA support")
         for msg in platform_result.failures:
             logger.warning(msg)
+        logger.warning("Installing Dragon without HSTA support")
 
     if asset is None:
         raise SmartSimCLIActionCancelled("No dragon runtime asset available to install")

tests/_legacy/test_dragon_installer.py

@@ -29,6 +29,7 @@
 import tarfile
 import typing as t
 from collections import namedtuple
+from unittest.mock import MagicMock
 
 import pytest
 from github.GitRelease import GitRelease
@@ -44,6 +45,7 @@
     DragonInstallRequest,
     cleanup,
     create_dotenv,
+    filter_assets,
     install_dragon,
     install_package,
     retrieve_asset,
@@ -577,3 +579,57 @@ def test_create_dotenv_format(monkeypatch: pytest.MonkeyPatch, test_dir: str):
         for line in lines:
             line_split = line.split("=")
             assert len(line_split) == 2
+
+
+@pytest.mark.parametrize(
+    "_platform_filter_return,asset_name,returned_asset_bool",
+    [
+        pytest.param(
+            True,
+            "dragon-0.10-py3.9.4.1-CRAYEX.tar.gz",
+            True,
+            id="cray platform, crayex in name",
+        ),
+        pytest.param(
+            False,
+            "dragon-0.10-py3.9.4.1-CRAYEX.tar.gz",
+            False,
+            id="non cray platform, crayex in name",
+        ),
+        pytest.param(
+            False,
+            "dragon-0.10-py3.9.4.1-.tar.gz",
+            True,
+            id="cray platform, crayex not in name",
+        ),
+        pytest.param(
+            True,
+            "dragon-0.10-py3.9.4.1-.tar.gz",
+            True,
+            id="non cray platform, crayex not in name",
+        ),
+    ],
+)
+def test_filter_assets(
+    monkeypatch, test_dir, _platform_filter_return, asset_name, returned_asset_bool
+):
+    request = DragonInstallRequest(test_dir, version="0.10")
+    monkeypatch.setattr(
+        "smartsim._core._cli.scripts.dragon_install._platform_filter",
+        MagicMock(return_value=_platform_filter_return),
+    )
+    monkeypatch.setattr(
+        "smartsim._core._cli.scripts.dragon_install._version_filter",
+        MagicMock(return_value=True),
+    )
+    monkeypatch.setattr(
+        "smartsim._core._cli.scripts.dragon_install._pin_filter",
+        MagicMock(return_value=True),
+    )
+    mocked_asset = MagicMock()
+    mocked_asset.name = asset_name
+    asset = filter_assets(request, [mocked_asset])
+    if returned_asset_bool:
+        assert asset is not None
+    else:
+        assert asset is None