From 0a8bd6548be945653880b942815ea9febcc3122b Mon Sep 17 00:00:00 2001 From: Travis Turner Date: Mon, 14 Jan 2019 17:09:30 -0600 Subject: [PATCH] don't delete test fragment data (part of repo) --- fragment_internal_test.go | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/fragment_internal_test.go b/fragment_internal_test.go index cca88dda1..f35cec46d 100644 --- a/fragment_internal_test.go +++ b/fragment_internal_test.go @@ -1142,7 +1142,7 @@ func BenchmarkFragment_Blocks(b *testing.B) { if err := f.Open(); err != nil { b.Fatal(err) } - defer f.Clean(b) + defer f.CleanKeep(b) // Reset timer and execute benchmark. b.ResetTimer() @@ -1671,7 +1671,7 @@ func BenchmarkFragment_Snapshot(b *testing.B) { if err := f.Open(); err != nil { b.Fatal(err) } - defer f.Clean(b) + defer f.CleanKeep(b) b.ResetTimer() // Reset timer and execute benchmark. @@ -2030,6 +2030,20 @@ func (f *fragment) Clean(t testing.TB) { } } +// CleanKeep is just like Clean(), but it doesn't remove the +// fragment file (note that it DOES remove the cache file). +func (f *fragment) CleanKeep(t testing.TB) { + errc := f.Close() + errp := os.Remove(f.cachePath()) + if errc != nil { + t.Fatal("closing fragment: ", errc, errp) + } + // not all fragments have cache files + if errp != nil && !os.IsNotExist(errp) { + t.Fatalf("cleaning up fragment cache: %v", errp) + } +} + // mustOpenFragment returns a new instance of Fragment with a temporary path. func mustOpenFragment(index, field, view string, shard uint64, cacheType string) *fragment { file, err := ioutil.TempFile(TempDir, "pilosa-fragment-")