Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/manage/installs.py
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ def get_matching_install_tags(
else:
matches.append((i, t))
matched_any = True
if single_tag:
if single_tag and matched_any:
break
if LOGGER.would_log_to_console(DEBUG):
# Don't bother listing all installs unless the user has asked
Expand Down
17 changes: 14 additions & 3 deletions tests/test_installs.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ def fake_get_installs(install_dir):

def fake_get_installs2(install_dir):
yield make_install("1.0-32", sort_version="1.0")
yield make_install("3.0a1-32", sort_version="3.0a1", run_for=["3-32", "3.0-32", "3.0a1-32"])
yield make_install("3.0a1-64", sort_version="3.0a1", run_for=["3-64", "3.0-64", "3.0a1-64"])
yield make_install("3.0a1-arm64", sort_version="3.0a1", run_for=["3-arm64", "3.0-arm64", "3.0a1-arm64"])
yield make_install("3.0a1-32", sort_version="3.0a1", run_for=["3.0.1a1-32", "3.0-32", "3-32"])
yield make_install("3.0a1-64", sort_version="3.0a1", run_for=["3.0.1a1-64", "3.0-64", "3-64"])
yield make_install("3.0a1-arm64", sort_version="3.0a1", run_for=["3.0.1a1-arm64", "3.0-arm64", "3-arm64"])


def fake_get_unmanaged_installs():
Expand Down Expand Up @@ -102,6 +102,17 @@ def test_get_default_with_default_platform(patched_installs):
assert i["id"] == "PythonCore-1.0-32"


def test_get_default_install_prerelease(patched_installs2):
inst = list(installs._get_installs("<none>"))
m = installs.get_matching_install_tags(inst, "1.0", None, "-32", single_tag=True)
assert m and m[0]
assert m[0][0]["id"] == "PythonCore-1.0-32"

m = installs.get_matching_install_tags(inst, "3.0", None, "-32", single_tag=True)
assert m and m[0]
assert m[0][0]["id"] == "PythonCore-3.0a1-32"


def test_get_install_to_run(patched_installs):
i = installs.get_install_to_run("<none>", None, "1.0")
assert i["id"] == "PythonCore-1.0"
Expand Down