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}
OK(t, cmd.Execute([]string{dir}))
if TestCleanup {
OK(t, os.RemoveAll(dir))
RemoveAll(t, dir)
}
}
@@ -101,7 +101,7 @@ func TestMount(t *testing.T) {
OK(t, err)
// We remove the mountpoint now to check that cmdMount creates it
OK(t, os.RemoveAll(mountpoint))
RemoveAll(t, mountpoint)
ready := make(chan struct{}, 1)
done := make(chan struct{})

View File

@@ -216,7 +216,7 @@ func cleanupTempdir(t testing.TB, tempdir string) {
return
}
OK(t, os.RemoveAll(tempdir))
RemoveAll(t, tempdir)
}
// 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
}
OK(t, os.RemoveAll(tempdir))
RemoveAll(t, tempdir)
}