Merge pull request #8854 from zalando-incubator/wisinghe-patch-1

opa: give more time for the routing change

Author: MustafaSaber

test/e2e/aaas.go

@@ -59,13 +59,13 @@ var _ = Describe("Ingress tests for OPA filters", func() {
 
 		url := "https://" + hostName + authorizationEnforcedPath
 		req, err := http.NewRequest("GET", url, nil)
-		resp, err := getAndWaitResponse(rt, req, 10*time.Second, http.StatusForbidden)
+		resp, err := getAndWaitResponseWithInterval(rt, req, 60*time.Second, 5*time.Second, http.StatusForbidden)
 		framework.ExpectNoError(err)
 		Expect(resp.StatusCode).To(Equal(http.StatusForbidden))
 
 		By(fmt.Sprintf("Calling ingress %s/%s we wait to get a 200 with opaAuthorizeRequest %s policy", ingressUpdate.Namespace, ingressUpdate.Name, opaPolicyName))
 		req.Header.Set("Authorization", "Basic valid_token") // Authorized request
-		resp, err = getAndWaitResponse(rt, req, 10*time.Second, http.StatusOK)
+		resp, err = getAndWaitResponseWithInterval(rt, req, 60*time.Second, 5*time.Second, http.StatusOK)
 		framework.ExpectNoError(err)
 		Expect(resp.StatusCode).To(Equal(http.StatusOK))
 		s, err := getBody(resp)
@@ -91,13 +91,13 @@ var _ = Describe("Ingress tests for OPA filters", func() {
 
 		url := "https://" + hostName + serveResponsePath
 		req, err := http.NewRequest("GET", url, nil)
-		resp, err := getAndWaitResponse(rt, req, 10*time.Second, http.StatusForbidden)
+		resp, err := getAndWaitResponseWithInterval(rt, req, 60*time.Second, 5*time.Second, http.StatusForbidden)
 		framework.ExpectNoError(err)
 		Expect(resp.StatusCode).To(Equal(http.StatusForbidden))
 
 		By(fmt.Sprintf("Calling ingress %s/%s we wait to get a 200 with opaServeResponse %s policy", ingressUpdate.Namespace, ingressUpdate.Name, opaPolicyName))
 		req.Header.Set("Authorization", "Basic permissions_token") // Authorized request
-		resp, err = getAndWaitResponse(rt, req, 10*time.Second, http.StatusOK)
+		resp, err = getAndWaitResponseWithInterval(rt, req, 60*time.Second, 5*time.Second, http.StatusOK)
 		framework.ExpectNoError(err)
 		Expect(resp.StatusCode).To(Equal(http.StatusOK))
 		s, err := getBody(resp)

test/e2e/util.go

@@ -953,9 +953,12 @@ func createHTTPRoundTripper() (http.RoundTripper, chan<- struct{}) {
 }
 
 func getAndWaitResponse(rt http.RoundTripper, req *http.Request, timeout time.Duration, expectedStatusCode int) (resp *http.Response, err error) {
-	d := 1 * time.Second
-	if timeout < d {
-		d = timeout - 1
+	return getAndWaitResponseWithInterval(rt, req, timeout, 1*time.Second, expectedStatusCode)
+}
+
+func getAndWaitResponseWithInterval(rt http.RoundTripper, req *http.Request, timeout time.Duration, interval time.Duration, expectedStatusCode int) (resp *http.Response, err error) {
+	if timeout < interval {
+		interval = timeout - 1
 	}
 	timeoutCH := make(chan struct{})
 	go func() {
@@ -976,7 +979,7 @@ func getAndWaitResponse(rt http.RoundTripper, req *http.Request, timeout time.Du
 		case <-timeoutCH:
 			log.Printf("timeout to GET %s", req.URL)
 			return
-		case <-time.After(d):
+		case <-time.After(interval):
 			log.Printf("retry to GET %s", req.URL)
 			continue
 		}