Wait for context finalization to provoke http timeouts on tests (#8074)…

… (#8128) Wait for request context to be done, that is closed when the server is stopped. (cherry picked from commit 81270a5)
elastic · Aug 29, 2018 · 8de038e · 8de038e
1 parent 3555b29
commit 8de038e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/metricbeat/module/apache/status/status_test.go b/metricbeat/module/apache/status/status_test.go
@@ -151,7 +151,7 @@ func TestFetchTimeout(t *testing.T) {
 		w.WriteHeader(200)
 		w.Header().Set("Content-Type", "text/plain; charset=ISO-8859-1")
 		w.Write([]byte(response))
-		time.Sleep(100 * time.Millisecond)
+		<-r.Context().Done()
 	}))
 	defer server.Close()
 

diff --git a/metricbeat/module/envoyproxy/server/server_test.go b/metricbeat/module/envoyproxy/server/server_test.go
@@ -118,7 +118,7 @@ func TestFetchTimeout(t *testing.T) {
 		w.WriteHeader(200)
 		w.Header().Set("Content-Type", "text/plain; charset=UTF-8")
 		w.Write([]byte(response))
-		time.Sleep(100 * time.Millisecond)
+		<-r.Context().Done()
 	}))
 	defer server.Close()