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 test hang #37175

Merged
merged 2 commits into from
Oct 24, 2016
Merged

Fix test hang #37175

merged 2 commits into from
Oct 24, 2016

Conversation

cachedout
Copy link
Contributor

We don't need to clean up here since the test suite will handle it for us. This unblocks the deployment of the newest version of salttesting.

We don't need to clean up here since the test suite will handle it for us.
cls.process_manager.kill_children()
# Attempting to kill the children hangs the test suite.
# Let the test suite handle this instead.
# cls.process_manager.kill_children()
time.sleep(2) # Give the procs a chance to fully close before we stop the io_loop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The sleep is probably also unnecessary right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed. Good eye.

@cachedout cachedout merged commit 0d7af93 into saltstack:2016.3 Oct 24, 2016
rallytime pushed a commit to rallytime/salt that referenced this pull request Oct 24, 2016
rallytime pushed a commit that referenced this pull request Oct 24, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants