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 timeout argument to run_salt for ShellCase #48143

Merged
merged 1 commit into from Jun 15, 2018

Conversation

Projects
None yet
3 participants
@Ch3LL
Contributor

Ch3LL commented Jun 14, 2018

What does this PR do?

This PR #47304 added the timeout variable for run_salt in the ShellTestCase Class but the integration.minion.test_timeout.MinionTimeoutTestCase.test_long_running_job test uses the ShellTest Class so updating this run_salt method with timeout argument

@Ch3LL Ch3LL requested a review from cachedout Jun 14, 2018

@rallytime rallytime merged commit 5ec3cf2 into saltstack:2017.7 Jun 15, 2018

6 of 9 checks passed

default Build finished.
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #18009 — FAILURE
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #19805 — FAILURE
Details
WIP ready for review
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #25954 — SUCCESS
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #5751 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #23681 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #10722 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #22644 — SUCCESS
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment