Added some code review fixes

arduino/cores/packagemanager/loader.go

@@ -381,7 +381,6 @@ func convertLegacyPlatformToPluggableDiscovery(platform *cores.PlatformRelease)
 			oldUploadTool := board.Properties.Get("upload.tool")
 			if oldUploadTool == toolName && !board.Properties.ContainsKey("upload.tool.network") {
 				board.Properties.Set("upload.tool.network", convertedToolName)
-				// fmt.Printf("ADDED: %s.upload.tool.network=%s\n", board, convertedToolName)
 
 				// Add identification properties for network protocol
 				i := 0
@@ -392,7 +391,6 @@ func convertLegacyPlatformToPluggableDiscovery(platform *cores.PlatformRelease)
 					i++
 				}
 				board.Properties.Set(fmt.Sprintf("upload_port.%d.board", i), board.BoardID)
-				// fmt.Printf("ADDED: upload_port.%d.board=%s\n", i, board.BoardID)
 			}
 		}
 	}

i18n/data/en.po

@@ -369,7 +369,7 @@ msgstr "Config file written to: %s"
 msgid "Configuring platform"
 msgstr "Configuring platform"
 
-#: cli/board/list.go:182
+#: cli/board/list.go:183
 msgid "Connected"
 msgstr "Connected"
 
@@ -483,7 +483,7 @@ msgstr "Directory where to save generated files. Default is './docs', the direct
 msgid "Disable completion description for shells that support it"
 msgstr "Disable completion description for shells that support it"
 
-#: cli/board/list.go:183
+#: cli/board/list.go:184
 msgid "Disconnected"
 msgstr "Disconnected"
 
@@ -1447,6 +1447,10 @@ msgstr "Programmers:"
 msgid "Progress {0}"
 msgstr "Progress {0}"
 
+#: cli/board/list.go:125
+msgid "Protocol"
+msgstr "Protocol"
+
 #: cli/lib/search.go:174
 msgid "Provides includes: %s"
 msgstr "Provides includes: %s"
@@ -1812,7 +1816,7 @@ msgstr "Uninstalls one or more cores and corresponding tool dependencies if no l
 msgid "Uninstalls one or more libraries."
 msgstr "Uninstalls one or more libraries."
 
-#: cli/board/list.go:156
+#: cli/board/list.go:157
 msgid "Unknown"
 msgstr "Unknown"
 
@@ -2128,7 +2132,7 @@ msgstr "can't find latest release of %s"
 msgid "can't find main Sketch file in %s"
 msgstr "can't find main Sketch file in %s"
 
-#: arduino/cores/packagemanager/loader.go:751
+#: arduino/cores/packagemanager/loader.go:749
 msgid "can't find pattern for discovery with id %s"
 msgstr "can't find pattern for discovery with id %s"
 
@@ -2238,7 +2242,7 @@ msgstr "copying output file %s"
 msgid "could not find a valid build artifact"
 msgstr "could not find a valid build artifact"
 
-#: arduino/cores/packagemanager/loader.go:723
+#: arduino/cores/packagemanager/loader.go:721
 msgid "creating discovery: %s"
 msgstr "creating discovery: %s"
 
@@ -2293,11 +2297,11 @@ msgstr "destination dir %s already exists, cannot install"
 msgid "discovery %[1]s process not started: %[2]w"
 msgstr "discovery %[1]s process not started: %[2]w"
 
-#: arduino/cores/packagemanager/loader.go:712
+#: arduino/cores/packagemanager/loader.go:710
 msgid "discovery not found: %s"
 msgstr "discovery not found: %s"
 
-#: arduino/cores/packagemanager/loader.go:717
+#: arduino/cores/packagemanager/loader.go:715
 msgid "discovery not installed: %s"
 msgstr "discovery not installed: %s"
 
@@ -2496,7 +2500,7 @@ msgstr "getting build properties for board %[1]s: %[2]s"
 msgid "getting discovery dependencies for platform %[1]s: %[2]s"
 msgstr "getting discovery dependencies for platform %[1]s: %[2]s"
 
-#: arduino/cores/packagemanager/loader.go:651
+#: arduino/cores/packagemanager/loader.go:649
 msgid "getting parent dir of %[1]s: %[2]s"
 msgstr "getting parent dir of %[1]s: %[2]s"
 
@@ -2758,7 +2762,7 @@ msgstr "loading board data: %s"
 msgid "loading boards: %s"
 msgstr "loading boards: %s"
 
-#: arduino/cores/packagemanager/loader.go:606
+#: arduino/cores/packagemanager/loader.go:604
 msgid "loading bundled tools from %[1]s: %[2]s"
 msgstr "loading bundled tools from %[1]s: %[2]s"
 
@@ -2785,7 +2789,7 @@ msgstr "loading platform release %[1]s: %[2]s"
 msgid "loading platform.txt: %v"
 msgstr "loading platform.txt: %v"
 
-#: arduino/cores/packagemanager/loader.go:573
+#: arduino/cores/packagemanager/loader.go:571
 msgid "loading tool release in %[1]s: %[2]s"
 msgstr "loading tool release in %[1]s: %[2]s"
 
@@ -2997,7 +3001,7 @@ msgstr "platform not found: %s"
 
 #: arduino/cores/packagemanager/install_uninstall.go:65
 #: arduino/cores/packagemanager/install_uninstall.go:108
-#: arduino/cores/packagemanager/loader.go:435
+#: arduino/cores/packagemanager/loader.go:433
 #: commands/compile/compile.go:128
 msgid "platform not installed"
 msgstr "platform not installed"
