Mercurial > p > roundup > code
diff test/test_templating.py @ 6992:a5f30372ef7f
New markdown2 release changed output with code highlighting (take 2)
code highight div generated/used by pygments is on a separate line in
2.4.4 release of markdown2.
python 2.7 still needs expected form without additonal newlines as
2.4.4 is python3 only.
| author | John Rouillard <rouilj@ieee.org> |
|---|---|
| date | Sat, 01 Oct 2022 22:10:48 -0400 |
| parents | 3085aac22f3a |
| children | dc83ebff4c90 |
line wrap: on
line diff
--- a/test/test_templating.py Sat Oct 01 21:31:27 2022 -0400 +++ b/test/test_templating.py Sat Oct 01 22:10:48 2022 -0400 @@ -854,6 +854,10 @@ self.assertEqual(p.markdown().strip().replace('\n\n', '\n'), u2s(u'<p>embedded code block <pre></p>\n<pre><code>line 1\nline 2\n</code></pre>\n<p>new </pre> paragraph</p>')) def test_string_markdown_code_block_attribute(self): + import sys + + _py3 = sys.version_info[0] > 2 + ''' also verify that embedded html is escaped ''' p = StringHTMLProperty(self.client, 'test', '1', None, 'test', u2s(u'embedded code block <pre>\n\n``` python\nline 1\nline 2\n```\n\nnew </pre> paragraph')) m = p.markdown().strip() @@ -864,7 +868,11 @@ self.assertEqual(m.replace('\n\n','\n'), '<p>embedded code block <pre></p>\n<pre><code class="language-python">line 1\nline 2\n</code></pre>\n<p>new </pre> paragraph</p>') else: test_output = m.replace('\n\n', '\n') - expected_result = '<p>embedded code block <pre></p>\n<div class="codehilite">\n<pre><span></span><code><span class="n">line</span> <span class="mi">1</span>\n<span class="n">line</span> <span class="mi">2</span>\n</code></pre>\n</div>\n<p>new </pre> paragraph</p>' + if _py3: + nl = "\n" + else: + nl = "" + expected_result = '<p>embedded code block <pre></p>\n<div class="codehilite">%(nl)s<pre><span></span><code><span class="n">line</span> <span class="mi">1</span>\n<span class="n">line</span> <span class="mi">2</span>\n</code></pre>%(nl)s</div>\n<p>new </pre> paragraph</p>' % { 'nl': nl } if test_output != expected_result: print("test_output:", test_output) print("expected_result:", expected_result)