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

tests: matrix: have the testcase struct as a global variable

Browse Source 
Future tests will need more info about the running test case.
This commit is contained in:
Jakob Unterwurzacher 2016-10-08 19:18:56 +02:00
parent 084cd597ab
commit 29c8ca85d8
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/matrix/matrix_test.go
View File

@ -30,7 +30,7 @@ import (
// Several tests need to be aware if plaintextnames is active or not, so make this // Several tests need to be aware if plaintextnames is active or not, so make this
// a global variable // a global variable
var plaintextnames bool var testcase testcaseMatrix
type testcaseMatrix struct { type testcaseMatrix struct {
// Exported so we can dump the struct using json.Marshal // Exported so we can dump the struct using json.Marshal
@ -56,7 +56,7 @@ var matrix []testcaseMatrix = []testcaseMatrix{
func TestMain(m *testing.M) { func TestMain(m *testing.M) {
// Make "testing.Verbose()" return the correct value // Make "testing.Verbose()" return the correct value
flag.Parse() flag.Parse()
for _, testcase := range matrix { for _, testcase = range matrix {
if !cryptocore.HaveModernGoGCM && testcase.Openssl != "true" { if !cryptocore.HaveModernGoGCM && testcase.Openssl != "true" {
fmt.Printf("Skipping Go GCM variant, Go installation is too old") fmt.Printf("Skipping Go GCM variant, Go installation is too old")
continue continue
@ -65,8 +65,8 @@ func TestMain(m *testing.M) {
j, _ := json.Marshal(testcase) j, _ := json.Marshal(testcase)
fmt.Printf("matrix: testcase = %s\n", string(j)) fmt.Printf("matrix: testcase = %s\n", string(j))
} }
plaintextnames = testcase.Plaintextnames testcase.Plaintextnames = testcase.Plaintextnames
test_helpers.ResetTmpDir(plaintextnames) test_helpers.ResetTmpDir(testcase.Plaintextnames)
opts := []string{"-zerokey"} opts := []string{"-zerokey"}
opts = append(opts, fmt.Sprintf("-openssl=%v", testcase.Openssl)) opts = append(opts, fmt.Sprintf("-openssl=%v", testcase.Openssl))
opts = append(opts, fmt.Sprintf("-plaintextnames=%v", testcase.Plaintextnames)) opts = append(opts, fmt.Sprintf("-plaintextnames=%v", testcase.Plaintextnames))
@ -474,17 +474,17 @@ func TestRmwRace(t *testing.T) {
func TestFiltered(t *testing.T) { func TestFiltered(t *testing.T) {
filteredFile := test_helpers.DefaultPlainDir + "/gocryptfs.conf" filteredFile := test_helpers.DefaultPlainDir + "/gocryptfs.conf"
file, err := os.Create(filteredFile) file, err := os.Create(filteredFile)
if plaintextnames && err == nil { if testcase.Plaintextnames && err == nil {
t.Errorf("should have failed but didn't") t.Errorf("should have failed but didn't")
} else if !plaintextnames && err != nil { } else if !testcase.Plaintextnames && err != nil {
t.Error(err) t.Error(err)
} }
file.Close() file.Close()
err = os.Remove(filteredFile) err = os.Remove(filteredFile)
if plaintextnames && err == nil { if testcase.Plaintextnames && err == nil {
t.Errorf("should have failed but didn't") t.Errorf("should have failed but didn't")
} else if !plaintextnames && err != nil { } else if !testcase.Plaintextnames && err != nil {
t.Error(err) t.Error(err)
} }
} }
@ -496,9 +496,9 @@ func TestFilenameEncryption(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
_, err = os.Stat(test_helpers.DefaultCipherDir + "/TestFilenameEncryption.txt") _, err = os.Stat(test_helpers.DefaultCipherDir + "/TestFilenameEncryption.txt")
if plaintextnames && err != nil { if testcase.Plaintextnames && err != nil {
t.Errorf("plaintextnames not working: %v", err) t.Errorf("plaintextnames not working: %v", err)
} else if !plaintextnames && err == nil { } else if !testcase.Plaintextnames && err == nil {
t.Errorf("file name encryption not working") t.Errorf("file name encryption not working")
} }
} }