Skip to content

Commit aba19e7

Browse files
mboersmamboersma
committed
Merge pull request #2577 from johanneswuerbach/godep-tests
ref(*): Manage test dependencies using godeps
2 parents 01dc19d + 95a3e48 commit aba19e7

407 files changed

Lines changed: 31399 additions & 646 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎builder/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,4 @@ test-unit:
7070

7171
test-functional:
7272
@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
73-
GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
73+
GOPATH=`cd ../tests/ && godep path`:$(GOPATH) go test -v ./tests/...

‎cache/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ test-unit:
5656

5757
test-functional:
5858
@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
59-
GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
59+
GOPATH=`cd ../tests/ && godep path`:$(GOPATH) go test -v ./tests/...

‎controller/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,4 @@ test-unit: setup-venv test-style
7272
test-functional:
7373
@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
7474
@docker history deis/test-postgresql >/dev/null 2>&1 || docker pull deis/test-postgresql:latest
75-
GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
75+
GOPATH=`cd ../tests/ && godep path`:$(GOPATH) go test -v ./tests/...

‎database/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ test-unit:
5050

5151
test-functional:
5252
@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
53-
GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
53+
GOPATH=`cd ../tests/ && godep path`:$(GOPATH) go test -v ./tests/...

‎logger/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ test-unit: test-style
6767

6868
test-functional:
6969
@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
70-
GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
70+
GOPATH=`cd ../tests/ && godep path`:$(GOPATH) go test -v ./tests/...
7171

7272
coverage:
7373
go test -coverprofile coverage.out ./syslog

‎registry/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ test-unit:
5050

5151
test-functional:
5252
@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
53-
GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
53+
GOPATH=`cd ../tests/ && godep path`:$(GOPATH) go test -v ./tests/...

‎router/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ test-unit:
5656

5757
test-functional:
5858
@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
59-
GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
59+
GOPATH=`cd ../tests/ && godep path`:$(GOPATH) go test -v ./tests/...

‎store/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,4 +108,4 @@ test-unit:
108108

109109
test-functional:
110110
@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
111-
GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
111+
GOPATH=`cd ../tests/ && godep path`:$(GOPATH) go test -v ./tests/...

‎tests/Godeps/Godeps.json‎

Lines changed: 214 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/Godeps/Readme‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)