From b77e39cc5e6c4db15ae181be0b81638ff95aff46 Mon Sep 17 00:00:00 2001 From: MarkDaveny Date: Sat, 8 Mar 2025 18:27:14 +0800 Subject: [PATCH] refactor: use t.TempDir() instead of os.MkdirTemp Signed-off-by: MarkDaveny --- cmd/fsccli/main_test.go | 5 +---- integration/nwo/cmd/cryptogen/csp/csp_test.go | 18 +++--------------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/cmd/fsccli/main_test.go b/cmd/fsccli/main_test.go index 711cddf4f..6e3982bd9 100644 --- a/cmd/fsccli/main_test.go +++ b/cmd/fsccli/main_test.go @@ -34,10 +34,7 @@ func TestArtifactsGen(t *testing.T) { Expect(err).NotTo(HaveOccurred()) defer gexec.CleanupBuildArtifacts() - tmpDir, err := os.MkdirTemp("", t.Name()) - Expect(err).NotTo(HaveOccurred()) - - defer os.RemoveAll(tmpDir) + tmpDir := t.TempDir() topologyFolder := filepath.Join("testdata", "fabric_iou.yaml") session, err := gexec.Start(exec.Command(cli, "artifactsgen", "gen", "-t", topologyFolder, "-o", tmpDir), GinkgoWriter, GinkgoWriter) diff --git a/integration/nwo/cmd/cryptogen/csp/csp_test.go b/integration/nwo/cmd/cryptogen/csp/csp_test.go index 3fbf75377..856506047 100644 --- a/integration/nwo/cmd/cryptogen/csp/csp_test.go +++ b/integration/nwo/cmd/cryptogen/csp/csp_test.go @@ -26,11 +26,7 @@ import ( ) func TestLoadPrivateKey(t *testing.T) { - testDir, err := os.MkdirTemp("", "csp-test") - if err != nil { - t.Fatalf("Failed to create test directory: %s", err) - } - defer os.RemoveAll(testDir) + testDir := t.TempDir() priv, err := csp2.GeneratePrivateKey(testDir) if err != nil { t.Fatalf("Failed to generate private key: %s", err) @@ -45,11 +41,7 @@ func TestLoadPrivateKey(t *testing.T) { } func TestLoadPrivateKey_BadPEM(t *testing.T) { - testDir, err := os.MkdirTemp("", "csp-test") - if err != nil { - t.Fatalf("Failed to create test directory: %s", err) - } - defer os.RemoveAll(testDir) + testDir := t.TempDir() badPEMFile := filepath.Join(testDir, "badpem_sk") @@ -108,11 +100,7 @@ func TestLoadPrivateKey_BadPEM(t *testing.T) { } func TestGeneratePrivateKey(t *testing.T) { - testDir, err := os.MkdirTemp("", "csp-test") - if err != nil { - t.Fatalf("Failed to create test directory: %s", err) - } - defer os.RemoveAll(testDir) + testDir := t.TempDir() expectedFile := filepath.Join(testDir, "priv_sk") priv, err := csp2.GeneratePrivateKey(testDir)