github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #50351 from zhangxiaoyu-zidif/fix-error-for-scale-test 

Automatic merge from submit-queue

fix error message for scale

**What this PR does / why we need it**:
ref: https://github.com/kubernetes/kubernetes/blob/master/cmd/genutils/genutils_test.go#L33

**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
```
pull/6/head
Kubernetes Submit Queue 2017-08-10 02:37:39 -07:00 committed by GitHub
parent 291eaeec29 fe7d158eaf
commit e786273024
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubectl/scale_test.go
View File

@ -257,7 +257,7 @@ func TestValidateReplicationController(t *testing.T) {
t.Errorf("unexpected error: %v (%s)", err, test.test)
}
if err == nil && test.expectError {
t.Errorf("unexpected non-error: %v (%s)", err, test.test)
t.Errorf("expected an error: %v (%s)", err, test.test)
}
}
}
@ -520,7 +520,7 @@ func TestValidateJob(t *testing.T) {
t.Errorf("unexpected error: %v (%s)", err, test.test)
}
if err == nil && test.expectError {
t.Errorf("unexpected non-error: %v (%s)", err, test.test)
t.Errorf("expected an error: %v (%s)", err, test.test)
}
}
}
@ -781,7 +781,7 @@ func TestValidateDeployment(t *testing.T) {
t.Errorf("unexpected error: %v (%s)", err, test.test)
}
if err == nil && test.expectError {
t.Errorf("unexpected non-error: %v (%s)", err, test.test)
t.Errorf("expected an error: %v (%s)", err, test.test)
}
}
}