Skip to content

Commit 055adad

Browse files
umbynosumbynos
committed
drop test on old tool not used anymore, and introduce again arduino-fwuploader 
1 parent cf0b8e4 commit 055adad

File tree

4 files changed

+2
-116
lines changed

4 files changed

+2
-116
lines changed

‎tools/download_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ func TestDownload(t *testing.T) {
120120
{"rp2040tools", "1.0.6", []string{"elf2uf2", "picotool", "pioasm", "rp2040load"}},
121121
{"esptool_py", "4.5.1", []string{"esptool"}},
122122
{"arduino-fwuploader", "2.2.2", []string{"arduino-fwuploader"}},
123-
{"fwupdater", "0.1.12", []string{"firmwares", "FirmwareUploader"}}, // old legacy tool
124123
}
125124
// prepare the test environment
126125
tempDir := t.TempDir()

‎tools/testdata/test_tool_index.json

-55
Original file line numberDiff line numberDiff line change
@@ -514,61 +514,6 @@
514514
"size": "6829396"
515515
}
516516
]
517-
},
518-
{
519-
"name": "fwupdater",
520-
"version": "0.1.12",
521-
"systems": [
522-
{
523-
"host": "i686-linux-gnu",
524-
"url": "http://downloads.arduino.cc/tools/FirmwareUploader_0.1.12_Linux_32bit.tar.bz2",
525-
"archiveFileName": "FirmwareUploader_0.1.12_Linux_32bit.tar.bz2",
526-
"checksum": "SHA-256:2fec2bdfd20ad4950bc9ba37108dc2a7c152f569174279c0697efe1f5a0db781",
527-
"size": "26097546"
528-
},
529-
{
530-
"host": "x86_64-pc-linux-gnu",
531-
"url": "http://downloads.arduino.cc/tools/FirmwareUploader_0.1.12_Linux_64bit.tar.bz2",
532-
"archiveFileName": "FirmwareUploader_0.1.12_Linux_64bit.tar.bz2",
533-
"checksum": "SHA-256:ce57d0afef30cb7d3513f5da326346c99d6bf4923bbc2200634086811f3fb31e",
534-
"size": "26073327"
535-
},
536-
{
537-
"host": "i686-mingw32",
538-
"url": "http://downloads.arduino.cc/tools/FirmwareUploader_0.1.12_Windows_32bit.zip",
539-
"archiveFileName": "FirmwareUploader_0.1.12_Windows_32bit.zip",
540-
"checksum": "SHA-256:558568b453caa1c821def8cc6d34555d0c910eb7e7e871de3ae1c39ae6f01bdd",
541-
"size": "25743641"
542-
},
543-
{
544-
"host": "x86_64-mingw32",
545-
"url": "http://downloads.arduino.cc/tools/FirmwareUploader_0.1.12_Windows_64bit.zip",
546-
"archiveFileName": "FirmwareUploader_0.1.12_Windows_64bit.zip",
547-
"checksum": "SHA-256:ec16de33620985434280c92c3c322257b89bb67adf8fd4d5dd5f9467ea1e9e40",
548-
"size": "25851428"
549-
},
550-
{
551-
"host": "i386-apple-darwin11",
552-
"url": "http://downloads.arduino.cc/tools/FirmwareUploader_0.1.12_macOS_64bit.tar.bz2",
553-
"archiveFileName": "FirmwareUploader_0.1.12_macOS_64bit.tar.bz2",
554-
"checksum": "SHA-256:a470361b57f86ddfcaecd274d844af51ee1d23a71cd6c26e30fcef2152d1a03f",
555-
"size": "25792860"
556-
},
557-
{
558-
"host": "arm-linux-gnueabihf",
559-
"url": "http://downloads.arduino.cc/tools/FirmwareUploader_0.1.12_Linux_ARM.tar.bz2",
560-
"archiveFileName": "FirmwareUploader_0.1.12_Linux_ARM.tar.bz2",
561-
"checksum": "SHA-256:855fa0a9b942c3ee18906efc510bdfe30bf3334ff28ffbb476e648ff30033847",
562-
"size": "25936245"
563-
},
564-
{
565-
"host": "aarch64-linux-gnu",
566-
"url": "http://downloads.arduino.cc/tools/FirmwareUploader_0.1.12_Linux_ARM64.tar.bz2",
567-
"archiveFileName": "FirmwareUploader_0.1.12_Linux_ARM64.tar.bz2",
568-
"checksum": "SHA-256:691461e64fe075e9a79801347c2bd895fb72f8f2c45a7cd49056c6ad9efe8fc4",
569-
"size": "25967430"
570-
}
571-
]
572517
}
573518
]
574519
}

‎v2/pkgs/testdata/test_tool_index.json

