TheArchive/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2025-11-04 03:56:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

restorer: Sanitize verify errors

Browse Source
This commit is contained in:
Michael Eischer
2021-09-19 13:21:57 +02:00
parent bdcdfaf6b4
commit 2cdc0719af
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/restorer/restorer.go
View File

@@ -351,6 +351,9 @@ func (res *Restorer) VerifyFiles(ctx context.Context, dst string) (int, error) {
for job := range work {
buf, err = res.verifyFile(job.path, job.node, buf)
if err != nil {
err = res.Error(job.path, err)
}
if err != nil || ctx.Err() != nil {
break
}
atomic.AddUint64(&nchecked, 1)

3
internal/restorer/restorer_test.go
View File

@@ -844,5 +844,6 @@ func TestVerifyCancel(t *testing.T) {
nverified, err := res.VerifyFiles(ctx, tempdir)
rtest.Equals(t, 0, nverified)
rtest.Assert(t, err != nil, "nil error from VerifyFiles")
rtest.Equals(t, []error(nil), errs)
rtest.Equals(t, 1, len(errs))
rtest.Assert(t, strings.Contains(errs[0].Error(), "Invalid file size for"), "wrong error %q", errs[0].Error())
}