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

Flush the logging handler just to be sure

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2023-11-07 12:23:40 +00:00 • committed by Pedro Algarvio
parent dc365fdce3
commit c5db6bf766
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
tests/pytests/unit/client/ssh/test_single.py
View file

@ -19,17 +19,13 @@ log = logging.getLogger(__name__)
@pytest.fixture
def opts(tmp_path):
return {
"argv": [
"ssh.set_auth_key",
"root",
"hobn+amNAXSBTiOXEqlBjGB...rsa root@master",
],
"__role": "master",
"cachedir": str(tmp_path),
"extension_modules": str(tmp_path / "extmods"),
}
def opts(master_opts):
master_opts["argv"] = [
"ssh.set_auth_key",
"root",
"hobn+amNAXSBTiOXEqlBjGB...rsa root@master",
]
return master_opts
@pytest.fixture
@ -411,6 +407,10 @@ def test_run_ssh_pre_flight_no_connect(opts, target, tmp_path, caplog):
with caplog.at_level(logging.TRACE):
with patch_send, patch_exec_cmd, patch_tmp:
ret = single.run_ssh_pre_flight()
# Flush the logging handler just to be sure
caplog.handler.flush()
assert "Copying the pre flight script" in caplog.text
assert "Could not copy the pre flight script to target" in caplog.text
assert ret == ret_send
@ -503,6 +503,9 @@ def test_run_ssh_pre_flight_connect(opts, target, tmp_path, caplog):
with patch_send, patch_exec_cmd, patch_tmp:
ret = single.run_ssh_pre_flight()
# Flush the logging handler just to be sure
caplog.handler.flush()
assert "Executing the pre flight script on target" in caplog.text
assert ret == ret_exec_cmd
assert send_mock.call_args_list[0][0][0] == tmp_file