iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If checksums for a download don't match, display the checksum that was found

This commit is contained in:
Tom Parker-Shemilt 2019-01-17 20:26:16 +00:00
parent d344675660
commit d72fb9bcb3
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/download.go
View File

@ -191,8 +191,9 @@ func (d *DownloadClient) Get() (string, error) {
} }
err = fmt.Errorf( err = fmt.Errorf(
"checksums didn't match expected: %s", "checksums didn't match. expected %s and got %s",
hex.EncodeToString(d.config.Checksum)) hex.EncodeToString(d.config.Checksum),
hex.EncodeToString(d.config.Hash.Sum(nil)))
} }
} }

4
common/download_test.go
View File

@ -411,7 +411,7 @@ func TestDownloadFileUrl(t *testing.T) {
// Verify that we fail to match the checksum // Verify that we fail to match the checksum
_, err = client.Get() _, err = client.Get()
if err.Error() != "checksums didn't match expected: 6e6f7065" { if err.Error() != "checksums didn't match. expected 6e6f7065 and got 606f1945f81a022d0ed0bd99edfd4f99081c1cb1f97fae087291ee14e945e608" {
t.Fatalf("Unexpected failure; expected checksum not to match. Error was \"%v\"", err) t.Fatalf("Unexpected failure; expected checksum not to match. Error was \"%v\"", err)
} }
@ -442,7 +442,7 @@ func SimulateFileUriDownload(t *testing.T, uri string) (string, error) {
path, err := client.Get() path, err := client.Get()
// ignore any non-important checksum errors if it's not a unc path // ignore any non-important checksum errors if it's not a unc path
if !strings.HasPrefix(path, "\\\\") && err.Error() != "checksums didn't match expected: 6e6f7065" { if !strings.HasPrefix(path, "\\\\") && err.Error() != "checksums didn't match. expected 6e6f7065 and got 606f1945f81a022d0ed0bd99edfd4f99081c1cb1f97fae087291ee14e945e608" {
t.Fatalf("Unexpected failure; expected checksum not to match") t.Fatalf("Unexpected failure; expected checksum not to match")
} }