summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-10-02 09:21:38 -0700
committerCorey Hulen <corey@hulen.com>2015-10-02 09:21:38 -0700
commit41069d83d2b6ad5cca599f75292027e13d5b10f7 (patch)
tree72b7687a5fb28fb0ae1e9114446ba1099f7c8aa9
parentc427e9c9d6fbd68662fdfbbe733af4b34ae69269 (diff)
parent32533b718f466578c3da13e574d4c95d104c8636 (diff)
downloadchat-41069d83d2b6ad5cca599f75292027e13d5b10f7.tar.gz
chat-41069d83d2b6ad5cca599f75292027e13d5b10f7.tar.bz2
chat-41069d83d2b6ad5cca599f75292027e13d5b10f7.zip
Merge pull request #904 from teviot/teviot-patch-1
Increase test timeouts to accommodate slow dev environments
-rw-r--r--Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 5cb5467f6..88df59d8b 100644
--- a/Makefile
+++ b/Makefile
@@ -140,11 +140,11 @@ check: install
test: install
@mkdir -p logs
- @$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=180s ./api || exit 1
- @$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=12s ./model || exit 1
- @$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s ./store || exit 1
- @$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s ./utils || exit 1
- @$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s ./web || exit 1
+ @$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=600s ./api || exit 1
+ @$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=60s ./model || exit 1
+ @$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=600s ./store || exit 1
+ @$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=600s ./utils || exit 1
+ @$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=600s ./web || exit 1
benchmark: install
@mkdir -p logs