2
2
mirror of https://github.com/octoleo/restic.git synced 2024-12-23 03:18:55 +00:00

test helpers: add RemoveAll and ResetReadOnly

This is mainly needed in Windows, where files and dirs cannot be
removed unless they are writeable.
This commit is contained in:
Alexander Neumann 2015-08-18 21:05:49 +02:00
parent 36ed3add3a
commit 1a47ea4ab8
5 changed files with 36 additions and 7 deletions

View File

@ -56,7 +56,7 @@ func cmdMount(t testing.TB, global GlobalOptions, dir string, ready, done chan s
cmd := &CmdMount{global: &global, ready: ready, done: done} cmd := &CmdMount{global: &global, ready: ready, done: done}
OK(t, cmd.Execute([]string{dir})) OK(t, cmd.Execute([]string{dir}))
if TestCleanup { if TestCleanup {
OK(t, os.RemoveAll(dir)) RemoveAll(t, dir)
} }
} }
@ -101,7 +101,7 @@ func TestMount(t *testing.T) {
OK(t, err) OK(t, err)
// We remove the mountpoint now to check that cmdMount creates it // We remove the mountpoint now to check that cmdMount creates it
OK(t, os.RemoveAll(mountpoint)) RemoveAll(t, mountpoint)
ready := make(chan struct{}, 1) ready := make(chan struct{}, 1)
done := make(chan struct{}) done := make(chan struct{})

View File

@ -216,7 +216,7 @@ func cleanupTempdir(t testing.TB, tempdir string) {
return return
} }
OK(t, os.RemoveAll(tempdir)) RemoveAll(t, tempdir)
} }
// withTestEnvironment creates a test environment and calls f with it. After f has // withTestEnvironment creates a test environment and calls f with it. After f has
@ -245,5 +245,5 @@ func withTestEnvironment(t testing.TB, f func(*testEnvironment, GlobalOptions))
return return
} }
OK(t, os.RemoveAll(tempdir)) RemoveAll(t, tempdir)
} }

View File

@ -109,7 +109,7 @@ func TestNodeRestoreAt(t *testing.T) {
defer func() { defer func() {
if TestCleanup { if TestCleanup {
OK(t, os.RemoveAll(tempdir)) RemoveAll(t, tempdir)
} else { } else {
t.Logf("leaving tempdir at %v", tempdir) t.Logf("leaving tempdir at %v", tempdir)
} }

View File

@ -59,6 +59,7 @@ func Equals(tb testing.TB, exp, act interface{}) {
} }
} }
// ParseID parses s as a backend.ID and panics if that fails.
func ParseID(s string) backend.ID { func ParseID(s string) backend.ID {
id, err := backend.ParseID(s) id, err := backend.ParseID(s)
if err != nil { if err != nil {
@ -123,7 +124,7 @@ func WithTestEnvironment(t testing.TB, repoFixture string, f func(repodir string
return return
} }
OK(t, os.RemoveAll(tempdir)) RemoveAll(t, tempdir)
} }
// OpenLocalRepo opens the local repository located at dir. // OpenLocalRepo opens the local repository located at dir.
@ -137,3 +138,31 @@ func OpenLocalRepo(t testing.TB, dir string) *repository.Repository {
return repo return repo
} }
func isFile(fi os.FileInfo) bool {
return fi.Mode()&(os.ModeType|os.ModeCharDevice) == 0
}
// ResetReadOnly recursively resets the read-only flag recursively for dir.
// This is mainly used for tests on Windows, which is unable to delete a file
// set read-only.
func ResetReadOnly(t testing.TB, dir string) {
OK(t, filepath.Walk(dir, func(path string, fi os.FileInfo, err error) error {
if fi.IsDir() {
return os.Chmod(path, 0777)
}
if isFile(fi) {
return os.Chmod(path, 0666)
}
return nil
}))
}
// RemoveAll recursively resets the read-only flag of all files and dirs and
// afterwards uses os.RemoveAll() to remove the path.
func RemoveAll(t testing.TB, path string) {
ResetReadOnly(t, path)
OK(t, os.RemoveAll(path))
}

View File

@ -50,7 +50,7 @@ func TestTree(t *testing.T) {
dir := createTempDir(t) dir := createTempDir(t)
defer func() { defer func() {
if TestCleanup { if TestCleanup {
OK(t, os.RemoveAll(dir)) RemoveAll(t, dir)
} }
}() }()
} }