valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2019.2.1' into fix_test_winrepo

Browse Source
This commit is contained in:
Shane Lee 2019-07-06 09:15:33 -06:00 committed by GitHub
commit c1f8cbacbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/unit/beacons/test_status.py
View File

@ -31,11 +31,12 @@ class StatusBeaconTestCase(TestCase, LoaderModuleMockMixin):
def setup_loader_modules(self): def setup_loader_modules(self):
opts = salt.config.DEFAULT_MINION_OPTS opts = salt.config.DEFAULT_MINION_OPTS
opts['grains'] = salt.loader.grains(opts)
module_globals = { module_globals = {
'__opts__': opts, '__opts__': opts,
'__salt__': 'autoload', '__salt__': 'autoload',
'__context__': {}, '__context__': {},
'__grains__': {'kernel': 'Linux'} '__grains__': opts['grains']
} }
return { return {
status: module_globals, status: module_globals,