Merge pull request #5363 from heyitsanthony/fix-test-wait

test: fix wait on integration tests
This commit is contained in:
Anthony Romano 2016-05-16 10:28:45 -07:00
commit e52fc2d07e

2
test
View File

@ -66,7 +66,7 @@ function integration_tests {
go test -timeout 10m -v -cpu 1,2,4 $@ ${REPO_PATH}/e2e & go test -timeout 10m -v -cpu 1,2,4 $@ ${REPO_PATH}/e2e &
e2epid="$!" e2epid="$!"
go test -timeout 15m -v -cpu 1,2,4 $@ ${REPO_PATH}/integration & go test -timeout 15m -v -cpu 1,2,4 $@ ${REPO_PATH}/integration &
intpid="$1" intpid="$!"
wait $e2epid wait $e2epid
wait $intpid wait $intpid
go test -timeout 10m -v ${RACE} -cpu 1,2,4 $@ ${REPO_PATH}/clientv3/integration go test -timeout 10m -v ${RACE} -cpu 1,2,4 $@ ${REPO_PATH}/clientv3/integration