Skip to content
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

Jump to bottom

store: make hash error message more accurate #3152

Merged
merged 2 commits into from Apr 10, 2017
Merged

store: make hash error message more accurate #3152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ded5d59
a hash error may happen for patching and generic download errors, mak…
mvo5 Apr 7, 2017
83aa183
store: update unit tests to match
zyga Apr 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion store/store.go
View file
Open in desktop
Expand Up @@ -1266,7 +1266,7 @@ type HashError struct {
}

func (e HashError) Error() string {
return fmt.Sprintf("sha3-384 mismatch after patching %q: got %s but expected %s", e.name, e.sha3_384, e.targetSha3_384)
return fmt.Sprintf("sha3-384 mismatch for %q: got %s but expected %s", e.name, e.sha3_384, e.targetSha3_384)
}

// Download downloads the snap addressed by download info and returns its
Expand Down
2 changes: 1 addition & 1 deletion store/store_test.go
View file
Open in desktop
Expand Up @@ -381,7 +381,7 @@ func (t *remoteRepoTestSuite) TestDownloadRangeRequestFailOnHashError(c *C) {

err = t.store.Download(context.TODO(), "foo", targetFn, &snap.DownloadInfo, nil, nil)
c.Assert(err, NotNil)
c.Assert(err, ErrorMatches, `sha3-384 mismatch after patching "foo": got 1234 but expected 5678`)
c.Assert(err, ErrorMatches, `sha3-384 mismatch for "foo": got 1234 but expected 5678`)
c.Assert(n, Equals, 2)
}

Expand Down