github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 11:21:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #79921 from s-ito-ts/remove_unnecessary_check

Browse Source 
e2e test: Remove unnecessary return value check
This commit is contained in:
Kubernetes Prow Robot 2019-07-19 00:19:11 -07:00 committed by GitHub
commit 15ade86935
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 // Now make sure they're spread across zones
zoneNames, err := framework.GetClusterZones(f.ClientSet) zoneNames, err := framework.GetClusterZones(f.ClientSet)
framework.ExpectNoError(err) framework.ExpectNoError(err)
ret, _ := checkZoneSpreading(f.ClientSet, pods, zoneNames.List()) checkZoneSpreading(f.ClientSet, pods, zoneNames.List())
framework.ExpectEqual(ret, true)
} }
// Find the name of the zone in which a Node is running // 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 // Determine whether a set of pods are approximately evenly spread
// across a given set of zones // 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) podsPerZone := make(map[string]int)
for _, zoneName := range zoneNames { for _, zoneName := range zoneNames {
podsPerZone[zoneName] = 0 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), gomega.Expect(minPodsPerZone).To(gomega.BeNumerically("~", maxPodsPerZone, 1),
"Pods were not evenly spread across zones. %d in one zone and %d in another zone", "Pods were not evenly spread across zones. %d in one zone and %d in another zone",
minPodsPerZone, maxPodsPerZone) minPodsPerZone, maxPodsPerZone)
return true, nil
} }
// SpreadRCOrFail Check that the pods comprising a replication // 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 // Now make sure they're spread across zones
zoneNames, err := framework.GetClusterZones(f.ClientSet) zoneNames, err := framework.GetClusterZones(f.ClientSet)
framework.ExpectNoError(err) framework.ExpectNoError(err)
ret, _ := checkZoneSpreading(f.ClientSet, pods, zoneNames.List()) checkZoneSpreading(f.ClientSet, pods, zoneNames.List())
framework.ExpectEqual(ret, true)
} }