diff options
| author | Jakob Unterwurzacher | 2019-10-06 21:50:27 +0200 |
|---|---|---|
| committer | Jakob Unterwurzacher | 2019-10-06 21:53:20 +0200 |
| commit | 8c4429408716d9890a98a48c246d616dbfea7e31 (patch) | |
| tree | 9a034353cd2fecb65232ea158b3d909d7db928c7 /tests | |
| parent | 00af4f48643f0533b6cfbd14fdf5186c844f8f5d (diff) | |
tests: use /var/tmp by default
On Fedora, /tmp is tmpfs, which behaves differently than ext4
(inode numbers are never reused, for example).
Use /var/tmp, which is ext4 on Fedora, to get a more realistic
test environment.
This also allows us to drop the xattr workaround.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_helpers/helpers.go | 8 | ||||
| -rw-r--r-- | tests/xattr/xattr_integration_test.go | 6 |
2 files changed, 0 insertions, 14 deletions
diff --git a/tests/test_helpers/helpers.go b/tests/test_helpers/helpers.go index df71e52..17d2f98 100644 --- a/tests/test_helpers/helpers.go +++ b/tests/test_helpers/helpers.go @@ -44,14 +44,6 @@ var DefaultPlainDir string // DefaultCipherDir is TmpDir + "/default-cipher" var DefaultCipherDir string -// SwitchTMPDIR changes TMPDIR and hence the directory the test are performed in. -// This is used when you want to perform tests on a special filesystem. The -// xattr tests cannot run on tmpfs and use /var/tmp instead of /tmp. -func SwitchTMPDIR(newDir string) { - os.Setenv("TMPDIR", newDir) - doInit() -} - func init() { doInit() } diff --git a/tests/xattr/xattr_integration_test.go b/tests/xattr/xattr_integration_test.go index 29c3e84..b091830 100644 --- a/tests/xattr/xattr_integration_test.go +++ b/tests/xattr/xattr_integration_test.go @@ -23,12 +23,6 @@ import ( ) func TestMain(m *testing.M) { - // On modern Linux distributions, /tmp may be on tmpfs, - // which does not support user xattrs. Try /var/tmp instead - if !xattrSupported(test_helpers.TmpDir) && os.TempDir() == "/tmp" { - fmt.Printf("Switching from /tmp to /var/tmp for xattr tests\n") - test_helpers.SwitchTMPDIR("/var/tmp") - } if !xattrSupported(test_helpers.TmpDir) { fmt.Printf("xattrs not supported on %q\n", test_helpers.TmpDir) os.Exit(1) |