Merge pull request #6681 from Juneezee/test/t.TempDir

content/local/store_test.go

@@ -291,28 +291,17 @@ func populateBlobStore(ctx context.Context, t checker, cs content.Store, nblobs,
 	return blobs
 }
 
-func contentStoreEnv(t checker) (context.Context, string, content.Store, func()) {
-	pc, _, _, ok := runtime.Caller(1)
-	if !ok {
-		t.Fatal("failed to resolve caller")
-	}
-	fn := runtime.FuncForPC(pc)
-
-	tmpdir, err := os.MkdirTemp("", filepath.Base(fn.Name())+"-")
-	if err != nil {
-		t.Fatal(err)
-	}
+func contentStoreEnv(t testing.TB) (context.Context, string, content.Store, func()) {
+	tmpdir := t.TempDir()
 
 	cs, err := NewStore(tmpdir)
 	if err != nil {
-		os.RemoveAll(tmpdir)
 		t.Fatal(err)
 	}
 
 	ctx, cancel := context.WithCancel(context.Background())
 	return ctx, tmpdir, cs, func() {
 		cancel()
-		os.RemoveAll(tmpdir)
 	}
 }
 
@@ -361,11 +350,7 @@ func checkWrite(ctx context.Context, t checker, cs content.Store, dgst digest.Di
 }
 
 func TestWriterTruncateRecoversFromIncompleteWrite(t *testing.T) {
-	tmpdir, err := os.MkdirTemp("", "test-local-content-store-recover")
-	assert.NilError(t, err)
-	defer os.RemoveAll(tmpdir)
-
-	cs, err := NewStore(tmpdir)
+	cs, err := NewStore(t.TempDir())
 	assert.NilError(t, err)
 
 	ctx, cancel := context.WithCancel(context.Background())
@@ -400,11 +385,7 @@ func setupIncompleteWrite(ctx context.Context, t *testing.T, cs content.Store, r
 }
 
 func TestWriteReadEmptyFileTimestamp(t *testing.T) {
-	root, err := os.MkdirTemp("", "test-write-read-file-timestamp")
-	if err != nil {
-		t.Errorf("failed to create a tmp dir: %v", err)
-	}
-	defer os.RemoveAll(root)
+	root := t.TempDir()
 
 	emptyFile := filepath.Join(root, "updatedat")
 	if err := writeTimestampFile(emptyFile, time.Time{}); err != nil {