Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pkmountTest: ensure tests don't share cache 

Also introduce PERKEEP_CACHE_DIR so we can deprecate CAMLI_CACHE_DIR
at some point.
This commit is contained in:
aviau 2021-01-31 23:55:58 -05:00 committed by Alexandre Viau
parent 317e9f5490
commit 457318579e
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/osutil/paths.go
View File

@ -59,6 +59,9 @@ func CacheDir() string {
} }
func cacheDir() string { func cacheDir() string {
if d := os.Getenv("PERKEEP_CACHE_DIR"); d != "" {
return d
}
if d := os.Getenv("CAMLI_CACHE_DIR"); d != "" { if d := os.Getenv("CAMLI_CACHE_DIR"); d != "" {
return d return d
} }
@ -72,15 +75,15 @@ func cacheDir() string {
// both. This seems to work. // both. This seems to work.
for _, ev := range []string{"TEMP", "TMP"} { for _, ev := range []string{"TEMP", "TMP"} {
if v := os.Getenv(ev); v != "" { if v := os.Getenv(ev); v != "" {
return filepath.Join(v, "Camlistore") return filepath.Join(v, "Perkeep")
} }
} }
panic("No Windows TEMP or TMP environment variables found; please file a bug report.") panic("No Windows TEMP or TMP environment variables found; please file a bug report.")
} }
if xdg := os.Getenv("XDG_CACHE_HOME"); xdg != "" { if xdg := os.Getenv("XDG_CACHE_HOME"); xdg != "" {
return filepath.Join(xdg, "camlistore") return filepath.Join(xdg, "perkeep")
} }
return filepath.Join(HomeDir(), ".cache", "camlistore") return filepath.Join(HomeDir(), ".cache", "perkeep")
} }
func makeCacheDir() { func makeCacheDir() {

20
pkg/fs/fs_test.go
View File

@ -142,15 +142,7 @@ func pkmountTest(t *testing.T, fn func(env *mountEnv)) {
defer log.SetOutput(os.Stderr) defer log.SetOutput(os.Stderr)
w := test.GetWorld(t) w := test.GetWorld(t)
mountPoint, err := ioutil.TempDir("", "fs-test-mount") mountPoint := t.TempDir()
if err != nil {
t.Fatal(err)
}
defer func() {
if err := os.RemoveAll(mountPoint); err != nil {
t.Fatal(err)
}
}()
verbose := "false" verbose := "false"
var stderrDest io.Writer = ioutil.Discard var stderrDest io.Writer = ioutil.Discard
if v, _ := strconv.ParseBool(os.Getenv("VERBOSE_FUSE")); v { if v, _ := strconv.ParseBool(os.Getenv("VERBOSE_FUSE")); v {
@ -161,7 +153,15 @@ func pkmountTest(t *testing.T, fn func(env *mountEnv)) {
stderrDest = io.MultiWriter(stderrDest, os.Stderr) stderrDest = io.MultiWriter(stderrDest, os.Stderr)
} }
mount := w.Cmd("pk-mount", "--debug="+verbose, mountPoint) mount := w.CmdWithEnv(
"pk-mount",
append(
os.Environ(),
"PERKEEP_CACHE_DIR="+t.TempDir(),
),
"--debug="+verbose,
mountPoint,
)
mount.Stderr = stderrDest mount.Stderr = stderrDest
mount.Env = append(mount.Env, "CAMLI_TRACK_FS_STATS=1") mount.Env = append(mount.Env, "CAMLI_TRACK_FS_STATS=1")