summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJakob Unterwurzacher2016-06-16 21:56:23 +0200
committerJakob Unterwurzacher2016-06-16 21:56:23 +0200
commit96750a7d3c52b75d13d6f3ed46bd48af28acebcd (patch)
treec635af442a00aaac8281c220216a608106d9128f /tests
parent82d87ff8eda1a8e43cda4a5f500fc579477ee606 (diff)
tests: exit with correct error code from TestMain
extpass_test and example_filesystems_test did it wrong, always returning 0.
Diffstat (limited to 'tests')
-rw-r--r--tests/example_filesystems/example_filesystems_test.go2
-rw-r--r--tests/test_helpers/helpers.go6
2 files changed, 6 insertions, 2 deletions
diff --git a/tests/example_filesystems/example_filesystems_test.go b/tests/example_filesystems/example_filesystems_test.go
index 7517bc5..e20fc94 100644
--- a/tests/example_filesystems/example_filesystems_test.go
+++ b/tests/example_filesystems/example_filesystems_test.go
@@ -15,7 +15,7 @@ const statusTxtContent = "It works!\n"
func TestMain(m *testing.M) {
test_helpers.ResetTmpDir(true)
- m.Run()
+ os.Exit(m.Run())
}
// checkExampleFS - verify that "dir" contains the expected test files
diff --git a/tests/test_helpers/helpers.go b/tests/test_helpers/helpers.go
index c006e8b..04686c2 100644
--- a/tests/test_helpers/helpers.go
+++ b/tests/test_helpers/helpers.go
@@ -109,7 +109,11 @@ func Mount(c string, p string, extraArgs ...string) error {
cmd := exec.Command(GocryptfsBinary, args...)
cmd.Stderr = os.Stderr
- cmd.Stdout = os.Stdout
+ if testing.Verbose() {
+ // Don't show the "deprecated filesystem" warnings by default. These
+ // are not silenced by "-q".
+ cmd.Stdout = os.Stdout
+ }
return cmd.Run()
}