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

Merge pull request #26607 from cachedout/minion_opts_dep

Browse Source 
Minion opts generation in yaml test
This commit is contained in:
Colton Myers 2015-08-28 10:00:07 -06:00
commit 2db2451cdf
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/integration/output/output.py
View File

@ -6,16 +6,17 @@
# Import Salt Libs
from __future__ import absolute_import
import os
import copy
import traceback
# Import Salt Testing Libs
from salttesting.helpers import ensure_in_syspath
from salttesting.mixins import RUNTIME_VARS
ensure_in_syspath('../../')
# Import Salt libs
import integration
from salt.output import display_output
import salt.config
class OutputReturnTest(integration.ShellCase):
@ -85,9 +86,9 @@ class OutputReturnTest(integration.ShellCase):
'''
Tests outputter reliability with utf8
'''
opts = copy.deepcopy(self.minion_opts)
opts = salt.config.minion_config(os.path.join(RUNTIME_VARS.TMP_CONF_DIR, "minion"))
opts['output_file'] = os.path.join(
self.minion_opts['root_dir'], 'outputtest')
opts['root_dir'], 'outputtest')
data = {'foo': {'result': False,
'aaa': 'azerzaeréééé',
'comment': u'ééééàààà'}}