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

Merge pull request #46434 from gtmanfred/highstate_return

Browse source 
split return key value correctly
This commit is contained in:
Nicole Thomas 2018-03-09 12:45:20 -05:00 • committed by GitHub
commit cac096b311
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 115 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/returners/highstate_return.py
View file

@ -293,8 +293,7 @@ def _generate_states_report(sorted_data):
'''
states = []
for state, data in sorted_data:
module, stateid, name, function = \
[x.rstrip('_').lstrip('-') for x in state.split('|')]
module, stateid, name, function = state.split('_|-')
module_function = '.'.join((module, function))
result = data.get('result', '')
single = [

114
tests/unit/returners/test_highstate_return.py Normal file
View file

@ -0,0 +1,114 @@
# -*- coding: utf-8 -*-
'''
tests.unit.returners.test_highstate_return
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Unit tests for the Highstate Returner Cache.
'''
# Import Python libs
from __future__ import absolute_import
import json
import logging
import os
# Import Salt Testing libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.runtests import RUNTIME_VARS
from tests.support.unit import TestCase
# Import Salt libs
import salt.utils
import salt.returners.highstate_return as highstate
log = logging.getLogger(__name__)
class HighstateReturnerTestCase(TestCase, LoaderModuleMockMixin):
'''
Tests for the highstate_return returner
'''
output_file = os.path.join(RUNTIME_VARS.TMP, 'highstate_return')
def tearDown(self):
os.unlink(self.output_file)
def setup_loader_modules(self):
return {highstate: {'__opts__': {
'highstate.report_everything': True,
'highstate.report_format': 'json',
'highstate.report_delivery': 'file',
'highstate.file_output': self.output_file,
}}}
def test_pipe_in_name(self):
ret = {
'fun_args': ['test'],
'jid': '20180308201402941603',
'return': {
'cmd_|-test_|-echo hi | grep h\n_|-run': {
'comment': 'Command "echo hi | grep h\n" run',
'name': 'echo hi | grep h\n',
'start_time': '20:14:03.053612',
'result': True,
'duration': 75.198,
'__run_num__': 0,
'__sls__': u'test',
'changes': {
'pid': 1429,
'retcode': 0,
'stderr': '',
'stdout': 'hi',
},
'__id__': 'test',
}
},
'retcode': 0,
'success': True,
'fun': 'state.apply',
'id': 'salt',
'out': 'highstate',
}
expected = [
{
"stats": [
{"total": 1},
{"failed": 0, "__style__": "failed"},
{"unchanged": 0, "__style__": "unchanged"},
{"changed": 1, "__style__": "changed"}, {"duration": 75.198},
],
},
{
"job": [
{"function": "state.apply"},
{"arguments": ["test"]},
{"jid": "20180308201402941603"},
{"success": True},
{"retcode": 0}
],
},
{
"states": [
{
"test": [
{"function": "cmd.run"},
{"name": "echo hi | grep h\n"},
{"result": True},
{"duration": 75.198},
{"comment": "Command \"echo hi | grep h\n\" run"},
{"changes": [
{"pid": 1429},
{"retcode": 0},
{"stderr": ""},
{"stdout": "hi"}
]},
{"started": "20:14:03.053612"}
],
"__style__": "changed"
}
]
}
]
highstate.returner(ret)
with salt.utils.fopen(self.output_file) as fh_:
self.assertEqual(json.load(fh_), expected)