aboutsummaryrefslogtreecommitdiff
path: root/tests/plaintextnames
diff options
context:
space:
mode:
authorJakob Unterwurzacher2016-06-30 00:57:14 +0200
committerJakob Unterwurzacher2016-06-30 00:57:14 +0200
commit02b6d3067d502bcc063965a5a9d75aa693125e1b (patch)
tree6b6df8eeac9017bc985de20fa3f8cf22466bad66 /tests/plaintextnames
parentffc000943b33724b1df0db69af35123abb1331a8 (diff)
test: split up integration_tests
...into "matrix" and "normal". Also: * Make running multiple packages in parallel safe, see http://stackoverflow.com/questions/23715302/go-how-to-run-tests-for-multiple-packages * Don't depent on test_helper.TmpDir and friends to have a terminating slash
Diffstat (limited to 'tests/plaintextnames')
-rw-r--r--tests/plaintextnames/plaintextnames_test.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/plaintextnames/plaintextnames_test.go b/tests/plaintextnames/plaintextnames_test.go
index 7e7db7c..6c6d272 100644
--- a/tests/plaintextnames/plaintextnames_test.go
+++ b/tests/plaintextnames/plaintextnames_test.go
@@ -20,7 +20,9 @@ func TestMain(m *testing.M) {
cDir = test_helpers.InitFS(nil, "-plaintextnames")
pDir = cDir + ".mnt"
test_helpers.MountOrExit(cDir, pDir, "-extpass", "echo test")
- os.Exit(m.Run())
+ r := m.Run()
+ test_helpers.Unmount(pDir)
+ os.Exit(r)
}
// Only the PlaintextNames feature flag should be set