Merge remote-tracking branch 'origin/rp2040-upload-improvements' into integration

esphome/__main__.py

@@ -762,7 +762,7 @@ def _find_picotool() -> Path | None:
 
     try:
         idedata = platformio_api.get_idedata(CORE.config)
-    except Exception:  # noqa: BLE001
+    except Exception:  # noqa: BLE001  # pylint: disable=broad-except
         return None
     return get_picotool_path(idedata.cc_path)
 

tests/unit_tests/test_main.py

@@ -8,6 +8,7 @@ import json
 import logging
 from pathlib import Path
 import re
+import sys
 import time
 from typing import Any
 from unittest.mock import MagicMock, Mock, patch
@@ -1339,7 +1340,8 @@ def test_upload_using_picotool_success(tmp_path: Path) -> None:
     toolchain_bin.mkdir(parents=True)
     picotool_dir = packages_dir / "tool-picotool-rp2040-earlephilhower"
     picotool_dir.mkdir(parents=True)
-    picotool = picotool_dir / "picotool"
+    binary_name = "picotool.exe" if sys.platform == "win32" else "picotool"
+    picotool = picotool_dir / binary_name
     picotool.touch()
 
     mock_idedata = MagicMock()
@@ -1412,7 +1414,8 @@ def test_upload_using_picotool_permission_error(tmp_path: Path) -> None:
     toolchain_bin.mkdir(parents=True)
     picotool_dir = packages_dir / "tool-picotool-rp2040-earlephilhower"
     picotool_dir.mkdir(parents=True)
-    picotool = picotool_dir / "picotool"
+    binary_name = "picotool.exe" if sys.platform == "win32" else "picotool"
+    picotool = picotool_dir / binary_name
     picotool.touch()
 
     mock_idedata = MagicMock()

tests/unit_tests/test_util.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 from pathlib import Path
 import subprocess
+import sys
 from unittest.mock import MagicMock, patch
 
 import pytest
@@ -415,9 +416,10 @@ def test_get_picotool_path_found(tmp_path: Path) -> None:
     gcc = toolchain_dir / "arm-none-eabi-gcc"
     gcc.touch()
 
+    binary_name = "picotool.exe" if sys.platform == "win32" else "picotool"
     picotool_dir = packages_dir / "tool-picotool-rp2040-earlephilhower"
     picotool_dir.mkdir(parents=True)
-    picotool = picotool_dir / "picotool"
+    picotool = picotool_dir / binary_name
     picotool.touch()
 
     result = util.get_picotool_path(str(gcc))