| kparal | |
| tflink |
Tried running a task. Also manually checked that YAMLError catches both ParserError and ScannerError. Worked.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
Can you amend the docstring? And perhaps a unit test or two, to verify that we catch exceptions when parsing % or :?
| Path | Packages | |||
|---|---|---|---|---|
| M | libtaskotron/config.py (6 lines) | |||
| M | testing/test_config.py (18 lines) |
| Commit | Tree | Parents | Author | Summary | Date |
|---|---|---|---|---|---|
| 8ba7d34443b8 | b4dab93d34ae | 94f5bcbd6c46 | Martin Krizek | Fail with TaskotronConfigError on YAML errors (Show More…) | Mar 31 2016, 10:49 AM |
| Show First 20 Lines • Show All 277 Lines • ▼ Show 20 Line(s) | |||||
| 278 | 278 | | |||
| 279 | 279 | | |||
| 280 | def parse_yaml_from_file(filename): | 280 | def parse_yaml_from_file(filename): | ||
| 281 | ''' | 281 | ''' | ||
| 282 | Parse given file in YAML format into a dictionary. | 282 | Parse given file in YAML format into a dictionary. | ||
| 283 | 283 | | |||
| 284 | :param str filename: a filename that yaml data are loaded from | 284 | :param str filename: a filename that yaml data are loaded from | ||
| 285 | :return: dictionary constructed from the yaml document | 285 | :return: dictionary constructed from the yaml document | ||
| 286 | :raise TaskotronConfigError: when YAML parsing fails | ||||
| 286 | ''' | 287 | ''' | ||
| 287 | with open(filename, 'r') as datafile: | 288 | with open(filename, 'r') as datafile: | ||
| 288 | return yaml.safe_load(datafile.read()) | 289 | try: | ||
| 290 | return yaml.safe_load(datafile.read()) | ||||
| 291 | except yaml.YAMLError, e: | ||||
| 292 | raise exc.TaskotronConfigError(e) | ||||
| 289 | 293 | | |||
| 290 | 294 | | |||
| 291 | def load_namespaces_config(): | 295 | def load_namespaces_config(): | ||
| 292 | ''' | 296 | ''' | ||
| 293 | Load and parse namespaces config file into a dictionary. | 297 | Load and parse namespaces config file into a dictionary. | ||
| 294 | 298 | | |||
| 295 | :return: dictionary constructed from the yaml document | 299 | :return: dictionary constructed from the yaml document | ||
| 296 | ''' | 300 | ''' | ||
| Show All 20 Lines | |||||
| 1 | # -*- coding: utf-8 -*- | 1 | # -*- coding: utf-8 -*- | ||
|---|---|---|---|---|---|
| 2 | # Copyright 2009-2014, Red Hat, Inc. | 2 | # Copyright 2009-2014, Red Hat, Inc. | ||
| 3 | # License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+> | 3 | # License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+> | ||
| 4 | # See the LICENSE file for more details on Licensing | 4 | # See the LICENSE file for more details on Licensing | ||
| 5 | 5 | | |||
| 6 | '''Unit tests for libtaskotron/config.py''' | 6 | '''Unit tests for libtaskotron/config.py''' | ||
| 7 | 7 | | |||
| 8 | import os | 8 | import os | ||
| 9 | import pytest | 9 | import pytest | ||
| 10 | import mock | ||||
| 10 | from StringIO import StringIO | 11 | from StringIO import StringIO | ||
| 11 | from libtaskotron import config | 12 | from libtaskotron import config | ||
| 12 | from libtaskotron import exceptions as exc | 13 | from libtaskotron import exceptions as exc | ||
| 13 | 14 | | |||
| 14 | 15 | | |||
| 15 | @pytest.mark.usefixtures('setup') | 16 | @pytest.mark.usefixtures('setup') | ||
| 16 | class TestConfig(object): | 17 | class TestConfig(object): | ||
| 17 | 18 | | |||
| ▲ Show 20 Lines • Show All 146 Lines • ▼ Show 20 Line(s) | 164 | if attr.startswith('_'): | |||
| 164 | continue | 165 | continue | ||
| 165 | conf.runtask_mode = value | 166 | conf.runtask_mode = value | ||
| 166 | config._check_sanity(conf) | 167 | config._check_sanity(conf) | ||
| 167 | 168 | | |||
| 168 | conf.runtask_mode = 'invalid runtask mode name' | 169 | conf.runtask_mode = 'invalid runtask mode name' | ||
| 169 | with pytest.raises(exc.TaskotronConfigError): | 170 | with pytest.raises(exc.TaskotronConfigError): | ||
| 170 | config._check_sanity(conf) | 171 | config._check_sanity(conf) | ||
| 171 | 172 | | |||
| 173 | def test_check_yaml_scanning_error(self): | ||||
| 174 | file_data = '%' | ||||
| 175 | mocked_open = mock.mock_open(read_data=file_data) | ||||
| 176 | | ||||
| 177 | with mock.patch('__builtin__.open', mocked_open): | ||||
| 178 | with pytest.raises(exc.TaskotronConfigError): | ||||
| 179 | config.parse_yaml_from_file('mocked_filename') | ||||
| 180 | | ||||
| 181 | def test_check_yaml_parsing_error(self): | ||||
| 182 | file_data = ':' | ||||
| 183 | mocked_open = mock.mock_open(read_data=file_data) | ||||
| 184 | | ||||
| 185 | with mock.patch('__builtin__.open', mocked_open): | ||||
| 186 | with pytest.raises(exc.TaskotronConfigError): | ||||
| 187 | config.parse_yaml_from_file('mocked_filename') | ||||
| 188 | | ||||
| 189 | | ||||
| 172 | class TestConfigDefaults(object): | 190 | class TestConfigDefaults(object): | ||
| 173 | 191 | | |||
| 174 | configtypes = [config.Config(), | 192 | configtypes = [config.Config(), | ||
| 175 | config.TestingConfig(), | 193 | config.TestingConfig(), | ||
| 176 | config.ProductionConfig() | 194 | config.ProductionConfig() | ||
| 177 | ] | 195 | ] | ||
| 178 | 196 | | |||
| 179 | @pytest.fixture(params=configtypes) | 197 | @pytest.fixture(params=configtypes) | ||
| 180 | def getconfig(self, request): | 198 | def getconfig(self, request): | ||
| 181 | return request.param | 199 | return request.param | ||
| 182 | 200 | | |||
| 183 | def test_no_null_defaults(self, getconfig): | 201 | def test_no_null_defaults(self, getconfig): | ||
| 184 | for option in dir(getconfig): | 202 | for option in dir(getconfig): | ||
| 185 | if option.startswith('_'): | 203 | if option.startswith('_'): | ||
| 186 | continue | 204 | continue | ||
| 187 | assert getattr(getconfig, option) is not None | 205 | assert getattr(getconfig, option) is not None | ||