Merge pull request #3555 from mitya57/stable

test_markup: Make verify functions test both HTML and LaTeX outputs
This commit is contained in:
Takeshi KOMIYA 2017-03-16 10:28:48 +09:00 committed by GitHub
commit c1a6377caa

View File

@ -97,9 +97,9 @@ def verify_re_latex(app, parse):
def verify_re(verify_re_html, verify_re_latex): def verify_re(verify_re_html, verify_re_latex):
def verify_re_(rst, html_expected, latex_expected): def verify_re_(rst, html_expected, latex_expected):
if html_expected: if html_expected:
return verify_re_html(rst, html_expected) verify_re_html(rst, html_expected)
if latex_expected: if latex_expected:
return verify_re_latex(rst, latex_expected) verify_re_latex(rst, latex_expected)
return verify_re_ return verify_re_
@ -107,9 +107,9 @@ def verify_re(verify_re_html, verify_re_latex):
def verify(verify_re_html, verify_re_latex): def verify(verify_re_html, verify_re_latex):
def verify_(rst, html_expected, latex_expected): def verify_(rst, html_expected, latex_expected):
if html_expected: if html_expected:
return verify_re_html(rst, re.escape(html_expected) + '$') verify_re_html(rst, re.escape(html_expected) + '$')
if latex_expected: if latex_expected:
return verify_re_latex(rst, re.escape(latex_expected) + '$') verify_re_latex(rst, re.escape(latex_expected) + '$')
return verify_ return verify_
@ -179,7 +179,7 @@ def get_verifier(verify, verify_re):
'verify', 'verify',
'"John"', '"John"',
'<p>&#8220;John&#8221;</p>', '<p>&#8220;John&#8221;</p>',
"``John''", r'\sphinxquotedblleft{}John\sphinxquotedblright{}',
), ),
( (
# ... but not in literal text # ... but not in literal text