diff --git a/tests/integration/output/output.py b/tests/integration/output/output.py index 00817724a8..0da35ac2a2 100644 --- a/tests/integration/output/output.py +++ b/tests/integration/output/output.py @@ -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'ééééàààà'}}