[YUNIKORN-2973] Adding GinkgoLinter Checks and fix

apache · Nov 27, 2024 · 8b118a7 · 8b118a7
1 parent f138d3e
commit 8b118a7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/test/e2e/admission_controller/admission_controller_test.go b/test/e2e/admission_controller/admission_controller_test.go
@@ -445,7 +445,7 @@ var _ = ginkgo.Describe("AdmissionController", func() {
 				rs.Status.ReadyReplicas,
 				rs.Status.AvailableReplicas)
 		}
-		gomega.Ω(len(replicaSetList.Items)).To(gomega.HaveLen(2))
+		gomega.Ω(replicaSetList.Items).To(gomega.HaveLen(2))
 	})
 
 	ginkgo.AfterEach(func() {

diff --git a/test/e2e/basic_scheduling/basic_scheduling_test.go b/test/e2e/basic_scheduling/basic_scheduling_test.go
@@ -101,8 +101,7 @@ var _ = ginkgo.Describe("", func() {
 
 	ginkgo.It("Verify_Pod_Alloc_Props", func() {
 		ginkgo.By("Verify the pod allocation properties")
-		gomega.Ω(appsInfo.Allocations).NotTo(gomega.BeNil())
-		gomega.Ω(len(appsInfo.Allocations)).NotTo(gomega.BeEmpty())
+		gomega.Ω(appsInfo.Allocations).NotTo(gomega.BeEmpty())
 		allocation := appsInfo.Allocations[0]
 		gomega.Ω(allocation).NotTo(gomega.BeNil())
 		gomega.Ω(allocation.AllocationKey).NotTo(gomega.BeNil())

diff --git a/test/e2e/recovery_and_restart/recovery_and_restart_test.go b/test/e2e/recovery_and_restart/recovery_and_restart_test.go
@@ -140,7 +140,7 @@ var _ = ginkgo.Describe("", func() {
 		gomega.Ω(appsInfo).NotTo(gomega.BeNil())
 		ginkgo.By("Verify the pod allocation properties")
 		gomega.Ω(appsInfo).NotTo(gomega.BeNil())
-		gomega.Ω(len(appsInfo.Allocations)).NotTo(gomega.BeEmpty())
+		gomega.Ω(appsInfo.Allocations).NotTo(gomega.BeNil())
 		allocations := appsInfo.Allocations[0]
 		gomega.Ω(allocations).NotTo(gomega.BeNil())
 		gomega.Ω(allocations.AllocationKey).NotTo(gomega.BeNil())
@@ -149,7 +149,7 @@ var _ = ginkgo.Describe("", func() {
 		core := sleepRespPod.Spec.Containers[0].Resources.Requests.Cpu().MilliValue()
 		mem := sleepRespPod.Spec.Containers[0].Resources.Requests.Memory().Value()
 		resMap := allocations.ResourcePerAlloc
-		gomega.Ω(len(resMap)).NotTo(gomega.BeEmpty())
+		gomega.Ω(resMap).NotTo(gomega.BeEmpty())
 		gomega.Ω(resMap["memory"]).To(gomega.Equal(mem))
 		gomega.Ω(resMap["vcore"]).To(gomega.Equal(core))
 	})