saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 02:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix ssh tests

Browse source
This commit is contained in:
Daniel A. Wozniak 2024-02-19 22:50:37 -07:00
parent 34ab8c732b
commit 66d8a33c88
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/loader/__init__.py
View file

@ -890,7 +890,9 @@ def log_handlers(opts, loaded_base_name=None):
return FilterDictWrapper(ret, ".setup_handlers") return FilterDictWrapper(ret, ".setup_handlers")
def ssh_wrapper(opts, functions=None, context=None, loaded_base_name=None): def ssh_wrapper(
opts, functions=None, context=None, file_client=None, loaded_base_name=None
):
""" """
Returns the custom logging handler modules Returns the custom logging handler modules
@ -908,7 +910,11 @@ def ssh_wrapper(opts, functions=None, context=None, loaded_base_name=None):
), ),
opts, opts,
tag="wrapper", tag="wrapper",
pack={"__salt__": functions, "__context__": context}, pack={
"__salt__": functions,
"__context__": context,
"__file_client__": file_client,
},
loaded_base_name=loaded_base_name, loaded_base_name=loaded_base_name,
) )

1
tests/conftest.py
View file

@ -23,7 +23,6 @@ import salt
import salt._logging import salt._logging
import salt._logging.mixins import salt._logging.mixins
import salt.config import salt.config
import salt.loader
import salt.utils.files import salt.utils.files
import salt.utils.path import salt.utils.path
import salt.utils.platform import salt.utils.platform