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

Default shell commands timeout to 240 seconds

Browse source
This commit is contained in:
Pedro Algarvio 2024-05-03 22:38:31 +01:00
parent 1d21028471
commit 454a74c8d7
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tests/support/pkg.py
View file

@ -12,7 +12,7 @@ from typing import TYPE_CHECKING, Dict, List
import attr
import distro
import packaging
import packaging.version
import psutil
import pytest
import requests
@ -85,7 +85,7 @@ class SaltPkgInstall:
@proc.default
def _default_proc(self):
return Subprocess()
return Subprocess(timeout=240)
@distro_id.default
def _default_distro_id(self):
@ -105,7 +105,7 @@ class SaltPkgInstall:
@distro_version.default
def _default_distro_version(self):
if self.distro_name == "photon":
if self.distro_name in ("photon", "rocky"):
return distro.version().split(".")[0]
return distro.version().lower()
@ -508,7 +508,6 @@ class SaltPkgInstall:
upgrade_cmd,
"-y",
*args,
_timeout=120,
env=env,
)
else: