diff options
Diffstat (limited to 'tests/test_intl.py')
| -rw-r--r-- | tests/test_intl.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/test_intl.py b/tests/test_intl.py index fae7b06a1..904fd7c5c 100644 --- a/tests/test_intl.py +++ b/tests/test_intl.py @@ -18,12 +18,12 @@ from docutils import nodes from subprocess import Popen, PIPE from babel.messages import pofile -from nose.tools import assert_equal from six import string_types +import pytest -from util import tempdir, rootdir, path, gen_with_app, with_app, SkipTest, \ +from util import tempdir, rootdir, path, gen_with_app, SkipTest, \ assert_re_search, assert_not_re_search, assert_in, assert_not_in, \ - assert_startswith, assert_node, repr_as, etree_parse, strip_escseq + assert_startswith, assert_node, etree_parse, strip_escseq, assert_equal root = tempdir / 'test-intl' @@ -846,7 +846,7 @@ def test_references(app, status, warning): yield assert_count(warning_expr, warnings, 0) -@with_app(buildername='dummy', testroot='image-glob', confoverrides={'language': 'xx'}) +@pytest.mark.sphinx('dummy', testroot='image-glob', confoverrides={'language': 'xx'}) def test_image_glob_intl(app, status, warning): app.builder.build_all() @@ -887,7 +887,7 @@ def test_image_glob_intl(app, status, warning): 'image/svg+xml': 'subdir/svgimg.xx.svg'}) -@with_app(buildername='dummy', testroot='image-glob', +@pytest.mark.sphinx('dummy', testroot='image-glob', confoverrides={'language': 'xx', 'figure_language_filename': u'{root}{ext}.{language}'}) def test_image_glob_intl_using_figure_language_filename(app, status, warning): @@ -931,4 +931,4 @@ def test_image_glob_intl_using_figure_language_filename(app, status, warning): def getwarning(warnings): - return repr_as(strip_escseq(warnings.getvalue().replace(os.sep, '/')), '<warnings>') + return strip_escseq(warnings.getvalue().replace(os.sep, '/')) |