fix tests for reverting the delay in trace (#343)

Author: geofffranks

integration/retry_test.go

@@ -36,7 +36,7 @@ var _ = Describe("Retries", func() {
 		BeforeEach(func() {
 			appURL = "bad-app." + test_util.LocalhostDNS
 
-			badApp = common.NewTcpApp([]route.Uri{route.Uri(appURL)}, testState.cfg.Port, testState.mbusClient, nil, "")
+			badApp = common.NewTcpApp([]route.Uri{route.Uri(appURL)}, test_util.NextAvailPort(), testState.mbusClient, nil, "")
 			badApp.Register()
 		})
 
@@ -70,16 +70,25 @@ var _ = Describe("Retries", func() {
 			badApp.SetHandlers(handlers)
 			badApp.Listen()
 
-			req := testState.newPostRequest(
-				fmt.Sprintf("http://%s", appURL),
-				bytes.NewReader([]byte(payload)),
-			)
-			resp, err := testState.client.Do(req)
-			Expect(err).NotTo(HaveOccurred())
-			Expect(resp.StatusCode).To(Equal(200))
-			if resp.Body != nil {
-				resp.Body.Close()
+			successSeen := false
+			// we need to retry the entire http request many times to get a success until https://github.com/golang/go/issues/31259
+			// is resolved.
+			for i := 0; i < 100; i++ {
+				req := testState.newPostRequest(
+					fmt.Sprintf("http://%s", appURL),
+					bytes.NewReader([]byte(payload)),
+				)
+				resp, err := testState.client.Do(req)
+				Expect(err).NotTo(HaveOccurred())
+				if resp.StatusCode == http.StatusOK {
+					successSeen = true
+					break
+				}
+				if resp.Body != nil {
+					resp.Body.Close()
+				}
 			}
+			Expect(successSeen).To(BeTrue())
 		})
 	})
 })