From f1051f34a79d43d4f92028715e50cca570d117d8 Mon Sep 17 00:00:00 2001 From: Rei1010 Date: Thu, 31 Aug 2023 19:15:49 +0800 Subject: [PATCH] Remove deprecated framework --- test/e2e/scheduling/limit_range.go | 6 +++--- test/e2e/scheduling/preemption.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/e2e/scheduling/limit_range.go b/test/e2e/scheduling/limit_range.go index 8f180ca0734..f57aaa19776 100644 --- a/test/e2e/scheduling/limit_range.go +++ b/test/e2e/scheduling/limit_range.go @@ -163,12 +163,12 @@ var _ = SIGDescribe("LimitRange", func() { ginkgo.By("Failing to create a Pod with less than min resources") pod = newTestPod(podName, getResourceList("10m", "50Mi", "50Gi"), v1.ResourceList{}) _, err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(ctx, pod, metav1.CreateOptions{}) - framework.ExpectError(err) + gomega.Expect(err).To(gomega.HaveOccurred()) ginkgo.By("Failing to create a Pod with more than max resources") pod = newTestPod(podName, getResourceList("600m", "600Mi", "600Gi"), v1.ResourceList{}) _, err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(ctx, pod, metav1.CreateOptions{}) - framework.ExpectError(err) + gomega.Expect(err).To(gomega.HaveOccurred()) ginkgo.By("Updating a LimitRange") newMin := getResourceList("9m", "49Mi", "49Gi") @@ -192,7 +192,7 @@ var _ = SIGDescribe("LimitRange", func() { ginkgo.By("Failing to create a Pod with more than max resources") pod = newTestPod(podName, getResourceList("600m", "600Mi", "600Gi"), v1.ResourceList{}) _, err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(ctx, pod, metav1.CreateOptions{}) - framework.ExpectError(err) + gomega.Expect(err).To(gomega.HaveOccurred()) ginkgo.By("Deleting a LimitRange") err = f.ClientSet.CoreV1().LimitRanges(f.Namespace.Name).Delete(ctx, limitRange.Name, *metav1.NewDeleteOptions(30)) diff --git a/test/e2e/scheduling/preemption.go b/test/e2e/scheduling/preemption.go index 6ae213dd16d..cc01bb2c833 100644 --- a/test/e2e/scheduling/preemption.go +++ b/test/e2e/scheduling/preemption.go @@ -814,13 +814,13 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() { pcCopy := pcs[0].DeepCopy() pcCopy.Value = pcCopy.Value * 10 err := patchPriorityClass(ctx, cs, pcs[0], pcCopy) - framework.ExpectError(err, "expect a patch error on an immutable field") + gomega.Expect(err).To(gomega.HaveOccurred(), "expect a patch error on an immutable field") framework.Logf("%v", err) pcCopy = pcs[1].DeepCopy() pcCopy.Value = pcCopy.Value * 10 _, err = cs.SchedulingV1().PriorityClasses().Update(ctx, pcCopy, metav1.UpdateOptions{}) - framework.ExpectError(err, "expect an update error on an immutable field") + gomega.Expect(err).To(gomega.HaveOccurred(), "expect an update error on an immutable field") framework.Logf("%v", err) // 2. Patch/Update on mutable fields will succeed.