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

Merge pull request #2614 from greatroar/simplify-fs

Browse Source 
Simplify internal/fs
This commit is contained in:
MichaelEischer
2020-09-21 22:05:10 +02:00
committed by GitHub
parent 6f2093e491 0d65b78168
commit 4875f7b659
15 changed files with 88 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/restic/integration_test.go
View File

@@ -21,7 +21,6 @@ import (
"github.com/restic/restic/internal/errors"
"github.com/restic/restic/internal/filter"
"github.com/restic/restic/internal/fs"
"github.com/restic/restic/internal/repository"
"github.com/restic/restic/internal/restic"
rtest "github.com/restic/restic/internal/test"
@@ -66,7 +65,7 @@ func testRunBackupAssumeFailure(t testing.TB, dir string, target []string, opts
gopts.stdout = ioutil.Discard
t.Logf("backing up %v in %v", target, dir)
if dir != "" {
cleanup := fs.TestChdir(t, dir)
cleanup := rtest.Chdir(t, dir)
defer cleanup()
}
@@ -1035,7 +1034,7 @@ func TestRestoreLatest(t *testing.T) {
// chdir manually here so we can get the current directory. This is not the
// same as the temp dir returned by ioutil.TempDir() on darwin.
back := fs.TestChdir(t, filepath.Dir(env.testdata))
back := rtest.Chdir(t, filepath.Dir(env.testdata))
defer back()
curdir, err := os.Getwd()