Skip to content

Commit

Permalink
Merge pull request #311 from per1234/handle-core-list-null
Browse files Browse the repository at this point in the history
Handle inappropriate `null` output from `arduino-cli core list` when no platforms are installed
  • Loading branch information
per1234 authored Aug 13, 2024
2 parents 5932bd0 + 8107fc9 commit 8ac27e9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
5 changes: 5 additions & 0 deletions compilesketches/compilesketches.py
Original file line number Diff line number Diff line change
Expand Up @@ -1453,6 +1453,11 @@ def cli_core_list_platform_list(self, data):
or semver.Version.parse(version=self.cli_version).compare(other=first_new_interface_version) >= 0
):
# cli_version is either "latest" (which will now always be >=1.0.0) or an explicit version >=1.0.0

# Workaround for https://github.com/arduino/arduino-cli/issues/2690
if data["platforms"] is None:
return []

return data["platforms"]

return data
Expand Down
1 change: 1 addition & 0 deletions compilesketches/tests/test_compilesketches.py
Original file line number Diff line number Diff line change
Expand Up @@ -2886,6 +2886,7 @@ def test_create_sketches_report_file(monkeypatch, tmp_path):
@pytest.mark.parametrize(
"cli_version, data, assertion",
[
("latest", {"platforms": None}, []), # Non-semver
("latest", {"platforms": [unittest.mock.sentinel.list_item]}, [unittest.mock.sentinel.list_item]), # Non-semver
("2.0.0", {"platforms": [unittest.mock.sentinel.list_item]}, [unittest.mock.sentinel.list_item]), # >
("1.0.0", {"platforms": [unittest.mock.sentinel.list_item]}, [unittest.mock.sentinel.list_item]), # ==
Expand Down

0 comments on commit 8ac27e9

Please sign in to comment.