-55
Original file line numberDiff line numberDiff line change
@@ -514,61 +514,6 @@
514514
"size": "6829396"
515515
}
516516
]
517-
},
518-
{
519-
"name": "fwupdater",
520-
"version": "0.1.12",
521-
"systems": [
522-
{
523-
"host": "i686-linux-gnu",
524-
"url": "http://downloads.arduino.cc/tools/FirmwareUploader_0.1.12_Linux_32bit.tar.bz2",
525-
"archiveFileName": "FirmwareUploader_0.1.12_Linux_32bit.tar.bz2",
526-
"checksum": "SHA-256:2fec2bdfd20ad4950bc9ba37108dc2a7c152f569174279c0697efe1f5a0db781",
527-
"size": "26097546"
528-
},
529-
{
530-
"host": "x86_64-pc-linux-gnu",
531-
"url": "http://downloads.arduino.cc/tools/FirmwareUploader_0.1.12_Linux_64bit.tar.bz2",
532-
"archiveFileName": "FirmwareUploader_0.1.12_Linux_64bit.tar.bz2",
533-
"checksum": "SHA-256:ce57d0afef30cb7d3513f5da326346c99d6bf4923bbc2200634086811f3fb31e",
534-
"size": "26073327"
535-
},
536-
{
537-
"host": "i686-mingw32",
538-
"url": "http://downloads.arduino.cc/tools/FirmwareUploader_0.1.12_Windows_32bit.zip",
539-
"archiveFileName": "FirmwareUploader_0.1.12_Windows_32bit.zip",
540-
"checksum": "SHA-256:558568b453caa1c821def8cc6d34555d0c910eb7e7e871de3ae1c39ae6f01bdd",
541-
"size": "25743641"
542-
},
543-
{
544-
"host": "x86_64-mingw32",
545-
"url": "http://downloads.arduino.cc/tools/FirmwareUploader_0.1.12_Windows_64bit.zip",
546-
"archiveFileName": "FirmwareUploader_0.1.12_Windows_64bit.zip",
547-
"checksum": "SHA-256:ec16de33620985434280c92c3c322257b89bb67adf8fd4d5dd5f9467ea1e9e40",
548-
"size": "25851428"
549-
},
550-
{
551-
"host": "i386-apple-darwin11",
552-
"url": "http://downloads.arduino.cc/tools/FirmwareUploader_0.1.12_macOS_64bit.tar.bz2",
553-
"archiveFileName": "FirmwareUploader_0.1.12_macOS_64bit.tar.bz2",
554-
"checksum": "SHA-256:a470361b57f86ddfcaecd274d844af51ee1d23a71cd6c26e30fcef2152d1a03f",
555-
"size": "25792860"
556-
},
557-
{
558-
"host": "arm-linux-gnueabihf",
559-
"url": "http://downloads.arduino.cc/tools/FirmwareUploader_0.1.12_Linux_ARM.tar.bz2",
560-
"archiveFileName": "FirmwareUploader_0.1.12_Linux_ARM.tar.bz2",
561-
"checksum": "SHA-256:855fa0a9b942c3ee18906efc510bdfe30bf3334ff28ffbb476e648ff30033847",
562-
"size": "25936245"
563-
},
564-
{
565-
"host": "aarch64-linux-gnu",
566-
"url": "http://downloads.arduino.cc/tools/FirmwareUploader_0.1.12_Linux_ARM64.tar.bz2",
567-
"archiveFileName": "FirmwareUploader_0.1.12_Linux_ARM64.tar.bz2",
568-
"checksum": "SHA-256:691461e64fe075e9a79801347c2bd895fb72f8f2c45a7cd49056c6ad9efe8fc4",
569-
"size": "25967430"
570-
}
571-
]
572517
}
573518
]
574519
}

‎v2/pkgs/tools_test.go

+2-5
Original file line numberDiff line numberDiff line change
@@ -230,9 +230,7 @@ func TestInstall(t *testing.T) {
230230
{Name: "dfu-util", Version: "0.10.0-arduino1", Packager: "arduino-test", URL: nil, Checksum: nil, Signature: nil},
231231
{Name: "rp2040tools", Version: "1.0.6", Packager: "arduino-test", URL: nil, Checksum: nil, Signature: nil},
232232
{Name: "esptool_py", Version: "4.5.1", Packager: "arduino-test", URL: nil, Checksum: nil, Signature: nil},
233-
// At the moment we don't install these ones because they are packaged in a different way: they do not have a top level dir, causing the rename funcion to behave incorrectly
234-
// {Name: "fwupdater", Version: "0.1.12", Packager: "arduino-test", URL: nil, Checksum: nil, Signature: nil},
235-
// {Name: "arduino-fwuploader", Version: "2.2.2", Packager: "arduino-test", URL: nil, Checksum: nil, Signature: nil},
233+
{Name: "arduino-fwuploader", Version: "2.2.2", Packager: "arduino-test", URL: nil, Checksum: nil, Signature: nil},
236234
}
237235

238236
expectedFiles := map[string][]string{
@@ -244,8 +242,7 @@ func TestInstall(t *testing.T) {
244242
"dfu-util-0.10.0-arduino1": {"dfu-prefix", "dfu-suffix", "dfu-util"},
245243
"rp2040tools-1.0.6": {"elf2uf2", "picotool", "pioasm", "rp2040load"},
246244
"esptool_py-4.5.1": {"esptool"},
247-
// "fwupdater-0.1.12": {"firmwares", "FirmwareUploader"}, // old legacy tool
248-
// "arduino-fwuploader-2.2.2": {"arduino-fwuploader"},
245+
"arduino-fwuploader-2.2.2": {"arduino-fwuploader"},
249246
}
250247
for _, tc := range testCases {
251248
t.Run(tc.Name+"-"+tc.Version, func(t *testing.T) {

0 commit comments

Comments
 (0)