Merge pull request deis#2577 from johanneswuerbach/godep-tests

ref(*): Manage test dependencies using godeps
sbuss · Dec 15, 2014 · aba19e7 · aba19e7
2 parents 01dc19d + 95a3e48
commit aba19e7
Show file tree

Hide file tree

Showing 407 changed files with 31,399 additions and 646 deletions.
diff --git a/builder/Makefile b/builder/Makefile
@@ -70,4 +70,4 @@ test-unit:
 
 test-functional:
 	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
-	GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
+	GOPATH=`cd ../tests/ && godep path`:$(GOPATH) go test -v ./tests/...
diff --git a/cache/Makefile b/cache/Makefile
@@ -56,4 +56,4 @@ test-unit:
 
 test-functional:
 	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
-	GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
+	GOPATH=`cd ../tests/ && godep path`:$(GOPATH) go test -v ./tests/...
diff --git a/controller/Makefile b/controller/Makefile
@@ -72,4 +72,4 @@ test-unit: setup-venv test-style
 test-functional:
 	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
 	@docker history deis/test-postgresql >/dev/null 2>&1 || docker pull deis/test-postgresql:latest
-	GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
+	GOPATH=`cd ../tests/ && godep path`:$(GOPATH) go test -v ./tests/...
diff --git a/database/Makefile b/database/Makefile
@@ -50,4 +50,4 @@ test-unit:
 
 test-functional:
 	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
-	GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
+	GOPATH=`cd ../tests/ && godep path`:$(GOPATH) go test -v ./tests/...
diff --git a/logger/Makefile b/logger/Makefile
@@ -67,7 +67,7 @@ test-unit: test-style
 
 test-functional:
 	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
-	GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
+	GOPATH=`cd ../tests/ && godep path`:$(GOPATH) go test -v ./tests/...
 
 coverage:
 	go test -coverprofile coverage.out ./syslog

diff --git a/registry/Makefile b/registry/Makefile
@@ -50,4 +50,4 @@ test-unit:
 
 test-functional:
 	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
-	GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
+	GOPATH=`cd ../tests/ && godep path`:$(GOPATH) go test -v ./tests/...
diff --git a/router/Makefile b/router/Makefile
@@ -56,4 +56,4 @@ test-unit:
 
 test-functional:
 	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
-	GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
+	GOPATH=`cd ../tests/ && godep path`:$(GOPATH) go test -v ./tests/...
diff --git a/store/Makefile b/store/Makefile
@@ -108,4 +108,4 @@ test-unit:
 
 test-functional:
 	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
-	GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
+	GOPATH=`cd ../tests/ && godep path`:$(GOPATH) go test -v ./tests/...
diff --git a/tests/Godeps/Godeps.json b/tests/Godeps/Godeps.json
diff --git a/tests/Godeps/Readme b/tests/Godeps/Readme
diff --git a/tests/Godeps/_workspace/.gitignore b/tests/Godeps/_workspace/.gitignore
diff --git a/...c/github.com/ThomasRooney/gexpect/LICENCE → ...c/github.com/ThomasRooney/gexpect/LICENCE b/...c/github.com/ThomasRooney/gexpect/LICENCE → ...c/github.com/ThomasRooney/gexpect/LICENCE
diff --git a/tests/Godeps/_workspace/src/github.com/ThomasRooney/gexpect/README.md b/tests/Godeps/_workspace/src/github.com/ThomasRooney/gexpect/README.md
diff --git a/tests/Godeps/_workspace/src/github.com/ThomasRooney/gexpect/examples/python.go b/tests/Godeps/_workspace/src/github.com/ThomasRooney/gexpect/examples/python.go