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

Remove printOnce() on e2e tests

Browse Source 
Originally, printOnce() was implemented for printing debugging message
once for checking actual value is the same as expected value.
However even if an error doesn't happen in ExpectEqual(), printOnce()
is called internally. Then the second ExpectEqual() doesn't output
the debugging message if an error happens. This makes debugging
difficult, let's just remove it for debugging.
This commit is contained in:
Kenichi Omichi 2019-08-08 07:27:27 +00:00
parent 072528e5f6
commit e8c41b8892
1 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
test/e2e/scheduling/predicates.go
View File

@ -745,17 +745,8 @@ func verifyResult(c clientset.Interface, expectedScheduled int, expectedNotSched
framework.ExpectNoError(err) framework.ExpectNoError(err)
scheduledPods, notScheduledPods := e2epod.GetPodsScheduled(masterNodes, allPods) scheduledPods, notScheduledPods := e2epod.GetPodsScheduled(masterNodes, allPods)
printed := false framework.ExpectEqual(len(notScheduledPods), expectedNotScheduled, fmt.Sprintf("Not scheduled Pods: %#v", notScheduledPods))
printOnce := func(msg string) string { framework.ExpectEqual(len(scheduledPods), expectedScheduled, fmt.Sprintf("Scheduled Pods: %#v", scheduledPods))
if !printed {
printed = true
return msg
}
return ""
}
framework.ExpectEqual(len(notScheduledPods), expectedNotScheduled, printOnce(fmt.Sprintf("Not scheduled Pods: %#v", notScheduledPods)))
framework.ExpectEqual(len(scheduledPods), expectedScheduled, printOnce(fmt.Sprintf("Scheduled Pods: %#v", scheduledPods)))
} }
// verifyReplicasResult is wrapper of verifyResult for a group pods with same "name: labelName" label, which means they belong to same RC // verifyReplicasResult is wrapper of verifyResult for a group pods with same "name: labelName" label, which means they belong to same RC
@ -763,17 +754,8 @@ func verifyReplicasResult(c clientset.Interface, expectedScheduled int, expected
allPods := getPodsByLabels(c, ns, map[string]string{"name": labelName}) allPods := getPodsByLabels(c, ns, map[string]string{"name": labelName})
scheduledPods, notScheduledPods := e2epod.GetPodsScheduled(masterNodes, allPods) scheduledPods, notScheduledPods := e2epod.GetPodsScheduled(masterNodes, allPods)
printed := false framework.ExpectEqual(len(notScheduledPods), expectedNotScheduled, fmt.Sprintf("Not scheduled Pods: %#v", notScheduledPods))
printOnce := func(msg string) string { framework.ExpectEqual(len(scheduledPods), expectedScheduled, fmt.Sprintf("Scheduled Pods: %#v", scheduledPods))
if !printed {
printed = true
return msg
}
return ""
}
framework.ExpectEqual(len(notScheduledPods), expectedNotScheduled, printOnce(fmt.Sprintf("Not scheduled Pods: %#v", notScheduledPods)))
framework.ExpectEqual(len(scheduledPods), expectedScheduled, printOnce(fmt.Sprintf("Scheduled Pods: %#v", scheduledPods)))
} }
func getPodsByLabels(c clientset.Interface, ns string, labelsMap map[string]string) *v1.PodList { func getPodsByLabels(c clientset.Interface, ns string, labelsMap map[string]string) *v1.PodList {