hardcoresushi/libgocryptfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fusefrontend: convert openBackingDir tests to prepareAtSyscall

Browse Source 
openBackingDir will be removed.
This commit is contained in:
Jakob Unterwurzacher 2021-06-26 16:22:37 +02:00
parent cbd5e8ba01
commit ee59b5269b
1 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
internal/fusefrontend/openbackingdir_test.go → internal/fusefrontend/prepare_syscall_test.go
View File

@ -13,7 +13,7 @@ import (
"github.com/rfjakob/gocryptfs/tests/test_helpers" "github.com/rfjakob/gocryptfs/tests/test_helpers"
) )
func TestOpenBackingDir(t *testing.T) { func TestPrepareAtSyscall(t *testing.T) {
cipherdir := test_helpers.InitFS(t) cipherdir := test_helpers.InitFS(t)
t.Logf("cipherdir = %q", cipherdir) t.Logf("cipherdir = %q", cipherdir)
args := Args{ args := Args{
@ -33,9 +33,9 @@ func TestOpenBackingDir(t *testing.T) {
t.Fatal(errno) t.Fatal(errno)
} }
dirfd, cName, err := rn.openBackingDir("") dirfd, cName, errno := rn.prepareAtSyscallMyself()
if err != nil { if errno != 0 {
t.Fatal(err) t.Fatal(errno)
} }
if cName != "." { if cName != "." {
t.Fatal("cName should be .") t.Fatal("cName should be .")
@ -44,15 +44,15 @@ func TestOpenBackingDir(t *testing.T) {
// 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
rn.Lookup(nil, "xyz1234", &fuse.EntryOut{}) rn.Lookup(nil, "xyz1234", &fuse.EntryOut{})
dirfd, cName, err = rn.openBackingDir("") dirfd, cName, errno = rn.prepareAtSyscallMyself()
if err != nil { if errno != 0 {
t.Fatal(err) t.Fatal(errno)
} }
if cName != "." { if cName != "." {
t.Fatal("cName should be .") t.Fatal("cName should be .")
} }
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.Error(err)
} }
@ -62,7 +62,7 @@ func TestOpenBackingDir(t *testing.T) {
} }
syscall.Close(dirfd) syscall.Close(dirfd)
dirfd, cName, err = rn.openBackingDir("dir1") dirfd, cName, errno = rn.prepareAtSyscall("dir1")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -75,9 +75,9 @@ func TestOpenBackingDir(t *testing.T) {
} }
syscall.Close(dirfd) syscall.Close(dirfd)
dirfd, cName, err = rn.openBackingDir("dir1/dir2") dirfd, cName, errno = dir1.prepareAtSyscall("dir2")
if err != nil { if errno != 0 {
t.Fatal(err) t.Fatal(errno)
} }
if cName == "" { if cName == "" {
t.Fatal("cName should not be empty") t.Fatal("cName should not be empty")
@ -90,9 +90,9 @@ func TestOpenBackingDir(t *testing.T) {
n255 := strings.Repeat("n", 255) n255 := strings.Repeat("n", 255)
dir1.Mkdir(nil, n255, 0700, out) dir1.Mkdir(nil, n255, 0700, out)
dirfd, cName, err = rn.openBackingDir("dir1/" + n255) dirfd, cName, errno = dir1.prepareAtSyscall(n255)
if err != nil { if errno != 0 {
t.Fatal(err) t.Fatal(errno)
} }
if cName == "" { if cName == "" {
t.Fatal("cName should not be empty") t.Fatal("cName should not be empty")
@ -107,32 +107,34 @@ func TestOpenBackingDir(t *testing.T) {
syscall.Close(dirfd) syscall.Close(dirfd)
} }
func TestOpenBackingDirPlaintextNames(t *testing.T) { func TestPrepareAtSyscallPlaintextnames(t *testing.T) {
cipherdir := test_helpers.InitFS(t, "-plaintextnames") cipherdir := test_helpers.InitFS(t, "-plaintextnames")
args := Args{ args := Args{
Cipherdir: cipherdir, Cipherdir: cipherdir,
PlaintextNames: true, PlaintextNames: true,
} }
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, errno := rn.prepareAtSyscallMyself()
if err != nil { if errno != 0 {
t.Fatal(err) t.Fatal(errno)
} }
if cName != "." { if cName != "." {
t.Fatal("cName should be .") t.Fatal("cName should be .")
} }
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.Error(err)
} }
@ -142,9 +144,9 @@ func TestOpenBackingDirPlaintextNames(t *testing.T) {
} }
syscall.Close(dirfd) syscall.Close(dirfd)
dirfd, cName, err = fs.openBackingDir("dir1") dirfd, cName, errno = rn.prepareAtSyscall("dir1")
if err != nil { if errno != 0 {
t.Fatal(err) t.Fatal(errno)
} }
if cName != "dir1" { if cName != "dir1" {
t.Fatalf("wrong cName: %q", cName) t.Fatalf("wrong cName: %q", cName)
@ -155,9 +157,9 @@ func TestOpenBackingDirPlaintextNames(t *testing.T) {
} }
syscall.Close(dirfd) syscall.Close(dirfd)
dirfd, cName, err = fs.openBackingDir("dir1/dir2") dirfd, cName, errno = dir1.prepareAtSyscall("dir2")
if err != nil { if errno != 0 {
t.Fatal(err) t.Fatal(errno)
} }
if cName != "dir2" { if cName != "dir2" {
t.Fatalf("wrong cName: %q", cName) t.Fatalf("wrong cName: %q", cName)