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

Fix race condition in event assertion #52540

Merged
merged 16 commits into from Apr 19, 2019

Conversation

@dwoz
Copy link
Contributor

commented Apr 13, 2019

Fix race condition in event assertion.

The integration.reactor.test_reactor.ReactorTest.test_ping_reaction is passing in most places but failing every once in a while. Like here: https://jenkinsci.saltstack.com/job/2018.3/job/salt-centos-6-py2/166/

Tests written?

No - Fixing flaky test integration.reactor.test_reactor.ReactorTest.test_ping_reaction

Commits signed with GPG?

Yes

Wait longer for the ping reaction in case there are multiple events on
the bus and/or high load on the system running tests
dwoz added 6 commits Apr 14, 2019
@Ch3LL
Ch3LL approved these changes Apr 16, 2019
dwoz added 6 commits Apr 18, 2019
@dwoz dwoz force-pushed the dwoz:ping_wait branch from df6536c to 3be18e5 Apr 19, 2019
@dwoz dwoz changed the title Wait longer for ping reaction Fix race condition in event assertion Apr 19, 2019
dwoz added 2 commits Apr 19, 2019
@s0undt3ch s0undt3ch merged commit 9bd0b7a into saltstack:2018.3 Apr 19, 2019
10 checks passed
10 checks passed
WIP Ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint Python lint test has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.