github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Remove unnecessary return value check

Browse Source
This commit is contained in:
s-ito-ts 2019-07-09 05:58:43 +00:00
parent 262e59b2c0
commit 0f8b7c92f3
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/e2e/scheduling/ubernetes_lite.go
View File

@ -113,8 +113,7 @@ func SpreadServiceOrFail(f *framework.Framework, replicaCount int, image string)
// Now make sure they're spread across zones
zoneNames, err := framework.GetClusterZones(f.ClientSet)
framework.ExpectNoError(err)
ret, _ := checkZoneSpreading(f.ClientSet, pods, zoneNames.List())
framework.ExpectEqual(ret, true)
checkZoneSpreading(f.ClientSet, pods, zoneNames.List())
}
// Find the name of the zone in which a Node is running
@ -147,7 +146,7 @@ func getZoneNameForPod(c clientset.Interface, pod v1.Pod) (string, error) {
// Determine whether a set of pods are approximately evenly spread
// across a given set of zones
func checkZoneSpreading(c clientset.Interface, pods *v1.PodList, zoneNames []string) (bool, error) {
func checkZoneSpreading(c clientset.Interface, pods *v1.PodList, zoneNames []string) {
podsPerZone := make(map[string]int)
for _, zoneName := range zoneNames {
podsPerZone[zoneName] = 0
@ -173,7 +172,6 @@ func checkZoneSpreading(c clientset.Interface, pods *v1.PodList, zoneNames []str
gomega.Expect(minPodsPerZone).To(gomega.BeNumerically("~", maxPodsPerZone, 1),
"Pods were not evenly spread across zones. %d in one zone and %d in another zone",
minPodsPerZone, maxPodsPerZone)
return true, nil
}
// SpreadRCOrFail Check that the pods comprising a replication
@ -229,6 +227,5 @@ func SpreadRCOrFail(f *framework.Framework, replicaCount int32, image string, ar
// Now make sure they're spread across zones
zoneNames, err := framework.GetClusterZones(f.ClientSet)
framework.ExpectNoError(err)
ret, _ := checkZoneSpreading(f.ClientSet, pods, zoneNames.List())
framework.ExpectEqual(ret, true)
checkZoneSpreading(f.ClientSet, pods, zoneNames.List())
}