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 2

Switch to sminion support code

Browse source
This commit is contained in:
Pedro Algarvio 2019-08-28 16:18:26 +01:00
parent ae304b539a
commit 85e387d13b
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
1 changed files with 5 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
tests/conftest.py
View file

@ -34,6 +34,7 @@ sys.path.insert(0, CODE_DIR)
# Import test libs
from tests.support.runtests import RUNTIME_VARS
from tests.support.sminion import create_sminion
# Import pytest libs
import pytest
@ -1138,26 +1139,8 @@ class GrainsMarkEvaluator(MarkEvaluator):
def _getglobals(self):
item_globals = super(GrainsMarkEvaluator, self)._getglobals()
if GrainsMarkEvaluator._cached_grains is None:
cachedir = self.item.config.cache._cachedir
root_dir = cachedir / 'salt'
minion_id = 'grains-mark-evaluator-minion'
defaults = salt.config.DEFAULT_MINION_OPTS.copy()
defaults.pop('conf_file')
defaults.update({
'id': minion_id,
'root_dir': str(root_dir),
'cachedir': 'cachedir',
'sock_dir': 'sock',
'pki_dir': 'pki',
'log_file': 'logs/minion',
'pidfile': 'pids/minion.pid',
'server_id_use_crc': 'adler32'
})
opts = salt.config.minion_config(None,
defaults=defaults,
minion_id=minion_id,
cache_minion_id=True)
GrainsMarkEvaluator._cached_grains = salt.loader.grains(opts)
sminion = create_sminion()
GrainsMarkEvaluator._cached_grains = sminion.opts['grains'].copy()
item_globals['grains'] = GrainsMarkEvaluator._cached_grains.copy()
return item_globals
@ -1203,18 +1186,6 @@ def reap_stray_processes():
@pytest.fixture(scope='session')
def grains(request):
cachedir = request.config.cache._cachedir
root_dir = cachedir / 'salt'
defaults = salt.config.DEFAULT_MINION_OPTS.copy()
defaults.pop('conf_file')
defaults.update({
'root_dir': str(root_dir),
'cachedir': 'cachedir',
'sock_dir': 'sock',
'pki_dir': 'pki',
'log_file': 'logs/minion',
'pidfile': 'pids/minion.pid'
})
opts = salt.config.minion_config(None, defaults=defaults, minion_id='grains-fixture-minion-conf')
return salt.loader.grains(opts)
sminion = create_sminion()
return sminion.opts['grains'].copy()
# <---- Custom Fixtures ----------------------------------------------------------------------------------------------