@@ -3050,7 +3054,7 @@ msgstr "quitting discovery %[1]s: %[2]w"
 msgid "reading %[1]s directory: %[2]s"
 msgstr "reading %[1]s directory: %[2]s"
 
-#: arduino/cores/packagemanager/loader.go:656
+#: arduino/cores/packagemanager/loader.go:654
 msgid "reading %[1]s: %[2]s"
 msgstr "reading %[1]s: %[2]s"
 
@@ -3064,7 +3068,7 @@ msgid "reading dir %[1]s: %[2]s"
 msgstr "reading dir %[1]s: %[2]s"
 
 #: arduino/cores/packagemanager/loader.go:162
-#: arduino/cores/packagemanager/loader.go:564
+#: arduino/cores/packagemanager/loader.go:562
 msgid "reading directory %[1]s: %[2]s"
 msgstr "reading directory %[1]s: %[2]s"
 
@@ -3163,7 +3167,7 @@ msgstr "saving downloaded index signature: %s"
 msgid "scanning examples: %s"
 msgstr "scanning examples: %s"
 
-#: arduino/cores/packagemanager/loader.go:642
+#: arduino/cores/packagemanager/loader.go:640
 msgid "searching for builtin_tools_versions.txt in %[1]s: %[2]s"
 msgstr "searching for builtin_tools_versions.txt in %[1]s: %[2]s"
 
@@ -3184,7 +3188,7 @@ msgstr "signature verification error: %s"
 msgid "sketchPath"
 msgstr "sketchPath"
 
-#: arduino/cores/packagemanager/loader.go:498
+#: arduino/cores/packagemanager/loader.go:496
 msgid "skipping loading of boards %s: malformed custom board options"
 msgstr "skipping loading of boards %s: malformed custom board options"
 

test/test_upload_mock.py

@@ -17,7 +17,6 @@
 import sys
 import hashlib
 import pytest
-import os
 from pathlib import Path
 
 
@@ -462,24 +461,24 @@ def generate_build_dir(sketch_path):
             "-f "
             '"{data_dir}/packages/arduino/hardware/samd/1.8.11/variants/arduino_zero/openocd_scripts/arduino_zero.cfg" '
             '-c "telnet_port disabled; program '
-            "{bo}{build_dir}/{sketch_name}.ino.bin{bc} verify reset "
-            '0x2000; shutdown"\n',
+            "{{{build_dir}/{sketch_name}.ino.bin}} verify reset 0x2000; "
+            'shutdown"\n',
             "linux": '"{data_dir}/packages/arduino/tools/openocd/0.10.0-arduino7/bin/openocd" '
             "-d2 -s "
             '"{data_dir}/packages/arduino/tools/openocd/0.10.0-arduino7/share/openocd/scripts/" '
             "-f "
             '"{data_dir}/packages/arduino/hardware/samd/1.8.11/variants/arduino_zero/openocd_scripts/arduino_zero.cfg" '
             '-c "telnet_port disabled; program '
-            "{bo}{build_dir}/{sketch_name}.ino.bin{bc} verify reset "
-            '0x2000; shutdown"\n',
+            "{{{build_dir}/{sketch_name}.ino.bin}} verify reset 0x2000; "
+            'shutdown"\n',
             "win32": '"{data_dir}/packages/arduino/tools/openocd/0.10.0-arduino7/bin/openocd.exe" '
             "-d2 -s "
             '"{data_dir}/packages/arduino/tools/openocd/0.10.0-arduino7/share/openocd/scripts/" '
             "-f "
             '"{data_dir}/packages/arduino/hardware/samd/1.8.11/variants/arduino_zero/openocd_scripts/arduino_zero.cfg" '
             '-c "telnet_port disabled; program '
-            "{bo}{build_dir}/{sketch_name}.ino.bin{bc} verify reset "
-            '0x2000; shutdown"\n',
+            "{{{build_dir}/{sketch_name}.ino.bin}} verify reset 0x2000; "
+            'shutdown"\n',
         },
     ),
     (
@@ -1170,7 +1169,7 @@ def test_upload_sketch(
     }
 
     # Install everything just once
-    if not os.path.isdir(session_data_dir + "/packages"):
+    if not Path(session_data_dir, "packages").is_dir():
         assert run_command("config init --overwrite", custom_env=env)
         for package_index in indexes:
             assert run_command(f"config add board_manager.additional_urls {package_index}", custom_env=env)
@@ -1186,15 +1185,8 @@ def test_upload_sketch(
 
     # Fake compilation, we just need the folder to exist
     build_dir = generate_build_dir(sketch_path)
-    if programmer != "":
-        programmer_arg = "-P " + programmer
-    else:
-        programmer_arg = ""
-    if upload_port != "":
-        port_arg = "-p " + upload_port
-    else:
-        port_arg = ""
-
+    programmer_arg = f"-P {programmer}" if programmer else ""
+    port_arg = f"-p {upload_port}" if upload_port else ""
     res = run_command(f'upload {port_arg} {programmer_arg} -b {fqbn} "{sketch_path}" --dry-run -v', custom_env=env)
     assert res.ok
 
@@ -1207,8 +1199,6 @@ def test_upload_sketch(
         upload_port=upload_port,
         build_dir=build_dir,
         sketch_name=sketch_name,
-        bo="{",
-        bc="}",
     ).replace("\\", "/")
 
     expected_output in res.stdout.replace("\\", "/").replace("\r", "")