def test_include_config_with_errors_exit(self): ''' Tests that include_config exits on errors ''' include_file = 'minion.d/my.conf' config_path = '/etc/salt/minion' with patch('glob.glob', MagicMock(return_value=include_file)): with patch('salt.config._read_conf_file', _salt_configuration_error): with self.assertRaises(SystemExit): sconfig.include_config(include_file, config_path, verbose=False, exit_on_config_errors=True)
def test_include_config_with_errors(self): ''' Tests that include_config function returns valid configuration even on errors ''' include_file = 'minion.d/my.conf' config_path = '/etc/salt/minion' config_opts = {} with patch('glob.glob', MagicMock(return_value=include_file)): with patch('salt.config._read_conf_file', _salt_configuration_error): configuration = sconfig.include_config(include_file, config_path, verbose=False) self.assertEqual(config_opts, configuration)