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 4

Wait longer for the test process to finish

Browse source
This commit is contained in:
Daniel A. Wozniak 2024-08-06 17:40:09 -07:00 • committed by Daniel Wozniak
parent 2b2c03893e
commit bcb0d79cdc
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tests/pytests/functional/utils/test_process.py
View file

@ -6,7 +6,7 @@ Test salt's process utility module
"""
import os
import subprocess
import pathlib
import time
import pytest
@ -43,10 +43,7 @@ def test_process_manager_60749(process_manager):
def _get_num_fds(pid):
"Determine the number of open fds for a process, linux only."
proc = subprocess.run(
["ls", "-l", f"/proc/{pid}/fd"], capture_output=True, check=True
)
return len(proc.stdout.decode().split("\n")) - 1
return len(list(pathlib.Path(f"/proc/{pid}/fd").iterdir()))
@pytest.mark.skip_unless_on_linux
@ -62,13 +59,12 @@ def test_subprocess_list_fds():
process = salt.utils.process.SignalHandlingProcess(target=target)
process.start()
process_list.add(process)
time.sleep(0.3)
num = _get_num_fds(pid)
assert num == before_num + 2
process_list.cleanup()
start = time.time()
while time.time() - start < 1:
process_list.cleanup()
if not process_list.processes:
break
assert len(process_list.processes) == 0
assert _get_num_fds(pid) == num - 2