diff options
author | Jakob Unterwurzacher | 2015-12-13 20:10:52 +0100 |
---|---|---|
committer | Jakob Unterwurzacher | 2015-12-13 20:24:13 +0100 |
commit | 00a712b4d1e68bb3c156eb8f97fbb89d684a7e92 (patch) | |
tree | abf6d8c1b4493542686b3e59aaa08602fbfd4ead /integration_tests | |
parent | 8518d6d7bde33fdc7ef5bcb7c3c7709404392ad8 (diff) |
go fmt
...and minimal comment changes.
Diffstat (limited to 'integration_tests')
-rw-r--r-- | integration_tests/cli_test.go | 2 | ||||
-rw-r--r-- | integration_tests/helpers.go | 8 | ||||
-rw-r--r-- | integration_tests/main_test.go | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/integration_tests/cli_test.go b/integration_tests/cli_test.go index dec28a2..5e8902d 100644 --- a/integration_tests/cli_test.go +++ b/integration_tests/cli_test.go @@ -104,7 +104,7 @@ func TestInitPlaintextNames(t *testing.T) { if err == nil { t.Errorf("gocryptfs.diriv should not have been created with -plaintextnames") } - _, cf, err := cryptfs.LoadConfFile(dir + cryptfs.ConfDefaultName, "test") + _, cf, err := cryptfs.LoadConfFile(dir+cryptfs.ConfDefaultName, "test") if err != nil { t.Fatal(err) } diff --git a/integration_tests/helpers.go b/integration_tests/helpers.go index 7c4aeef..8eb5379 100644 --- a/integration_tests/helpers.go +++ b/integration_tests/helpers.go @@ -1,13 +1,13 @@ package integration_tests import ( - "syscall" "crypto/md5" "encoding/hex" "fmt" "io/ioutil" "os" "os/exec" + "syscall" "testing" "github.com/rfjakob/gocryptfs/cryptfs" @@ -143,7 +143,7 @@ func testMkdirRmdir(t *testing.T, plainDir string) { if errno != syscall.ENOTEMPTY { t.Errorf("Should have gotten ENOTEMPTY, go %v", errno) } - if syscall.Unlink(dir + "/file") != nil { + if syscall.Unlink(dir+"/file") != nil { t.Fatal(err) } if syscall.Rmdir(dir) != nil { @@ -164,8 +164,8 @@ func testMkdirRmdir(t *testing.T, plainDir string) { // Create and rename a file func testRename(t *testing.T, plainDir string) { - file1 := plainDir+"rename1" - file2 := plainDir+"rename2" + file1 := plainDir + "rename1" + file2 := plainDir + "rename2" err := ioutil.WriteFile(file1, []byte("content"), 0777) if err != nil { t.Fatal(err) diff --git a/integration_tests/main_test.go b/integration_tests/main_test.go index cfa481d..f4ff544 100644 --- a/integration_tests/main_test.go +++ b/integration_tests/main_test.go @@ -333,7 +333,6 @@ func TestRename(t *testing.T) { testRename(t, defaultPlainDir) } - // Overwrite an empty directory with another directory func TestDirOverwrite(t *testing.T) { dir1 := defaultPlainDir + "DirOverwrite1" |