Skip to content

Eric/agreement test timeout adjustment #905

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
algobolson merged 32 commits into from
Mar 12, 2020
Merged

Eric/agreement test timeout adjustment #905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
c055ddb
Merge pull request #1 from algorand/master
egieseke Jun 24, 2019
fa6bb63
Merge pull request #2 from algorand/master
egieseke Jul 2, 2019
3d32b1b
Merge branch 'master' of https://github.com/algorand/go-algorand
egieseke Jul 11, 2019
47a71ad
Merge branch 'master' of https://github.com/algorand/go-algorand
egieseke Jul 29, 2019
b37b800
Merge remote-tracking branch 'upstream/master'
egieseke Aug 2, 2019
aec5bdd
Merge branch 'master' of https://github.com/algorand/go-algorand
egieseke Aug 9, 2019
11f28a2
Merge branch 'master' of https://github.com/algorand/go-algorand
egieseke Sep 10, 2019
8c0026e
Merge branch 'master' of https://github.com/algorand/go-algorand
egieseke Sep 11, 2019
a851563
Merge branch 'master' of https://github.com/algorand/go-algorand
egieseke Sep 13, 2019
0b43e97
Merge branch 'master' of https://github.com/algorand/go-algorand
egieseke Oct 3, 2019
31b26ce
Merge branch 'master' of https://github.com/algorand/go-algorand
egieseke Oct 22, 2019
ef4b5b3
Merge branch 'master' of https://github.com/algorand/go-algorand
egieseke Oct 24, 2019
b694dcf
Merge branch 'master' of https://github.com/algorand/go-algorand
egieseke Oct 30, 2019
09f9a91
Merge branch 'master' of https://github.com/algorand/go-algorand
egieseke Nov 1, 2019
f955c24
Merge branch 'master' of https://github.com/algorand/go-algorand
egieseke Nov 4, 2019
dafd3fd
Merge branch 'master' of https://github.com/algorand/go-algorand
egieseke Nov 5, 2019
f6ad55f
Merge branch 'master' of https://github.com/algorand/go-algorand
egieseke Nov 6, 2019
6b89fac
Merge branch 'master' of https://github.com/algorand/go-algorand
egieseke Nov 18, 2019
c9c432f
Merge branch 'master' of https://github.com/algorand/go-algorand
egieseke Nov 19, 2019
9849769
Merge branch 'master' of https://github.com/algorand/go-algorand
egieseke Nov 20, 2019
0525f95
Merge branch 'master' of https://github.com/algorand/go-algorand
egieseke Nov 20, 2019
3f270ca
Merge branch 'master' of https://github.com/algorand/go-algorand
egieseke Nov 20, 2019
e5ad00d
Merge branch 'master' of https://github.com/algorand/go-algorand
egieseke Dec 5, 2019
d32f769
Merge branch 'master' of https://github.com/algorand/go-algorand
egieseke Dec 6, 2019
87fb8b9
Merge branch 'master' of https://github.com/algorand/go-algorand
egieseke Dec 11, 2019
0e3f09d
Merge branch 'master' of https://github.com/algorand/go-algorand
egieseke Feb 10, 2020
f899573
Merge branch 'master' of https://github.com/algorand/go-algorand
egieseke Feb 14, 2020
7d0de73
Merge branch 'master' of https://github.com/algorand/go-algorand
egieseke Feb 26, 2020
c218867
Merge branch 'master' of https://github.com/algorand/go-algorand
egieseke Feb 26, 2020
f61f30e
Merge branch 'master' of https://github.com/algorand/go-algorand
egieseke Feb 28, 2020
50469eb
Merge branch 'master' of https://github.com/algorand/go-algorand
egieseke Mar 9, 2020
2f93f41
Extend timeouts for simulate_test and service_test to support
egieseke Mar 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion agreement/agreementtest/simulate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import (

var poolAddr = basics.Address{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}

var deadline = time.Second
var deadline = time.Second * 5

var proto = protocol.ConsensusCurrentVersion

Expand Down
2 changes: 1 addition & 1 deletion agreement/service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ func (m *activityMonitor) waitForActivity() {
func (m *activityMonitor) waitForQuiet() {
select {
case <-m.quiet:
case <-time.After(5 * time.Second):
case <-time.After(10 * time.Second):
m.dump()

var buf [1000000]byte
Expand Down