Merge pull request #40 from vinxi/bugfix/race_condition

fix(test): fix race conditions in Forward tests
vinxi · Jun 2, 2016 · 4ad0b04 · 4ad0b04
2 parents df44e02 + c46aadd
commit 4ad0b04
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/forward/forward_test.go b/forward/forward_test.go
@@ -160,9 +160,11 @@ func (s *FwdSuite) TestCustomRewriter(c *C) {
 }
 
 func (s *FwdSuite) TestCustomTransportTimeout(c *C) {
+	done := make(chan bool)
 	srv := testutils.NewHandler(func(w http.ResponseWriter, req *http.Request) {
 		time.Sleep(20 * time.Millisecond)
 		w.Write([]byte("hello"))
+		done <- true
 	})
 	defer srv.Close()
 
@@ -179,6 +181,7 @@ func (s *FwdSuite) TestCustomTransportTimeout(c *C) {
 	defer proxy.Close()
 
 	re, _, err := testutils.Get(proxy.URL)
+	<-done
 	c.Assert(err, IsNil)
 	c.Assert(re.StatusCode, Equals, http.StatusGatewayTimeout)
 }