From b1730d8e0cc4aa35d6b2d593b83fef7cb0c81673 Mon Sep 17 00:00:00 2001 From: Keegan Carruthers-Smith Date: Tue, 10 Sep 2019 11:14:47 +0200 Subject: [PATCH] all: remove temp directories in tests Change-Id: I33efc7302b381c8def3aeac35a2d618d0ad71918 --- build/e2e_test.go | 8 +++++--- gitindex/delete_test.go | 2 ++ gitindex/tree_test.go | 1 + shards/watcher_test.go | 1 + 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/build/e2e_test.go b/build/e2e_test.go index 40de0a48..7019c69c 100644 --- a/build/e2e_test.go +++ b/build/e2e_test.go @@ -95,9 +95,7 @@ func TestLargeFileOption(t *testing.T) { if err != nil { t.Fatalf("TempDir: %v", err) } - defer func() { - os.RemoveAll(dir) - }() + defer os.RemoveAll(dir) sizeMax := 1000 opts := Options{ @@ -151,6 +149,7 @@ func TestUpdate(t *testing.T) { if err != nil { t.Fatalf("TempDir: %v", err) } + defer os.RemoveAll(dir) opts := Options{ IndexDir: dir, @@ -243,6 +242,7 @@ func TestDeleteOldShards(t *testing.T) { if err != nil { t.Fatalf("TempDir: %v", err) } + defer os.RemoveAll(dir) opts := Options{ IndexDir: dir, @@ -325,6 +325,7 @@ func TestPartialSuccess(t *testing.T) { if err != nil { t.Fatalf("TempDir: %v", err) } + defer os.RemoveAll(dir) opts := Options{ IndexDir: dir, @@ -447,6 +448,7 @@ func TestEmptyContent(t *testing.T) { if err != nil { t.Fatalf("TempDir: %v", err) } + defer os.RemoveAll(dir) opts := Options{ IndexDir: dir, diff --git a/gitindex/delete_test.go b/gitindex/delete_test.go index 571a25d1..f7c6ee3b 100644 --- a/gitindex/delete_test.go +++ b/gitindex/delete_test.go @@ -3,6 +3,7 @@ package gitindex import ( "io/ioutil" "net/url" + "os" "path/filepath" "reflect" "testing" @@ -13,6 +14,7 @@ func TestDeleteRepos(t *testing.T) { if err != nil { t.Fatalf("TempDir: %v", err) } + defer os.RemoveAll(dir) if err := createSubmoduleRepo(dir); err != nil { t.Error("createSubmoduleRepo", err) diff --git a/gitindex/tree_test.go b/gitindex/tree_test.go index 90cea27f..74316f5c 100644 --- a/gitindex/tree_test.go +++ b/gitindex/tree_test.go @@ -91,6 +91,7 @@ func TestFindGitRepos(t *testing.T) { if err != nil { t.Fatalf("TempDir: %v", err) } + defer os.RemoveAll(dir) if err := createSubmoduleRepo(dir); err != nil { t.Error("createSubmoduleRepo", err) diff --git a/shards/watcher_test.go b/shards/watcher_test.go index 6ca565df..0678c9b9 100644 --- a/shards/watcher_test.go +++ b/shards/watcher_test.go @@ -45,6 +45,7 @@ func TestDirWatcherUnloadOnce(t *testing.T) { if err != nil { t.Fatal(err) } + defer os.RemoveAll(dir) logger := &loggingLoader{ loads: make(chan string, 10),