summaryrefslogtreecommitdiff
path: root/tests/base.py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/base.py')
-rw-r--r--tests/base.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/tests/base.py b/tests/base.py
index 740e223..1f233b0 100644
--- a/tests/base.py
+++ b/tests/base.py
@@ -246,7 +246,8 @@ class SingleJobTestCase(BaseScenariosTestCase):
246 def test_yaml_snippet(self): 246 def test_yaml_snippet(self):
247 config = self._get_config() 247 config = self._get_config()
248 248
249 expected_xml = self._read_utf8_content().strip() 249 expected_xml = self._read_utf8_content().strip() \
250 .replace('<BLANKLINE>', '').replace('\n\n', '\n')
250 251
251 parser = YamlParser(config) 252 parser = YamlParser(config)
252 parser.parse(self.in_filename) 253 parser.parse(self.in_filename)
@@ -290,14 +291,14 @@ class SingleJobTestCase(BaseScenariosTestCase):
290 291
291 # Prettify generated XML 292 # Prettify generated XML
292 pretty_xml = u"\n".join(job.output().decode('utf-8') 293 pretty_xml = u"\n".join(job.output().decode('utf-8')
293 for job in xml_jobs).strip() 294 for job in xml_jobs) \
295 .strip().replace('\n\n', '\n')
294 296
295 self.assertThat( 297 self.assertThat(
296 pretty_xml, 298 pretty_xml,
297 testtools.matchers.DocTestMatches(expected_xml, 299 testtools.matchers.DocTestMatches(expected_xml,
298 doctest.ELLIPSIS | 300 doctest.ELLIPSIS |
299 doctest.REPORT_NDIFF) 301 doctest.REPORT_NDIFF))
300 )
301 302
302 303
303class JsonTestCase(BaseScenariosTestCase): 304class JsonTestCase(BaseScenariosTestCase):