From 5187baeb4e858cb88993392463cf17615ad45e24 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Mon, 19 Aug 2024 15:46:15 -0700
Subject: [PATCH] os: use t.TempDir in TestMkdirTemp, TestCreateTemp
This simplifies tests a little bit.
Change-Id: I910e3c97cfd20b26951d2a4909d86b5be06bde56
Reviewed-on: https://go-review.googlesource.com/c/go/+/606899
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
---
src/os/tempfile_test.go | 30 +++++-------------------------
1 file changed, 5 insertions(+), 25 deletions(-)
diff --git a/src/os/tempfile_test.go b/src/os/tempfile_test.go
index 82f0aabda07..f2b4ffa7500 100644
--- a/src/os/tempfile_test.go
+++ b/src/os/tempfile_test.go
@@ -17,13 +17,7 @@ import (
func TestCreateTemp(t *testing.T) {
t.Parallel()
- dir, err := MkdirTemp("", "TestCreateTempBadDir")
- if err != nil {
- t.Fatal(err)
- }
- defer RemoveAll(dir)
-
- nonexistentDir := filepath.Join(dir, "_not_exists_")
+ nonexistentDir := filepath.Join(t.TempDir(), "_not_exists_")
f, err := CreateTemp(nonexistentDir, "foo")
if f != nil || err == nil {
t.Errorf("CreateTemp(%q, `foo`) = %v, %v", nonexistentDir, f, err)
@@ -57,11 +51,7 @@ func TestCreateTempPattern(t *testing.T) {
func TestCreateTempBadPattern(t *testing.T) {
t.Parallel()
- tmpDir, err := MkdirTemp("", t.Name())
- if err != nil {
- t.Fatal(err)
- }
- defer RemoveAll(tmpDir)
+ tmpDir := t.TempDir()
const sep = string(PathSeparator)
tests := []struct {
@@ -152,14 +142,8 @@ func TestMkdirTemp(t *testing.T) {
func TestMkdirTempBadDir(t *testing.T) {
t.Parallel()
- dir, err := MkdirTemp("", "MkdirTempBadDir")
- if err != nil {
- t.Fatal(err)
- }
- defer RemoveAll(dir)
-
- badDir := filepath.Join(dir, "not-exist")
- _, err = MkdirTemp(badDir, "foo")
+ badDir := filepath.Join(t.TempDir(), "not-exist")
+ _, err := MkdirTemp(badDir, "foo")
if pe, ok := err.(*fs.PathError); !ok || !IsNotExist(err) || pe.Path != badDir {
t.Errorf("TempDir error = %#v; want PathError for path %q satisfying IsNotExist", err, badDir)
}
@@ -168,11 +152,7 @@ func TestMkdirTempBadDir(t *testing.T) {
func TestMkdirTempBadPattern(t *testing.T) {
t.Parallel()
- tmpDir, err := MkdirTemp("", t.Name())
- if err != nil {
- t.Fatal(err)
- }
- defer RemoveAll(tmpDir)
+ tmpDir := t.TempDir()
const sep = string(PathSeparator)
tests := []struct {
--
GitLab