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

Add the ability to pass a timeout to beacons #52314

Merged
merged 2 commits into from Mar 27, 2019

Conversation

@twangboy
Copy link
Contributor

commented Mar 25, 2019

What does this PR do?

Fixes the following failing tests

integration.states.test_beacon.BeaconStateTestCase.test_present_absent
integration.modules.test_beacons.BeaconsAddDeleteTest.test_add_and_delete

What issues does this PR fix or reference?

#52245
#52246

Tests written?

Yes

Commits signed with GPG?

Yes

@twangboy twangboy added the 2019.2.1 label Mar 25, 2019
@garethgreenaway

This comment has been minimized.

Copy link
Member

commented Mar 25, 2019

@twangboy is f_timeout the right argument to pass in the run_function for the tests?

@twangboy

This comment has been minimized.

Copy link
Contributor Author

commented Mar 25, 2019

@garethgreenaway The run_function... uh, function... has a timeout parameter for itself. But it takes the f_timeout parameter and passes it to the function being called as part of kwargs. I believe the code is kwargs['timeout'] = f_timeout

@dwoz
dwoz approved these changes Mar 25, 2019
twangboy added 2 commits Mar 25, 2019
Update the tests to pass a longer timeout of 300 seconds, the default is
30
@twangboy twangboy force-pushed the twangboy:fix_beacon_tests branch from 58d2ddb to a5fa99a Mar 27, 2019
@dwoz dwoz merged commit d3f4c9d into saltstack:2019.2 Mar 27, 2019
9 checks passed
9 checks passed
WIP Ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
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
twangboy added a commit to twangboy/salt that referenced this pull request Mar 27, 2019
@twangboy twangboy referenced this pull request Mar 27, 2019
@twangboy twangboy deleted the twangboy:fix_beacon_tests branch Mar 27, 2019
dwoz added a commit that referenced this pull request Mar 27, 2019
Bring #52314 to develop
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.