TheArchive/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2025-12-14 13:42:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

backup: fix test on windows

Browse Source
This commit is contained in:
Michael Eischer
2025-09-05 19:35:25 +02:00
parent 484b706dd8
commit 01bc60e96f
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
internal/archiver/archiver_test.go
View File

@@ -1876,7 +1876,7 @@ func TestArchiverErrorReporting(t *testing.T) {
want TestDir want TestDir
prepare func(t testing.TB) prepare func(t testing.TB)
errFn ErrorFunc errFn ErrorFunc
errStr string errStr []string
}{ }{
{ {
name: "no-error", name: "no-error",
@@ -1890,7 +1890,7 @@ func TestArchiverErrorReporting(t *testing.T) {
"targetfile": TestFile{Content: "foobar"}, "targetfile": TestFile{Content: "foobar"},
}, },
prepare: chmodUnreadable("targetfile"), prepare: chmodUnreadable("targetfile"),
errStr: "open targetfile: permission denied", errStr: []string{"open targetfile: permission denied"},
}, },
{ {
name: "file-unreadable-ignore-error", name: "file-unreadable-ignore-error",
@@ -1912,7 +1912,7 @@ func TestArchiverErrorReporting(t *testing.T) {
}, },
}, },
prepare: chmodUnreadable("subdir/targetfile"), prepare: chmodUnreadable("subdir/targetfile"),
errStr: "open subdir/targetfile: permission denied", errStr: []string{"open subdir/targetfile: permission denied"},
}, },
{ {
name: "file-subdir-unreadable-ignore-error", name: "file-subdir-unreadable-ignore-error",
@@ -1934,7 +1934,7 @@ func TestArchiverErrorReporting(t *testing.T) {
name: "parent-dir-missing", name: "parent-dir-missing",
targets: []string{"subdir/missing"}, targets: []string{"subdir/missing"},
src: TestDir{}, src: TestDir{},
errStr: "stat subdir: no such file or directory", errStr: []string{"stat subdir: no such file or directory", "CreateFile subdir: The system cannot find the file specified"},
}, },
{ {
name: "parent-dir-missing-filtered", name: "parent-dir-missing-filtered",
@@ -1968,10 +1968,13 @@ func TestArchiverErrorReporting(t *testing.T) {
target = []string{"."} target = []string{"."}
} }
_, snapshotID, _, err := arch.Snapshot(ctx, target, SnapshotOptions{Time: time.Now()}) _, snapshotID, _, err := arch.Snapshot(ctx, target, SnapshotOptions{Time: time.Now()})
if test.errStr != "" { if test.errStr != nil {
if strings.Contains(err.Error(), test.errStr) { // check if any of the expected errors are contained in the error message
t.Logf("found expected error (%v), skipping further checks", err) for _, errStr := range test.errStr {
return if strings.Contains(err.Error(), errStr) {
t.Logf("found expected error (%v)", err)
return
}
} }
t.Fatalf("expected error (%v) not returned by archiver, got (%v)", test.errStr, err) t.Fatalf("expected error (%v) not returned by archiver, got (%v)", test.errStr, err)