tests: fusefronted: fix TestOpenBackingDir

This test only worked accidentially, and would
break once dirfd caching is added.

fs.Mkdir(..., "dir1/dir2", ...) is illegal
(child name cannot contain slashes).
This commit is contained in:
Jakob Unterwurzacher 2021-04-03 12:29:17 +02:00
parent 6b28c0be2c
commit 6aae2aad97
1 changed files with 15 additions and 13 deletions

View File

@ -15,22 +15,25 @@ import (
func TestOpenBackingDir(t *testing.T) { func TestOpenBackingDir(t *testing.T) {
cipherdir := test_helpers.InitFS(t) cipherdir := test_helpers.InitFS(t)
t.Logf("cipherdir = %q", cipherdir)
args := Args{ args := Args{
Cipherdir: cipherdir, Cipherdir: cipherdir,
} }
fs := newTestFS(args) rn := newTestFS(args)
out := &fuse.EntryOut{} out := &fuse.EntryOut{}
_, errno := fs.Mkdir(nil, "dir1", 0700, out) child, errno := rn.Mkdir(nil, "dir1", 0700, out)
if errno != 0 { if errno != 0 {
t.Fatal(errno) t.Fatal(errno)
} }
_, errno = fs.Mkdir(nil, "dir1/dir2", 0700, out) rn.AddChild("dir1", child, false)
dir1 := toNode(child.Operations())
_, errno = dir1.Mkdir(nil, "dir2", 0700, out)
if errno != 0 { if errno != 0 {
t.Fatal(errno) t.Fatal(errno)
} }
dirfd, cName, err := fs.openBackingDir("") dirfd, cName, err := rn.openBackingDir("")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -40,8 +43,8 @@ func TestOpenBackingDir(t *testing.T) {
syscall.Close(dirfd) syscall.Close(dirfd)
// Again, but populate the cache for "" by looking up a non-existing file // Again, but populate the cache for "" by looking up a non-existing file
fs.Lookup(nil, "xyz1234", &fuse.EntryOut{}) rn.Lookup(nil, "xyz1234", &fuse.EntryOut{})
dirfd, cName, err = fs.openBackingDir("") dirfd, cName, err = rn.openBackingDir("")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -59,7 +62,7 @@ func TestOpenBackingDir(t *testing.T) {
} }
syscall.Close(dirfd) syscall.Close(dirfd)
dirfd, cName, err = fs.openBackingDir("dir1") dirfd, cName, err = rn.openBackingDir("dir1")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -72,7 +75,7 @@ func TestOpenBackingDir(t *testing.T) {
} }
syscall.Close(dirfd) syscall.Close(dirfd)
dirfd, cName, err = fs.openBackingDir("dir1/dir2") dirfd, cName, err = rn.openBackingDir("dir1/dir2")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -81,14 +84,13 @@ func TestOpenBackingDir(t *testing.T) {
} }
err = syscallcompat.Faccessat(dirfd, cName, unix.R_OK) err = syscallcompat.Faccessat(dirfd, cName, unix.R_OK)
if err != nil { if err != nil {
t.Error(err) t.Errorf("Faccessat(%d, %q): %v", dirfd, cName, err)
} }
syscall.Close(dirfd) syscall.Close(dirfd)
n255 := strings.Repeat("n", 255) n255 := strings.Repeat("n", 255)
path := "dir1/" + n255 dir1.Mkdir(nil, n255, 0700, out)
fs.Mkdir(nil, path, 0700, out) dirfd, cName, err = rn.openBackingDir("dir1/" + n255)
dirfd, cName, err = fs.openBackingDir(path)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -100,7 +102,7 @@ func TestOpenBackingDir(t *testing.T) {
} }
err = syscallcompat.Faccessat(dirfd, cName, unix.R_OK) err = syscallcompat.Faccessat(dirfd, cName, unix.R_OK)
if err != nil { if err != nil {
t.Error(err) t.Errorf("Faccessat(%d, %q): %v", dirfd, cName, err)
} }
syscall.Close(dirfd) syscall.Close(dirfd)
} }