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

Remove extra tests added after rebasing

Browse source
This commit is contained in:
Tyler Levy Conde 2024-04-16 15:22:23 -06:00 • committed by Daniel Wozniak
parent eef1ff2e2d
commit 8a724997a7
1 changed files with 0 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
tests/pytests/unit/client/ssh/test_shell.py
View file

@ -1,5 +1,4 @@
import importlib
import logging
import subprocess
import types
@ -102,32 +101,6 @@ def test_ssh_shell_exec_cmd_returns_status_code_with_highest_bit_set_if_process_
assert retcode == 137
def exec_cmd(cmd):
if cmd.startswith("mkdir -p"):
return "", "Not a directory", 1
return "OK", "", 0
def test_ssh_shell_send_makedirs_failure_returns_immediately():
with patch("salt.client.ssh.shell.Shell.exec_cmd", side_effect=exec_cmd):
shl = shell.Shell({}, "localhost")
stdout, stderr, retcode = shl.send("/tmp/file", "/tmp/file", True)
assert retcode == 1
assert "Not a directory" in stderr
def test_ssh_shell_send_makedirs_on_relative_filename_skips_exec(caplog):
with patch("salt.client.ssh.shell.Shell.exec_cmd", side_effect=exec_cmd) as cmd:
with patch("salt.client.ssh.shell.Shell._run_cmd", return_value=("", "", 0)):
shl = shell.Shell({}, "localhost")
with caplog.at_level(logging.WARNING):
stdout, stderr, retcode = shl.send("/tmp/file", "targetfile", True)
assert retcode == 0
assert "Not a directory" not in stderr
assert call("mkdir -p ''") not in cmd.mock_calls
assert "Makedirs called on relative filename" in caplog.text
@pytest.fixture()
def mock_bin_paths():
"""Automatically apply fixture to all tests that need it."""