More test coverage

Author: zooba

src/manage/aliasutils.py

@@ -248,17 +248,21 @@ def _scan(prefix, dirs):
         yield from _scan_one(root)
 
 
-def scan_and_create_entrypoints(cmd, install, shortcut, _create_alias=create_alias):
+def scan_and_create_entrypoints(cmd, install, shortcut, _create_alias=create_alias, _scan=_scan):
     prefix = install["prefix"]
     known = cmd.scratch.setdefault("entrypointutils.known", set())
 
     aliases = list(install.get("alias", ()))
     alias_1 = [a for a in aliases if not a.get("windowed")]
-    alias_2 = [a for a in aliases if a.get("windowed")]
-
     # If no windowed targets, we'll use the non-windowed one
-    targets = [prefix / a["target"] for a in [*alias_1[:1], *alias_2[:1], *alias_1[:1]]]
-    if len(targets) < 2:
+    alias_2 = [a for a in aliases if a.get("windowed")] or alias_1
+
+    targets = [
+        (prefix / alias_1[0]["target"]) if alias_1 else None,
+        (prefix / alias_2[0]["target"]) if alias_2 else None,
+    ]
+
+    if not any(targets):
         LOGGER.debug("No suitable alias found for %s. Skipping entrypoints",
                      install["id"])
         return
@@ -271,8 +275,12 @@ def scan_and_create_entrypoints(cmd, install, shortcut, _create_alias=create_ali
         known.add(n)
 
         # Copy the launcher template and create a standard __target__ file
-        _create_alias(cmd, install, alias, targets[alias.get("windowed", 0)],
-                      script_code=code)
+        target = targets[1 if alias.get("windowed", 0) else 0]
+        if not target:
+            LOGGER.debug("No suitable alias found for %s. Skipping this " +
+                         "entrypoint", alias["name"])
+            continue
+        _create_alias(cmd, install, alias, target, script_code=code)
 
 
 def cleanup_entrypoints(cmd, install_shortcut_pairs):

tests/test_alias.py

@@ -279,6 +279,46 @@ def test_scan_create_entrypoints(fake_config, tmp_path):
         assert "from a import main" in expect["script_code"]
 
 
+@pytest.mark.parametrize("alias_set", ["none", "one", "onew", "two"])
+def test_scan_create_entrypoints_with_alias(fake_config, tmp_path, alias_set):
+    # In this test, we fake the scan, but vary the set of aliases associated
+    # with the installed runtime.
+    # If there are no aliases, we shouldn't create any entrypoints.
+    # If we have a non-windowed alias, we'll use that for both.
+    # If we have a windowed alias, we'll only create windowed entrypoints.
+    # If we have both, we'll use the appropriate one
+
+    def fake_scan(*a):
+        return [(dict(name="a", windowed=0), "CODE"),
+                (dict(name="aw", windowed=1), "CODE")]
+
+    alias = {
+        "none": [],
+        "one": [dict(target="test.exe", windowed=0)],
+        "onew": [dict(target="testw.exe", windowed=1)],
+        "two": [dict(target="test.exe", windowed=0),
+                dict(target="testw.exe", windowed=1)],
+    }[alias_set]
+
+    expect = {
+        "none": [],
+        "one": [("a", "test.exe"), ("aw", "test.exe")],
+        "onew": [("aw", "testw.exe")],
+        "two": [("a", "test.exe"), ("aw", "testw.exe")],
+    }[alias_set]
+
+    created = []
+    AU.scan_and_create_entrypoints(
+        fake_config,
+        dict(prefix=fake_config.root, id="test", alias=alias),
+        {},
+        _create_alias=lambda *a, **kw: created.append((a, kw)),
+        _scan=fake_scan,
+    )
+    names = [(c[0][2]["name"], c[0][3].name) for c in created]
+    assert names == expect
+
+
 def test_scan_entrypoints(tmp_path):
     site = tmp_path / "site"
     A = site / "a.dist-info"