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

Use uncommon item in mine delete test #52393

merged 1 commit into from Apr 10, 2019


Copy link

commented Apr 2, 2019

What does this PR do?

As an attempt to prevent #52087 from failing during a (probable) race condition, rather than using grains.items, I've refactored this test to use test.arg which is less common, and
specifying a value that isn't currently used anywhere else.

What issues does this PR fix or reference?


Previous Behavior

If a mine.send \* grains.items was launched, or for any other reason the mine was updated with grains between mine.delete and mine.get, this test would fail due to the race condition (see #52087)

New Behavior

Use test.arg with an unlikely value in an attempt to avoid any possibility of race condition

Tests written?

Yes (and, since this was changing the test, I also manually verified - failing to actually delete the the value in the mine makes the test fail).

Commits signed with GPG?


Rather than using `grains.items`, `test.arg` is less common, and
specifiying a value that isn't currently used anywhere else should
eliminate any chance of race condition for this test.
dwoz approved these changes Apr 10, 2019
Copy link

left a comment

LGTM, I've re-launched the centos py3 tests which should pass now.

@dwoz dwoz merged commit d699485 into saltstack:2018.3 Apr 10, 2019
10 checks passed
10 checks passed
WIP Ready for review
continuous-integration/jenkins/pr-merge This commit looks good
jenkins/pr/docs The docs job has passed
jenkins/pr/lint Python lint test has passed
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
None yet
2 participants
You can’t perform that action at this time.