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

test fixes

Browse source
This commit is contained in:
Daniel A. Wozniak 2023-05-28 01:00:15 -07:00 • committed by Gareth J. Greenaway
parent e521194579
commit 5ac48c5161
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/crypt.py
View file

@ -558,8 +558,8 @@ class AsyncAuth:
self._crypticle = Crypticle(self.opts, creds["aes"])
self._authenticate_future = tornado.concurrent.Future()
self._authenticate_future.set_result(True)
else:
self.authenticate()
#else:
# self.authenticate()
def __deepcopy__(self, memo):
cls = self.__class__

2
tests/pytests/functional/channel/test_server.py
View file

@ -176,7 +176,7 @@ def test_pub_server_channel(
assert not bool(os.lstat(p).st_mode & stat.S_IRGRP)
assert not bool(os.lstat(p).st_mode & stat.S_IROTH)
pub_channel = salt.channel.client.AsyncPubChannel.factory(minion_config)
pub_channel = salt.channel.client.AsyncPubChannel.factory(minion_config, io_loop=io_loop)
received = []
try:

1
tests/pytests/functional/cli/test_salt.py
View file

@ -13,6 +13,7 @@ log = logging.getLogger(__name__)
@pytest.fixture(autouse=True)
def _install_salt_extension(shell):
if os.environ.get("ONEDIR_TESTRUN", "0") == "0":
yield
return
script_name = "salt-pip"