saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

change some timing, allow more time for the process to fully die

Browse source
This commit is contained in:
MKLeb 2022-07-21 15:44:39 -04:00 • committed by Megan Wilhite
parent 569dafd214
commit 54e2c9fa06
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/pytests/integration/ssh/test_ssh_setup.py
View file

@ -175,7 +175,7 @@ def test_setup(salt_ssh_cli, ssh_container_name, ssh_sub_container_name, ssh_pas
assert ret.data[id] == id
# Run a test.sleep and kill it
sleep_time = 30
sleep_time = 15
cmdline = salt_ssh_cli.cmdline("test.sleep", sleep_time, minion_tgt="*")
terminal_stdout = tempfile.SpooledTemporaryFile(512000, buffering=0)
terminal_stderr = tempfile.SpooledTemporaryFile(512000, buffering=0)
@ -203,7 +203,7 @@ def test_setup(salt_ssh_cli, ssh_container_name, ssh_sub_container_name, ssh_pas
with proc:
# Wait for the process to terminate, to avoid zombies.
# Shouldn't really take the 30 seconds
proc.wait(sleep_time)
proc.wait(sleep_time * 2)
# poll the terminal so the right returncode is set on the popen object
proc.poll()
# This call shouldn't really be necessary