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

[master] Porting #50059 to master #55844

Merged
merged 9 commits into from
Jan 13, 2020
+108 −2
Merged

[master] Porting #50059 to master #55844

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3ad7928
Initial work to allow running multiple instances of a Salt engine.
garethgreenaway Oct 15, 2018
ff06eaa
Adding some documention and some information to the release notes abo…
garethgreenaway Oct 25, 2018
e66cf67
Adding a test to test engine_type parameter.
garethgreenaway Oct 25, 2018
e4af051
Moving unit.engines.test_engines to unit.test_engines.
garethgreenaway Oct 28, 2018
e8241ab
Moving unit.engines.test_engines to unit.test_engines.
garethgreenaway Oct 28, 2018
f5125b3
Renaming engine_type to engine_module for configuration parameter.
garethgreenaway Oct 29, 2018
41c7fdd
Fixing lint, removing NO_MOCK and NO_MOCK_REASON.
garethgreenaway Jan 12, 2020
8dc87f4
Fixing lint
garethgreenaway Jan 12, 2020
80a52ab
Fixing failed test, using a copy of the default minion opts.
garethgreenaway Jan 12, 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
Prev Previous commit
Fixing failed test, using a copy of the default minion opts.
@garethgreenaway
garethgreenaway committed Jan 12, 2020
commit 80a52ab32883f54b6b05147147d12aecf16ea77d
2 changes: 1 addition & 1 deletion tests/unit/test_engines.py
View file
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ def test_engine_module(self):
'''
Test
'''
mock_opts = salt.config.DEFAULT_MINION_OPTS
mock_opts = salt.config.DEFAULT_MINION_OPTS.copy()
mock_opts['__role'] = 'minion'
mock_opts['engines'] = [{'test_one': {'engine_module': 'test'}},
{'test_two': {'engine_module': 'test'}}]