Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test loader namespaceing #56513

Merged
merged 15 commits into from
Sep 30, 2020
Merged

Test loader namespaceing #56513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
526a973
Test loader namespaceing
dwoz Apr 3, 2020
4e256e1
Honor loaded_base_name
dwoz Jun 14, 2020
c7cf71b
Ensure thin_dir is available.
garethgreenaway Jul 23, 2020
f3fc2da
ensure master_tops is available.
garethgreenaway Jul 23, 2020
c62b7ae
Need to ensure cachedir and fsclient are preserved throughout the call.
garethgreenaway Jul 27, 2020
ab39a52
override get_new_ioloop for TestEventListener
Ch3LL Aug 12, 2020
7281ae5
Merge branch 'master' into loader_namespace
garethgreenaway Sep 15, 2020
d656268
Merge branch 'master' into loader_namespace
garethgreenaway Sep 22, 2020
70039b5
Merge branch 'master' into loader_namespace
garethgreenaway Sep 25, 2020
1796602
Increase self.wait timeout in the test_clean_by_request to 30 seconds.
garethgreenaway Sep 26, 2020
3a5f467
bump timeouts up to 60 seconds.
garethgreenaway Sep 26, 2020
c4768e1
Removing the timeouts from self.wait. Bumping up the sleep before yi…
garethgreenaway Sep 28, 2020
92fa564
Revert "override get_new_ioloop for TestEventListener"
Ch3LL Sep 28, 2020
613fb0f
Add global lazyloader test
Ch3LL Sep 28, 2020
57784ce
Run pre-commit
Ch3LL Sep 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions salt/client/ssh/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
"""
Create ssh executor system
"""
# Import python libs

import base64
import binascii
Expand All @@ -28,8 +27,6 @@
import salt.loader
import salt.log
import salt.minion

# Import salt libs
import salt.output
import salt.roster
import salt.serializers.yaml
Expand All @@ -46,8 +43,6 @@
import salt.utils.thin
import salt.utils.url
import salt.utils.verify

# Import 3rd-party libs
from salt.ext import six
from salt.ext.six.moves import input # pylint: disable=import-error,redefined-builtin
from salt.template import compile_template
Expand Down Expand Up @@ -1128,6 +1123,7 @@ def run_wfunc(self):
minion_opts=self.minion_opts,
**self.target
)

opts_pkg = pre_wrapper["test.opts_pkg"]() # pylint: disable=E1102
if "_error" in opts_pkg:
# Refresh failed
Expand All @@ -1141,6 +1137,8 @@ def run_wfunc(self):
opts_pkg["extension_modules"] = self.opts["extension_modules"]
opts_pkg["module_dirs"] = self.opts["module_dirs"]
opts_pkg["_ssh_version"] = self.opts["_ssh_version"]
opts_pkg["thin_dir"] = self.opts["thin_dir"]
opts_pkg["master_tops"] = self.opts["master_tops"]
opts_pkg["__master_opts__"] = self.context["master_opts"]
if "known_hosts_file" in self.opts:
opts_pkg["known_hosts_file"] = self.opts["known_hosts_file"]
Expand Down Expand Up @@ -1203,6 +1201,7 @@ def run_wfunc(self):
minion_opts=self.minion_opts,
**self.target
)
wrapper.fsclient.opts["cachedir"] = opts["cachedir"]
self.wfuncs = salt.loader.ssh_wrapper(opts, wrapper, self.context)
wrapper.wfuncs = self.wfuncs

Expand Down
Loading