fix golint error in test/e2e/scheduling

danielqsj · danielqsj · commit ccecc67a5b8a · 2019-05-14T14:18:52.000+08:00
diff --git a/hack/.golint_failures b/hack/.golint_failures
@@ -605,7 +605,6 @@ test/e2e/common
 test/e2e/framework
 test/e2e/lifecycle/bootstrap
 test/e2e/scalability
-test/e2e/scheduling
 test/e2e/storage/drivers
 test/e2e/storage/testsuites
 test/e2e/storage/utils
diff --git a/test/e2e/scheduling/equivalence_cache_predicates.go b/test/e2e/scheduling/equivalence_cache_predicates.go
@@ -33,6 +33,7 @@ import (
 
 	"github.com/onsi/ginkgo"
 	"github.com/onsi/gomega"
+	// ensure libs have a chance to initialize
 	_ "github.com/stretchr/testify/assert"
 )
 
@@ -92,7 +93,7 @@ var _ = framework.KubeDescribe("EquivalenceCache [Serial]", func() {
 		nodeSelector := map[string]string{"kubernetes.io/hostname": nodeName}
 
 		ginkgo.By("One pod should be scheduled, the other should be rejected")
-		// CreateNodeSelectorPods creates RC with host port 4312
+		// CreateNodeSelectorPods creates RC with host port 4321
 		WaitForSchedulerAfterAction(f, func() error {
 			err := CreateNodeSelectorPods(f, rcName, 2, nodeSelector, false)
 			return err
@@ -269,6 +270,7 @@ func getRCWithInterPodAffinityNodeSelector(name string, labelsMap map[string]str
 	}
 }
 
+// CreateNodeSelectorPods creates RC with host port 4321 and defines node selector
 func CreateNodeSelectorPods(f *framework.Framework, id string, replicas int, nodeSelector map[string]string, expectRunning bool) error {
 	ginkgo.By(fmt.Sprintf("Running RC which reserves host port and defines node selector"))
 
diff --git a/test/e2e/scheduling/framework.go b/test/e2e/scheduling/framework.go
@@ -18,6 +18,7 @@ package scheduling
 
 import "github.com/onsi/ginkgo"
 
+// SIGDescribe annotates the test with the SIG label.
 func SIGDescribe(text string, body func()) bool {
 	return ginkgo.Describe("[sig-scheduling] "+text, body)
 }
diff --git a/test/e2e/scheduling/nvidia-gpus.go b/test/e2e/scheduling/nvidia-gpus.go
@@ -42,7 +42,7 @@ const (
 
 var (
 	gpuResourceName v1.ResourceName
-	dsYamlUrl       string
+	dsYamlURL       string
 )
 
 func makeCudaAdditionDevicePluginTestPod() *v1.Pod {
@@ -116,20 +116,21 @@ func getGPUsAvailable(f *framework.Framework) int64 {
 	return gpusAvailable
 }
 
+// SetupNVIDIAGPUNode install Nvidia Drivers and wait for Nvidia GPUs to be available on nodes
 func SetupNVIDIAGPUNode(f *framework.Framework, setupResourceGatherer bool) *framework.ContainerResourceGatherer {
 	logOSImages(f)
 
-	dsYamlUrlFromEnv := os.Getenv("NVIDIA_DRIVER_INSTALLER_DAEMONSET")
-	if dsYamlUrlFromEnv != "" {
-		dsYamlUrl = dsYamlUrlFromEnv
+	dsYamlURLFromEnv := os.Getenv("NVIDIA_DRIVER_INSTALLER_DAEMONSET")
+	if dsYamlURLFromEnv != "" {
+		dsYamlURL = dsYamlURLFromEnv
 	} else {
-		dsYamlUrl = "https://raw.githubusercontent.com/GoogleCloudPlatform/container-engine-accelerators/master/daemonset.yaml"
+		dsYamlURL = "https://raw.githubusercontent.com/GoogleCloudPlatform/container-engine-accelerators/master/daemonset.yaml"
 	}
 	gpuResourceName = gpu.NVIDIAGPUResourceName
 
-	e2elog.Logf("Using %v", dsYamlUrl)
+	e2elog.Logf("Using %v", dsYamlURL)
 	// Creates the DaemonSet that installs Nvidia Drivers.
-	ds, err := framework.DsFromManifest(dsYamlUrl)
+	ds, err := framework.DsFromManifest(dsYamlURL)
 	gomega.Expect(err).NotTo(gomega.HaveOccurred())
 	ds.Namespace = f.Namespace.Name
 	_, err = f.ClientSet.AppsV1().DaemonSets(f.Namespace.Name).Create(ds)
diff --git a/test/e2e/scheduling/predicates.go b/test/e2e/scheduling/predicates.go
@@ -36,6 +36,7 @@ import (
 
 	"github.com/onsi/ginkgo"
 	"github.com/onsi/gomega"
+	// ensure libs have a chance to initialize
 	_ "github.com/stretchr/testify/assert"
 )
 
@@ -727,9 +728,8 @@ func verifyResult(c clientset.Interface, expectedScheduled int, expectedNotSched
 		if !printed {
 			printed = true
 			return msg
-		} else {
-			return ""
 		}
+		return ""
 	}
 
 	gomega.Expect(len(notScheduledPods)).To(gomega.Equal(expectedNotScheduled), printOnce(fmt.Sprintf("Not scheduled Pods: %#v", notScheduledPods)))
@@ -746,9 +746,8 @@ func verifyReplicasResult(c clientset.Interface, expectedScheduled int, expected
 		if !printed {
 			printed = true
 			return msg
-		} else {
-			return ""
 		}
+		return ""
 	}
 
 	gomega.Expect(len(notScheduledPods)).To(gomega.Equal(expectedNotScheduled), printOnce(fmt.Sprintf("Not scheduled Pods: %#v", notScheduledPods)))
@@ -775,6 +774,7 @@ func runAndKeepPodWithLabelAndGetNodeName(f *framework.Framework) (string, strin
 	return pod.Spec.NodeName, pod.Name
 }
 
+// GetNodeThatCanRunPod trying to launch a pod without a label to get a node which can launch it
 func GetNodeThatCanRunPod(f *framework.Framework) string {
 	ginkgo.By("Trying to launch a pod without a label to get a node which can launch it.")
 	return runPodAndGetNodeName(f, pausePodConfig{Name: "without-label"})
@@ -785,6 +785,7 @@ func getNodeThatCanRunPodWithoutToleration(f *framework.Framework) string {
 	return runPodAndGetNodeName(f, pausePodConfig{Name: "without-toleration"})
 }
 
+// CreateHostPortPods creates RC with host port 4321
 func CreateHostPortPods(f *framework.Framework, id string, replicas int, expectRunning bool) {
 	ginkgo.By(fmt.Sprintf("Running RC which reserves host port"))
 	config := &testutils.RCConfig{
diff --git a/test/e2e/scheduling/preemption.go b/test/e2e/scheduling/preemption.go
@@ -39,6 +39,7 @@ import (
 
 	"github.com/onsi/ginkgo"
 	"github.com/onsi/gomega"
+	// ensure libs have a chance to initialize
 	_ "github.com/stretchr/testify/assert"
 )
 
diff --git a/test/e2e/scheduling/priorities.go b/test/e2e/scheduling/priorities.go
@@ -24,6 +24,7 @@ import (
 
 	"github.com/onsi/ginkgo"
 	"github.com/onsi/gomega"
+	// ensure libs have a chance to initialize
 	_ "github.com/stretchr/testify/assert"
 
 	"k8s.io/api/core/v1"
@@ -40,14 +41,15 @@ import (
 	imageutils "k8s.io/kubernetes/test/utils/image"
 )
 
+// Resource is a collection of compute resource.
 type Resource struct {
 	MilliCPU int64
 	Memory   int64
 }
 
-var balancePodLabel map[string]string = map[string]string{"name": "priority-balanced-memory"}
+var balancePodLabel = map[string]string{"name": "priority-balanced-memory"}
 
-var podRequestedResource *v1.ResourceRequirements = &v1.ResourceRequirements{
+var podRequestedResource = &v1.ResourceRequirements{
 	Limits: v1.ResourceList{
 		v1.ResourceMemory: resource.MustParse("100Mi"),
 		v1.ResourceCPU:    resource.MustParse("100m"),
@@ -265,7 +267,7 @@ func createBalancedPodForNodes(f *framework.Framework, cs clientset.Interface, n
 	var cpuFractionMap = make(map[string]float64)
 	var memFractionMap = make(map[string]float64)
 	for _, node := range nodes {
-		cpuFraction, memFraction := computeCpuMemFraction(cs, node, requestedResource)
+		cpuFraction, memFraction := computeCPUMemFraction(cs, node, requestedResource)
 		cpuFractionMap[node.Name] = cpuFraction
 		memFractionMap[node.Name] = memFraction
 		if cpuFraction > maxCPUFraction {
@@ -311,15 +313,15 @@ func createBalancedPodForNodes(f *framework.Framework, cs clientset.Interface, n
 
 	for _, node := range nodes {
 		ginkgo.By("Compute Cpu, Mem Fraction after create balanced pods.")
-		computeCpuMemFraction(cs, node, requestedResource)
+		computeCPUMemFraction(cs, node, requestedResource)
 	}
 
 	return nil
 }
 
-func computeCpuMemFraction(cs clientset.Interface, node v1.Node, resource *v1.ResourceRequirements) (float64, float64) {
-	e2elog.Logf("ComputeCpuMemFraction for node: %v", node.Name)
-	totalRequestedCpuResource := resource.Requests.Cpu().MilliValue()
+func computeCPUMemFraction(cs clientset.Interface, node v1.Node, resource *v1.ResourceRequirements) (float64, float64) {
+	e2elog.Logf("ComputeCPUMemFraction for node: %v", node.Name)
+	totalRequestedCPUResource := resource.Requests.Cpu().MilliValue()
 	totalRequestedMemResource := resource.Requests.Memory().Value()
 	allpods, err := cs.CoreV1().Pods(metav1.NamespaceAll).List(metav1.ListOptions{})
 	if err != nil {
@@ -332,7 +334,7 @@ func computeCpuMemFraction(cs clientset.Interface, node v1.Node, resource *v1.Re
 			if v1qos.GetPodQOS(&pod) == v1.PodQOSBestEffort {
 				continue
 			}
-			totalRequestedCpuResource += getNonZeroRequests(&pod).MilliCPU
+			totalRequestedCPUResource += getNonZeroRequests(&pod).MilliCPU
 			totalRequestedMemResource += getNonZeroRequests(&pod).Memory
 		}
 	}
@@ -341,7 +343,7 @@ func computeCpuMemFraction(cs clientset.Interface, node v1.Node, resource *v1.Re
 	cpuAllocatableMil := cpuAllocatable.MilliValue()
 
 	floatOne := float64(1)
-	cpuFraction := float64(totalRequestedCpuResource) / float64(cpuAllocatableMil)
+	cpuFraction := float64(totalRequestedCPUResource) / float64(cpuAllocatableMil)
 	if cpuFraction > floatOne {
 		cpuFraction = floatOne
 	}
@@ -353,7 +355,7 @@ func computeCpuMemFraction(cs clientset.Interface, node v1.Node, resource *v1.Re
 		memFraction = floatOne
 	}
 
-	e2elog.Logf("Node: %v, totalRequestedCpuResource: %v, cpuAllocatableMil: %v, cpuFraction: %v", node.Name, totalRequestedCpuResource, cpuAllocatableMil, cpuFraction)
+	e2elog.Logf("Node: %v, totalRequestedCPUResource: %v, cpuAllocatableMil: %v, cpuFraction: %v", node.Name, totalRequestedCPUResource, cpuAllocatableMil, cpuFraction)
 	e2elog.Logf("Node: %v, totalRequestedMemResource: %v, memAllocatableVal: %v, memFraction: %v", node.Name, totalRequestedMemResource, memAllocatableVal, memFraction)
 
 	return cpuFraction, memFraction
diff --git a/test/e2e/scheduling/taints.go b/test/e2e/scheduling/taints.go
diff --git a/test/e2e/scheduling/ubernetes_lite.go b/test/e2e/scheduling/ubernetes_lite.go
diff --git a/test/e2e/scheduling/ubernetes_lite_volumes.go b/test/e2e/scheduling/ubernetes_lite_volumes.go

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ import (`
`33`	`33`
`34`	`34`	`"github.com/onsi/ginkgo"`
`35`	`35`	`"github.com/onsi/gomega"`
	`36`	`+ // ensure libs have a chance to initialize`
`36`	`37`	`_ "github.com/stretchr/testify/assert"`
`37`	`38`	`)`
`38`	`39`
`@@ -92,7 +93,7 @@ var _ = framework.KubeDescribe("EquivalenceCache [Serial]", func() {`
`92`	`93`	`nodeSelector := map[string]string{"kubernetes.io/hostname": nodeName}`
`93`	`94`
`94`	`95`	`ginkgo.By("One pod should be scheduled, the other should be rejected")`
`95`		`- // CreateNodeSelectorPods creates RC with host port 4312`
	`96`	`+ // CreateNodeSelectorPods creates RC with host port 4321`
`96`	`97`	`WaitForSchedulerAfterAction(f, func() error {`
`97`	`98`	`err := CreateNodeSelectorPods(f, rcName, 2, nodeSelector, false)`
`98`	`99`	`return err`
`@@ -269,6 +270,7 @@ func getRCWithInterPodAffinityNodeSelector(name string, labelsMap map[string]str`
`269`	`270`	`}`
`270`	`271`	`}`
`271`	`272`
	`273`	`+// CreateNodeSelectorPods creates RC with host port 4321 and defines node selector`
`272`	`274`	`func CreateNodeSelectorPods(f *framework.Framework, id string, replicas int, nodeSelector map[string]string, expectRunning bool) error {`
`273`	`275`	`ginkgo.By(fmt.Sprintf("Running RC which reserves host port and defines node selector"))`
`274`	`276`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ package scheduling`
`18`	`18`
`19`	`19`	`import "github.com/onsi/ginkgo"`
`20`	`20`
	`21`	`+// SIGDescribe annotates the test with the SIG label.`
`21`	`22`	`func SIGDescribe(text string, body func()) bool {`
`22`	`23`	`return ginkgo.Describe("[sig-scheduling] "+text, body)`
`23`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ import (`
`36`	`36`
`37`	`37`	`"github.com/onsi/ginkgo"`
`38`	`38`	`"github.com/onsi/gomega"`
	`39`	`+ // ensure libs have a chance to initialize`
`39`	`40`	`_ "github.com/stretchr/testify/assert"`
`40`	`41`	`)`
`41`	`42`
`@@ -727,9 +728,8 @@ func verifyResult(c clientset.Interface, expectedScheduled int, expectedNotSched`
`727`	`728`	`if !printed {`
`728`	`729`	`printed = true`
`729`	`730`	`return msg`
`730`		`- } else {`
`731`		`- return ""`
`732`	`731`	`}`
	`732`	`+ return ""`
`733`	`733`	`}`
`734`	`734`
`735`	`735`	`gomega.Expect(len(notScheduledPods)).To(gomega.Equal(expectedNotScheduled), printOnce(fmt.Sprintf("Not scheduled Pods: %#v", notScheduledPods)))`
`@@ -746,9 +746,8 @@ func verifyReplicasResult(c clientset.Interface, expectedScheduled int, expected`
`746`	`746`	`if !printed {`
`747`	`747`	`printed = true`
`748`	`748`	`return msg`
`749`		`- } else {`
`750`		`- return ""`
`751`	`749`	`}`
	`750`	`+ return ""`
`752`	`751`	`}`
`753`	`752`
`754`	`753`	`gomega.Expect(len(notScheduledPods)).To(gomega.Equal(expectedNotScheduled), printOnce(fmt.Sprintf("Not scheduled Pods: %#v", notScheduledPods)))`
`@@ -775,6 +774,7 @@ func runAndKeepPodWithLabelAndGetNodeName(f *framework.Framework) (string, strin`
`775`	`774`	`return pod.Spec.NodeName, pod.Name`
`776`	`775`	`}`
`777`	`776`
	`777`	`+// GetNodeThatCanRunPod trying to launch a pod without a label to get a node which can launch it`
`778`	`778`	`func GetNodeThatCanRunPod(f *framework.Framework) string {`
`779`	`779`	`ginkgo.By("Trying to launch a pod without a label to get a node which can launch it.")`
`780`	`780`	`return runPodAndGetNodeName(f, pausePodConfig{Name: "without-label"})`
`@@ -785,6 +785,7 @@ func getNodeThatCanRunPodWithoutToleration(f *framework.Framework) string {`
`785`	`785`	`return runPodAndGetNodeName(f, pausePodConfig{Name: "without-toleration"})`
`786`	`786`	`}`
`787`	`787`
	`788`	`+// CreateHostPortPods creates RC with host port 4321`
`788`	`789`	`func CreateHostPortPods(f *framework.Framework, id string, replicas int, expectRunning bool) {`
`789`	`790`	`ginkgo.By(fmt.Sprintf("Running RC which reserves host port"))`
`790`	`791`	`config := &testutils.RCConfig{`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ import (`
`39`	`39`
`40`	`40`	`"github.com/onsi/ginkgo"`
`41`	`41`	`"github.com/onsi/gomega"`
	`42`	`+ // ensure libs have a chance to initialize`
`42`	`43`	`_ "github.com/stretchr/testify/assert"`
`43`	`44`	`)`
`44`	`45`