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

Fix test_system flaky setup_teardown fn

Browse source
This commit is contained in:
Marek Czernek 2024-08-30 11:37:27 +02:00 • committed by Daniel Wozniak
parent 99639ca5c9
commit 6c38c1a253
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/pytests/functional/modules/test_system.py
View file

@ -5,10 +5,12 @@ import shutil
import signal
import subprocess
import textwrap
import time
import pytest
import salt.utils.files
from salt.exceptions import CommandExecutionError
pytestmark = [
pytest.mark.skip_unless_on_linux,
@ -76,7 +78,13 @@ def setup_teardown_vars(file, service, system):
file.remove("/etc/machine-info")
if _systemd_timesyncd_available_:
res = service.start("systemd-timesyncd")
try:
res = service.start("systemd-timesyncd")
except CommandExecutionError:
# We possibly did too many restarts in too short time
# Wait 10s (default systemd timeout) and try again
time.sleep(10)
res = service.start("systemd-timesyncd")
assert res