diff --git a/test/e2e/common/apparmor.go b/test/e2e/common/apparmor.go index 62e2cb4131b..97e95435930 100644 --- a/test/e2e/common/apparmor.go +++ b/test/e2e/common/apparmor.go @@ -26,8 +26,6 @@ import ( "k8s.io/kubernetes/test/e2e/framework" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" imageutils "k8s.io/kubernetes/test/utils/image" - - "github.com/onsi/gomega" ) const ( @@ -139,7 +137,7 @@ done`, testCmd) // Verify Pod affinity colocated the Pods. loader := getRunningLoaderPod(f) - gomega.Expect(pod.Spec.NodeName).To(gomega.Equal(loader.Spec.NodeName)) + framework.ExpectEqual(pod.Spec.NodeName, loader.Spec.NodeName) return pod } diff --git a/test/e2e/common/events.go b/test/e2e/common/events.go index 4db12e4d25d..30ec90bd2eb 100644 --- a/test/e2e/common/events.go +++ b/test/e2e/common/events.go @@ -31,7 +31,6 @@ import ( "k8s.io/kubernetes/test/e2e/framework" "github.com/onsi/ginkgo" - "github.com/onsi/gomega" ) type Action func() error @@ -64,7 +63,7 @@ func ObserveNodeUpdateAfterAction(f *framework.Framework, nodeName string, nodeP cache.ResourceEventHandlerFuncs{ UpdateFunc: func(oldObj, newObj interface{}) { n, ok := newObj.(*v1.Node) - gomega.Expect(ok).To(gomega.Equal(true)) + framework.ExpectEqual(ok, true) if nodePredicate(n) { observedMatchingNode = true } @@ -121,7 +120,7 @@ func ObserveEventAfterAction(f *framework.Framework, eventPredicate func(*v1.Eve AddFunc: func(obj interface{}) { e, ok := obj.(*v1.Event) ginkgo.By(fmt.Sprintf("Considering event: \nType = [%s], Name = [%s], Reason = [%s], Message = [%s]", e.Type, e.Name, e.Reason, e.Message)) - gomega.Expect(ok).To(gomega.Equal(true)) + framework.ExpectEqual(ok, true) if ok && eventPredicate(e) { observedMatchingEvent = true } diff --git a/test/e2e/common/init_container.go b/test/e2e/common/init_container.go index 7152925e93c..7b7d58ba3af 100644 --- a/test/e2e/common/init_container.go +++ b/test/e2e/common/init_container.go @@ -99,12 +99,12 @@ var _ = framework.KubeDescribe("InitContainer [NodeConformance]", func() { gomega.Expect(err).To(gomega.BeNil()) framework.CheckInvariants(wr.Events(), framework.ContainerInitInvariant) endPod := event.Object.(*v1.Pod) - gomega.Expect(endPod.Status.Phase).To(gomega.Equal(v1.PodSucceeded)) + framework.ExpectEqual(endPod.Status.Phase, v1.PodSucceeded) _, init := podutil.GetPodCondition(&endPod.Status, v1.PodInitialized) gomega.Expect(init).NotTo(gomega.BeNil()) - gomega.Expect(init.Status).To(gomega.Equal(v1.ConditionTrue)) + framework.ExpectEqual(init.Status, v1.ConditionTrue) - gomega.Expect(len(endPod.Status.InitContainerStatuses)).To(gomega.Equal(2)) + framework.ExpectEqual(len(endPod.Status.InitContainerStatuses), 2) for _, status := range endPod.Status.InitContainerStatuses { gomega.Expect(status.Ready).To(gomega.BeTrue()) gomega.Expect(status.State.Terminated).NotTo(gomega.BeNil()) @@ -170,12 +170,12 @@ var _ = framework.KubeDescribe("InitContainer [NodeConformance]", func() { gomega.Expect(err).To(gomega.BeNil()) framework.CheckInvariants(wr.Events(), framework.ContainerInitInvariant) endPod := event.Object.(*v1.Pod) - gomega.Expect(endPod.Status.Phase).To(gomega.Equal(v1.PodRunning)) + framework.ExpectEqual(endPod.Status.Phase, v1.PodRunning) _, init := podutil.GetPodCondition(&endPod.Status, v1.PodInitialized) gomega.Expect(init).NotTo(gomega.BeNil()) - gomega.Expect(init.Status).To(gomega.Equal(v1.ConditionTrue)) + framework.ExpectEqual(init.Status, v1.ConditionTrue) - gomega.Expect(len(endPod.Status.InitContainerStatuses)).To(gomega.Equal(2)) + framework.ExpectEqual(len(endPod.Status.InitContainerStatuses), 2) for _, status := range endPod.Status.InitContainerStatuses { gomega.Expect(status.Ready).To(gomega.BeTrue()) gomega.Expect(status.State.Terminated).NotTo(gomega.BeNil()) @@ -292,13 +292,13 @@ var _ = framework.KubeDescribe("InitContainer [NodeConformance]", func() { gomega.Expect(err).To(gomega.BeNil()) framework.CheckInvariants(wr.Events(), framework.ContainerInitInvariant) endPod := event.Object.(*v1.Pod) - gomega.Expect(endPod.Status.Phase).To(gomega.Equal(v1.PodPending)) + framework.ExpectEqual(endPod.Status.Phase, v1.PodPending) _, init := podutil.GetPodCondition(&endPod.Status, v1.PodInitialized) gomega.Expect(init).NotTo(gomega.BeNil()) - gomega.Expect(init.Status).To(gomega.Equal(v1.ConditionFalse)) - gomega.Expect(init.Reason).To(gomega.Equal("ContainersNotInitialized")) - gomega.Expect(init.Message).To(gomega.Equal("containers with incomplete status: [init1 init2]")) - gomega.Expect(len(endPod.Status.InitContainerStatuses)).To(gomega.Equal(2)) + framework.ExpectEqual(init.Status, v1.ConditionFalse) + framework.ExpectEqual(init.Reason, "ContainersNotInitialized") + framework.ExpectEqual(init.Message, "containers with incomplete status: [init1 init2]") + framework.ExpectEqual(len(endPod.Status.InitContainerStatuses), 2) }) /* @@ -402,13 +402,13 @@ var _ = framework.KubeDescribe("InitContainer [NodeConformance]", func() { framework.CheckInvariants(wr.Events(), framework.ContainerInitInvariant) endPod := event.Object.(*v1.Pod) - gomega.Expect(endPod.Status.Phase).To(gomega.Equal(v1.PodFailed)) + framework.ExpectEqual(endPod.Status.Phase, v1.PodFailed) _, init := podutil.GetPodCondition(&endPod.Status, v1.PodInitialized) gomega.Expect(init).NotTo(gomega.BeNil()) - gomega.Expect(init.Status).To(gomega.Equal(v1.ConditionFalse)) - gomega.Expect(init.Reason).To(gomega.Equal("ContainersNotInitialized")) - gomega.Expect(init.Message).To(gomega.Equal("containers with incomplete status: [init2]")) - gomega.Expect(len(endPod.Status.InitContainerStatuses)).To(gomega.Equal(2)) + framework.ExpectEqual(init.Status, v1.ConditionFalse) + framework.ExpectEqual(init.Reason, "ContainersNotInitialized") + framework.ExpectEqual(init.Message, "containers with incomplete status: [init2]") + framework.ExpectEqual(len(endPod.Status.InitContainerStatuses), 2) gomega.Expect(endPod.Status.ContainerStatuses[0].State.Waiting).ToNot(gomega.BeNil()) }) }) diff --git a/test/e2e/common/node_lease.go b/test/e2e/common/node_lease.go index ad71dcadf8e..b437b05e2ab 100644 --- a/test/e2e/common/node_lease.go +++ b/test/e2e/common/node_lease.go @@ -155,7 +155,7 @@ var _ = framework.KubeDescribe("NodeLease", func() { node, err := f.ClientSet.CoreV1().Nodes().Get(nodeName, metav1.GetOptions{}) gomega.Expect(err).To(gomega.BeNil()) _, readyCondition := testutils.GetNodeCondition(&node.Status, v1.NodeReady) - gomega.Expect(readyCondition.Status).To(gomega.Equal(v1.ConditionTrue)) + framework.ExpectEqual(readyCondition.Status, v1.ConditionTrue) }) }) }) @@ -164,7 +164,7 @@ func getHeartbeatTimeAndStatus(clientSet clientset.Interface, nodeName string) ( node, err := clientSet.CoreV1().Nodes().Get(nodeName, metav1.GetOptions{}) gomega.Expect(err).To(gomega.BeNil()) _, readyCondition := testutils.GetNodeCondition(&node.Status, v1.NodeReady) - gomega.Expect(readyCondition.Status).To(gomega.Equal(v1.ConditionTrue)) + framework.ExpectEqual(readyCondition.Status, v1.ConditionTrue) heartbeatTime := readyCondition.LastHeartbeatTime.Time readyCondition.LastHeartbeatTime = metav1.Time{} return heartbeatTime, node.Status diff --git a/test/e2e/common/pods.go b/test/e2e/common/pods.go index cf9f543b476..b8be23ce0d2 100644 --- a/test/e2e/common/pods.go +++ b/test/e2e/common/pods.go @@ -219,7 +219,7 @@ var _ = framework.KubeDescribe("Pods", func() { options := metav1.ListOptions{LabelSelector: selector.String()} pods, err := podClient.List(options) framework.ExpectNoError(err, "failed to query for pods") - gomega.Expect(len(pods.Items)).To(gomega.Equal(0)) + framework.ExpectEqual(len(pods.Items), 0) options = metav1.ListOptions{ LabelSelector: selector.String(), ResourceVersion: pods.ListMeta.ResourceVersion, @@ -257,7 +257,7 @@ var _ = framework.KubeDescribe("Pods", func() { options = metav1.ListOptions{LabelSelector: selector.String()} pods, err = podClient.List(options) framework.ExpectNoError(err, "failed to query for pods") - gomega.Expect(len(pods.Items)).To(gomega.Equal(1)) + framework.ExpectEqual(len(pods.Items), 1) ginkgo.By("verifying pod creation was observed") select { @@ -336,7 +336,7 @@ var _ = framework.KubeDescribe("Pods", func() { options = metav1.ListOptions{LabelSelector: selector.String()} pods, err = podClient.List(options) framework.ExpectNoError(err, "failed to query for pods") - gomega.Expect(len(pods.Items)).To(gomega.Equal(0)) + framework.ExpectEqual(len(pods.Items), 0) }) /* @@ -374,7 +374,7 @@ var _ = framework.KubeDescribe("Pods", func() { options := metav1.ListOptions{LabelSelector: selector.String()} pods, err := podClient.List(options) framework.ExpectNoError(err, "failed to query for pods") - gomega.Expect(len(pods.Items)).To(gomega.Equal(1)) + framework.ExpectEqual(len(pods.Items), 1) ginkgo.By("updating the pod") podClient.Update(name, func(pod *v1.Pod) { @@ -389,7 +389,7 @@ var _ = framework.KubeDescribe("Pods", func() { options = metav1.ListOptions{LabelSelector: selector.String()} pods, err = podClient.List(options) framework.ExpectNoError(err, "failed to query for pods") - gomega.Expect(len(pods.Items)).To(gomega.Equal(1)) + framework.ExpectEqual(len(pods.Items), 1) e2elog.Logf("Pod update OK") }) @@ -428,7 +428,7 @@ var _ = framework.KubeDescribe("Pods", func() { options := metav1.ListOptions{LabelSelector: selector.String()} pods, err := podClient.List(options) framework.ExpectNoError(err, "failed to query for pods") - gomega.Expect(len(pods.Items)).To(gomega.Equal(1)) + framework.ExpectEqual(len(pods.Items), 1) ginkgo.By("updating the pod") podClient.Update(name, func(pod *v1.Pod) { diff --git a/test/e2e/common/runtime.go b/test/e2e/common/runtime.go index 23da0e58581..375bd2572ca 100644 --- a/test/e2e/common/runtime.go +++ b/test/e2e/common/runtime.go @@ -118,7 +118,7 @@ while true; do sleep 1; done framework.ExpectNoError(err) ginkgo.By(fmt.Sprintf("Container '%s': should get the expected 'State'", testContainer.Name)) - gomega.Expect(GetContainerState(status.State)).To(gomega.Equal(testCase.State)) + framework.ExpectEqual(GetContainerState(status.State), testCase.State) ginkgo.By(fmt.Sprintf("Container '%s': should be possible to delete [NodeConformance]", testContainer.Name)) gomega.Expect(terminateContainer.Delete()).To(gomega.Succeed()) @@ -152,7 +152,7 @@ while true; do sleep 1; done framework.ExpectNoError(err) ginkgo.By("the container should be terminated") - gomega.Expect(GetContainerState(status.State)).To(gomega.Equal(ContainerStateTerminated)) + framework.ExpectEqual(GetContainerState(status.State), ContainerStateTerminated) ginkgo.By("the termination message should be set") e2elog.Logf("Expected: %v to match Container's Termination Message: %v --", expectedMsg, status.State.Terminated.Message) diff --git a/test/e2e/common/security_context.go b/test/e2e/common/security_context.go index 9ffc38e7b15..16fce458882 100644 --- a/test/e2e/common/security_context.go +++ b/test/e2e/common/security_context.go @@ -136,7 +136,7 @@ var _ = framework.KubeDescribe("Security Context", func() { ev, err := podClient.WaitForErrorEventOrSuccess(pod) framework.ExpectNoError(err) gomega.Expect(ev).NotTo(gomega.BeNil()) - gomega.Expect(ev.Reason).To(gomega.Equal(events.FailedToCreateContainer)) + framework.ExpectEqual(ev.Reason, events.FailedToCreateContainer) }) ginkgo.It("should run with an image specified user ID", func() { name := "implicit-nonroot-uid" @@ -154,7 +154,7 @@ var _ = framework.KubeDescribe("Security Context", func() { ev, err := podClient.WaitForErrorEventOrSuccess(pod) framework.ExpectNoError(err) gomega.Expect(ev).NotTo(gomega.BeNil()) - gomega.Expect(ev.Reason).To(gomega.Equal(events.FailedToCreateContainer)) + framework.ExpectEqual(ev.Reason, events.FailedToCreateContainer) }) }) diff --git a/test/e2e/common/sysctl.go b/test/e2e/common/sysctl.go index 4a0f071fcff..aa15c27d441 100644 --- a/test/e2e/common/sysctl.go +++ b/test/e2e/common/sysctl.go @@ -91,7 +91,7 @@ var _ = framework.KubeDescribe("Sysctls [NodeFeature:Sysctls]", func() { framework.ExpectNoError(err) ginkgo.By("Checking that the pod succeeded") - gomega.Expect(pod.Status.Phase).To(gomega.Equal(v1.PodSucceeded)) + framework.ExpectEqual(pod.Status.Phase, v1.PodSucceeded) ginkgo.By("Getting logs from the pod") log, err := e2epod.GetPodLogs(f.ClientSet, f.Namespace.Name, pod.Name, pod.Spec.Containers[0].Name) @@ -134,7 +134,7 @@ var _ = framework.KubeDescribe("Sysctls [NodeFeature:Sysctls]", func() { framework.ExpectNoError(err) ginkgo.By("Checking that the pod succeeded") - gomega.Expect(pod.Status.Phase).To(gomega.Equal(v1.PodSucceeded)) + framework.ExpectEqual(pod.Status.Phase, v1.PodSucceeded) ginkgo.By("Getting logs from the pod") log, err := e2epod.GetPodLogs(f.ClientSet, f.Namespace.Name, pod.Name, pod.Spec.Containers[0].Name) @@ -205,6 +205,6 @@ var _ = framework.KubeDescribe("Sysctls [NodeFeature:Sysctls]", func() { ginkgo.By("Checking that the pod was rejected") gomega.Expect(ev).ToNot(gomega.BeNil()) - gomega.Expect(ev.Reason).To(gomega.Equal("SysctlForbidden")) + framework.ExpectEqual(ev.Reason, "SysctlForbidden") }) })