Skip to content

Fix pluggable conversion #1512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmaglie merged 6 commits into from
Oct 20, 2021
Merged

Fix pluggable conversion #1512

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e6e0d24
Fixed network upload for avr packages
cmaglie Oct 13, 2021
19bc30f
Added test for serial pluggable-monitor compatibility conversion
cmaglie Oct 13, 2021
a7ff552
Added data for unit testing
cmaglie Oct 13, 2021
0cbc3d5
Fixed other collateral tests
cmaglie Oct 14, 2021
290866d
Perform regexp compile at package level
cmaglie Oct 15, 2021
f444a6e
fix i18n
cmaglie Oct 18, 2021
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
Prev Previous commit
Next Next commit
Added test for serial pluggable-monitor compatibility conversion
  • Loading branch information
@cmaglie
cmaglie committed Oct 18, 2021
commit 19bc30f0e43ae3798d217fd9f913c6aa12aab62c
3 changes: 3 additions & 0 deletions arduino/cores/packagemanager/package_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,7 @@ func TestLegacyPackageConversionToPluggableDiscovery(t *testing.T) {
platformProps := platformRelease.Properties
require.Equal(t, "builtin:serial-discovery", platformProps.Get("pluggable_discovery.required.0"))
require.Equal(t, "builtin:mdns-discovery", platformProps.Get("pluggable_discovery.required.1"))
require.Equal(t, "builtin:serial-monitor", platformProps.Get("pluggable_monitor.required.serial"))
require.Equal(t, "{runtime.tools.esptool.path}", platformProps.Get("tools.esptool__pluggable_network.path"))
require.Contains(t, platformProps.Get("tools.esptool__pluggable_network.cmd"), "esptool")
require.Contains(t, platformProps.Get("tools.esptool__pluggable_network.network_cmd"), "{runtime.platform.path}/tools/espota")
Expand All @@ -481,6 +482,7 @@ func TestLegacyPackageConversionToPluggableDiscovery(t *testing.T) {
platformProps := platformRelease.Properties
require.Equal(t, "builtin:serial-discovery", platformProps.Get("pluggable_discovery.required.0"))
require.Equal(t, "builtin:mdns-discovery", platformProps.Get("pluggable_discovery.required.1"))
require.Equal(t, "builtin:serial-monitor", platformProps.Get("pluggable_monitor.required.serial"))
require.Equal(t, "", platformProps.Get("tools.esptool__pluggable_network.path"))
require.Equal(t, "{runtime.tools.python3.path}/python3", platformProps.Get("tools.esptool__pluggable_network.cmd"))
require.Equal(t, "{runtime.tools.python3.path}/python3", platformProps.Get("tools.esptool__pluggable_network.network_cmd"))
Expand All @@ -502,6 +504,7 @@ func TestLegacyPackageConversionToPluggableDiscovery(t *testing.T) {
platformProps := platformRelease.Properties
require.Equal(t, "builtin:serial-discovery", platformProps.Get("pluggable_discovery.required.0"))
require.Equal(t, "builtin:mdns-discovery", platformProps.Get("pluggable_discovery.required.1"))
require.Equal(t, "builtin:serial-monitor", platformProps.Get("pluggable_monitor.required.serial"))
require.Equal(t, `"{network_cmd}" -address {upload.port.address} -port {upload.port.properties.port} -sketch "{build.path}/{build.project_name}.hex" -upload {upload.port.properties.endpoint_upload} -sync {upload.port.properties.endpoint_sync} -reset {upload.port.properties.endpoint_reset} -sync_exp {upload.port.properties.sync_return}`, platformProps.Get("tools.avrdude__pluggable_network.upload.pattern"))
}
}