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

tests: MountOrFatal creates mnt dir itself

Browse Source 
Allows to drop a few Mkdir()s.
This commit is contained in:
Jakob Unterwurzacher 2021-03-20 10:33:34 +01:00
parent f6036c429a
commit 255a71c917
3 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/cli/cli_test.go
View File

@ -516,17 +516,13 @@ func TestMultipleOperationFlags(t *testing.T) {
func TestNoexec(t *testing.T) { func TestNoexec(t *testing.T) {
dir := test_helpers.InitFS(t) dir := test_helpers.InitFS(t)
mnt := dir + ".mnt" mnt := dir + ".mnt"
err := os.Mkdir(mnt, 0700)
if err != nil {
t.Fatal(err)
}
test_helpers.MountOrFatal(t, dir, mnt, "-extpass=echo test", "-noexec") test_helpers.MountOrFatal(t, dir, mnt, "-extpass=echo test", "-noexec")
defer test_helpers.UnmountPanic(mnt) defer test_helpers.UnmountPanic(mnt)
sh := mnt + "/x.sh" sh := mnt + "/x.sh"
content := `#!/bin/bash content := `#!/bin/bash
echo hello echo hello
` `
err = ioutil.WriteFile(sh, []byte(content), 0755) err := ioutil.WriteFile(sh, []byte(content), 0755)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -633,11 +629,7 @@ func TestIdle(t *testing.T) {
func TestNotIdle(t *testing.T) { func TestNotIdle(t *testing.T) {
dir := test_helpers.InitFS(t) dir := test_helpers.InitFS(t)
mnt := dir + ".mnt" mnt := dir + ".mnt"
err := os.Mkdir(mnt, 0700) err := test_helpers.Mount(dir, mnt, false, "-extpass", "echo test", "-i=100ms")
if err != nil {
t.Fatal(err)
}
err = test_helpers.Mount(dir, mnt, false, "-extpass", "echo test", "-i=100ms")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -829,10 +821,6 @@ func TestInitNotEmpty(t *testing.T) {
func TestSharedstorage(t *testing.T) { func TestSharedstorage(t *testing.T) {
dir := test_helpers.InitFS(t) dir := test_helpers.InitFS(t)
mnt := dir + ".mnt" mnt := dir + ".mnt"
err := os.Mkdir(mnt, 0700)
if err != nil {
t.Fatal(err)
}
test_helpers.MountOrFatal(t, dir, mnt, "-extpass=echo test", "-sharedstorage") test_helpers.MountOrFatal(t, dir, mnt, "-extpass=echo test", "-sharedstorage")
defer test_helpers.UnmountPanic(mnt) defer test_helpers.UnmountPanic(mnt)
foo1 := mnt + "/foo1" foo1 := mnt + "/foo1"
@ -878,10 +866,6 @@ func TestMountCreat(t *testing.T) {
dir := test_helpers.InitFS(t) dir := test_helpers.InitFS(t)
mnt := dir + ".mnt" mnt := dir + ".mnt"
err := os.Mkdir(mnt, 0700)
if err != nil {
t.Fatal(err)
}
for j := 0; j < repeat; j++ { for j := 0; j < repeat; j++ {
test_helpers.MountOrFatal(t, dir, mnt, "-extpass=echo test") test_helpers.MountOrFatal(t, dir, mnt, "-extpass=echo test")

4
tests/root_test/root_test.go
View File

@ -191,10 +191,6 @@ func TestDiskFull(t *testing.T) {
// Mount gocryptfs // Mount gocryptfs
mnt := ext4mnt + "/b" mnt := ext4mnt + "/b"
err = os.Mkdir(mnt, 0600)
if err != nil {
t.Fatal(err)
}
test_helpers.MountOrFatal(t, cipherdir, mnt, "-extpass", "echo test") test_helpers.MountOrFatal(t, cipherdir, mnt, "-extpass", "echo test")
defer test_helpers.UnmountPanic(mnt) defer test_helpers.UnmountPanic(mnt)

1
tests/test_helpers/mount_unmount.go
View File

@ -113,6 +113,7 @@ func MountOrExit(c string, p string, extraArgs ...string) {
} }
// MountOrFatal calls Mount() and calls t.Fatal() on failure. // MountOrFatal calls Mount() and calls t.Fatal() on failure.
// Creates plaindir `p` if it does not exist.
// //
// Contrary to InitFS(), you MUST passt "-extpass=echo test" (or another way for // Contrary to InitFS(), you MUST passt "-extpass=echo test" (or another way for
// getting the master key) explicitly. // getting the master key) explicitly.