From 4625ee65b8ec8fda8635adb8eccf943b39dc4821 Mon Sep 17 00:00:00 2001 From: Mike Place Date: Mon, 18 Jul 2016 09:12:18 -0600 Subject: [PATCH] Remove unnedeed config test Refs #34607 --- tests/unit/config/config_test.py | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py index 42c5f9bcbdc7..9a78247738a9 100644 --- a/tests/unit/config/config_test.py +++ b/tests/unit/config/config_test.py @@ -18,7 +18,7 @@ # Import Salt Testing libs from salttesting import TestCase from salttesting.mock import MagicMock, patch -from salttesting.helpers import ensure_in_syspath, TestsLoggingHandler +from salttesting.helpers import ensure_in_syspath from salt.exceptions import CommandExecutionError ensure_in_syspath('../') @@ -364,34 +364,6 @@ def test_syndic_config(self): self.assertEqual(syndic_opts['_master_conf_file'], minion_conf_path) self.assertEqual(syndic_opts['_minion_conf_file'], syndic_conf_path) - def test_issue_6714_parsing_errors_logged(self): - try: - tempdir = tempfile.mkdtemp(dir=integration.SYS_TMP_DIR) - test_config = os.path.join(tempdir, 'config') - - # Let's populate a master configuration file with some basic - # settings - salt.utils.fopen(test_config, 'w').write( - 'root_dir: {0}\n' - 'log_file: {0}/foo.log\n'.format(tempdir) + - '\n\n\n' - 'blah:false\n' - ) - - with TestsLoggingHandler() as handler: - # Let's load the configuration - config = sconfig.master_config(test_config) - for message in handler.messages: - if message.startswith('ERROR:Error parsing configuration'): - break - else: - raise AssertionError( - 'No parsing error message was logged' - ) - finally: - if os.path.isdir(tempdir): - shutil.rmtree(tempdir) - @patch('salt.utils.network.get_fqhostname', MagicMock(return_value='localhost')) def test_get_id_etc_hostname(self): '''