Browse Source

test: support -tags cluster_proxy for e2e tests

Anthony Romano 8 years ago
parent
commit
107828d777
1 changed files with 4 additions and 0 deletions
  1. 4 0
      test

+ 4 - 0
test

@@ -170,7 +170,10 @@ function cov_pass {
 	# use 30m timeout because e2e coverage takes longer
 	# use 30m timeout because e2e coverage takes longer
 	# due to many tests cause etcd process to wait
 	# due to many tests cause etcd process to wait
 	# on leadership transfer timeout during gracefully shutdown
 	# 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"
 	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
 	# incrementally merge to get coverage data even if some coverage files are corrupted
 	# optimistically assume etcdserver package's coverage file is OK since gocovmerge
 	# optimistically assume etcdserver package's coverage file is OK since gocovmerge
@@ -217,6 +220,7 @@ function integration_e2e_pass {
 function grpcproxy_pass {
 function grpcproxy_pass {
 	go test -timeout 20m -v ${RACE} -tags cluster_proxy -cpu 1,2,4 $@ ${REPO_PATH}/integration
 	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 ${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 {
 function release_pass {