Make ``test_include`` independent of the CWD

Tests in ``test_include`` previously only passed when the current
working directory was equal to the test root. This change makes it
possible to run the tests without changing the CWD, as part of the
test suite refactoring project

git-svn-id: https://svn.code.sf.net/p/docutils/code/trunk@9233 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

1 files changed, 268 insertions, 267 deletions

diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_include.py b/docutils/test/test_parsers/test_rst/test_directives/test_include.py
index 60c7a686c..78b31c1a8 100755
--- a/docutils/test/test_parsers/test_rst/test_directives/test_include.py
+++ b/docutils/test/test_parsers/test_rst/test_directives/test_include.py
@@ -18,6 +18,8 @@ from docutils.parsers.rst import Parser
 from docutils.utils import new_document
 from docutils.utils.code_analyzer import with_pygments
 
+TEST_ROOT = os.path.abspath(os.path.join(__file__, '..', '..', '..', '..'))
+
 # optional 3rd-party markdown parser
 md_parser_name = 'recommonmark'
 try:  # check availability
@@ -54,19 +56,19 @@ except ValueError as detail:
 else:
     unichr_exception = ''
 
+
 # prepend this directory (relative to the test root):
 def mydir(path):
-    return os.path.join('test_parsers/test_rst/test_directives/', path)
-
-
-# make `path` relative with utils.relative_path():
-def reldir(path):
-    return utils.relative_path(None, path)
+    return utils.relative_path(
+        os.getcwd(),
+        os.path.join(TEST_ROOT, 'test_parsers', 'test_rst', 'test_directives', path)
+    )
 
 
 include1 = mydir('include1.txt')
 include2 = mydir('include2.txt')
 include3 = mydir('include3.txt')
+include5 = mydir('includes/include5.txt')
 include6 = mydir('includes/more/include6.txt')
 include8 = mydir('include8.txt')
 include10 = mydir('include10.txt')
@@ -78,13 +80,16 @@ include15 = mydir('includes/include15.txt')
 include16 = mydir('includes/include16.txt')
 include_literal = mydir('include_literal.txt')
 include_md = mydir('include.md')
-utf_16_file = 'data/utf-16-le-sig.txt'
+include = os.path.join(TEST_ROOT, 'data/include.txt')
+latin2 = os.path.join(TEST_ROOT, 'data/latin2.txt')
+utf_16_file = os.path.join(TEST_ROOT, 'data/utf-16-le-sig.txt')
 utf_16_error_str = ("UnicodeDecodeError: 'ascii' codec can't decode byte 0xff "
                     "in position 0: ordinal not in range(128)")
-nonexistent = os.path.join(os.path.dirname(parsers.rst.states.__file__),
-                           'include', 'nonexistent')
-nonexistent_rel = utils.relative_path(
-    os.path.join(DocutilsTestSupport.testroot, 'dummy'), nonexistent)
+rst_states_dir = os.path.dirname(parsers.rst.states.__file__)
+nonexistent = utils.relative_path(
+    os.path.join(TEST_ROOT, 'dummy'),
+    os.path.join(rst_states_dir, 'include', 'nonexistent')
+)
 
 # Different error for path with 8bit chars with locale == C or None:
 try:
