Merge pull request #8014 from zalando-incubator/use-framework-expectnoerror

[e2e] use framework.ExpectNoError for assertions

Author: linki

test/e2e/README.md

@@ -91,7 +91,7 @@ var _ = describe("Thing under test, func() {
 		}()
             // creates the Ingress Object
 		_, err := cs.CoreV1().Foo(ns).Create(foo)
-		Expect(err).NotTo(HaveOccurred())
+		framework.ExpectNoError(err)
 	})
 })
 ```
@@ -118,7 +118,7 @@ var _ = describe("Thing under test, func() {
   	Expect(err2).NotTo(HaveOccurred())
   }()
   _, err = cs.CoreV1().Pods(ns).Create(pod)
-  Expect(err).NotTo(HaveOccurred())
+  framework.ExpectNoError(err)
   framework.ExpectNoError(f.WaitForPodRunning(pod.Name))
 ```
 
@@ -142,7 +142,7 @@ var _ = describe("Thing under test, func() {
   	Expect(err2).NotTo(HaveOccurred())
   }()
   _, err := cs.CoreV1().Services(ns).Create(service)
-  Expect(err).NotTo(HaveOccurred())
+  framework.ExpectNoError(err)
 ```
 
 ### Create a Ingress and wait for external components to be created
@@ -168,11 +168,11 @@ Create Kubernetes ingress object:
   	Expect(err2).NotTo(HaveOccurred())
   }()
   ingressCreate, err := cs.NetworkingV1beta1().Ingresses(ns).Create(ing)
-  Expect(err).NotTo(HaveOccurred())
+  framework.ExpectNoError(err)
   addr, err := jig.WaitForIngressAddress(cs, ns, ingressCreate.Name, 3*time.Minute)
-  Expect(err).NotTo(HaveOccurred())
+  framework.ExpectNoError(err)
   ingress, err := cs.NetworkingV1beta1().Ingresses(ns).Get(ing.Name, metav1.GetOptions{ResourceVersion: "0"})
-  Expect(err).NotTo(HaveOccurred())
+  framework.ExpectNoError(err)
   By(fmt.Sprintf("ALB endpoint from ingress status: %s", ingress.Status.LoadBalancer.Ingress[0].Hostname))
 ```
 
@@ -182,15 +182,15 @@ Follow up code, that waits for creations to be happen:
   // skipper http -> https redirect
   By("Waiting for skipper route to default redirect from http to https, to see that our ingress-controller and skipper works")
   err = waitForResponse(addr, "http", 2*time.Minute, 301, true)
-  Expect(err).NotTo(HaveOccurred())
+  framework.ExpectNoError(err)
   // ALB ready
   By("Waiting for ALB to create endpoint " + addr + " and skipper route, to see that our ingress-controller and skipper works")
   err = waitForResponse(addr, "https", 2*time.Minute, 200, true) // insecure=true
-  Expect(err).NotTo(HaveOccurred())
+  framework.ExpectNoError(err)
   // DNS ready
   By("Waiting for DNS to see that mate and skipper route to service and pod works")
   err = waitForResponse(hostName, "https", 2*time.Minute, 200, false)
-  Expect(err).NotTo(HaveOccurred())
+  framework.ExpectNoError(err)
 ```
 
 ### FAQ

test/e2e/admission_controller.go

@@ -62,18 +62,18 @@ var _ = describe("Admission controller tests", func() {
 
 		deployment := createDeploymentWithDeploymentInfo(nameprefix+"-", ns, replicas)
 		_, err := cs.AppsV1().Deployments(ns).Create(context.TODO(), deployment, metav1.CreateOptions{})
-		Expect(err).NotTo(HaveOccurred())
+		framework.ExpectNoError(err)
 		labelSelector, err := metav1.LabelSelectorAsSelector(deployment.Spec.Selector)
-		Expect(err).NotTo(HaveOccurred())
+		framework.ExpectNoError(err)
 		err = waitForDeploymentWithCondition(cs, ns, deployment.Name, "MinimumReplicasAvailable", appsv1.DeploymentAvailable)
-		Expect(err).NotTo(HaveOccurred())
+		framework.ExpectNoError(err)
 
 		//pods are not returned here
 		_, err = e2epod.WaitForPodsWithLabelRunningReady(context.TODO(), cs, ns, labelSelector, int(replicas), 1*time.Minute)
-		Expect(err).NotTo(HaveOccurred())
+		framework.ExpectNoError(err)
 
 		pods, err := cs.CoreV1().Pods(ns).List(context.TODO(), metav1.ListOptions{LabelSelector: labelSelector.String()})
-		Expect(err).NotTo(HaveOccurred())
+		framework.ExpectNoError(err)
 		Expect(len(pods.Items)).To(Equal(1))
 
 		pod := pods.Items[0]
@@ -82,12 +82,12 @@ var _ = describe("Admission controller tests", func() {
 
 		// Check the injected node zone
 		node, err := cs.CoreV1().Nodes().Get(context.TODO(), pod.Spec.NodeName, metav1.GetOptions{})
-		Expect(err).NotTo(HaveOccurred())
+		framework.ExpectNoError(err)
 		nodeZone := node.Labels["topology.kubernetes.io/zone"]
 		Expect(pod.Annotations).To(HaveKeyWithValue("topology.kubernetes.io/zone", nodeZone))
 
 		envarValues, err := fetchEnvarValues(cs, ns, pod.Name)
-		Expect(err).NotTo(HaveOccurred())
+		framework.ExpectNoError(err)
 
 		// Check the environment variable values
 
@@ -123,10 +123,10 @@ var _ = describe("Admission controller tests", func() {
 		By("Creating pod " + podName + " in namespace " + ns)
 		pod := createInvalidOwnerPod(ns, podName)
 		_, err := cs.CoreV1().Pods(ns).Create(context.TODO(), pod, metav1.CreateOptions{})
-		Expect(err).NotTo(HaveOccurred())
+		framework.ExpectNoError(err)
 
 		err = e2epod.WaitForPodSuccessInNamespaceTimeout(context.TODO(), cs, podName, ns, 15*time.Minute)
-		Expect(err).NotTo(HaveOccurred())
+		framework.ExpectNoError(err)
 	})
 })