Commit 69c4a8ff authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub

Merge pull request #46281 from zjj2wry/err

Automatic merge from submit-queue (batch tested with PRs 46489, 46281, 46463, 46114, 43946) add error info **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
parents 61693bf6 586ebdb3
...@@ -57,9 +57,12 @@ func TestCurrentContextWithUnsetContext(t *testing.T) { ...@@ -57,9 +57,12 @@ func TestCurrentContextWithUnsetContext(t *testing.T) {
} }
func (test currentContextTest) run(t *testing.T) { func (test currentContextTest) run(t *testing.T) {
fakeKubeFile, _ := ioutil.TempFile("", "") fakeKubeFile, err := ioutil.TempFile("", "")
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
defer os.Remove(fakeKubeFile.Name()) defer os.Remove(fakeKubeFile.Name())
err := clientcmd.WriteToFile(test.startingConfig, fakeKubeFile.Name()) err = clientcmd.WriteToFile(test.startingConfig, fakeKubeFile.Name())
if err != nil { if err != nil {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)
} }
......
...@@ -53,9 +53,12 @@ func TestDeleteCluster(t *testing.T) { ...@@ -53,9 +53,12 @@ func TestDeleteCluster(t *testing.T) {
} }
func (test deleteClusterTest) run(t *testing.T) { func (test deleteClusterTest) run(t *testing.T) {
fakeKubeFile, _ := ioutil.TempFile("", "") fakeKubeFile, err := ioutil.TempFile("", "")
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
defer os.Remove(fakeKubeFile.Name()) defer os.Remove(fakeKubeFile.Name())
err := clientcmd.WriteToFile(test.config, fakeKubeFile.Name()) err = clientcmd.WriteToFile(test.config, fakeKubeFile.Name())
if err != nil { if err != nil {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)
} }
......
...@@ -53,9 +53,12 @@ func TestDeleteContext(t *testing.T) { ...@@ -53,9 +53,12 @@ func TestDeleteContext(t *testing.T) {
} }
func (test deleteContextTest) run(t *testing.T) { func (test deleteContextTest) run(t *testing.T) {
fakeKubeFile, _ := ioutil.TempFile("", "") fakeKubeFile, err := ioutil.TempFile("", "")
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
defer os.Remove(fakeKubeFile.Name()) defer os.Remove(fakeKubeFile.Name())
err := clientcmd.WriteToFile(test.config, fakeKubeFile.Name()) err = clientcmd.WriteToFile(test.config, fakeKubeFile.Name())
if err != nil { if err != nil {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)
} }
......
...@@ -57,9 +57,12 @@ func TestGetClustersEmpty(t *testing.T) { ...@@ -57,9 +57,12 @@ func TestGetClustersEmpty(t *testing.T) {
} }
func (test getClustersTest) run(t *testing.T) { func (test getClustersTest) run(t *testing.T) {
fakeKubeFile, _ := ioutil.TempFile("", "") fakeKubeFile, err := ioutil.TempFile("", "")
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
defer os.Remove(fakeKubeFile.Name()) defer os.Remove(fakeKubeFile.Name())
err := clientcmd.WriteToFile(test.config, fakeKubeFile.Name()) err = clientcmd.WriteToFile(test.config, fakeKubeFile.Name())
if err != nil { if err != nil {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)
} }
......
...@@ -123,9 +123,12 @@ func TestGetContextsSelectOneOfTwo(t *testing.T) { ...@@ -123,9 +123,12 @@ func TestGetContextsSelectOneOfTwo(t *testing.T) {
} }
func (test getContextsTest) run(t *testing.T) { func (test getContextsTest) run(t *testing.T) {
fakeKubeFile, _ := ioutil.TempFile("", "") fakeKubeFile, err := ioutil.TempFile("", "")
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
defer os.Remove(fakeKubeFile.Name()) defer os.Remove(fakeKubeFile.Name())
err := clientcmd.WriteToFile(test.startingConfig, fakeKubeFile.Name()) err = clientcmd.WriteToFile(test.startingConfig, fakeKubeFile.Name())
if err != nil { if err != nil {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment