summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/cli/cli_test.go4
-rw-r--r--tests/defaults/main_test.go4
-rw-r--r--tests/matrix/concurrency_test.go2
-rw-r--r--tests/plaintextnames/plaintextnames_test.go8
-rw-r--r--tests/reverse/inomap_test.go12
-rw-r--r--tests/test_helpers/helpers.go10
6 files changed, 22 insertions, 18 deletions
diff --git a/tests/cli/cli_test.go b/tests/cli/cli_test.go
index fc2bfed..bbaca51 100644
--- a/tests/cli/cli_test.go
+++ b/tests/cli/cli_test.go
@@ -462,7 +462,9 @@ func TestPasswdPasswordIncorrect(t *testing.T) {
// Check that we correctly background on mount and close stderr and stdout.
// Something like
-// gocryptfs a b | cat
+//
+// gocryptfs a b | cat
+//
// must not hang ( https://github.com/rfjakob/gocryptfs/issues/130 ).
func TestMountBackground(t *testing.T) {
dir := test_helpers.InitFS(t)
diff --git a/tests/defaults/main_test.go b/tests/defaults/main_test.go
index 7633e8b..d0210e2 100644
--- a/tests/defaults/main_test.go
+++ b/tests/defaults/main_test.go
@@ -204,7 +204,9 @@ func TestWrite0200File(t *testing.T) {
// TestMvWarnings:
// When xattr support was introduced, mv threw warnings like these:
-// mv: preserving permissions for ‘b/x’: Operation not permitted
+//
+// mv: preserving permissions for ‘b/x’: Operation not permitted
+//
// because we returned EPERM when it tried to set system.posix_acl_access.
// Now we return EOPNOTSUPP and mv is happy.
func TestMvWarnings(t *testing.T) {
diff --git a/tests/matrix/concurrency_test.go b/tests/matrix/concurrency_test.go
index 4f060ab..15dbc3e 100644
--- a/tests/matrix/concurrency_test.go
+++ b/tests/matrix/concurrency_test.go
@@ -134,7 +134,7 @@ func TestConcurrentReadCreate(t *testing.T) {
//
// So far, it only has triggered warnings like this
//
-// go-fuse: warning: Inode.Path: inode i4201033 is orphaned, replacing segment with ".go-fuse.5577006791947779410/deleted"
+// go-fuse: warning: Inode.Path: inode i4201033 is orphaned, replacing segment with ".go-fuse.5577006791947779410/deleted"
//
// but none of the "blocked waiting for FORGET".
func TestInoReuse(t *testing.T) {
diff --git a/tests/plaintextnames/plaintextnames_test.go b/tests/plaintextnames/plaintextnames_test.go
index f2dc7e7..8892c39 100644
--- a/tests/plaintextnames/plaintextnames_test.go
+++ b/tests/plaintextnames/plaintextnames_test.go
@@ -92,10 +92,10 @@ func TestFiltered(t *testing.T) {
// Only works on filesystems that recycle inode numbers (ext4 does),
// and then the test causes a hang with these messages:
//
-// go-fuse: blocked for 5 seconds waiting for FORGET on i4329366
-// go-fuse: blocked for 11 seconds waiting for FORGET on i4329366
-// go-fuse: blocked for 17 seconds waiting for FORGET on i4329366
-// [...]
+// go-fuse: blocked for 5 seconds waiting for FORGET on i4329366
+// go-fuse: blocked for 11 seconds waiting for FORGET on i4329366
+// go-fuse: blocked for 17 seconds waiting for FORGET on i4329366
+// [...]
//
// The test runs with -plaintextnames because that makes it easier to manipulate
// cipherdir directly.
diff --git a/tests/reverse/inomap_test.go b/tests/reverse/inomap_test.go
index d5544c8..a79ddd2 100644
--- a/tests/reverse/inomap_test.go
+++ b/tests/reverse/inomap_test.go
@@ -35,15 +35,15 @@ func findIno(dir string, ino uint64) string {
// TestVirtualFileIno creates a directory tree like this:
//
-// TestVirtualFileIno <---- parent
-// └── xxxxxxx[...] <---- child
+// TestVirtualFileIno <---- parent
+// └── xxxxxxx[...] <---- child
//
// Which looks like this encrypted:
//
-// OLUKdPMg6l87EiKVlufgwIkQL8MD6JdUgOR3a8nEZ-w <---- parent
-// ├── gocryptfs.diriv <---- diriv
-// ├── gocryptfs.longname.e31v1ax4h_F0l4jhlN8kCjaWWMq8rO9VVBZ15IYsV50 <---- child
-// └── gocryptfs.longname.e31v1ax4h_F0l4jhlN8kCjaWWMq8rO9VVBZ15IYsV50.name <---- name
+// OLUKdPMg6l87EiKVlufgwIkQL8MD6JdUgOR3a8nEZ-w <---- parent
+// ├── gocryptfs.diriv <---- diriv
+// ├── gocryptfs.longname.e31v1ax4h_F0l4jhlN8kCjaWWMq8rO9VVBZ15IYsV50 <---- child
+// └── gocryptfs.longname.e31v1ax4h_F0l4jhlN8kCjaWWMq8rO9VVBZ15IYsV50.name <---- name
//
// It verifies that the inode numbers match what we expect.
func TestVirtualFileIno(t *testing.T) {
diff --git a/tests/test_helpers/helpers.go b/tests/test_helpers/helpers.go
index daa37d7..0d21548 100644
--- a/tests/test_helpers/helpers.go
+++ b/tests/test_helpers/helpers.go
@@ -67,10 +67,10 @@ func doInit() {
// ResetTmpDir deletes TmpDir, create new dir tree:
//
-// TmpDir
-// |-- DefaultPlainDir
-// *-- DefaultCipherDir
-// *-- gocryptfs.diriv
+// TmpDir
+// |-- DefaultPlainDir
+// *-- DefaultCipherDir
+// *-- gocryptfs.diriv
func ResetTmpDir(createDirIV bool) {
// Try to unmount and delete everything
entries, err := ioutil.ReadDir(TmpDir)
@@ -138,7 +138,7 @@ func isExt4(path string) bool {
// InitFS creates a new empty cipherdir and calls
//
-// gocryptfs -q -init -extpass "echo test" -scryptn=10 $extraArgs $cipherdir
+// gocryptfs -q -init -extpass "echo test" -scryptn=10 $extraArgs $cipherdir
//
// It returns cipherdir without a trailing slash.
//