aboutsummaryrefslogtreecommitdiff
path: root/integration_tests
diff options
context:
space:
mode:
authorJakob Unterwurzacher2016-02-07 13:28:55 +0100
committerJakob Unterwurzacher2016-02-07 13:28:55 +0100
commit2a11906963d4e9be8876757690eee53c737dcef9 (patch)
tree6ce5eb287522878f93c132304b7387018c311c21 /integration_tests
parent6b5d977cce3a65f04f17c84aa9b2776b52487946 (diff)
tests: do not create gocryptfs.diriv if plaintextnames==true
Diffstat (limited to 'integration_tests')
-rw-r--r--integration_tests/helpers.go21
-rw-r--r--integration_tests/main_test.go22
2 files changed, 23 insertions, 20 deletions
diff --git a/integration_tests/helpers.go b/integration_tests/helpers.go
index 4adce97..df4c82a 100644
--- a/integration_tests/helpers.go
+++ b/integration_tests/helpers.go
@@ -1,13 +1,13 @@
package integration_tests
import (
- "path/filepath"
"crypto/md5"
"encoding/hex"
"fmt"
"io/ioutil"
"os"
"os/exec"
+ "path/filepath"
"syscall"
"testing"
@@ -22,7 +22,7 @@ const defaultCipherDir = tmpDir + "cipher/"
const gocryptfsBinary = "../gocryptfs"
// resetTmpDir - delete old tmp dir, create new one, write gocryptfs.diriv
-func resetTmpDir() {
+func resetTmpDir(plaintextNames bool) {
fu := exec.Command("fusermount", "-z", "-u", defaultPlainDir)
fu.Run()
@@ -43,10 +43,12 @@ func resetTmpDir() {
fmt.Println(err)
os.Exit(1)
}
- err = nametransform.WriteDirIV(defaultCipherDir)
- if err != nil {
- fmt.Println(err)
- os.Exit(1)
+ if !plaintextNames {
+ err = nametransform.WriteDirIV(defaultCipherDir)
+ if err != nil {
+ fmt.Println(err)
+ os.Exit(1)
+ }
}
}
@@ -54,8 +56,9 @@ func resetTmpDir() {
func mount(c string, p string, extraArgs ...string) {
var args []string
args = append(args, extraArgs...)
- args = append(args, "-q", "-wpanic")
- //args = append(args, "--fusedebug")
+ args = append(args, "-nosyslog", "-q", "-wpanic")
+ //args = append(args, "-fusedebug")
+ //args = append(args, "-d")
args = append(args, c)
args = append(args, p)
cmd := exec.Command(gocryptfsBinary, args...)
@@ -205,7 +208,7 @@ func verifyExistence(path string) bool {
//t.Log(err)
return false
}
- for _, i := range(fi) {
+ for _, i := range fi {
if i.Name() == name {
return true
}
diff --git a/integration_tests/main_test.go b/integration_tests/main_test.go
index 6ac03e1..2d150f2 100644
--- a/integration_tests/main_test.go
+++ b/integration_tests/main_test.go
@@ -3,7 +3,6 @@ package integration_tests
// File reading, writing, modification, truncate
import (
- "syscall"
"bytes"
"crypto/md5"
"encoding/hex"
@@ -13,6 +12,7 @@ import (
"os"
"runtime"
"sync"
+ "syscall"
"testing"
)
@@ -27,7 +27,7 @@ func TestMain(m *testing.M) {
if testing.Verbose() {
fmt.Println("***** Testing with OpenSSL")
}
- resetTmpDir() // <- this also create gocryptfs.diriv
+ resetTmpDir(false) // <- this also create gocryptfs.diriv
mount(defaultCipherDir, defaultPlainDir, "--zerokey")
r := m.Run()
unmount(defaultPlainDir)
@@ -43,7 +43,7 @@ func TestMain(m *testing.M) {
if testing.Verbose() {
fmt.Println("***** Testing with native Go crypto")
}
- resetTmpDir()
+ resetTmpDir(false)
mount(defaultCipherDir, defaultPlainDir, "--zerokey", "--openssl=false")
r = m.Run()
unmount(defaultPlainDir)
@@ -55,7 +55,7 @@ func TestMain(m *testing.M) {
if testing.Verbose() {
fmt.Println("***** Testing \"--plaintextnames\"")
}
- resetTmpDir()
+ resetTmpDir(true) // do not create gocryptfs.diriv
mount(defaultCipherDir, defaultPlainDir, "--zerokey", "--plaintextnames")
plaintextNames = true
r = m.Run()
@@ -356,12 +356,12 @@ func TestLongNames(t *testing.T) {
// Create
wd := defaultPlainDir
n255x := string(bytes.Repeat([]byte("x"), 255))
- f, err := os.Create(wd+n255x)
+ f, err := os.Create(wd + n255x)
if err != nil {
t.Fatalf("Could not create n255x")
}
f.Close()
- if !verifyExistence(wd+n255x) {
+ if !verifyExistence(wd + n255x) {
t.Errorf("n255x is not in directory listing")
}
// Rename long to long
@@ -370,7 +370,7 @@ func TestLongNames(t *testing.T) {
if err != nil {
t.Fatalf("Could not rename n255x to n255y")
}
- if !verifyExistence(wd+n255y) {
+ if !verifyExistence(wd + n255y) {
t.Errorf("n255y is not in directory listing")
}
// Rename long to short
@@ -378,7 +378,7 @@ func TestLongNames(t *testing.T) {
if err != nil {
t.Fatalf("Could not rename n255y to short")
}
- if !verifyExistence(wd+"short") {
+ if !verifyExistence(wd + "short") {
t.Errorf("short is not in directory listing")
}
// Rename short to long
@@ -386,15 +386,15 @@ func TestLongNames(t *testing.T) {
if err != nil {
t.Fatalf("Could not rename short to n255x")
}
- if !verifyExistence(wd+n255x) {
+ if !verifyExistence(wd + n255x) {
t.Errorf("255x is not in directory listing II")
}
// Unlink
- err = syscall.Unlink(wd+n255x)
+ err = syscall.Unlink(wd + n255x)
if err != nil {
t.Fatalf("Could not unlink n255x")
}
- if verifyExistence(wd+n255x) {
+ if verifyExistence(wd + n255x) {
t.Errorf("n255x still there after unlink")
}
}