Skip to content

Commit

Permalink
test: support -tags cluster_proxy for e2e tests
Browse files Browse the repository at this point in the history
  • Loading branch information
heyitsanthony committed Jul 20, 2017
1 parent bf633b9 commit 95a1bff
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions test
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,10 @@ function cov_pass {
# use 30m timeout because e2e coverage takes longer
# due to many tests cause etcd process to wait
# on leadership transfer timeout during gracefully shutdown
echo Testing e2e without proxy...
go test -tags cov -timeout 30m -v ${REPO_PATH}"/e2e" || failed="$failed e2e"
echo Testing e2e with proxy...
go test -tags "cov cluster_proxy" -timeout 30m -v ${REPO_PATH}"/e2e" || failed="$failed e2e-proxy"

# incrementally merge to get coverage data even if some coverage files are corrupted
# optimistically assume etcdserver package's coverage file is OK since gocovmerge
Expand Down Expand Up @@ -217,6 +220,7 @@ function integration_e2e_pass {
function grpcproxy_pass {
go test -timeout 20m -v ${RACE} -tags cluster_proxy -cpu 1,2,4 $@ ${REPO_PATH}/integration
go test -timeout 15m -v ${RACE} -tags cluster_proxy -cpu 1,2,4 $@ ${REPO_PATH}/clientv3/integration
go test -timeout 15m -v -tags cluster_proxy $@ ${REPO_PATH}/e2e
}

function release_pass {
Expand Down

0 comments on commit 95a1bff

Please sign in to comment.