Merge pull request #4217 from Smattr/4a164170-33e9-4df3-aad2-a13af37b6b43

Fix #4214: Two todolist directives break sphinx-1.6.5

1 files changed, 5 insertions, 3 deletions

diff --git a/tests/test_ext_todo.py b/tests/test_ext_todo.py
index 4f01a07ab..cee59fe9d 100644
--- a/tests/test_ext_todo.py
+++ b/tests/test_ext_todo.py
@@ -86,7 +86,7 @@ def test_todo_not_included(app, status, warning):
     assert set(todo[1].astext() for todo in todos) == set(['todo in foo', 'todo in bar'])
 
 @pytest.mark.sphinx('latex', testroot='ext-todo', freshenv=True,
-                    confoverrides={'todo_include_todos': True, 'todo_emit_warnings': True})
+                    confoverrides={'todo_include_todos': True})
 def test_todo_valid_link(app, status, warning):
     """
     Test that the inserted "original entry" links for todo items have a target
@@ -99,11 +99,13 @@ def test_todo_valid_link(app, status, warning):
 
     content = (app.outdir / 'TodoTests.tex').text()
 
-    # Look for the link to foo. We could equally well look for the link to bar.
+    # Look for the link to foo. Note that there are two of them because the
+    # source document uses todolist twice. We could equally well look for links
+    # to bar.
     link = r'\{\\hyperref\[\\detokenize\{(.*?foo.*?)}]\{\\sphinxcrossref{' \
         r'\\sphinxstyleemphasis{original entry}}}}'
     m = re.findall(link, content)
-    assert len(m) == 1
+    assert len(m) == 2
     target = m[0]
 
     # Look for the targets of this link.