Merge pull request #19137 from gmarek/fix-test

Auto commit by PR queue bot
2016-01-15 20:38:24 -08:00
parent fab5fbde7c 9993f1d881
commit f26713f997
1 changed files with 2 additions and 2 deletions
--- a/cmd/integration/integration.go
+++ b/cmd/integration/integration.go
@@ -75,9 +75,9 @@ var (
 	// Limit the number of concurrent tests.
 	maxConcurrency int

-	longTestTimeout = time.Second * 300
+	longTestTimeout = time.Second * 500

-	maxTestTimeout = time.Minute * 10
+	maxTestTimeout = time.Minute * 15
 )

 type delegateHandler struct {