@@ -101,14 +106,14 @@ InputError: [Errno 2] No such file or directory: '\u043c\u0438\u0440.txt'.\
 totest = {}
 
 totest['include'] = [
-["""\
+[f"""\
 Include Test
 ============
 
-.. include:: %s
+.. include:: {include1}
 
 A paragraph.
-""" % include1,
+""",
 """\
 <document source="test data">
     <section ids="include-test" names="include\\ test">
@@ -125,42 +130,42 @@ A paragraph.
             <paragraph>
                 A paragraph.
 """],
-["""\
+[f"""\
 Include Test
 ============
 
-.. include:: %s
+.. include:: {include1}
    :literal:
    :class: test
    :name: my name
 
 A paragraph.
-""" % include1,
-"""\
+""",
+f"""\
 <document source="test data">
     <section ids="include-test" names="include\\ test">
         <title>
             Include Test
-        <literal_block classes="test" ids="my-name" names="my\\ name" source="%s" xml:space="preserve">
+        <literal_block classes="test" ids="my-name" names="my\\ name" source="{include1}" xml:space="preserve">
             Inclusion 1
             -----------
             \n\
             This file is used by ``test_include.py``.
         <paragraph>
             A paragraph.
-""" % reldir(include1)],
-["""\
+"""],
+[f"""\
 Literal include, add line numbers
 
-.. include:: %s
+.. include:: {include1}
    :literal:
    :number-lines:
-""" % include1,
-"""\
+""",
+f"""\
 <document source="test data">
     <paragraph>
         Literal include, add line numbers
-    <literal_block source="%s" xml:space="preserve">
+    <literal_block source="{include1}" xml:space="preserve">
         <inline classes="ln">
             1 \n\
         Inclusion 1
@@ -173,37 +178,37 @@ Literal include, add line numbers
         <inline classes="ln">
             4 \n\
         This file is used by ``test_include.py``.
-""" % reldir(include1)],
-["""\
+"""],
+[f"""\
 Include code
 
-.. include:: %s
+.. include:: {include1}
    :code:
    :class: test
    :name: my name
-""" % include1,
-"""\
+""",
+f"""\
 <document source="test data">
     <paragraph>
         Include code
-    <literal_block classes="code test" ids="my-name" names="my\\ name" source="%s" xml:space="preserve">
+    <literal_block classes="code test" ids="my-name" names="my\\ name" source="{include1}" xml:space="preserve">
         Inclusion 1
         -----------
         \n\
         This file is used by ``test_include.py``.
-""" % reldir(include1)],
-["""\
+"""],
+[f"""\
 Include code, add line numbers
 
-.. include:: %s
+.. include:: {include1}
    :code:
    :number-lines:
-""" % include1,
-"""\
+""",
+f"""\
 <document source="test data">
     <paragraph>
         Include code, add line numbers
-    <literal_block classes="code" source="%s" xml:space="preserve">
+    <literal_block classes="code" source="{include1}" xml:space="preserve">
         <inline classes="ln">
             1 \n\
         Inclusion 1
@@ -216,16 +221,16 @@ Include code, add line numbers
         <inline classes="ln">
             4 \n\
         This file is used by ``test_include.py``.
-""" % reldir(include1)],
-["""\
+"""],
+[f"""\
 Include with unknown parser.
 
-.. include:: %s
+.. include:: {include1}
    :parser: sillyformat
 
 A paragraph.
-""" % include1,
-"""\
+""",
+f"""\
 <document source="test data">
     <paragraph>
         Include with unknown parser.
@@ -235,20 +240,20 @@ A paragraph.
             invalid option value: (option: "parser"; value: \'sillyformat\')
             Parser "sillyformat" not found. No module named 'sillyformat'.
         <literal_block xml:space="preserve">
-            .. include:: test_parsers/test_rst/test_directives/include1.txt
+            .. include:: {include1}
                :parser: sillyformat
     <paragraph>
         A paragraph.
 """],
-["""\
+[f"""\
 Let's test the parse context.
 
     This paragraph is in a block quote.
 
-    .. include:: %s
+    .. include:: {include2}
 
 The included paragraphs should also be in the block quote.
-""" % include2,
+""",
 """\
 <document source="test data">
     <paragraph>
@@ -289,17 +294,17 @@ A paragraph.
         <paragraph>
             A paragraph.
 """],
-["""\
+[f"""\
 Include Test
 ============
 
-.. include:: %s
+.. include:: {include1}
 
-.. include:: %s
+.. include:: {include1}
 
 A paragraph.
-""" % (include1, include1),
-"""\
+""",
+f"""\
 <document source="test data">
     <section ids="include-test" names="include\\ test">
         <title>
@@ -315,7 +320,7 @@ A paragraph.
         <section dupnames="inclusion\\ 1" ids="inclusion-1-1">
             <title>
                 Inclusion 1
-            <system_message backrefs="inclusion-1-1" level="1" line="2" source="%s" type="INFO">
+            <system_message backrefs="inclusion-1-1" level="1" line="2" source="{include1}" type="INFO">
                 <paragraph>
                     Duplicate implicit target name: "inclusion 1".
             <paragraph>
@@ -325,20 +330,20 @@ A paragraph.
                 .
             <paragraph>
                 A paragraph.
-""" % reldir(include1)],
-["""\
+"""],
+[f"""\
 Include Test
 ============
 
-.. include:: %s
+.. include:: {include1}
 
 ----------
 
-.. include:: %s
+.. include:: {include1}
 
 A paragraph.
-""" % (include1, include1),
-"""\
+""",
+f"""\
 <document source="test data">
     <section ids="include-test" names="include\\ test">
         <title>
@@ -355,7 +360,7 @@ A paragraph.
         <section dupnames="inclusion\\ 1" ids="inclusion-1-1">
             <title>
                 Inclusion 1
-            <system_message backrefs="inclusion-1-1" level="1" line="2" source="%s" type="INFO">
+            <system_message backrefs="inclusion-1-1" level="1" line="2" source="{include1}" type="INFO">
                 <paragraph>
                     Duplicate implicit target name: "inclusion 1".
             <paragraph>
@@ -365,15 +370,15 @@ A paragraph.
                 .
             <paragraph>
                 A paragraph.
-""" % reldir(include1)],
-["""\
+"""],
+[f"""\
 Recursive inclusions: adapt paths.
 
 In test data
 
-.. include:: %s
-""" % include3,
-"""\
+.. include:: {include3}
+""",
+f"""\
 <document source="test data">
     <paragraph>
         Recursive inclusions: adapt paths.
@@ -389,7 +394,7 @@ In test data
         In includes/more/include6.txt
     <paragraph>
         In includes/sibling/include7.txt
-    <literal_block source="test_parsers/test_rst/test_directives/includes/include5.txt" xml:space="preserve">
+    <literal_block source="{include5}" xml:space="preserve">
         In includes/include5.txt
         \n\
         .. include:: more/include6.txt
@@ -406,15 +411,15 @@ In test data
                         <paragraph>
                             includes/sibling/include7.txt
 """],
-["""\
+[f"""\
 Recursive inclusion with specified parser.
 
 In test data
 
-.. include:: %s
+.. include:: {include3}
    :parser: rst
-""" % include3,
-"""\
+""",
+f"""\
 <document source="test data">
     <paragraph>
         Recursive inclusion with specified parser.
@@ -430,7 +435,7 @@ In test data
         In includes/more/include6.txt
     <paragraph>
         In includes/sibling/include7.txt
-    <literal_block source="test_parsers/test_rst/test_directives/includes/include5.txt" xml:space="preserve">
+    <literal_block source="{include5}" xml:space="preserve">
         In includes/include5.txt
         \n\
         .. include:: more/include6.txt
@@ -447,7 +452,7 @@ In test data
                         <paragraph>
                             includes/sibling/include7.txt
 """],
-["""\
+[f"""\
 In test data
 
 Section
@@ -455,9 +460,9 @@ Section
 
 (Section contents in nested parse; slice of input_lines ViewList.)
 
-.. include:: %s
-""" % include3,
-"""\
+.. include:: {include3}
+""",
+f"""\
 <document source="test data">
     <paragraph>
         In test data
@@ -476,7 +481,7 @@ Section
             In includes/more/include6.txt
         <paragraph>
             In includes/sibling/include7.txt
-        <literal_block source="test_parsers/test_rst/test_directives/includes/include5.txt" xml:space="preserve">
+        <literal_block source="{include5}" xml:space="preserve">
             In includes/include5.txt
             \n\
             .. include:: more/include6.txt
@@ -493,11 +498,11 @@ Section
                             <paragraph>
                                 includes/sibling/include7.txt
 """],
-["""\
+[f"""\
 Testing relative includes:
 
-.. include:: %s
-""" % include8,
+.. include:: {include8}
+""",
 """\
 <document source="test data">
     <paragraph>
@@ -515,12 +520,12 @@ Testing relative includes:
             test_include.py
         .
 """],
-["""\
+[f"""\
 Encoding:
 
-.. include:: %s
+.. include:: {utf_16_file}
    :encoding: utf-16
-""" % reldir(utf_16_file),
+""",
 """\
 <document source="test data">
     <paragraph>
@@ -528,11 +533,11 @@ Encoding:
     <paragraph>
         Grüße
 """],
-["""\
+[f"""\
 Default encoding: auto-determine (here via BOM).
 
-.. include:: %s
-""" % reldir(utf_16_file),
+.. include:: {utf_16_file}
+""",
 """\
 <document source="test data">
     <paragraph>
@@ -540,10 +545,10 @@ Default encoding: auto-determine (here via BOM).
     <paragraph>
         Grüße
 """],
-["""\
+[f"""\
 Default encoding: auto-determine (via encoding declaration).
 
-.. include:: data/latin2.txt
+.. include:: {latin2}
 """,
 """\
 <document source="test data">
@@ -554,56 +559,56 @@ Default encoding: auto-determine (via encoding declaration).
     <paragraph>
         škoda
 """],
-["""\
+[f"""\
 Include file is UTF-16-encoded, and is not valid ASCII.
 
-.. include:: %s
+.. include:: {utf_16_file}
    :encoding: ascii
-""" % reldir(utf_16_file),
-"""\
+""",
+f"""\
 <document source="test data">
     <paragraph>
         Include file is UTF-16-encoded, and is not valid ASCII.
     <system_message level="4" line="3" source="test data" type="SEVERE">
         <paragraph>
             Problem with "include" directive:
-            %s
+            {utf_16_error_str}
         <literal_block xml:space="preserve">
-            .. include:: %s
+            .. include:: {utf_16_file}
                :encoding: ascii
-""" % (utf_16_error_str, reldir(utf_16_file))],
+"""],
 ["""\
 cyrillic filename:
 
 .. include:: \u043c\u0438\u0440.txt
 """,
-"""\
+f"""\
 <document source="test data">
     <paragraph>
         cyrillic filename:
     <system_message level="4" line="3" source="test data" type="SEVERE">
         <paragraph>
             Problems with "include" directive path:
-            %s
+            {errstr_8bit_path}
         <literal_block xml:space="preserve">
             .. include:: \u043c\u0438\u0440.txt
-""" % errstr_8bit_path],
-["""\
+"""],
+[f"""\
 Testing errors in included file:
 
-.. include:: %s
-""" % include10,
-"""\
+.. include:: {include10}
+""",
+f"""\
 <document source="test data">
     <paragraph>
         Testing errors in included file:
-    <system_message level="3" line="1" source="%(source)s" type="ERROR">
+    <system_message level="3" line="1" source="{include10}" type="ERROR">
         <paragraph>
             Invalid character code: 0x11111111
-            %(unichr_exception)s
+            {unichr_exception}
         <literal_block xml:space="preserve">
             unicode:: 0x11111111
-    <system_message level="2" line="1" source="%(source)s" type="WARNING">
+    <system_message level="2" line="1" source="{include10}" type="WARNING">
         <paragraph>
             Substitution definition "bad" empty or invalid.
         <literal_block xml:space="preserve">
@@ -614,7 +619,7 @@ Testing errors in included file:
         <block_quote>
             <paragraph>
                 indent
-        <system_message level="2" line="7" source="%(source)s" type="WARNING">
+        <system_message level="2" line="7" source="{include10}" type="WARNING">
             <paragraph>
                 Block quote ends without a blank line; unexpected unindent.
         <paragraph>
@@ -622,42 +627,42 @@ Testing errors in included file:
     <section dupnames="hi" ids="hi-1">
         <title>
             hi
-        <system_message backrefs="hi-1" level="1" line="10" source="%(source)s" type="INFO">
+        <system_message backrefs="hi-1" level="1" line="10" source="{include10}" type="INFO">
             <paragraph>
                 Duplicate implicit target name: "hi".
-        <system_message level="4" line="12" source="%(source)s" type="SEVERE">
+        <system_message level="4" line="12" source="{include10}" type="SEVERE">
             <paragraph>
                 Problems with "include" directive path:
-                InputError: [Errno 2] No such file or directory: '%(nonexistent)s'.
+                InputError: [Errno 2] No such file or directory: '{nonexistent}'.
             <literal_block xml:space="preserve">
                 .. include:: <nonexistent>
-        <system_message level="3" line="14" source="%(source)s" type="ERROR">
+        <system_message level="3" line="14" source="{include10}" type="ERROR">
             <paragraph>
                 Content block expected for the "note" directive; none found.
             <literal_block xml:space="preserve">
                 .. note::
-        <system_message level="3" line="16" source="%(source)s" type="ERROR">
+        <system_message level="3" line="16" source="{include10}" type="ERROR">
             <paragraph>
                 Content block expected for the "admonition" directive; none found.
             <literal_block xml:space="preserve">
                 .. admonition::
                    without title
-        <system_message level="3" line="19" source="%(source)s" type="ERROR">
+        <system_message level="3" line="19" source="{include10}" type="ERROR">
             <paragraph>
                 Content block expected for the "epigraph" directive; none found.
             <literal_block xml:space="preserve">
                 .. epigraph::
-        <system_message level="3" line="21" source="%(source)s" type="ERROR">
+        <system_message level="3" line="21" source="{include10}" type="ERROR">
             <paragraph>
                 Content block expected for the "highlights" directive; none found.
             <literal_block xml:space="preserve">
                 .. highlights::
-        <system_message level="3" line="23" source="%(source)s" type="ERROR">
+        <system_message level="3" line="23" source="{include10}" type="ERROR">
             <paragraph>
                 Content block expected for the "pull-quote" directive; none found.
             <literal_block xml:space="preserve">
                 .. pull-quote::
-        <system_message level="3" line="25" source="%(source)s" type="ERROR">
+        <system_message level="3" line="25" source="{include10}" type="ERROR">
             <paragraph>
                 Invalid context: the "date" directive can only be used within a substitution definition.
             <literal_block xml:space="preserve">
@@ -665,13 +670,13 @@ Testing errors in included file:
         <paragraph>
             not a
             definition list:
-        <system_message level="3" line="29" source="%(source)s" type="ERROR">
+        <system_message level="3" line="29" source="{include10}" type="ERROR">
             <paragraph>
                 Unexpected indentation.
         <block_quote>
             <paragraph>
                 as a term may only be one line long.
-        <system_message level="3" line="31" source="%(source)s" type="ERROR">
+        <system_message level="3" line="31" source="{include10}" type="ERROR">
             <paragraph>
                 Error in "admonition" directive:
                 1 argument(s) required, 0 supplied.
@@ -682,7 +687,7 @@ Testing errors in included file:
     <section ids="section-underline-too-short" names="section\\ underline\\ too\\ short">
         <title>
             section underline too short
-        <system_message level="2" line="36" source="%(source)s" type="WARNING">
+        <system_message level="2" line="36" source="{include10}" type="WARNING">
             <paragraph>
                 Title underline too short.
             <literal_block xml:space="preserve">
@@ -708,29 +713,29 @@ Testing errors in included file:
                         <entry>
                             <paragraph>
                                 cell 4
-        <system_message level="2" line="43" source="%(source)s" type="WARNING">
+        <system_message level="2" line="43" source="{include10}" type="WARNING">
             <paragraph>
                 Blank line required after table.
         <paragraph>
             No blank line after table.
-        <system_message level="3" line="45" source="%(source)s" type="ERROR">
+        <system_message level="3" line="45" source="{include10}" type="ERROR">
             <paragraph>
                 Error in "unicode" directive:
                 1 argument(s) required, 0 supplied.
             <literal_block xml:space="preserve">
                 unicode::
-        <system_message level="2" line="45" source="%(source)s" type="WARNING">
+        <system_message level="2" line="45" source="{include10}" type="WARNING">
             <paragraph>
                 Substitution definition "empty" empty or invalid.
             <literal_block xml:space="preserve">
                 .. |empty| unicode::
-        <system_message level="3" line="47" source="%(source)s" type="ERROR">
+        <system_message level="3" line="47" source="{include10}" type="ERROR">
             <paragraph>
                 Error in "topic" directive:
                 1 argument(s) required, 0 supplied.
             <literal_block xml:space="preserve">
                 .. topic::
-        <system_message level="3" line="49" source="%(source)s" type="ERROR">
+        <system_message level="3" line="49" source="{include10}" type="ERROR">
             <paragraph>
                 Error in "rubric" directive:
                 1 argument(s) required, 0 supplied.
@@ -740,12 +745,12 @@ Testing errors in included file:
             A rubric has no content
         <comment xml:space="preserve">
             _`target: No matching backquote.
-        <system_message level="2" line="52" source="%(source)s" type="WARNING">
+        <system_message level="2" line="52" source="{include10}" type="WARNING">
             <paragraph>
                 malformed hyperlink target.
         <comment xml:space="preserve">
             __malformed: no good
-        <system_message level="2" line="53" source="%(source)s" type="WARNING">
+        <system_message level="2" line="53" source="{include10}" type="WARNING">
             <paragraph>
                 malformed hyperlink target.
         <definition_list>
@@ -753,14 +758,14 @@ Testing errors in included file:
                 <term>
                     A literal block::
                 <definition>
-                    <system_message level="1" line="57" source="%(source)s" type="INFO">
+                    <system_message level="1" line="57" source="{include10}" type="INFO">
                         <paragraph>
                             Blank line missing before literal block (after the "::")? Interpreted as a definition list item.
                     <paragraph>
                         with no blank line above.
         <literal_block xml:space="preserve">
             > A literal block.
-        <system_message level="3" line="61" source="%(source)s" type="ERROR">
+        <system_message level="3" line="61" source="{include10}" type="ERROR">
             <paragraph>
                 Inconsistent literal block quoting.
         <paragraph>
@@ -779,20 +784,20 @@ Testing errors in included file:
             <problematic ids="problematic-4" refid="system-message-4">
                 **
             markup
-        <system_message level="1" line="63" source="%(source)s" type="INFO">
+        <system_message level="1" line="63" source="{include10}" type="INFO">
             <paragraph>
                 No role entry for "unknown-role" in module "docutils.parsers.rst.languages.en".
                 Trying "unknown-role" as canonical role name.
-        <system_message backrefs="problematic-1" ids="system-message-1" level="3" line="63" source="%(source)s" type="ERROR">
+        <system_message backrefs="problematic-1" ids="system-message-1" level="3" line="63" source="{include10}" type="ERROR">
             <paragraph>
                 Unknown interpreted text role "unknown-role".
-        <system_message backrefs="problematic-2" ids="system-message-2" level="2" line="63" source="%(source)s" type="WARNING">
+        <system_message backrefs="problematic-2" ids="system-message-2" level="2" line="63" source="{include10}" type="WARNING">
             <paragraph>
                 Inline emphasis start-string without end-string.
-        <system_message backrefs="problematic-3" ids="system-message-3" level="2" line="63" source="%(source)s" type="WARNING">
+        <system_message backrefs="problematic-3" ids="system-message-3" level="2" line="63" source="{include10}" type="WARNING">
             <paragraph>
                 Inline interpreted text or phrase reference start-string without end-string.
-        <system_message backrefs="problematic-4" ids="system-message-4" level="2" line="63" source="%(source)s" type="WARNING">
+        <system_message backrefs="problematic-4" ids="system-message-4" level="2" line="63" source="{include10}" type="WARNING">
             <paragraph>
                 Inline strong start-string without end-string.
         <block_quote>
@@ -801,7 +806,7 @@ Testing errors in included file:
                 <problematic ids="problematic-5" refid="system-message-5">
                     *
                 inline warning
-            <system_message backrefs="problematic-5" ids="system-message-5" level="2" line="68" source="test_parsers/test_rst/test_directives/include10.txt" type="WARNING">
+            <system_message backrefs="problematic-5" ids="system-message-5" level="2" line="68" source="{include10}" type="WARNING">
                 <paragraph>
                     Inline emphasis start-string without end-string.
             <attribution>
@@ -809,25 +814,25 @@ Testing errors in included file:
                 <problematic ids="problematic-6" refid="system-message-6">
                     *
                 inline warning
-        <system_message backrefs="problematic-6" ids="system-message-6" level="2" line="70" source="test_parsers/test_rst/test_directives/include10.txt" type="WARNING">
+        <system_message backrefs="problematic-6" ids="system-message-6" level="2" line="70" source="{include10}" type="WARNING">
             <paragraph>
                 Inline emphasis start-string without end-string.
         <paragraph>
             <problematic ids="problematic-7" refid="system-message-7">
                 :PEP:`-1`
-        <system_message backrefs="problematic-7" ids="system-message-7" level="3" line="72" source="%(source)s" type="ERROR">
+        <system_message backrefs="problematic-7" ids="system-message-7" level="3" line="72" source="{include10}" type="ERROR">
             <paragraph>
                 PEP number must be a number from 0 to 9999; "-1" is invalid.
-        <system_message level="1" line="70" source="%(source)s" type="INFO">
+        <system_message level="1" line="70" source="{include10}" type="INFO">
             <paragraph>
                 No directive entry for "unknown" in module "docutils.parsers.rst.languages.en".
                 Trying "unknown" as canonical directive name.
-        <system_message level="3" line="74" source="%(source)s" type="ERROR">
+        <system_message level="3" line="74" source="{include10}" type="ERROR">
             <paragraph>
                 Unknown directive type "unknown".
             <literal_block xml:space="preserve">
                 .. unknown:: directive (TODO: info still reported with wrong line)
-        <system_message level="3" line="76" source="%(source)s" type="ERROR">
+        <system_message level="3" line="76" source="{include10}" type="ERROR">
             <paragraph>
                 Malformed table.
                 No bottom table border found.
@@ -836,15 +841,13 @@ Testing errors in included file:
                 A simple table  with
                 no bottom       border
                 \n\
-                .. end of inclusion from "test_parsers/test_rst/test_directives/include10.txt"
-""" % {'source': reldir(include10), 'nonexistent': reldir(nonexistent),
-       'unichr_exception': unichr_exception,
-      }],
-["""\
+                .. end of inclusion from "{include10}"
+"""],
+[f"""\
 Include file with whitespace in the path:
 
-.. include:: %s
-""" % reldir(include11),
+.. include:: {include11}
+""",
 """\
 <document source="test data">
     <paragraph>
@@ -857,7 +860,7 @@ Standard include data file:
 
 .. include:: <isogrk4.txt>
 """,
-b"""\
+"""\
 <document source="test data">
     <paragraph>
         Standard include data file:
@@ -869,33 +872,33 @@ b"""\
         Processed by unicode2rstsubs.py, part of Docutils:
         <https://docutils.sourceforge.io>.
     <substitution_definition names="b.Gammad">
-        \\u03dc
+        \u03dc
     <substitution_definition names="b.gammad">
-        \\u03dd
-""".decode('raw_unicode_escape')],
+        \u03dd
+"""],
 ["""\
 Nonexistent standard include data file:
 
 .. include:: <nonexistent>
 """,
-"""\
+f"""\
 <document source="test data">
     <paragraph>
         Nonexistent standard include data file:
     <system_message level="4" line="3" source="test data" type="SEVERE">
         <paragraph>
             Problems with "include" directive path:
-            InputError: [Errno 2] No such file or directory: '%s'.
+            InputError: [Errno 2] No such file or directory: '{nonexistent}'.
         <literal_block xml:space="preserve">
             .. include:: <nonexistent>
-""" % nonexistent_rel],
-["""\
+"""],
+[f"""\
 Include start-line/end-line Test
 
-.. include:: %s
+.. include:: {include2}
    :start-line: 3
    :end-line: 4
-""" % include2,
+""",
 """\
 <document source="test data">
     <paragraph>
@@ -903,16 +906,16 @@ Include start-line/end-line Test
     <paragraph>
         This file (include2.txt) is used by
 """],
-["""\
+[f"""\
 Include start-line/end-line + start-after Test
 
-.. include:: %s
+.. include:: {include12}
    :start-line: 2
    :end-line: 5
    :start-after: here
 
 Text search is limited to the specified lines.
-""" % include12,
+""",
 """\
 <document source="test data">
     <paragraph>
@@ -922,15 +925,15 @@ Text search is limited to the specified lines.
     <paragraph>
         Text search is limited to the specified lines.
 """],
-["""\
+[f"""\
 Include start-after/end-before Test
 
-.. include:: %s
+.. include:: {include12}
    :start-after: .. start here
    :end-before: .. stop here
 
 A paragraph.
-""" % include12,
+""",
 """\
 <document source="test data">
     <paragraph>
@@ -940,17 +943,17 @@ A paragraph.
     <paragraph>
         A paragraph.
 """],
-["""\
+[f"""\
 Include start-after/end-before Test, single option variant
 
-.. include:: %s
+.. include:: {include12}
    :end-before: .. start here
 
-.. include:: %s
+.. include:: {include12}
    :start-after: .. stop here
 
 A paragraph.
-""" % (include12, include12),
+""",
 """\
 <document source="test data">
     <paragraph>
@@ -962,16 +965,16 @@ A paragraph.
     <paragraph>
         A paragraph.
 """],
-["""\
+[f"""\
 Include start-after/end-before multi-line test.
 
-.. include:: %s
+.. include:: {include13}
    :start-after: From: me
                  To: you
    :end-before: -------
                 -- mork of ork
 
-.. include:: %s
+.. include:: {include13}
    :start-after: From: me
                  To: you
    :end-before:
@@ -979,8 +982,8 @@ Include start-after/end-before multi-line test.
          -- mork of ork
 
 A paragraph.
-""" % (include13, include13),
-"""\
+""",
+f"""\
 <document source="test data">
     <paragraph>
         Include start-after/end-before multi-line test.
@@ -989,7 +992,7 @@ A paragraph.
             Problem with "end-before" option of "include" directive:
             Text not found.
         <literal_block xml:space="preserve">
-            .. include:: %s
+            .. include:: {include13}
                :start-after: From: me
                              To: you
                :end-before: -------
@@ -998,15 +1001,15 @@ A paragraph.
         In include13.txt (between header and signature)
     <paragraph>
         A paragraph.
-""" % include13],
-["""\
+"""],
+[f"""\
 Error handling test; "end-before" error handling tested in previous test.
 
-.. include:: %s
+.. include:: {include13}
    :start-after: bad string
    :end-before: mork of ork
-""" % include13,
-"""\
+""",
+f"""\
 <document source="test data">
     <paragraph>
         Error handling test; "end-before" error handling tested in previous test.
@@ -1015,80 +1018,80 @@ Error handling test; "end-before" error handling tested in previous test.
             Problem with "start-after" option of "include" directive:
             Text not found.
         <literal_block xml:space="preserve">
-            .. include:: %s
+            .. include:: {include13}
                :start-after: bad string
                :end-before: mork of ork
-""" % include13],
-["""\
+"""],
+[f"""\
 TAB expansion with literal include:
 
-.. include:: %s
+.. include:: {include_literal}
    :literal:
-""" % include_literal,
-"""\
+""",
+f"""\
 <document source="test data">
     <paragraph>
         TAB expansion with literal include:
-    <literal_block source="%s" xml:space="preserve">
+    <literal_block source="{include_literal}" xml:space="preserve">
         Literal included this should **not** be *marked* `up`.
                 <- leading raw tab.
         \n\
         Newlines
         are
         normalized.
-""" % include_literal],
-["""\
+"""],
+[f"""\
 Custom TAB expansion with literal include:
 
-.. include:: %s
+.. include:: {include_literal}
    :literal:
    :tab-width: 2
-""" % include_literal,
-"""\
+""",
+f"""\
 <document source="test data">
     <paragraph>
         Custom TAB expansion with literal include:
-    <literal_block source="%s" xml:space="preserve">
+    <literal_block source="{include_literal}" xml:space="preserve">
         Literal included this should **not** be *marked* `up`.
           <- leading raw tab.
         \n\
         Newlines
         are
         normalized.
-""" % include_literal],
-["""\
+"""],
+[f"""\
 No TAB expansion with literal include:
 
-.. include:: %s
+.. include:: {include_literal}
    :literal:
    :tab-width: -1
-""" % include_literal,
-"""\
+""",
+f"""\
 <document source="test data">
     <paragraph>
         No TAB expansion with literal include:
-    <literal_block source="%s" xml:space="preserve">
+    <literal_block source="{include_literal}" xml:space="preserve">
         Literal included this should **not** be *marked* `up`.
         \t<- leading raw tab.
         \n\
         Newlines
         are
         normalized.
-""" % include_literal],
+"""],
 ]
 
 totest['include_code'] = [
-["""\
+[f"""\
 Included code
 
-.. include:: %s
+.. include:: {include1}
    :code: rst
-""" % include1,
-"""\
+""",
+f"""\
 <document source="test data">
     <paragraph>
         Included code
-    <literal_block classes="code rst" source="%s" xml:space="preserve">
+    <literal_block classes="code rst" source="{include1}" xml:space="preserve">
         <inline classes="generic heading">
             Inclusion 1
         \n\
@@ -1100,19 +1103,19 @@ Included code
         <inline classes="literal string">
             ``test_include.py``
         .
-""" % reldir(include1)],
-["""\
+"""],
+[f"""\
 Included code
 
-.. include:: %s
+.. include:: {include1}
    :code: rst
    :number-lines:
-""" % include1,
-"""\
+""",
+f"""\
 <document source="test data">
     <paragraph>
         Included code
-    <literal_block classes="code rst" source="%s" xml:space="preserve">
+    <literal_block classes="code rst" source="{include1}" xml:space="preserve">
         <inline classes="ln">
             1 \n\
         <inline classes="generic heading">
@@ -1132,18 +1135,18 @@ Included code
         <inline classes="literal string">
             ``test_include.py``
         .
-""" % reldir(include1)],
-["""\
+"""],
+[f"""\
 TAB expansion with included code:
 
-.. include:: %s
+.. include:: {include_literal}
    :code: rst
-""" % include_literal,
-"""\
+""",
+f"""\
 <document source="test data">
     <paragraph>
         TAB expansion with included code:
-    <literal_block classes="code rst" source="%s" xml:space="preserve">
+    <literal_block classes="code rst" source="{include_literal}" xml:space="preserve">
         Literal included this should \n\
         <inline classes="generic strong">
             **not**
@@ -1159,19 +1162,19 @@ TAB expansion with included code:
         Newlines
         are
         normalized.
-""" % include_literal],
-["""\
+"""],
+[f"""\
 Custom TAB expansion with included code:
 
-.. include:: %s
+.. include:: {include_literal}
    :code: rst
    :tab-width: 2
-""" % include_literal,
-"""\
+""",
+f"""\
 <document source="test data">
     <paragraph>
         Custom TAB expansion with included code:
-    <literal_block classes="code rst" source="%s" xml:space="preserve">
+    <literal_block classes="code rst" source="{include_literal}" xml:space="preserve">
         Literal included this should \n\
         <inline classes="generic strong">
             **not**
@@ -1187,19 +1190,19 @@ Custom TAB expansion with included code:
         Newlines
         are
         normalized.
-""" % include_literal],
-["""\
+"""],
+[f"""\
 Custom TAB expansion with included code:
 
-.. include:: %s
+.. include:: {include_literal}
    :code: rst
    :tab-width: -1
-""" % include_literal,
-"""\
+""",
+f"""\
 <document source="test data">
     <paragraph>
         Custom TAB expansion with included code:
-    <literal_block classes="code rst" source="%s" xml:space="preserve">
+    <literal_block classes="code rst" source="{include_literal}" xml:space="preserve">
         Literal included this should \n\
         <inline classes="generic strong">
             **not**
@@ -1215,19 +1218,19 @@ Custom TAB expansion with included code:
         Newlines
         are
         normalized.
-""" % include_literal],
-["""\
+"""],
+[f"""\
 Including includes/include14.txt
 
-.. include:: %s
-""" % include14,
-"""\
+.. include:: {include14}
+""",
+f"""\
 <document source="test data">
     <paragraph>
         Including includes/include14.txt
     <paragraph>
         Including more/include6.txt as rst-code from includes/include14.txt:
-    <literal_block classes="code rst" source="%s" xml:space="preserve">
+    <literal_block classes="code rst" source="{include6}" xml:space="preserve">
         In includes/more/include6.txt
         \n\
         <inline classes="punctuation">
@@ -1238,13 +1241,13 @@ Including includes/include14.txt
         <inline classes="punctuation">
             ::
          ../sibling/include7.txt
-""" % reldir(include6)],
-["""\
+"""],
+[f"""\
 Circular inclusion
 
-.. include:: %s
-""" % include15,
-"""\
+.. include:: {include15}
+""",
+f"""\
 <document source="test data">
     <paragraph>
         Circular inclusion
@@ -1252,12 +1255,12 @@ Circular inclusion
         File "include15.txt": example of rekursive inclusion.
     <paragraph>
         File "include16.txt": example of rekursive inclusion.
-    <system_message level="2" line="3" source="%s" type="WARNING">
+    <system_message level="2" line="3" source="{include16}" type="WARNING">
         <paragraph>
             circular inclusion in "include" directive:
-            %s
-            > %s
-            > %s
+            {include15}
+            > {include16}
+            > {include15}
             > test data
         <literal_block xml:space="preserve">
             .. include:: include15.txt
@@ -1265,15 +1268,14 @@ Circular inclusion
         No loop when clipping before the "include" directive:
     <paragraph>
         File "include15.txt": example of rekursive inclusion.
-""" % (reldir(include16), reldir(include15),
-       reldir(include16), reldir(include15))],
-["""\
+"""],
+[f"""\
 Circular inclusion with clipping.
 
-.. include:: %s
+.. include:: {include16}
    :start-line: 2
-""" % include16,
-"""\
+""",
+f"""\
 <document source="test data">
     <paragraph>
         Circular inclusion with clipping.
@@ -1281,13 +1283,13 @@ Circular inclusion with clipping.
         File "include15.txt": example of rekursive inclusion.
     <paragraph>
         File "include16.txt": example of rekursive inclusion.
-    <system_message level="2" line="3" source="%s" type="WARNING">
+    <system_message level="2" line="3" source="{include16}" type="WARNING">
         <paragraph>
             circular inclusion in "include" directive:
-            %s
-            > %s
-            > %s
-            > %s
+            {include15}
+            > {include16}
+            > {include15}
+            > {include16}
             > test data
         <literal_block xml:space="preserve">
             .. include:: include15.txt
@@ -1299,15 +1301,14 @@ Circular inclusion with clipping.
         No loop when clipping before the "include" directive:
     <paragraph>
         File "include15.txt": example of rekursive inclusion.
-""" % (reldir(include16), reldir(include15), reldir(include16),
-       reldir(include15), reldir(include16))],
-["""\
+"""],
+[f"""\
 Circular inclusion with specified parser.
 
-.. include:: %s
+.. include:: {include15}
    :parser: rst
-""" % include15,
-"""\
+""",
+f"""\
 <document source="test data">
     <paragraph>
         Circular inclusion with specified parser.
@@ -1315,12 +1316,12 @@ Circular inclusion with specified parser.
         File "include15.txt": example of rekursive inclusion.
     <paragraph>
         File "include16.txt": example of rekursive inclusion.
-    <system_message level="2" line="3" source="%s" type="WARNING">
+    <system_message level="2" line="3" source="{include16}" type="WARNING">
         <paragraph>
             circular inclusion in "include" directive:
-            %s
-            > %s
-            > %s
+            {include15}
+            > {include16}
+            > {include15}
             > test data
         <literal_block xml:space="preserve">
             .. include:: include15.txt
@@ -1328,14 +1329,14 @@ Circular inclusion with specified parser.
         No loop when clipping before the "include" directive:
     <paragraph>
         File "include15.txt": example of rekursive inclusion.
-""" % (reldir(include16), reldir(include15),
-       reldir(include16), reldir(include15))],
-["""\
+"""],
+[f"""\
 No circular inclusion.
 
-============================= =============================
-.. include:: data/include.txt .. include:: data/include.txt
-============================= =============================
+.. list-table::
+
+   * - .. include:: {include}
+     - .. include:: {include}
 """,
 """\
 <document source="test data">
@@ -1343,8 +1344,8 @@ No circular inclusion.
         No circular inclusion.
     <table>
         <tgroup cols="2">
-            <colspec colwidth="29">
-            <colspec colwidth="29">
+            <colspec colwidth="50">
+            <colspec colwidth="50">
             <tbody>
                 <row>
                     <entry>