From 0f8b7c92f3ca5751bc1cc255a7c3ebf42bef4105 Mon Sep 17 00:00:00 2001 From: s-ito-ts Date: Tue, 9 Jul 2019 05:58:43 +0000 Subject: [PATCH] Remove unnecessary return value check --- test/e2e/scheduling/ubernetes_lite.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/test/e2e/scheduling/ubernetes_lite.go b/test/e2e/scheduling/ubernetes_lite.go index e6b36911a6c..7d3d75abd6a 100644 --- a/test/e2e/scheduling/ubernetes_lite.go +++ b/test/e2e/scheduling/ubernetes_lite.go @@ -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()) }