From 82c0cbf6d843977328422143c7c67872d8164e47 Mon Sep 17 00:00:00 2001 From: penguin Date: Mon, 4 Sep 2023 21:41:25 +0800 Subject: [PATCH] e2e: stop using deprecated framework.ExpectNotEqual --- test/e2e/instrumentation/logging/generic_soak.go | 3 ++- test/e2e/scheduling/predicates.go | 2 +- test/e2e/scheduling/preemption.go | 2 +- test/e2e/scheduling/priorities.go | 2 +- test/e2e/windows/security_context.go | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/test/e2e/instrumentation/logging/generic_soak.go b/test/e2e/instrumentation/logging/generic_soak.go index b1617ae2397..c95d1c40e30 100644 --- a/test/e2e/instrumentation/logging/generic_soak.go +++ b/test/e2e/instrumentation/logging/generic_soak.go @@ -34,6 +34,7 @@ import ( admissionapi "k8s.io/pod-security-admission/api" "github.com/onsi/ginkgo/v2" + "github.com/onsi/gomega" ) var loggingSoak struct { @@ -85,7 +86,7 @@ func RunLogPodsWithSleepOf(ctx context.Context, f *framework.Framework, sleep ti nodes, err := e2enode.GetReadySchedulableNodes(ctx, f.ClientSet) framework.ExpectNoError(err) totalPods := len(nodes.Items) - framework.ExpectNotEqual(totalPods, 0) + gomega.Expect(nodes.Items).ToNot(gomega.BeEmpty()) kilobyte := strings.Repeat("logs-123", 128) // 8*128=1024 = 1KB of text. diff --git a/test/e2e/scheduling/predicates.go b/test/e2e/scheduling/predicates.go index c3abf77e5bc..357cc8260e2 100644 --- a/test/e2e/scheduling/predicates.go +++ b/test/e2e/scheduling/predicates.go @@ -1183,6 +1183,6 @@ func getNodeHostIP(ctx context.Context, f *framework.Framework, nodeName string) node, err := f.ClientSet.CoreV1().Nodes().Get(ctx, nodeName, metav1.GetOptions{}) framework.ExpectNoError(err) ips := e2enode.GetAddressesByTypeAndFamily(node, v1.NodeInternalIP, family) - framework.ExpectNotEqual(len(ips), 0) + gomega.Expect(ips).ToNot(gomega.BeEmpty()) return ips[0] } diff --git a/test/e2e/scheduling/preemption.go b/test/e2e/scheduling/preemption.go index cc01bb2c833..d1883d23ba5 100644 --- a/test/e2e/scheduling/preemption.go +++ b/test/e2e/scheduling/preemption.go @@ -328,7 +328,7 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() { podRes := v1.ResourceList{testExtendedResource: resource.MustParse("1")} ginkgo.By("Select a node to run the lower and higher priority pods") - framework.ExpectNotEqual(len(nodeList.Items), 0, "We need at least one node for the test to run") + gomega.Expect(nodeList.Items).ToNot(gomega.BeEmpty(), "We need at least one node for the test to run") node := nodeList.Items[0] nodeCopy := node.DeepCopy() nodeCopy.Status.Capacity[testExtendedResource] = resource.MustParse("1") diff --git a/test/e2e/scheduling/priorities.go b/test/e2e/scheduling/priorities.go index 97c41bd0572..bc1f98c85b2 100644 --- a/test/e2e/scheduling/priorities.go +++ b/test/e2e/scheduling/priorities.go @@ -199,7 +199,7 @@ var _ = SIGDescribe("SchedulerPriorities [Serial]", func() { labelPod, err := cs.CoreV1().Pods(ns).Get(ctx, labelPodName, metav1.GetOptions{}) framework.ExpectNoError(err) ginkgo.By("Verify the pod was scheduled to the expected node.") - framework.ExpectNotEqual(labelPod.Spec.NodeName, nodeName) + gomega.Expect(labelPod.Spec.NodeName).ToNot(gomega.Equal(nodeName)) }) ginkgo.It("Pod should be preferably scheduled to nodes pod can tolerate", func(ctx context.Context) { diff --git a/test/e2e/windows/security_context.go b/test/e2e/windows/security_context.go index f72dd48ef3e..b7049e69559 100644 --- a/test/e2e/windows/security_context.go +++ b/test/e2e/windows/security_context.go @@ -167,7 +167,7 @@ var _ = sigDescribe("[Feature:Windows] SecurityContext", skipUnlessWindows(func( ginkgo.By("Waiting for pod to finish") event, err := e2epod.NewPodClient(f).WaitForErrorEventOrSuccess(ctx, podInvalid) framework.ExpectNoError(err) - framework.ExpectNotEqual(event, nil, "event should not be empty") + gomega.Expect(event).ToNot(gomega.BeNil(), "event should not be empty") framework.Logf("Got event: %v", event) expectedEventError := "container's runAsUserName (ContainerAdministrator) which will be regarded as root identity and will break non-root policy" gomega.Expect(event.Message).Should(gomega.ContainSubstring(expectedEventError), "Event error should indicate non-root policy caused container to not start") @@ -185,7 +185,7 @@ var _ = sigDescribe("[Feature:Windows] SecurityContext", skipUnlessWindows(func( ginkgo.By("Waiting for pod to finish") event, err := e2epod.NewPodClient(f).WaitForErrorEventOrSuccess(ctx, podInvalid) framework.ExpectNoError(err) - framework.ExpectNotEqual(event, nil, "event should not be empty") + gomega.Expect(event).ToNot(gomega.BeNil(), "event should not be empty") framework.Logf("Got event: %v", event) expectedEventError := "container's runAsUserName (CONTAINERADMINISTRATOR) which will be regarded as root identity and will break non-root policy" gomega.Expect(event.Message).Should(gomega.ContainSubstring(expectedEventError), "Event error should indicate non-root policy caused container to not start")