From 00af29d52e4e13f7a58c0b6bddf4ef809e2f72e2 Mon Sep 17 00:00:00 2001 From: John O'Loughlin Date: Wed, 16 May 2018 10:00:21 +0000 Subject: Separate out test_parse_to_value_exception() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Separate out test_parse_to_value_exception(self) into 3 different methods:     test_parse_scanner(self)     test_parse_parser(self)     test_parse_reader(self) This ensures that each side effect is tested, even if one fails. JIRA: YARDSTICK-940 Change-Id: Ifdc84284c633fe1ddc1acf9cd985c5144030b430 Signed-off-by: John O Loughlin --- yardstick/tests/unit/common/test_template_format.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/yardstick/tests/unit/common/test_template_format.py b/yardstick/tests/unit/common/test_template_format.py index 56253efbc..6e4827e16 100644 --- a/yardstick/tests/unit/common/test_template_format.py +++ b/yardstick/tests/unit/common/test_template_format.py @@ -22,16 +22,21 @@ from yardstick.common import template_format class TemplateFormatTestCase(unittest.TestCase): - def test_parse_to_value_exception(self): + def test_parse_scanner(self): - # TODO(elfoley): Don't hide the error that occurs in - # template_format.parse - # TODO(elfoley): Separate these tests; one per error type with mock.patch.object(yaml, 'load') as yaml_loader: yaml_loader.side_effect = yaml.scanner.ScannerError() self.assertRaises(ValueError, template_format.parse, 'FOOBAR') + + def test_parse_parser(self): + + with mock.patch.object(yaml, 'load') as yaml_loader: yaml_loader.side_effect = yaml.parser.ParserError() self.assertRaises(ValueError, template_format.parse, 'FOOBAR') + + def test_parse_reader(self): + + with mock.patch.object(yaml, 'load') as yaml_loader: yaml_loader.side_effect = \ yaml.reader.ReaderError('', '', '', '', '') self.assertRaises(ValueError, template_format.parse, 'FOOBAR') -- cgit 1.2.3-korg