github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #75032 from rosti/win-test

Browse Source 
kubeadm: Don't hardcode temp path in a test
This commit is contained in:
Kubernetes Prow Robot 2019-03-06 09:51:15 -08:00 committed by GitHub
commit c360bac6e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/kubeadm/app/cmd/upgrade/common_test.go
View File

@ -18,11 +18,9 @@ package upgrade
import ( import (
"bytes" "bytes"
"fmt"
"io/ioutil" "io/ioutil"
"os" "os"
"testing" "testing"
"time"
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
) )
@ -77,17 +75,25 @@ func TestGetK8sVersionFromUserInput(t *testing.T) {
name: "Version is optional", name: "Version is optional",
}, },
} }
for tnum, tt := range tcases { for _, tt := range tcases {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
flags := &applyPlanFlags{} flags := &applyPlanFlags{}
if len(tt.clusterConfig) > 0 { if len(tt.clusterConfig) > 0 {
tmpfile := fmt.Sprintf("/tmp/kubeadm-upgrade-common-test-%d-%d.yaml", tnum, time.Now().Unix()) file, err := ioutil.TempFile("", "kubeadm-upgrade-common-test-*.yaml")
if err := ioutil.WriteFile(tmpfile, []byte(tt.clusterConfig), 0666); err != nil { if err != nil {
t.Fatalf("Failed to create test config file: %+v", err) t.Fatalf("Failed to create test config file: %+v", err)
} }
defer os.Remove(tmpfile)
flags.cfgPath = tmpfile tmpFileName := file.Name()
defer os.Remove(tmpFileName)
_, err = file.WriteString(tt.clusterConfig)
file.Close()
if err != nil {
t.Fatalf("Failed to write test config file contents: %+v", err)
}
flags.cfgPath = tmpFileName
} }
userVersion, err := getK8sVersionFromUserInput(flags, tt.args, tt.isVersionMandatory) userVersion, err := getK8sVersionFromUserInput(flags, tt.args, tt.isVersionMandatory)