diff options
Diffstat (limited to 'integration_tests')
| -rw-r--r-- | integration_tests/cli_test.go | 15 | ||||
| -rw-r--r-- | integration_tests/helpers.go | 6 |
2 files changed, 11 insertions, 10 deletions
diff --git a/integration_tests/cli_test.go b/integration_tests/cli_test.go index 5e8902d..062a90d 100644 --- a/integration_tests/cli_test.go +++ b/integration_tests/cli_test.go @@ -7,7 +7,8 @@ import ( "os/exec" "testing" - "github.com/rfjakob/gocryptfs/cryptfs" + "github.com/rfjakob/gocryptfs/internal/configfile" + "github.com/rfjakob/gocryptfs/internal/nametransform" ) // Test -init flag @@ -26,7 +27,7 @@ func TestInit(t *testing.T) { if err != nil { t.Fatal(err) } - _, err = os.Stat(dir + cryptfs.ConfDefaultName) + _, err = os.Stat(dir + configfile.ConfDefaultName) if err != nil { t.Fatal(err) } @@ -96,22 +97,22 @@ func TestInitPlaintextNames(t *testing.T) { if err != nil { t.Fatal(err) } - _, err = os.Stat(dir + cryptfs.ConfDefaultName) + _, err = os.Stat(dir + configfile.ConfDefaultName) if err != nil { t.Fatal(err) } - _, err = os.Stat(dir + cryptfs.DIRIV_FILENAME) + _, err = os.Stat(dir + nametransform.DirIVFilename) if err == nil { t.Errorf("gocryptfs.diriv should not have been created with -plaintextnames") } - _, cf, err := cryptfs.LoadConfFile(dir+cryptfs.ConfDefaultName, "test") + _, cf, err := configfile.LoadConfFile(dir+configfile.ConfDefaultName, "test") if err != nil { t.Fatal(err) } - if !cf.IsFeatureFlagSet(cryptfs.FlagPlaintextNames) { + if !cf.IsFeatureFlagSet(configfile.FlagPlaintextNames) { t.Error("PlaintextNames flag should be set but isnt") } - if cf.IsFeatureFlagSet(cryptfs.FlagEMENames) || cf.IsFeatureFlagSet(cryptfs.FlagDirIV) { + if cf.IsFeatureFlagSet(configfile.FlagEMENames) || cf.IsFeatureFlagSet(configfile.FlagDirIV) { t.Error("FlagEMENames and FlagDirIV should be not set") } } diff --git a/integration_tests/helpers.go b/integration_tests/helpers.go index 5145b30..e5458c9 100644 --- a/integration_tests/helpers.go +++ b/integration_tests/helpers.go @@ -10,7 +10,7 @@ import ( "syscall" "testing" - "github.com/rfjakob/gocryptfs/cryptfs" + "github.com/rfjakob/gocryptfs/internal/nametransform" ) // Note: the code assumes that all have a trailing slash @@ -42,7 +42,7 @@ func resetTmpDir() { fmt.Println(err) os.Exit(1) } - err = cryptfs.WriteDirIV(defaultCipherDir) + err = nametransform.WriteDirIV(defaultCipherDir) if err != nil { fmt.Println(err) os.Exit(1) @@ -58,9 +58,9 @@ func mount(c string, p string, extraArgs ...string) { args = append(args, c) args = append(args, p) cmd := exec.Command(gocryptfsBinary, args...) + cmd.Stderr = os.Stderr if testing.Verbose() { cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr } err := cmd.Run() if err != nil { |