From fb4b2b29e49d653547f46f004953aed4dc3c3249 Mon Sep 17 00:00:00 2001
From: dfawley <dfawley@google.com>
Date: Tue, 31 Oct 2017 14:07:09 -0700
Subject: [PATCH] reduce timeout for tests to 5m (7m for testrace) (#1635)

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 39606b56..c4453437 100644
--- a/Makefile
+++ b/Makefile
@@ -23,10 +23,10 @@ proto:
 	go generate google.golang.org/grpc/...
 
 test: testdeps
-	go test -cpu 1,4 google.golang.org/grpc/...
+	go test -cpu 1,4 -timeout 5m google.golang.org/grpc/...
 
 testrace: testdeps
-	go test -race -cpu 1,4 google.golang.org/grpc/...
+	go test -race -cpu 1,4 -timeout 7m google.golang.org/grpc/...
 
 clean:
 	go clean -i google.golang.org/grpc/...