From 0d2299217d55e4f14b0b44d48e5b95fb302dfa82 Mon Sep 17 00:00:00 2001 From: charles-chenzz Date: Tue, 18 Apr 2023 11:18:10 +0800 Subject: [PATCH] reduce util pkg for testing in tempdir. Kubernetes-commit: aaa30439bdda1589eacc7be8547c297a73e346b9 --- pkg/cmd/create/create_secret_tls_test.go | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/pkg/cmd/create/create_secret_tls_test.go b/pkg/cmd/create/create_secret_tls_test.go index 0aea2f2b4..51f3a7730 100644 --- a/pkg/cmd/create/create_secret_tls_test.go +++ b/pkg/cmd/create/create_secret_tls_test.go @@ -17,7 +17,6 @@ limitations under the License. package create import ( - "fmt" "os" "path" "testing" @@ -25,7 +24,6 @@ import ( corev1 "k8s.io/api/core/v1" apiequality "k8s.io/apimachinery/pkg/api/equality" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - utiltesting "k8s.io/client-go/util/testing" ) var rsaCertPEM = `-----BEGIN CERTIFICATE----- @@ -84,17 +82,14 @@ rLTt0TTazzwBCgCD0Jkoqg== func TestCreateSecretTLS(t *testing.T) { - validCertTmpDir := utiltesting.MkTmpdirOrDie("tls-valid-cert-test") + validCertTmpDir := t.TempDir() validKeyPath, validCertPath := writeKeyPair(validCertTmpDir, rsaKeyPEM, rsaCertPEM, t) - defer tearDown(validCertTmpDir) - invalidCertTmpDir := utiltesting.MkTmpdirOrDie("tls-invalid-cert-test") + invalidCertTmpDir := t.TempDir() invalidKeyPath, invalidCertPath := writeKeyPair(invalidCertTmpDir, "test", "test", t) - defer tearDown(invalidCertTmpDir) - mismatchCertTmpDir := utiltesting.MkTmpdirOrDie("tls-mismatch-test") + mismatchCertTmpDir := t.TempDir() mismatchKeyPath, mismatchCertPath := writeKeyPair(mismatchCertTmpDir, rsaKeyPEM, mismatchRSAKeyPEM, t) - defer tearDown(mismatchCertTmpDir) tests := map[string]struct { tlsSecretName string @@ -189,13 +184,6 @@ func TestCreateSecretTLS(t *testing.T) { } } -func tearDown(tmpDir string) { - err := os.RemoveAll(tmpDir) - if err != nil { - fmt.Printf("Error in cleaning up test: %v", err) - } -} - func write(path, contents string, t *testing.T) { f, err := os.Create(path) if err != nil {