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

Merge pull request #50353 from zhangxiaoyu-zidif/Delete-redundant-expectError-for-controller-ref-test 

Automatic merge from submit-queue

Delete redundant test para. for controller_ref_manager_test

**What this PR does / why we need it**:
The test does not use para. expectError.

**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-12 00:00:55 -07:00 committed by GitHub
parent c1da492ad2 b952bb1d19
commit 527c44881a
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/controller/controller_ref_manager_test.go
View File

@ -60,13 +60,12 @@ func newPod(podName string, label map[string]string, owner metav1.Object) *v1.Po
func TestClaimPods(t *testing.T) { func TestClaimPods(t *testing.T) {
controllerKind := schema.GroupVersionKind{} controllerKind := schema.GroupVersionKind{}
type test struct { type test struct {
name string name string
manager *PodControllerRefManager manager *PodControllerRefManager
pods []*v1.Pod pods []*v1.Pod
filters []func(*v1.Pod) bool filters []func(*v1.Pod) bool
claimed []*v1.Pod claimed []*v1.Pod
released []*v1.Pod released []*v1.Pod
expectError bool
} }
var tests = []test{ var tests = []test{
{ {
@ -164,8 +163,8 @@ func TestClaimPods(t *testing.T) {
} }
for _, test := range tests { for _, test := range tests {
claimed, err := test.manager.ClaimPods(test.pods) claimed, err := test.manager.ClaimPods(test.pods)
if test.expectError && err == nil { if err != nil {
t.Errorf("Test case `%s`, expected error but got nil", test.name) t.Errorf("Test case `%s`, unexpected error: %v", test.name, err)
} else if !reflect.DeepEqual(test.claimed, claimed) { } else if !reflect.DeepEqual(test.claimed, claimed) {
t.Errorf("Test case `%s`, claimed wrong pods. Expected %v, got %v", test.name, podToStringSlice(test.claimed), podToStringSlice(claimed)) t.Errorf("Test case `%s`, claimed wrong pods. Expected %v, got %v", test.name, podToStringSlice(test.claimed), podToStringSlice(claimed))
} }