Skip to content
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.

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

test: Avoid race in p2p_timeouts #15013

Merged
merged 1 commit into from Dec 21, 2018

Conversation

Projects
None yet
4 participants
@MarcoFalke
Copy link
Member

commented Dec 21, 2018

Avoid filesystem/network racyness by sleeping another second. The alternative would be to poll the debug.log, but that seems overkill to avoid a sleep in a test that already requires them.

@MarcoFalke MarcoFalke added this to the 0.18.0 milestone Dec 21, 2018

@MarcoFalke MarcoFalke added the Tests label Dec 21, 2018

@practicalswift

This comment has been minimized.

Copy link
Member

commented Dec 21, 2018

utACK fabcd64

@DrahtBot

This comment has been minimized.

Copy link
Contributor

commented Dec 21, 2018

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

No conflicts as of last run.

@gkrizek

This comment has been minimized.

Copy link
Contributor

commented Dec 21, 2018

ACK fabcd64

I was testing #14954 in my fork (which failed the p2p_timeouts test). I applied these changes and it's passing now.

MarcoFalke added a commit to MarcoFalke/bitcoin that referenced this pull request Dec 21, 2018

Merge bitcoin#15013: test: Avoid race in p2p_timeouts
fabcd64 test: Avoid racy test p2p_timeouts (MarcoFalke)

Pull request description:

  Avoid filesystem/network racyness by sleeping another second. The alternative would be to poll the `debug.log`, but that seems overkill to avoid a sleep in a test that already requires them.

Tree-SHA512: 32de75ecba38426323158fda241e37ffae73806d8c0e60b7ad73fb917e9cd25a3e5f0722cbc6f2f7a5b86501221c317783266bc2e3b4697fb120f05898ccc12d

@MarcoFalke MarcoFalke merged commit fabcd64 into bitcoin:master Dec 21, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@MarcoFalke MarcoFalke deleted the MarcoFalke:Mf1812-testP2PnoRace branch Dec 21, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.