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

removing code for older version of psutil that is no longer necessary. Adding more test cases.

Browse source
This commit is contained in:
Gareth J. Greenaway 2023-10-13 13:23:59 -07:00 • committed by Daniel Wozniak
parent bbff0243be
commit d1c171e93a
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
tests/pytests/unit/modules/test_ps.py
View file

@ -141,8 +141,6 @@ def test__status_when_some_matching_processes_then_only_correct_info_should_be_r
HAS_PSUTIL_VERSION = False
PSUTIL2 = psutil.version_info >= (2, 0)
STUB_CPU_TIMES = namedtuple("cputimes", "user nice system idle")(1, 2, 3, 4)
STUB_CPU_TIMES_PERCPU = [
namedtuple("cputimes", "user nice system idle")(1, 2, 3, 4),
@ -222,7 +220,7 @@ except ImportError:
def _get_proc_name(proc):
return proc.name() if PSUTIL2 else proc.name
return proc.name()
def _get_proc_pid(proc):
@ -305,12 +303,11 @@ class DummyProcess:
@pytest.fixture
def mocked_proc():
mocked_proc = MagicMock("salt.utils.psutil_compat.Process")
if PSUTIL2:
mocked_proc.name = Mock(return_value="test_mock_proc")
mocked_proc.pid = Mock(return_value=9999999999)
else:
mocked_proc.name = "test_mock_proc"
mocked_proc.pid = 9999999999
mocked_proc.name = Mock(return_value="test_mock_proc")
mocked_proc.pid = Mock(return_value=9999999999)
mocked_proc.cmdline = Mock(
return_value=["test_mock_proc", "--arg", "--kwarg=value"]
)
with patch("salt.utils.psutil_compat.Process.send_signal"), patch(
"salt.utils.psutil_compat.process_iter",
@ -475,6 +472,10 @@ def test_pgrep(mocked_proc):
):
assert mocked_proc.pid in (ps.pgrep(_get_proc_name(mocked_proc)) or [])
assert mocked_proc.pid in (
ps.pgrep(_get_proc_name(mocked_proc), full=True) or []
)
def test_pgrep_regex(mocked_proc):
with patch(