Resolve issues with various Sphinx tests

Resolve issues with the Sphinx tests. Signed-off-by: Stephen Finucane <stephen@that.guru>
rst2pdf · Apr 26, 2020 · a2776ee · a2776ee
1 parent 6d67776
commit a2776ee
Show file tree

Hide file tree

Showing 11 changed files with 69 additions and 98 deletions.
diff --git a/rst2pdf/tests/conftest.py b/rst2pdf/tests/conftest.py
@@ -252,14 +252,7 @@ def _build(self):
 
         input_dir = os.path.join(INPUT_DIR, self.name)
         build_dir = tempfile.mkdtemp(prefix='rst2pdf-sphinx-')
-        # TODO(stephenfin): Add '-W' once we fix the failing tests and update
-        # the PDFs
-        #
-        # sphinx-issue257
-        # sphinx-issue318
-        # sphinx-issue364
-        # sphinx-multidoc
-        # sphinx-repeat-table-rows
+
         cmd = ['sphinx-build', '-b', 'pdf', input_dir, build_dir]
 
         try:

diff --git a/rst2pdf/tests/input/sphinx-issue257/conf.py b/rst2pdf/tests/input/sphinx-issue257/conf.py
@@ -34,7 +34,7 @@
 source_encoding = 'utf-8'
 
 # The master toctree document.
-master_doc = 'foobar'
+master_doc = 'index'
 
 # General information about the project.
 project = u'Foobar'

diff --git a/rst2pdf/tests/input/sphinx-issue257/foobar.rst b/rst2pdf/tests/input/sphinx-issue257/foobar.rst
diff --git a/rst2pdf/tests/input/sphinx-issue318/test.rst b/rst2pdf/tests/input/sphinx-issue318/test.rst
@@ -20,7 +20,7 @@ Contents:
 
    Describes a method without types.
 
-.. cpp:function:: const T &array<T>::operator[]() const
+.. cpp:function:: const T& array::operator[] (int index) const
 
    Describes the constant indexing operator of a templated array.
 

diff --git a/rst2pdf/tests/input/sphinx-issue364/index.rst b/rst2pdf/tests/input/sphinx-issue364/index.rst
@@ -11,4 +11,3 @@ Index 1
         A term in 2nd place
 
 :term:`term1` and :term:`term2` link to the glossary
-
diff --git a/rst2pdf/tests/input/sphinx-issue364/index2.rst b/rst2pdf/tests/input/sphinx-issue364/index2.rst
@@ -1,6 +1,6 @@
-Index 2
-
+:orphan:
 
+Index 2
 
 .. glossary::
 
@@ -11,4 +11,3 @@ Index 2
         A term in 2nd place
 
 :term:`term3` and :term:`term2` link to the glossary
-
diff --git a/rst2pdf/tests/input/sphinx-multidoc/index.rst b/rst2pdf/tests/input/sphinx-multidoc/index.rst
@@ -1,7 +1,5 @@
 Index 1
 
-
-
 .. glossary::
 
     term1
@@ -11,4 +9,3 @@ Index 1
         A term in 2nd place
 
 :term:`term1` and :term:`term2` link to the glossary
-
diff --git a/rst2pdf/tests/input/sphinx-multidoc/index2.rst b/rst2pdf/tests/input/sphinx-multidoc/index2.rst
@@ -1,6 +1,6 @@
-Index 2
-
+:orphan:
 
+Index 2
 
 .. glossary::
 
@@ -11,4 +11,3 @@ Index 2
         A term in 2nd place
 
 :term:`term3` and :term:`term2` link to the glossary
-
diff --git a/rst2pdf/tests/input/sphinx-repeat-table-rows/index.rst b/rst2pdf/tests/input/sphinx-repeat-table-rows/index.rst
diff --git a/rst2pdf/tests/reference/sphinx-issue318.pdf b/rst2pdf/tests/reference/sphinx-issue318.pdf
diff --git a/rst2pdf/tests/reference/sphinx-repeat-table-rows.pdf b/rst2pdf/tests/reference/sphinx-repeat-table-rows.pdf