TheArchive/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2025-08-12 17:18:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fs: Add TestChdir()

Browse Source
This commit is contained in:
Alexander Neumann
2017-12-16 00:01:28 +01:00
parent e4fdc5eb76
commit a472868e06
3 changed files with 29 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
internal/archiver/archiver_test.go
View File

@@ -12,6 +12,7 @@ import (
"github.com/restic/restic/internal/archiver"
"github.com/restic/restic/internal/crypto"
"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"
@@ -226,27 +227,6 @@ func TestArchiveEmptySnapshot(t *testing.T) {
}
}
func chdir(t testing.TB, target string) (cleanup func()) {
curdir, err := os.Getwd()
if err != nil {
t.Fatal(err)
}
t.Logf("chdir to %v", target)
err = os.Chdir(target)
if err != nil {
t.Fatal(err)
}
return func() {
t.Logf("chdir back to %v", curdir)
err := os.Chdir(curdir)
if err != nil {
t.Fatal(err)
}
}
}
func TestArchiveNameCollision(t *testing.T) {
repo, cleanup := repository.TestRepository(t)
defer cleanup()
@@ -260,7 +240,7 @@ func TestArchiveNameCollision(t *testing.T) {
rtest.OK(t, ioutil.WriteFile(filepath.Join(dir, "testfile"), []byte("testfile1"), 0644))
rtest.OK(t, ioutil.WriteFile(filepath.Join(dir, "root", "testfile"), []byte("testfile2"), 0644))
defer chdir(t, root)()
defer fs.TestChdir(t, root)()
arch := archiver.New(repo)