Skip to content

G
go-fuse
Commit 3a9ffc11 authored by Han-Wen Nienhuys's avatar Han-Wen Nienhuys
Browse files
Options

unionfs: stop leaking temp dirs in test.

parent dd926abd
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 19 deletions
unionfs/unionfs_test.go
View file @ 3a9ffc11
...@@ -31,11 +31,17 @@ var testOpts = UnionFsOptions{ ...@@ -31,11 +31,17 @@ var testOpts = UnionFsOptions{
HiddenFiles: []string{"hidden"}, HiddenFiles: []string{"hidden"},
} }
func freezeRo(t *testing.T, dir string) { func setRecursiveWritable(t *testing.T, dir string, writable bool) {
err := filepath.Walk( err := filepath.Walk(
dir, dir,
func(path string, fi os.FileInfo, err error) error { func(path string, fi os.FileInfo, err error) error {
newMode := uint32(fi.Mode().Perm()) &^ 0222 var newMode uint32
if writable {
newMode = uint32(fi.Mode().Perm()) | 0200
} else {
newMode = uint32(fi.Mode().Perm()) &^ 0222
}
if fi.Mode() | os.ModeSymlink != 0 { return nil }
return os.Chmod(path, os.FileMode(newMode)) return os.Chmod(path, os.FileMode(newMode))
}) })
if err != nil { if err != nil {
...@@ -49,7 +55,7 @@ func setupUfs(t *testing.T) (workdir string, cleanup func()) { ...@@ -49,7 +55,7 @@ func setupUfs(t *testing.T) (workdir string, cleanup func()) {
// Make sure system setting does not affect test. // Make sure system setting does not affect test.
syscall.Umask(0) syscall.Umask(0)
wd, _ := ioutil.TempDir("", "") wd, _ := ioutil.TempDir("", "unionfs")
err := os.Mkdir(wd+"/mnt", 0700) err := os.Mkdir(wd+"/mnt", 0700)
if err != nil { if err != nil {
t.Fatalf("Mkdir failed: %v", err) t.Fatalf("Mkdir failed: %v", err)
...@@ -90,7 +96,11 @@ func setupUfs(t *testing.T) (workdir string, cleanup func()) { ...@@ -90,7 +96,11 @@ func setupUfs(t *testing.T) (workdir string, cleanup func()) {
go state.Loop() go state.Loop()
return wd, func() { return wd, func() {
state.Unmount() err := state.Unmount()
if err != nil {
return
}
setRecursiveWritable(t, wd, true)
os.RemoveAll(wd) os.RemoveAll(wd)
} }
} }
...@@ -584,7 +594,7 @@ func TestUnionFsRenameDirAllSourcesGone(t *testing.T) { ...@@ -584,7 +594,7 @@ func TestUnionFsRenameDirAllSourcesGone(t *testing.T) {
t.Fatalf("WriteFile failed: %v", err) t.Fatalf("WriteFile failed: %v", err)
} }
freezeRo(t, wd+"/ro") setRecursiveWritable(t, wd+"/ro", false)
err = os.Rename(wd+"/mnt/dir", wd+"/mnt/renamed") err = os.Rename(wd+"/mnt/dir", wd+"/mnt/renamed")
if err != nil { if err != nil {
t.Fatalf("Rename failed: %v", err) t.Fatalf("Rename failed: %v", err)
...@@ -614,7 +624,7 @@ func TestUnionFsRenameDirWithDeletions(t *testing.T) { ...@@ -614,7 +624,7 @@ func TestUnionFsRenameDirWithDeletions(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("WriteFile failed: %v", err) t.Fatalf("WriteFile failed: %v", err)
} }
freezeRo(t, wd+"/ro") setRecursiveWritable(t, wd+"/ro", false)
if fi, _ := os.Lstat(wd + "/mnt/dir/subdir/file.txt"); fi == nil || fi.Mode()&os.ModeType != 0 { if fi, _ := os.Lstat(wd + "/mnt/dir/subdir/file.txt"); fi == nil || fi.Mode()&os.ModeType != 0 {
t.Fatalf("%s/mnt/dir/subdir/file.txt should be file: %v", wd, fi) t.Fatalf("%s/mnt/dir/subdir/file.txt should be file: %v", wd, fi)
...@@ -691,7 +701,7 @@ func TestUnionFsWritableDir(t *testing.T) { ...@@ -691,7 +701,7 @@ func TestUnionFsWritableDir(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("Mkdir failed: %v", err) t.Fatalf("Mkdir failed: %v", err)
} }
freezeRo(t, wd+"/ro") setRecursiveWritable(t, wd+"/ro", false)
fi, err := os.Lstat(wd + "/mnt/subdir") fi, err := os.Lstat(wd + "/mnt/subdir")
if err != nil { if err != nil {
...@@ -712,7 +722,7 @@ func TestUnionFsWriteAccess(t *testing.T) { ...@@ -712,7 +722,7 @@ func TestUnionFsWriteAccess(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("WriteFile failed: %v", err) t.Fatalf("WriteFile failed: %v", err)
} }
freezeRo(t, wd+"/ro") setRecursiveWritable(t, wd+"/ro", false)
err = syscall.Access(wd+"/mnt/file", raw.W_OK) err = syscall.Access(wd+"/mnt/file", raw.W_OK)
if err != nil { if err != nil {
...@@ -732,7 +742,7 @@ func TestUnionFsLink(t *testing.T) { ...@@ -732,7 +742,7 @@ func TestUnionFsLink(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("WriteFile failed: %v", err) t.Fatalf("WriteFile failed: %v", err)
} }
freezeRo(t, wd+"/ro") setRecursiveWritable(t, wd+"/ro", false)
err = os.Link(wd+"/mnt/file", wd+"/mnt/linked") err = os.Link(wd+"/mnt/file", wd+"/mnt/linked")
if err != nil { if err != nil {
...@@ -765,7 +775,7 @@ func TestUnionFsTruncate(t *testing.T) { ...@@ -765,7 +775,7 @@ func TestUnionFsTruncate(t *testing.T) {
defer clean() defer clean()
WriteFile(t, wd+"/ro/file", "hello") WriteFile(t, wd+"/ro/file", "hello")
freezeRo(t, wd+"/ro") setRecursiveWritable(t, wd+"/ro", false)
os.Truncate(wd+"/mnt/file", 2) os.Truncate(wd+"/mnt/file", 2)
content := readFromFile(t, wd+"/mnt/file") content := readFromFile(t, wd+"/mnt/file")
...@@ -861,7 +871,7 @@ func TestUnionFsRemoveAll(t *testing.T) { ...@@ -861,7 +871,7 @@ func TestUnionFsRemoveAll(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("WriteFile failed: %v", err) t.Fatalf("WriteFile failed: %v", err)
} }
freezeRo(t, wd+"/ro") setRecursiveWritable(t, wd+"/ro", false)
err = os.RemoveAll(wd + "/mnt/dir") err = os.RemoveAll(wd + "/mnt/dir")
if err != nil { if err != nil {
...@@ -900,7 +910,7 @@ func TestUnionFsRmRf(t *testing.T) { ...@@ -900,7 +910,7 @@ func TestUnionFsRmRf(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("WriteFile failed: %v", err) t.Fatalf("WriteFile failed: %v", err)
} }
freezeRo(t, wd+"/ro") setRecursiveWritable(t, wd+"/ro", false)
bin, err := exec.LookPath("rm") bin, err := exec.LookPath("rm")
if err != nil { if err != nil {
...@@ -949,7 +959,7 @@ func TestUnionFsDropDeletionCache(t *testing.T) { ...@@ -949,7 +959,7 @@ func TestUnionFsDropDeletionCache(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("WriteFile failed: %v", err) t.Fatalf("WriteFile failed: %v", err)
} }
freezeRo(t, wd+"/ro") setRecursiveWritable(t, wd+"/ro", false)
_, err = os.Lstat(wd + "/mnt/file") _, err = os.Lstat(wd + "/mnt/file")
if err != nil { if err != nil {
...@@ -1077,7 +1087,7 @@ func TestUnionFsDisappearing(t *testing.T) { ...@@ -1077,7 +1087,7 @@ func TestUnionFsDisappearing(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("WriteFile failed: %v", err) t.Fatalf("WriteFile failed: %v", err)
} }
freezeRo(t, wd+"/ro") setRecursiveWritable(t, wd+"/ro", false)
err = os.Remove(wd + "/mnt/file") err = os.Remove(wd + "/mnt/file")
if err != nil { if err != nil {
...@@ -1125,7 +1135,7 @@ func TestUnionFsDeletedGetAttr(t *testing.T) { ...@@ -1125,7 +1135,7 @@ func TestUnionFsDeletedGetAttr(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("WriteFile failed: %v", err) t.Fatalf("WriteFile failed: %v", err)
} }
freezeRo(t, wd+"/ro") setRecursiveWritable(t, wd+"/ro", false)
f, err := os.Open(wd + "/mnt/file") f, err := os.Open(wd + "/mnt/file")
if err != nil { if err != nil {
...@@ -1150,7 +1160,7 @@ func TestUnionFsDoubleOpen(t *testing.T) { ...@@ -1150,7 +1160,7 @@ func TestUnionFsDoubleOpen(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("WriteFile failed: %v", err) t.Fatalf("WriteFile failed: %v", err)
} }
freezeRo(t, wd+"/ro") setRecursiveWritable(t, wd+"/ro", false)
roFile, err := os.Open(wd + "/mnt/file") roFile, err := os.Open(wd + "/mnt/file")
if err != nil { if err != nil {
...@@ -1202,7 +1212,7 @@ func TestUnionFsFdLeak(t *testing.T) { ...@@ -1202,7 +1212,7 @@ func TestUnionFsFdLeak(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("WriteFile failed: %v", err) t.Fatalf("WriteFile failed: %v", err)
} }
freezeRo(t, wd+"/ro") setRecursiveWritable(t, wd+"/ro", false)
contents, err := ioutil.ReadFile(wd + "/mnt/file") contents, err := ioutil.ReadFile(wd + "/mnt/file")
if err != nil { if err != nil {
...@@ -1342,7 +1352,7 @@ func TestUnionFsPromoteDirTimeStamp(t *testing.T) { ...@@ -1342,7 +1352,7 @@ func TestUnionFsPromoteDirTimeStamp(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("WriteFile failed: %v", err) t.Fatalf("WriteFile failed: %v", err)
} }
freezeRo(t, wd+"/ro") setRecursiveWritable(t, wd+"/ro", false)
err = os.Chmod(wd+"/mnt/subdir/file", 0060) err = os.Chmod(wd+"/mnt/subdir/file", 0060)
if err != nil { if err != nil {
...@@ -1381,7 +1391,7 @@ func TestUnionFsCheckHiddenFiles(t *testing.T) { ...@@ -1381,7 +1391,7 @@ func TestUnionFsCheckHiddenFiles(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("WriteFile failed: %v", err) t.Fatalf("WriteFile failed: %v", err)
} }
freezeRo(t, wd+"/ro") setRecursiveWritable(t, wd+"/ro", false)
fi, _ := os.Lstat(wd + "/mnt/hidden") fi, _ := os.Lstat(wd + "/mnt/hidden")
if fi != nil { if fi != nil {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7