From 937f35e284adc74c09598dc2167389771fd4cf2d Mon Sep 17 00:00:00 2001
From: Bo-Yi Wu <appleboy.tw@gmail.com>
Date: Wed, 4 May 2016 15:02:54 +0800
Subject: [PATCH] update docker testing script via glide.

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
---
 Makefile                    |  3 ++-
 docker/Dockerfile.testing   | 11 +++++++----
 storage/redis/redis_test.go |  1 +
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 3a8cf08..f849e60 100644
--- a/Makefile
+++ b/Makefile
@@ -36,9 +36,10 @@ docker_build: clean
 	docker build --rm -t $(PRODUCTION_IMAGE) -f docker/Dockerfile.dist .
 
 docker_test:
+	-docker rm -f gorush-redis
 	@docker build --rm -t $(TEST_IMAGE) -f docker/Dockerfile.testing .
 	@docker run --name gorush-redis -d redis
-	@docker run --rm --link gorush-redis:redis -e ANDROID_TEST_TOKEN=$(ANDROID_TEST_TOKEN) -e ANDROID_API_KEY=$(ANDROID_API_KEY) $(TEST_IMAGE) sh -c "cd gorush && go test -v"
+	@docker run --rm --link gorush-redis:redis -e ANDROID_TEST_TOKEN=$(ANDROID_TEST_TOKEN) -e ANDROID_API_KEY=$(ANDROID_API_KEY) $(TEST_IMAGE) sh -c "make test"
 	@docker rm -f gorush-redis
 
 deploy:
diff --git a/docker/Dockerfile.testing b/docker/Dockerfile.testing
index a4c0dda..6dd511c 100644
--- a/docker/Dockerfile.testing
+++ b/docker/Dockerfile.testing
@@ -2,9 +2,12 @@ FROM golang:1.6
 
 MAINTAINER Bo-Yi Wu <appleboy.tw@gmail.com>
 
-RUN mkdir -p /tmp/build
-Add . /tmp/build/
-WORKDIR /tmp/build
+# install glide package management.
+RUN go get github.com/Masterminds/glide && cd $GOPATH/src/github.com/Masterminds/glide && make install
+RUN mkdir -p $GOPATH/src/github.com/appleboy/gorush
+Add . $GOPATH/src/github.com/appleboy/gorush/
+WORKDIR $GOPATH/src/github.com/appleboy/gorush
 RUN sed -i"" -e "s/localhost/redis/g" config/config.yml
 RUN sed -i"" -e "s/localhost/redis/g" gorush/status_test.go
-RUN go get -v -d -t ./...
+RUN sed -i"" -e "s/localhost/redis/g" storage/redis/redis_test.go
+RUN make bundle
diff --git a/storage/redis/redis_test.go b/storage/redis/redis_test.go
index c50662a..41a5149 100644
--- a/storage/redis/redis_test.go
+++ b/storage/redis/redis_test.go
@@ -20,6 +20,7 @@ func TestRedisEngine(t *testing.T) {
 	var val int64
 
 	config := c.BuildDefaultPushConf()
+	config.Stat.Redis.Addr = "localhost:6379"
 
 	redis := New(config)
 	redis.Init()