From 0aac0c89284bfe93dd1f40620fcf31f2a05bdc92 Mon Sep 17 00:00:00 2001
From: Philip O'Toole <philip.otoole@yahoo.com>
Date: Fri, 25 Aug 2023 08:09:58 -0400
Subject: [PATCH] Revert "Use manually-created temp dirs"

This reverts commit f1845e887f9f9f8000a81c04bdf55b3e109dd12b.
---
 snapshot/upgrader_test.go | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/snapshot/upgrader_test.go b/snapshot/upgrader_test.go
index 7049e463..719ea4a2 100644
--- a/snapshot/upgrader_test.go
+++ b/snapshot/upgrader_test.go
@@ -27,12 +27,8 @@ func Test_Upgrade_OK(t *testing.T) {
 	logger := log.New(os.Stderr, "[snapshot-store-upgrader] ", 0)
 	v7Snapshot := "testdata/upgrade/v7.20.3-snapshots"
 	v7SnapshotID := "2-18-1686659761026"
-	oldTemp := mustMakeTempDir()
-	defer os.RemoveAll(oldTemp)
-	newTemp := mustMakeTempDir()
-	defer os.RemoveAll(newTemp)
-	oldTemp = filepath.Join(oldTemp, "snapshots")
-	newTemp = filepath.Join(newTemp, "rsnapshots")
+	oldTemp := filepath.Join(t.TempDir(), "snapshots")
+	newTemp := filepath.Join(t.TempDir(), "rsnapshots")
 
 	// Copy directory because succeessful test runs will delete it.
 	copyDir(v7Snapshot, oldTemp)
@@ -203,11 +199,3 @@ func copyDir(src string, dst string) (err error) {
 
 	return
 }
-
-func mustMakeTempDir() string {
-	dir, err := os.MkdirTemp("", "rsnapshots-upgrade-test")
-	if err != nil {
-		panic(err)
-	}
-	return dir
-}