minor fix

gateway/gateway_test.go

@@ -340,15 +340,17 @@ var _ = Describe("Gateway", func() {
 		var (
 			gateway    *HandleT
 			statsStore *memstats.Store
-			whServer   *httptest.Server
+			server     *httptest.Server
+			url        *url.URL
 		)
 
 		BeforeEach(func() {
-			whServer = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			server = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 				w.WriteHeader(http.StatusOK)
 				_, _ = io.WriteString(w, "OK")
 			}))
-			url, err := url.Parse(whServer.URL)
+			var err error
+			url, err = url.Parse(server.URL)
 			Expect(err).To(BeNil())
 			config.Set("Warehouse.webPort", url.Port())
 
@@ -364,7 +366,7 @@ var _ = Describe("Gateway", func() {
 		AfterEach(func() {
 			err := gateway.Shutdown()
 			Expect(err).To(BeNil())
-			whServer.Close()
+			server.Close()
 		})
 
 		createValidBody := func(customProperty, customValue string) []byte {
@@ -378,9 +380,8 @@ var _ = Describe("Gateway", func() {
 		}
 		verifyEndpoint := func(endpoints []string, method string) {
 			client := &http.Client{}
-			baseURL := "http://localhost:8080"
 			for _, ep := range endpoints {
-				url := baseURL + ep
+				url := url.String() + ep
 				var req *http.Request
 				var err error
 				if ep == "/beacon/v1/batch" {
@@ -409,21 +410,24 @@ var _ = Describe("Gateway", func() {
 			})
 			c.mockBackendConfig.EXPECT().WaitForConfig(gomock.Any()).AnyTimes()
 			var err error
+			wait := make(chan struct{})
 			ctx, cancel := context.WithCancel(context.Background())
 			go func() {
 				err = gateway.StartWebHandler(ctx)
 				Expect(err).To(BeNil())
+				close(wait)
 			}()
-			require.Eventually(GinkgoT(), func() bool {
+			Eventually(func() bool {
 				verifyEndpoint([]string{"/version"}, http.MethodGet)
 				return true
-			}, time.Second*10, time.Second)
+			}, time.Second*10, time.Second).Should(BeTrue())
 
 			getEndpoint, postEndpoints, deleteEndpoints := getEndpointMethodMap()
 			verifyEndpoint(getEndpoint, http.MethodGet)
 			verifyEndpoint(postEndpoints, http.MethodPost)
 			verifyEndpoint(deleteEndpoints, http.MethodDelete)
 			cancel()
+			<-wait
 		})
 	})
 
@@ -1143,6 +1147,8 @@ func authorizedRequest(username string, body io.Reader) *http.Request {
 func expectHandlerResponse(handler http.HandlerFunc, req *http.Request, responseStatus int, responseBody string) {
 	testutils.RunTestWithTimeout(func() {
 		rr := httptest.NewRecorder()
+		defer rr.Result().Body.Close()
+
 		handler.ServeHTTP(rr, req)
 
 		bodyBytes, _ := io.ReadAll(rr.Body)