travis timeouts has been increased

This commit is contained in:
Evgeny Danienko 2017-11-08 10:35:29 +03:00
parent 209d5fed74
commit 332e18a3a9
No known key found for this signature in database
GPG Key ID: BC8C34D8B45BECBF
3 changed files with 3 additions and 13 deletions

View File

@ -17,7 +17,7 @@ jobs:
- stage: Test e2e on privite network
script: make test-e2e
- stage: Test e2e on public network
script: make test-e2e networkid=4
script: travis_wait 50 make test-e2e networkid=4
cache:
directories:
- ".ethereumtest/Mainnet"

View File

@ -111,7 +111,7 @@ test-e2e: ##@tests Run e2e tests
go test -timeout 5m ./e2e/accounts/... -network=$(networkid)
go test -timeout 5m ./e2e/api/... -network=$(networkid)
go test -timeout 5m ./e2e/node/... -network=$(networkid)
go test -timeout 30m ./e2e/jail/... -network=$(networkid)
go test -timeout 50m ./e2e/jail/... -network=$(networkid)
go test -timeout 20m ./e2e/rpc/... -network=$(networkid)
go test -timeout 20m ./e2e/whisper/... -network=$(networkid)
go test -timeout 10m ./e2e/transactions/... -network=$(networkid)

View File

@ -104,12 +104,10 @@ func EnsureNodeSync(nodeManager common.NodeManager) {
}
// todo(@jeka): we should extract it into config
timeout := time.NewTimer(30 * time.Minute)
timeout := time.NewTimer(50 * time.Minute)
defer timeout.Stop()
ticker := time.NewTicker(1 * time.Second)
defer ticker.Stop()
statusTicker := time.NewTicker(5 * time.Minute)
defer statusTicker.Stop()
for {
select {
@ -126,15 +124,7 @@ func EnsureNodeSync(nodeManager common.NodeManager) {
return
}
}
// FIXME(tiabc): This is done for travis not to kill the application if syncing is taking
// too long. Another approach is to use travis_wait, see:
// https://docs.travis-ci.com/user/common-build-problems/#Build-times-out-because-no-output-was-received
// However, in case we prefix commands with `travis_wait`, the output is not shown in case
// of any error and it's impossible to get what happened. Is there a proper way out of this problem?
case <-statusTicker.C:
fmt.Println("Syncing...")
}
}
}