vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #5221 from heyitsanthony/parallel-e2e-integration 

test: run e2e and integration tests in parallel
release-3.0
Anthony Romano 2016-04-28 10:30:40 -07:00
parent d1e11842df 85edd66c65
commit 7c666b533a
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
integration/cluster.go
View File

@ -57,7 +57,7 @@ var (
// integration test uses well-known ports to listen for each running member,
// which ensures restarted member could listen on specific port again.
nextListenPort int64 = 20000
nextListenPort int64 = 21000
testTLSInfo = transport.TLSInfo{
KeyFile: "./fixtures/server.key.insecure",

8
test
View File

@ -63,8 +63,12 @@ function unit_tests {
function integration_tests {
echo "Running integration tests..."
go test -timeout 10m -v -cpu 1,2,4 $@ ${REPO_PATH}/e2e
go test -timeout 15m -v -cpu 1,2,4 $@ ${REPO_PATH}/integration
go test -timeout 10m -v -cpu 1,2,4 $@ ${REPO_PATH}/e2e &
e2epid="$!"
go test -timeout 15m -v -cpu 1,2,4 $@ ${REPO_PATH}/integration &
intpid="$1"
wait $e2epid
wait $intpid
go test -timeout 10m -v ${RACE} -cpu 1,2,4 $@ ${REPO_PATH}/clientv3/integration
go test -timeout 1m -v -cpu 1,2,4 $@ ${REPO_PATH}/contrib/raftexample
go test -timeout 1m -v ${RACE} -cpu 1,2,4 -run=Example $@ ${TEST}