summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml6
-rw-r--r--Makefile1
-rw-r--r--config/config.json2
3 files changed, 7 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index a97e568f6..03a106f58 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,4 +12,8 @@ before_script:
- mysql -e "GRANT ALL ON mattermost_test.* TO 'mmuser'@'%' ;" -uroot
services:
- - redis-server \ No newline at end of file
+ - redis-server
+
+addons:
+ hosts:
+ - 127.0.0.1 dockerhost \ No newline at end of file
diff --git a/Makefile b/Makefile
index b3ad75450..4036f3c6b 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,7 @@ travis:
@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
build:
diff --git a/config/config.json b/config/config.json
index e38f1701a..b0a019e8d 100644
--- a/config/config.json
+++ b/config/config.json
@@ -1,7 +1,7 @@
{
"LogSettings": {
"ConsoleEnable": true,
- "ConsoleLevel": "INFO",
+ "ConsoleLevel": "DEBUG",
"FileEnable": true,
"FileLevel": "INFO",
"FileFormat": "",