Skip to content

Commit c360bac

Browse files
authored
Merge pull request kubernetes#75032 from rosti/win-test
kubeadm: Don't hardcode temp path in a test
2 parents 0e2c268 + 5a3b1a0 commit c360bac

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

cmd/kubeadm/app/cmd/upgrade/common_test.go

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@ package upgrade
1818

1919
import (
2020
"bytes"
21-
"fmt"
2221
"io/ioutil"
2322
"os"
2423
"testing"
25-
"time"
2624

2725
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
2826
)
@@ -77,17 +75,25 @@ func TestGetK8sVersionFromUserInput(t *testing.T) {
7775
name: "Version is optional",
7876
},
7977
}
80-
for tnum, tt := range tcases {
78+
for _, tt := range tcases {
8179
t.Run(tt.name, func(t *testing.T) {
8280
flags := &applyPlanFlags{}
8381
if len(tt.clusterConfig) > 0 {
84-
tmpfile := fmt.Sprintf("/tmp/kubeadm-upgrade-common-test-%d-%d.yaml", tnum, time.Now().Unix())
85-
if err := ioutil.WriteFile(tmpfile, []byte(tt.clusterConfig), 0666); err != nil {
82+
file, err := ioutil.TempFile("", "kubeadm-upgrade-common-test-*.yaml")
83+
if err != nil {
8684
t.Fatalf("Failed to create test config file: %+v", err)
8785
}
88-
defer os.Remove(tmpfile)
8986

90-
flags.cfgPath = tmpfile
87+
tmpFileName := file.Name()
88+
defer os.Remove(tmpFileName)
89+
90+
_, err = file.WriteString(tt.clusterConfig)
91+
file.Close()
92+
if err != nil {
93+
t.Fatalf("Failed to write test config file contents: %+v", err)
94+
}
95+
96+
flags.cfgPath = tmpFileName
9197
}
9298

9399
userVersion, err := getK8sVersionFromUserInput(flags, tt.args, tt.isVersionMandatory)

0 commit comments

Comments
 (0)