From b637f0a72812008e471b9a8985ebca8fb748ee64 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 21 Sep 2014 18:41:08 +0200 Subject: [PATCH] No need to insist on fresh builds with test_build_* --- tests/test_build_html.py | 10 +++++----- tests/test_build_latex.py | 2 +- tests/test_build_texinfo.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/test_build_html.py b/tests/test_build_html.py index 9cf21c63c..214580de7 100644 --- a/tests/test_build_html.py +++ b/tests/test_build_html.py @@ -21,21 +21,21 @@ from etree13 import ElementTree as ET ENV_WARNINGS = """\ -%(root)s/autodoc_fodder.py:docstring of autodoc_fodder\\.MarkupError:2: \ +(%(root)s/autodoc_fodder.py:docstring of autodoc_fodder\\.MarkupError:2: \ WARNING: Explicit markup ends without a blank line; unexpected \ unindent\\.\\n? -%(root)s/images.txt:9: WARNING: image file not readable: foo.png +)?%(root)s/images.txt:9: WARNING: image file not readable: foo.png %(root)s/images.txt:23: WARNING: nonlocal image URI found: \ http://www.python.org/logo.png %(root)s/includes.txt:\\d*: WARNING: Encoding 'utf-8-sig' used for \ reading included file u'.*?wrongenc.inc' seems to be wrong, try giving an \ :encoding: option\\n? %(root)s/includes.txt:4: WARNING: download file not readable: .*?nonexisting.png -%(root)s/markup.txt:\\d+: WARNING: Malformed :option: u'Python c option', does \ +(%(root)s/markup.txt:\\d+: WARNING: Malformed :option: u'Python c option', does \ not contain option marker - or -- or / or \\+ %(root)s/undecodable.txt:3: WARNING: undecodable source characters, replacing \ with "\\?": b?'here: >>>\\\\xbb<<<' -""" +)?""" HTML_WARNINGS = ENV_WARNINGS + """\ %(root)s/images.txt:20: WARNING: no matching candidate for image URI u'foo.\\*' @@ -341,7 +341,7 @@ def check_extra_entries(outdir): assert (outdir / 'robots.txt').isfile() -@gen_with_app(buildername='html', freshenv=True, +@gen_with_app(buildername='html', confoverrides={'html_context.hckey_co': 'hcval_co'}, tags=['testtag']) def test_html_output(app, status, warning): diff --git a/tests/test_build_latex.py b/tests/test_build_latex.py index 8edea98ff..9e4c11d59 100644 --- a/tests/test_build_latex.py +++ b/tests/test_build_latex.py @@ -33,7 +33,7 @@ if PY3: LATEX_WARNINGS = remove_unicode_literals(LATEX_WARNINGS) -@with_app(buildername='latex', freshenv=True) +@with_app(buildername='latex') def test_latex(app, status, warning): LaTeXTranslator.ignore_missing_images = True app.builder.build_all() diff --git a/tests/test_build_texinfo.py b/tests/test_build_texinfo.py index 7f50857f9..bb10f8fa4 100644 --- a/tests/test_build_texinfo.py +++ b/tests/test_build_texinfo.py @@ -32,7 +32,7 @@ if PY3: TEXINFO_WARNINGS = remove_unicode_literals(TEXINFO_WARNINGS) -@with_app('texinfo', freshenv=True) +@with_app('texinfo') def test_texinfo(app, status, warning): TexinfoTranslator.ignore_missing_images = True app.builder.build_all()