Skip to content

Commit dbbc2c2

Browse files
authored
Merge pull request #21738 from bobsira/fix-win-unit-test-TestGetStoragev1
test: Fix TestGetStoragev1 unit test on windows
2 parents 3255088 + 0f64f31 commit dbbc2c2

File tree

1 file changed

+11
-14
lines changed

1 file changed

+11
-14
lines changed

pkg/minikube/storageclass/storageclass_test.go

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"context"
2121
"fmt"
2222
"os"
23+
"path/filepath"
2324
"strings"
2425
"testing"
2526

@@ -228,19 +229,18 @@ func TestGetStoragev1(t *testing.T) {
228229
err: true,
229230
},
230231
}
231-
configFile, err := os.CreateTemp("/tmp", "")
232-
if err != nil {
233-
t.Fatal(err.Error())
234-
}
235-
defer os.Remove(configFile.Name())
232+
236233
for _, test := range tests {
237234
t.Run(test.description, func(t *testing.T) {
238-
if err := setK8SConfig(t, test.config, configFile.Name()); err != nil {
239-
t.Fatal(err.Error())
235+
tmpDir := t.TempDir()
236+
kubeconfigPath := filepath.Join(tmpDir, "kubeconfig")
237+
238+
if err := setK8SConfig(t, test.config, kubeconfigPath); err != nil {
239+
t.Fatalf("setK8SConfig failed: %v", err)
240240
}
241241

242242
// context name is hardcoded by mockK8sConfig
243-
_, err = GetStoragev1("minikube")
243+
_, err := GetStoragev1("minikube")
244244
if err != nil && !test.err {
245245
t.Fatalf("Unexpected err: %v for test: %v", err, test.description)
246246
}
@@ -252,12 +252,9 @@ func TestGetStoragev1(t *testing.T) {
252252
}
253253

254254
func setK8SConfig(t *testing.T, config, kubeconfigPath string) error {
255-
mockK8sConfigByte := []byte(config)
256-
mockK8sConfigPath := kubeconfigPath
257-
err := os.WriteFile(mockK8sConfigPath, mockK8sConfigByte, 0644)
258-
if err != nil {
259-
return fmt.Errorf("Unexpected error when writing to file %v. Error: %v", kubeconfigPath, err)
255+
if err := os.WriteFile(kubeconfigPath, []byte(config), 0o644); err != nil {
256+
t.Fatalf("unexpected error when writing to %v: %v", kubeconfigPath, err)
260257
}
261-
t.Setenv("KUBECONFIG", mockK8sConfigPath)
258+
t.Setenv("KUBECONFIG", kubeconfigPath)
262259
return nil
263260
}

0 commit comments

Comments
 (0)