fix(tests): fix flaky timing assertions across four test files

Author: hoffmaen

src/code.cloudfoundry.org/gorouter/handlers/reporter_test.go

@@ -88,7 +88,9 @@ var _ = Describe("Reporter Handler", func() {
 	})
 
 	It("emits routing response metrics", func() {
+		before := time.Now()
 		handler.ServeHTTP(resp, req)
+		after := time.Now()
 
 		Expect(fakeReporter.CaptureBadGatewayCallCount()).To(Equal(0))
 
@@ -102,7 +104,11 @@ var _ = Describe("Reporter Handler", func() {
 		Expect(capturedEndpoint.PrivateInstanceId).To(Equal("id"))
 		Expect(capturedEndpoint.PrivateInstanceIndex).To(Equal("1"))
 		Expect(capturedRespCode).To(Equal(http.StatusTeapot))
-		Expect(startTime).To(BeTemporally("~", time.Now(), 100*time.Millisecond))
+		// ReceivedAt is set to timeNow-1ms where timeNow is captured inside
+		// the handler (between before and after), so the exact bracket is:
+		//   before-1ms <= startTime <= after-1ms
+		Expect(startTime).To(BeTemporally(">=", before.Add(-1*time.Millisecond)))
+		Expect(startTime).To(BeTemporally("<=", after.Add(-1*time.Millisecond)))
 		Expect(latency).To(BeNumerically(">", 0))
 		Expect(latency).To(BeNumerically("<", 10*time.Millisecond))
 

src/code.cloudfoundry.org/gorouter/handlers/requestinfo_test.go

@@ -59,16 +59,17 @@ var _ = Describe("RequestInfoHandler", func() {
 	})
 
 	It("sets RequestInfo with StartTime on the context", func() {
+		before := time.Now()
 		handler.ServeHTTP(resp, req, nextHandler)
 		var contextReq *http.Request
 		Eventually(reqChan).Should(Receive(&contextReq))
-
-		expectedStartTime := time.Now()
+		after := time.Now()
 
 		ri, err := handlers.ContextRequestInfo(contextReq)
 		Expect(err).ToNot(HaveOccurred())
 		Expect(ri).ToNot(BeNil())
-		Expect(ri.ReceivedAt).To(BeTemporally("~", expectedStartTime, 10*time.Millisecond))
+		Expect(ri.ReceivedAt).To(BeTemporally(">=", before))
+		Expect(ri.ReceivedAt).To(BeTemporally("<=", after))
 
 	})
 })

src/code.cloudfoundry.org/gorouter/proxy/proxy_test.go

@@ -3,8 +3,6 @@ package proxy_test
 import (
 	"bufio"
 	"bytes"
-	"code.cloudfoundry.org/gorouter/proxy"
-	"code.cloudfoundry.org/gorouter/routeservice"
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
@@ -22,6 +20,9 @@ import (
 	"sync/atomic"
 	"time"
 
+	"code.cloudfoundry.org/gorouter/proxy"
+	"code.cloudfoundry.org/gorouter/routeservice"
+
 	"github.com/cloudfoundry/dropsonde/factories"
 	"github.com/cloudfoundry/sonde-go/events"
 	uuid "github.com/nu7hatch/gouuid"
@@ -2888,9 +2889,11 @@ var _ = Describe("Proxy", func() {
 			conn := dialProxy(proxyServer)
 
 			req := test_util.NewRequest("GET", "reporter-test", "/", nil)
+			before := time.Now()
 			conn.WriteRequest(req)
 
 			resp, _ := conn.ReadResponse()
+			after := time.Now()
 			Expect(resp.StatusCode).To(Equal(http.StatusOK))
 
 			Expect(fakeReporter.CaptureBadGatewayCallCount()).To(Equal(0))
@@ -2906,7 +2909,8 @@ var _ = Describe("Proxy", func() {
 			Expect(capturedEndpoint.PrivateInstanceId).To(Equal(""))
 			Expect(capturedEndpoint.PrivateInstanceIndex).To(Equal("2"))
 			Expect(capturedRespCode).To(Equal(http.StatusOK))
-			Expect(startTime).To(BeTemporally("~", time.Now(), 100*time.Millisecond))
+			Expect(startTime).To(BeTemporally(">=", before))
+			Expect(startTime).To(BeTemporally("<=", after))
 			Expect(latency).To(BeNumerically(">", 0))
 
 			Expect(fakeReporter.CaptureRoutingRequestCallCount()).To(Equal(1))

src/code.cloudfoundry.org/gorouter/proxy/round_tripper/proxy_round_tripper_test.go

@@ -3028,13 +3028,14 @@ var _ = Describe("ProxyRoundTripper", func() {
 						}
 					})
 					It("sets a http/1 timeout on the request context", func() {
+						before := time.Now()
 						proxyRoundTripper.RoundTrip(req)
 						var request *http.Request
 						Eventually(reqCh).Should(Receive(&request))
 
 						deadLine, deadlineSet := request.Context().Deadline()
 						Expect(deadlineSet).To(BeTrue())
-						Expect(deadLine).To(BeTemporally("~", time.Now().Add(20*time.Millisecond), 11*time.Millisecond))
+						Expect(deadLine).To(BeTemporally("~", before.Add(20*time.Millisecond), 20*time.Millisecond))
 						Eventually(func() string {
 							err := request.Context().Err()
 							if err != nil {
@@ -3053,13 +3054,14 @@ var _ = Describe("ProxyRoundTripper", func() {
 						}
 					})
 					It("sets a http/2 timeout on the request context", func() {
+						before := time.Now()
 						proxyRoundTripper.RoundTrip(req)
 						var request *http.Request
 						Eventually(reqCh).Should(Receive(&request))
 
 						deadLine, deadlineSet := request.Context().Deadline()
 						Expect(deadlineSet).To(BeTrue())
-						Expect(deadLine).To(BeTemporally("~", time.Now().Add(15*time.Millisecond), 6*time.Millisecond))
+						Expect(deadLine).To(BeTemporally("~", before.Add(15*time.Millisecond), 15*time.Millisecond))
 						Eventually(func() string {
 							err := request.Context().Err()
 							if err != nil {