Move tests from package directories to separate src/tests directory t…

…o move them out of the installed distribution. Closes https://bugs.launchpad.net/lxml/+bug/2059794
lxml · Apr 5, 2024 · c4df3e2 · c4df3e2
1 parent 8936f7a
commit c4df3e2
Show file tree

Hide file tree

Showing 167 changed files with 20 additions and 24 deletions.
diff --git a/src/lxml/tests/__init__.py → src/tests/__init__.py b/src/lxml/tests/__init__.py → src/tests/__init__.py
diff --git a/src/lxml/tests/c14n-20/c14nComment.xml → src/tests/c14n-20/c14nComment.xml b/src/lxml/tests/c14n-20/c14nComment.xml → src/tests/c14n-20/c14nComment.xml
diff --git a/src/lxml/tests/c14n-20/c14nDefault.xml → src/tests/c14n-20/c14nDefault.xml b/src/lxml/tests/c14n-20/c14nDefault.xml → src/tests/c14n-20/c14nDefault.xml
diff --git a/src/lxml/tests/c14n-20/c14nPrefix.xml → src/tests/c14n-20/c14nPrefix.xml b/src/lxml/tests/c14n-20/c14nPrefix.xml → src/tests/c14n-20/c14nPrefix.xml
diff --git a/src/lxml/tests/c14n-20/c14nPrefixQname.xml → src/tests/c14n-20/c14nPrefixQname.xml b/src/lxml/tests/c14n-20/c14nPrefixQname.xml → src/tests/c14n-20/c14nPrefixQname.xml
diff --git a/...ests/c14n-20/c14nPrefixQnameXpathElem.xml → ...ests/c14n-20/c14nPrefixQnameXpathElem.xml b/...ests/c14n-20/c14nPrefixQnameXpathElem.xml → ...ests/c14n-20/c14nPrefixQnameXpathElem.xml
diff --git a/src/lxml/tests/c14n-20/c14nQname.xml → src/tests/c14n-20/c14nQname.xml b/src/lxml/tests/c14n-20/c14nQname.xml → src/tests/c14n-20/c14nQname.xml
diff --git a/src/lxml/tests/c14n-20/c14nQnameElem.xml → src/tests/c14n-20/c14nQnameElem.xml b/src/lxml/tests/c14n-20/c14nQnameElem.xml → src/tests/c14n-20/c14nQnameElem.xml
diff --git a/...lxml/tests/c14n-20/c14nQnameXpathElem.xml → src/tests/c14n-20/c14nQnameXpathElem.xml b/...lxml/tests/c14n-20/c14nQnameXpathElem.xml → src/tests/c14n-20/c14nQnameXpathElem.xml
diff --git a/src/lxml/tests/c14n-20/c14nTrim.xml → src/tests/c14n-20/c14nTrim.xml b/src/lxml/tests/c14n-20/c14nTrim.xml → src/tests/c14n-20/c14nTrim.xml
diff --git a/src/lxml/tests/c14n-20/doc.dtd → src/tests/c14n-20/doc.dtd b/src/lxml/tests/c14n-20/doc.dtd → src/tests/c14n-20/doc.dtd
diff --git a/src/lxml/tests/c14n-20/doc.xsl → src/tests/c14n-20/doc.xsl b/src/lxml/tests/c14n-20/doc.xsl → src/tests/c14n-20/doc.xsl
diff --git a/src/lxml/tests/c14n-20/inC14N1.xml → src/tests/c14n-20/inC14N1.xml b/src/lxml/tests/c14n-20/inC14N1.xml → src/tests/c14n-20/inC14N1.xml
diff --git a/src/lxml/tests/c14n-20/inC14N2.xml → src/tests/c14n-20/inC14N2.xml b/src/lxml/tests/c14n-20/inC14N2.xml → src/tests/c14n-20/inC14N2.xml
diff --git a/src/lxml/tests/c14n-20/inC14N3.xml → src/tests/c14n-20/inC14N3.xml b/src/lxml/tests/c14n-20/inC14N3.xml → src/tests/c14n-20/inC14N3.xml
diff --git a/src/lxml/tests/c14n-20/inC14N4.xml → src/tests/c14n-20/inC14N4.xml b/src/lxml/tests/c14n-20/inC14N4.xml → src/tests/c14n-20/inC14N4.xml
diff --git a/src/lxml/tests/c14n-20/inC14N5.xml → src/tests/c14n-20/inC14N5.xml b/src/lxml/tests/c14n-20/inC14N5.xml → src/tests/c14n-20/inC14N5.xml
diff --git a/src/lxml/tests/c14n-20/inC14N6.xml → src/tests/c14n-20/inC14N6.xml b/src/lxml/tests/c14n-20/inC14N6.xml → src/tests/c14n-20/inC14N6.xml
diff --git a/src/lxml/tests/c14n-20/inNsContent.xml → src/tests/c14n-20/inNsContent.xml b/src/lxml/tests/c14n-20/inNsContent.xml → src/tests/c14n-20/inNsContent.xml
diff --git a/src/lxml/tests/c14n-20/inNsDefault.xml → src/tests/c14n-20/inNsDefault.xml b/src/lxml/tests/c14n-20/inNsDefault.xml → src/tests/c14n-20/inNsDefault.xml
diff --git a/src/lxml/tests/c14n-20/inNsPushdown.xml → src/tests/c14n-20/inNsPushdown.xml b/src/lxml/tests/c14n-20/inNsPushdown.xml → src/tests/c14n-20/inNsPushdown.xml
diff --git a/src/lxml/tests/c14n-20/inNsRedecl.xml → src/tests/c14n-20/inNsRedecl.xml b/src/lxml/tests/c14n-20/inNsRedecl.xml → src/tests/c14n-20/inNsRedecl.xml
diff --git a/src/lxml/tests/c14n-20/inNsSort.xml → src/tests/c14n-20/inNsSort.xml b/src/lxml/tests/c14n-20/inNsSort.xml → src/tests/c14n-20/inNsSort.xml
diff --git a/src/lxml/tests/c14n-20/inNsSuperfluous.xml → src/tests/c14n-20/inNsSuperfluous.xml b/src/lxml/tests/c14n-20/inNsSuperfluous.xml → src/tests/c14n-20/inNsSuperfluous.xml
diff --git a/src/lxml/tests/c14n-20/inNsXml.xml → src/tests/c14n-20/inNsXml.xml b/src/lxml/tests/c14n-20/inNsXml.xml → src/tests/c14n-20/inNsXml.xml
diff --git a/...tests/c14n-20/out_inC14N1_c14nComment.xml → ...tests/c14n-20/out_inC14N1_c14nComment.xml b/...tests/c14n-20/out_inC14N1_c14nComment.xml → ...tests/c14n-20/out_inC14N1_c14nComment.xml
diff --git a/...tests/c14n-20/out_inC14N1_c14nDefault.xml → ...tests/c14n-20/out_inC14N1_c14nDefault.xml b/...tests/c14n-20/out_inC14N1_c14nDefault.xml → ...tests/c14n-20/out_inC14N1_c14nDefault.xml
diff --git a/...tests/c14n-20/out_inC14N2_c14nDefault.xml → ...tests/c14n-20/out_inC14N2_c14nDefault.xml b/...tests/c14n-20/out_inC14N2_c14nDefault.xml → ...tests/c14n-20/out_inC14N2_c14nDefault.xml
diff --git a/...ml/tests/c14n-20/out_inC14N2_c14nTrim.xml → src/tests/c14n-20/out_inC14N2_c14nTrim.xml b/...ml/tests/c14n-20/out_inC14N2_c14nTrim.xml → src/tests/c14n-20/out_inC14N2_c14nTrim.xml
diff --git a/...tests/c14n-20/out_inC14N3_c14nDefault.xml → ...tests/c14n-20/out_inC14N3_c14nDefault.xml b/...tests/c14n-20/out_inC14N3_c14nDefault.xml → ...tests/c14n-20/out_inC14N3_c14nDefault.xml
diff --git a/.../tests/c14n-20/out_inC14N3_c14nPrefix.xml → src/tests/c14n-20/out_inC14N3_c14nPrefix.xml b/.../tests/c14n-20/out_inC14N3_c14nPrefix.xml → src/tests/c14n-20/out_inC14N3_c14nPrefix.xml
diff --git a/...ml/tests/c14n-20/out_inC14N3_c14nTrim.xml → src/tests/c14n-20/out_inC14N3_c14nTrim.xml b/...ml/tests/c14n-20/out_inC14N3_c14nTrim.xml → src/tests/c14n-20/out_inC14N3_c14nTrim.xml
diff --git a/...tests/c14n-20/out_inC14N4_c14nDefault.xml → ...tests/c14n-20/out_inC14N4_c14nDefault.xml b/...tests/c14n-20/out_inC14N4_c14nDefault.xml → ...tests/c14n-20/out_inC14N4_c14nDefault.xml
diff --git a/...ml/tests/c14n-20/out_inC14N4_c14nTrim.xml → src/tests/c14n-20/out_inC14N4_c14nTrim.xml b/...ml/tests/c14n-20/out_inC14N4_c14nTrim.xml → src/tests/c14n-20/out_inC14N4_c14nTrim.xml
diff --git a/...tests/c14n-20/out_inC14N5_c14nDefault.xml → ...tests/c14n-20/out_inC14N5_c14nDefault.xml b/...tests/c14n-20/out_inC14N5_c14nDefault.xml → ...tests/c14n-20/out_inC14N5_c14nDefault.xml
diff --git a/...ml/tests/c14n-20/out_inC14N5_c14nTrim.xml → src/tests/c14n-20/out_inC14N5_c14nTrim.xml b/...ml/tests/c14n-20/out_inC14N5_c14nTrim.xml → src/tests/c14n-20/out_inC14N5_c14nTrim.xml
diff --git a/...tests/c14n-20/out_inC14N6_c14nDefault.xml → ...tests/c14n-20/out_inC14N6_c14nDefault.xml b/...tests/c14n-20/out_inC14N6_c14nDefault.xml → ...tests/c14n-20/out_inC14N6_c14nDefault.xml
diff --git a/...s/c14n-20/out_inNsContent_c14nDefault.xml → ...s/c14n-20/out_inNsContent_c14nDefault.xml b/...s/c14n-20/out_inNsContent_c14nDefault.xml → ...s/c14n-20/out_inNsContent_c14nDefault.xml
diff --git a/..._inNsContent_c14nPrefixQnameXpathElem.xml → ..._inNsContent_c14nPrefixQnameXpathElem.xml b/..._inNsContent_c14nPrefixQnameXpathElem.xml → ..._inNsContent_c14nPrefixQnameXpathElem.xml
diff --git a/...c14n-20/out_inNsContent_c14nQnameElem.xml → ...c14n-20/out_inNsContent_c14nQnameElem.xml b/...c14n-20/out_inNsContent_c14nQnameElem.xml → ...c14n-20/out_inNsContent_c14nQnameElem.xml
diff --git a/...20/out_inNsContent_c14nQnameXpathElem.xml → ...20/out_inNsContent_c14nQnameXpathElem.xml b/...20/out_inNsContent_c14nQnameXpathElem.xml → ...20/out_inNsContent_c14nQnameXpathElem.xml
diff --git a/...s/c14n-20/out_inNsDefault_c14nDefault.xml → ...s/c14n-20/out_inNsDefault_c14nDefault.xml b/...s/c14n-20/out_inNsDefault_c14nDefault.xml → ...s/c14n-20/out_inNsDefault_c14nDefault.xml
diff --git a/...ts/c14n-20/out_inNsDefault_c14nPrefix.xml → ...ts/c14n-20/out_inNsDefault_c14nPrefix.xml b/...ts/c14n-20/out_inNsDefault_c14nPrefix.xml → ...ts/c14n-20/out_inNsDefault_c14nPrefix.xml
diff --git a/.../c14n-20/out_inNsPushdown_c14nDefault.xml → .../c14n-20/out_inNsPushdown_c14nDefault.xml b/.../c14n-20/out_inNsPushdown_c14nDefault.xml → .../c14n-20/out_inNsPushdown_c14nDefault.xml
diff --git a/...s/c14n-20/out_inNsPushdown_c14nPrefix.xml → ...s/c14n-20/out_inNsPushdown_c14nPrefix.xml b/...s/c14n-20/out_inNsPushdown_c14nPrefix.xml → ...s/c14n-20/out_inNsPushdown_c14nPrefix.xml
diff --git a/...ts/c14n-20/out_inNsRedecl_c14nDefault.xml → ...ts/c14n-20/out_inNsRedecl_c14nDefault.xml b/...ts/c14n-20/out_inNsRedecl_c14nDefault.xml → ...ts/c14n-20/out_inNsRedecl_c14nDefault.xml
diff --git a/...sts/c14n-20/out_inNsRedecl_c14nPrefix.xml → ...sts/c14n-20/out_inNsRedecl_c14nPrefix.xml b/...sts/c14n-20/out_inNsRedecl_c14nPrefix.xml → ...sts/c14n-20/out_inNsRedecl_c14nPrefix.xml
diff --git a/...ests/c14n-20/out_inNsSort_c14nDefault.xml → ...ests/c14n-20/out_inNsSort_c14nDefault.xml b/...ests/c14n-20/out_inNsSort_c14nDefault.xml → ...ests/c14n-20/out_inNsSort_c14nDefault.xml
diff --git a/...tests/c14n-20/out_inNsSort_c14nPrefix.xml → ...tests/c14n-20/out_inNsSort_c14nPrefix.xml b/...tests/c14n-20/out_inNsSort_c14nPrefix.xml → ...tests/c14n-20/out_inNsSort_c14nPrefix.xml
diff --git a/...4n-20/out_inNsSuperfluous_c14nDefault.xml → ...4n-20/out_inNsSuperfluous_c14nDefault.xml b/...4n-20/out_inNsSuperfluous_c14nDefault.xml → ...4n-20/out_inNsSuperfluous_c14nDefault.xml
diff --git a/...14n-20/out_inNsSuperfluous_c14nPrefix.xml → ...14n-20/out_inNsSuperfluous_c14nPrefix.xml b/...14n-20/out_inNsSuperfluous_c14nPrefix.xml → ...14n-20/out_inNsSuperfluous_c14nPrefix.xml
diff --git a/...tests/c14n-20/out_inNsXml_c14nDefault.xml → ...tests/c14n-20/out_inNsXml_c14nDefault.xml b/...tests/c14n-20/out_inNsXml_c14nDefault.xml → ...tests/c14n-20/out_inNsXml_c14nDefault.xml
diff --git a/.../tests/c14n-20/out_inNsXml_c14nPrefix.xml → src/tests/c14n-20/out_inNsXml_c14nPrefix.xml b/.../tests/c14n-20/out_inNsXml_c14nPrefix.xml → src/tests/c14n-20/out_inNsXml_c14nPrefix.xml
diff --git a/...s/c14n-20/out_inNsXml_c14nPrefixQname.xml → ...s/c14n-20/out_inNsXml_c14nPrefixQname.xml b/...s/c14n-20/out_inNsXml_c14nPrefixQname.xml → ...s/c14n-20/out_inNsXml_c14nPrefixQname.xml
diff --git a/...l/tests/c14n-20/out_inNsXml_c14nQname.xml → src/tests/c14n-20/out_inNsXml_c14nQname.xml b/...l/tests/c14n-20/out_inNsXml_c14nQname.xml → src/tests/c14n-20/out_inNsXml_c14nQname.xml
diff --git a/src/lxml/tests/c14n-20/world.txt → src/tests/c14n-20/world.txt b/src/lxml/tests/c14n-20/world.txt → src/tests/c14n-20/world.txt
diff --git a/src/lxml/tests/common_imports.py → src/tests/common_imports.py b/src/lxml/tests/common_imports.py → src/tests/common_imports.py
@@ -37,6 +37,8 @@ def make_version_tuple(version_string):
 else:
     ET_VERSION = (0,0,0)
 
+DOC_DIR = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), 'doc')
+
 
 def filter_by_version(test_class, version_dict, current_version):
     """Remove test methods that do not work with the current lib version.
@@ -69,12 +71,6 @@ def __call__(self, func, *args): return func
     skipif = pytest.mark.skipif
 
 
-def _get_caller_relative_path(filename, frame_depth=2):
-    module = sys.modules[sys._getframe(frame_depth).f_globals['__name__']]
-    return os.path.normpath(os.path.join(
-            os.path.dirname(getattr(module, '__file__', '')), filename))
-
-
 unichr_escape = re.compile(r'\\u[0-9a-fA-F]{4}|\\U[0-9a-fA-F]{8}')
 
 
@@ -95,7 +91,7 @@ def BytesIO(*args):
 doctest_parser = doctest.DocTestParser()
 
 def make_doctest(filename):
-    file_path = _get_caller_relative_path(filename)
+    file_path = os.path.join(DOC_DIR, filename)
     return doctest.DocFileSuite(file_path, module_relative=False, encoding='utf-8')
 
 

diff --git a/src/lxml/tests/dummy_http_server.py → src/tests/dummy_http_server.py b/src/lxml/tests/dummy_http_server.py → src/tests/dummy_http_server.py
diff --git a/src/lxml/tests/fuzz_xml_parse.py → src/tests/fuzz_xml_parse.py b/src/lxml/tests/fuzz_xml_parse.py → src/tests/fuzz_xml_parse.py
diff --git a/src/lxml/html/tests/__init__.py → src/tests/html/__init__.py b/src/lxml/html/tests/__init__.py → src/tests/html/__init__.py
diff --git a/...feedparser-data/entry_content_applet.data → ...feedparser-data/entry_content_applet.data b/...feedparser-data/entry_content_applet.data → ...feedparser-data/entry_content_applet.data
diff --git a/.../feedparser-data/entry_content_blink.data → .../feedparser-data/entry_content_blink.data b/.../feedparser-data/entry_content_blink.data → .../feedparser-data/entry_content_blink.data
diff --git a/.../feedparser-data/entry_content_crazy.data → .../feedparser-data/entry_content_crazy.data b/.../feedparser-data/entry_content_crazy.data → .../feedparser-data/entry_content_crazy.data
diff --git a/.../feedparser-data/entry_content_embed.data → .../feedparser-data/entry_content_embed.data b/.../feedparser-data/entry_content_embed.data → .../feedparser-data/entry_content_embed.data
diff --git a/.../feedparser-data/entry_content_frame.data → .../feedparser-data/entry_content_frame.data b/.../feedparser-data/entry_content_frame.data → .../feedparser-data/entry_content_frame.data
diff --git a/...feedparser-data/entry_content_iframe.data → ...feedparser-data/entry_content_iframe.data b/...feedparser-data/entry_content_iframe.data → ...feedparser-data/entry_content_iframe.data
diff --git a/...s/feedparser-data/entry_content_link.data → ...l/feedparser-data/entry_content_link.data b/...s/feedparser-data/entry_content_link.data → ...l/feedparser-data/entry_content_link.data
diff --git a/...s/feedparser-data/entry_content_meta.data → ...l/feedparser-data/entry_content_meta.data b/...s/feedparser-data/entry_content_meta.data → ...l/feedparser-data/entry_content_meta.data
diff --git a/...feedparser-data/entry_content_object.data → ...feedparser-data/entry_content_object.data b/...feedparser-data/entry_content_object.data → ...feedparser-data/entry_content_object.data
diff --git a/...eedparser-data/entry_content_onabort.data → ...eedparser-data/entry_content_onabort.data b/...eedparser-data/entry_content_onabort.data → ...eedparser-data/entry_content_onabort.data
diff --git a/...feedparser-data/entry_content_onblur.data → ...feedparser-data/entry_content_onblur.data b/...feedparser-data/entry_content_onblur.data → ...feedparser-data/entry_content_onblur.data
diff --git a/...edparser-data/entry_content_onchange.data → ...edparser-data/entry_content_onchange.data b/...edparser-data/entry_content_onchange.data → ...edparser-data/entry_content_onchange.data
diff --git a/...eedparser-data/entry_content_onclick.data → ...eedparser-data/entry_content_onclick.data b/...eedparser-data/entry_content_onclick.data → ...eedparser-data/entry_content_onclick.data
diff --git a/...parser-data/entry_content_ondblclick.data → ...parser-data/entry_content_ondblclick.data b/...parser-data/entry_content_ondblclick.data → ...parser-data/entry_content_ondblclick.data
diff --git a/...eedparser-data/entry_content_onerror.data → ...eedparser-data/entry_content_onerror.data b/...eedparser-data/entry_content_onerror.data → ...eedparser-data/entry_content_onerror.data
diff --git a/...eedparser-data/entry_content_onfocus.data → ...eedparser-data/entry_content_onfocus.data b/...eedparser-data/entry_content_onfocus.data → ...eedparser-data/entry_content_onfocus.data
diff --git a/...dparser-data/entry_content_onkeydown.data → ...dparser-data/entry_content_onkeydown.data b/...dparser-data/entry_content_onkeydown.data → ...dparser-data/entry_content_onkeydown.data
diff --git a/...parser-data/entry_content_onkeypress.data → ...parser-data/entry_content_onkeypress.data b/...parser-data/entry_content_onkeypress.data → ...parser-data/entry_content_onkeypress.data
diff --git a/...eedparser-data/entry_content_onkeyup.data → ...eedparser-data/entry_content_onkeyup.data b/...eedparser-data/entry_content_onkeyup.data → ...eedparser-data/entry_content_onkeyup.data
diff --git a/...feedparser-data/entry_content_onload.data → ...feedparser-data/entry_content_onload.data b/...feedparser-data/entry_content_onload.data → ...feedparser-data/entry_content_onload.data
diff --git a/...arser-data/entry_content_onmousedown.data → ...arser-data/entry_content_onmousedown.data b/...arser-data/entry_content_onmousedown.data → ...arser-data/entry_content_onmousedown.data
diff --git a/...parser-data/entry_content_onmouseout.data → ...parser-data/entry_content_onmouseout.data b/...parser-data/entry_content_onmouseout.data → ...parser-data/entry_content_onmouseout.data
diff --git a/...arser-data/entry_content_onmouseover.data → ...arser-data/entry_content_onmouseover.data b/...arser-data/entry_content_onmouseover.data → ...arser-data/entry_content_onmouseover.data
diff --git a/...dparser-data/entry_content_onmouseup.data → ...dparser-data/entry_content_onmouseup.data b/...dparser-data/entry_content_onmouseup.data → ...dparser-data/entry_content_onmouseup.data
diff --git a/...eedparser-data/entry_content_onreset.data → ...eedparser-data/entry_content_onreset.data b/...eedparser-data/entry_content_onreset.data → ...eedparser-data/entry_content_onreset.data
diff --git a/...edparser-data/entry_content_onresize.data → ...edparser-data/entry_content_onresize.data b/...edparser-data/entry_content_onresize.data → ...edparser-data/entry_content_onresize.data
diff --git a/...edparser-data/entry_content_onsubmit.data → ...edparser-data/entry_content_onsubmit.data b/...edparser-data/entry_content_onsubmit.data → ...edparser-data/entry_content_onsubmit.data
diff --git a/...edparser-data/entry_content_onunload.data → ...edparser-data/entry_content_onunload.data b/...edparser-data/entry_content_onunload.data → ...edparser-data/entry_content_onunload.data
diff --git a/...feedparser-data/entry_content_script.data → ...feedparser-data/entry_content_script.data b/...feedparser-data/entry_content_script.data → ...feedparser-data/entry_content_script.data
diff --git a/...rser-data/entry_content_script_cdata.data → ...rser-data/entry_content_script_cdata.data b/...rser-data/entry_content_script_cdata.data → ...rser-data/entry_content_script_cdata.data
diff --git a/...ser-data/entry_content_script_inline.data → ...ser-data/entry_content_script_inline.data b/...ser-data/entry_content_script_inline.data → ...ser-data/entry_content_script_inline.data
diff --git a/.../feedparser-data/entry_content_style.data → .../feedparser-data/entry_content_style.data b/.../feedparser-data/entry_content_style.data → .../feedparser-data/entry_content_style.data
diff --git a/...ckers-org-data/background-image-plus.data → ...ckers-org-data/background-image-plus.data b/...ckers-org-data/background-image-plus.data → ...ckers-org-data/background-image-plus.data
diff --git a/...-data/background-image-with-unicoded.data → ...-data/background-image-with-unicoded.data b/...-data/background-image-with-unicoded.data → ...-data/background-image-with-unicoded.data
diff --git a/...ts/hackers-org-data/downlevel-hidden.data → ...ml/hackers-org-data/downlevel-hidden.data b/...ts/hackers-org-data/downlevel-hidden.data → ...ml/hackers-org-data/downlevel-hidden.data
diff --git a/...ests/hackers-org-data/html-plus-time.data → ...html/hackers-org-data/html-plus-time.data b/...ests/hackers-org-data/html-plus-time.data → ...html/hackers-org-data/html-plus-time.data
diff --git a/...sts/hackers-org-data/javascript-link.data → ...tml/hackers-org-data/javascript-link.data b/...sts/hackers-org-data/javascript-link.data → ...tml/hackers-org-data/javascript-link.data
diff --git a/...tests/hackers-org-data/style-comment.data → .../html/hackers-org-data/style-comment.data b/...tests/hackers-org-data/style-comment.data → .../html/hackers-org-data/style-comment.data
diff --git a/...ts/hackers-org-data/style-expression.data → ...ml/hackers-org-data/style-expression.data b/...ts/hackers-org-data/style-expression.data → ...ml/hackers-org-data/style-expression.data
diff --git a/.../tests/hackers-org-data/style-import.data → ...s/html/hackers-org-data/style-import.data b/.../tests/hackers-org-data/style-import.data → ...s/html/hackers-org-data/style-import.data
diff --git a/.../tests/hackers-org-data/style-js-tag.data → ...s/html/hackers-org-data/style-js-tag.data b/.../tests/hackers-org-data/style-js-tag.data → ...s/html/hackers-org-data/style-js-tag.data
diff --git a/.../tests/hackers-org-data/style-url-js.data → ...s/html/hackers-org-data/style-url-js.data b/.../tests/hackers-org-data/style-url-js.data → ...s/html/hackers-org-data/style-url-js.data
diff --git a/...sts/hackers-org-data/xml-data-island.data → ...tml/hackers-org-data/xml-data-island.data b/...sts/hackers-org-data/xml-data-island.data → ...tml/hackers-org-data/xml-data-island.data
diff --git a/...sts/hackers-org-data/xml-embedded-js.data → ...tml/hackers-org-data/xml-embedded-js.data b/...sts/hackers-org-data/xml-embedded-js.data → ...tml/hackers-org-data/xml-embedded-js.data
diff --git a/...ackers-org-data/xml-namespace.data.BROKEN → ...ackers-org-data/xml-namespace.data.BROKEN b/...ackers-org-data/xml-namespace.data.BROKEN → ...ackers-org-data/xml-namespace.data.BROKEN
diff --git a/src/lxml/html/tests/test_basic.py → src/tests/html/test_basic.py b/src/lxml/html/tests/test_basic.py → src/tests/html/test_basic.py
diff --git a/src/lxml/html/tests/test_basic.txt → src/tests/html/test_basic.txt b/src/lxml/html/tests/test_basic.txt → src/tests/html/test_basic.txt
diff --git a/src/lxml/html/tests/test_diff.py → src/tests/html/test_diff.py b/src/lxml/html/tests/test_diff.py → src/tests/html/test_diff.py
diff --git a/src/lxml/html/tests/test_diff.txt → src/tests/html/test_diff.txt b/src/lxml/html/tests/test_diff.txt → src/tests/html/test_diff.txt
diff --git a/src/lxml/html/tests/test_elementsoup.py → src/tests/html/test_elementsoup.py b/src/lxml/html/tests/test_elementsoup.py → src/tests/html/test_elementsoup.py
@@ -119,7 +119,7 @@ def test_suite():
     suite = unittest.TestSuite()
     if BS_INSTALLED:
         suite.addTests([unittest.defaultTestLoader.loadTestsFromTestCase(SoupParserTestCase)])
-        #suite.addTests([make_doctest('../../../../doc/elementsoup.txt')])  # FIXME: Py2-only ?
+        #suite.addTests([make_doctest('elementsoup.txt')])  # FIXME: Py2-only ?
     return suite
 
 

diff --git a/src/lxml/html/tests/test_feedparser_data.py → src/tests/html/test_feedparser_data.py b/src/lxml/html/tests/test_feedparser_data.py → src/tests/html/test_feedparser_data.py
diff --git a/src/lxml/html/tests/test_formfill.py → src/tests/html/test_formfill.py b/src/lxml/html/tests/test_formfill.py → src/tests/html/test_formfill.py
diff --git a/src/lxml/html/tests/test_formfill.txt → src/tests/html/test_formfill.txt b/src/lxml/html/tests/test_formfill.txt → src/tests/html/test_formfill.txt
diff --git a/src/lxml/html/tests/test_forms.py → src/tests/html/test_forms.py b/src/lxml/html/tests/test_forms.py → src/tests/html/test_forms.py
diff --git a/src/lxml/html/tests/test_forms.txt → src/tests/html/test_forms.txt b/src/lxml/html/tests/test_forms.txt → src/tests/html/test_forms.txt
diff --git a/src/lxml/html/tests/test_frames.py → src/tests/html/test_frames.py b/src/lxml/html/tests/test_frames.py → src/tests/html/test_frames.py
diff --git a/src/lxml/html/tests/test_html5parser.py → src/tests/html/test_html5parser.py b/src/lxml/html/tests/test_html5parser.py → src/tests/html/test_html5parser.py
diff --git a/src/lxml/html/tests/test_rewritelinks.py → src/tests/html/test_rewritelinks.py b/src/lxml/html/tests/test_rewritelinks.py → src/tests/html/test_rewritelinks.py
diff --git a/src/lxml/html/tests/test_rewritelinks.txt → src/tests/html/test_rewritelinks.txt b/src/lxml/html/tests/test_rewritelinks.txt → src/tests/html/test_rewritelinks.txt
diff --git a/src/lxml/html/tests/test_select.py → src/tests/html/test_select.py b/src/lxml/html/tests/test_select.py → src/tests/html/test_select.py
diff --git a/src/lxml/html/tests/test_xhtml.py → src/tests/html/test_xhtml.py b/src/lxml/html/tests/test_xhtml.py → src/tests/html/test_xhtml.py
diff --git a/src/lxml/html/tests/test_xhtml.txt → src/tests/html/test_xhtml.txt b/src/lxml/html/tests/test_xhtml.txt → src/tests/html/test_xhtml.txt
diff --git a/...l/html/tests/transform_feedparser_data.py → src/tests/html/transform_feedparser_data.py b/...l/html/tests/transform_feedparser_data.py → src/tests/html/transform_feedparser_data.py
diff --git a/src/lxml/tests/include/test_xinclude.xml → src/tests/include/test_xinclude.xml b/src/lxml/tests/include/test_xinclude.xml → src/tests/include/test_xinclude.xml
diff --git a/src/lxml/tests/selftest.py → src/tests/selftest.py b/src/lxml/tests/selftest.py → src/tests/selftest.py
diff --git a/src/lxml/tests/selftest2.py → src/tests/selftest2.py b/src/lxml/tests/selftest2.py → src/tests/selftest2.py
diff --git a/src/lxml/tests/shakespeare.html → src/tests/shakespeare.html b/src/lxml/tests/shakespeare.html → src/tests/shakespeare.html
diff --git a/src/lxml/tests/test-document.xslt → src/tests/test-document.xslt b/src/lxml/tests/test-document.xslt → src/tests/test-document.xslt
diff --git a/src/lxml/tests/test-string.xml → src/tests/test-string.xml b/src/lxml/tests/test-string.xml → src/tests/test-string.xml
diff --git a/src/lxml/tests/test.dtd → src/tests/test.dtd b/src/lxml/tests/test.dtd → src/tests/test.dtd
diff --git a/src/lxml/tests/test.rnc → src/tests/test.rnc b/src/lxml/tests/test.rnc → src/tests/test.rnc
diff --git a/src/lxml/tests/test.sch → src/tests/test.sch b/src/lxml/tests/test.sch → src/tests/test.sch
diff --git a/src/lxml/tests/test.xml → src/tests/test.xml b/src/lxml/tests/test.xml → src/tests/test.xml
diff --git a/src/lxml/tests/test.xsd → src/tests/test.xsd b/src/lxml/tests/test.xsd → src/tests/test.xsd
diff --git a/src/lxml/tests/test1.rng → src/tests/test1.rng b/src/lxml/tests/test1.rng → src/tests/test1.rng
diff --git a/src/lxml/tests/test1.xslt → src/tests/test1.xslt b/src/lxml/tests/test1.xslt → src/tests/test1.xslt
diff --git a/src/lxml/tests/test2.rng → src/tests/test2.rng b/src/lxml/tests/test2.rng → src/tests/test2.rng
diff --git a/src/lxml/tests/test2.xslt → src/tests/test2.xslt b/src/lxml/tests/test2.xslt → src/tests/test2.xslt
diff --git a/src/lxml/tests/test_broken.xml → src/tests/test_broken.xml b/src/lxml/tests/test_broken.xml → src/tests/test_broken.xml
diff --git a/src/lxml/tests/test_builder.py → src/tests/test_builder.py b/src/lxml/tests/test_builder.py → src/tests/test_builder.py
diff --git a/src/lxml/tests/test_classlookup.py → src/tests/test_classlookup.py b/src/lxml/tests/test_classlookup.py → src/tests/test_classlookup.py
diff --git a/src/lxml/tests/test_css.py → src/tests/test_css.py b/src/lxml/tests/test_css.py → src/tests/test_css.py
diff --git a/src/lxml/tests/test_doctestcompare.py → src/tests/test_doctestcompare.py b/src/lxml/tests/test_doctestcompare.py → src/tests/test_doctestcompare.py
diff --git a/src/lxml/tests/test_dtd.py → src/tests/test_dtd.py b/src/lxml/tests/test_dtd.py → src/tests/test_dtd.py
@@ -423,7 +423,7 @@ def test_suite():
     suite = unittest.TestSuite()
     suite.addTests([unittest.defaultTestLoader.loadTestsFromTestCase(ETreeDtdTestCase)])
     suite.addTests(
-        [make_doctest('../../../doc/validation.txt')])
+        [make_doctest('validation.txt')])
     return suite
 
 if __name__ == '__main__':

diff --git a/src/lxml/tests/test_elementpath.py → src/tests/test_elementpath.py b/src/lxml/tests/test_elementpath.py → src/tests/test_elementpath.py
diff --git a/src/lxml/tests/test_elementtree.py → src/tests/test_elementtree.py b/src/lxml/tests/test_elementtree.py → src/tests/test_elementtree.py
diff --git a/src/lxml/tests/test_errors.py → src/tests/test_errors.py b/src/lxml/tests/test_errors.py → src/tests/test_errors.py
diff --git a/src/lxml/tests/test_etree.py → src/tests/test_etree.py b/src/lxml/tests/test_etree.py → src/tests/test_etree.py
@@ -5739,15 +5739,15 @@ def test_suite():
     # add doctests
     suite.addTests(doctest.DocTestSuite(etree))
     suite.addTests(
-        [make_doctest('../../../doc/tutorial.txt')])
+        [make_doctest('tutorial.txt')])
     suite.addTests(
-        [make_doctest('../../../doc/api.txt')])
+        [make_doctest('api.txt')])
     suite.addTests(
-        [make_doctest('../../../doc/FAQ.txt')])
+        [make_doctest('FAQ.txt')])
     suite.addTests(
-        [make_doctest('../../../doc/parsing.txt')])
+        [make_doctest('parsing.txt')])
     suite.addTests(
-        [make_doctest('../../../doc/resolvers.txt')])
+        [make_doctest('resolvers.txt')])
     return suite
 
 

diff --git a/src/lxml/tests/test_external_document.py → src/tests/test_external_document.py b/src/lxml/tests/test_external_document.py → src/tests/test_external_document.py
diff --git a/src/lxml/tests/test_htmlparser.py → src/tests/test_htmlparser.py b/src/lxml/tests/test_htmlparser.py → src/tests/test_htmlparser.py
diff --git a/src/lxml/tests/test_http_io.py → src/tests/test_http_io.py b/src/lxml/tests/test_http_io.py → src/tests/test_http_io.py
diff --git a/src/lxml/tests/test_import.xsd → src/tests/test_import.xsd b/src/lxml/tests/test_import.xsd → src/tests/test_import.xsd
diff --git a/src/lxml/tests/test_inc.xsd → src/tests/test_inc.xsd b/src/lxml/tests/test_inc.xsd → src/tests/test_inc.xsd
diff --git a/src/lxml/tests/test_incremental_xmlfile.py → src/tests/test_incremental_xmlfile.py b/src/lxml/tests/test_incremental_xmlfile.py → src/tests/test_incremental_xmlfile.py
diff --git a/src/lxml/tests/test_io.py → src/tests/test_io.py b/src/lxml/tests/test_io.py → src/tests/test_io.py
diff --git a/src/lxml/tests/test_isoschematron.py → src/tests/test_isoschematron.py b/src/lxml/tests/test_isoschematron.py → src/tests/test_isoschematron.py
@@ -862,7 +862,7 @@ def test_suite():
     suite.addTests([unittest.defaultTestLoader.loadTestsFromTestCase(ETreeISOSchematronTestCase)])
     suite.addTests(doctest.DocTestSuite(isoschematron))
     suite.addTests(
-        [make_doctest('../../../doc/validation.txt')])
+        [make_doctest('validation.txt')])
     return suite
 
 if __name__ == '__main__':

diff --git a/src/lxml/tests/test_nsclasses.py → src/tests/test_nsclasses.py b/src/lxml/tests/test_nsclasses.py → src/tests/test_nsclasses.py
@@ -202,7 +202,7 @@ def test_suite():
     suite = unittest.TestSuite()
     suite.addTests([unittest.defaultTestLoader.loadTestsFromTestCase(ETreeNamespaceClassesTestCase)])
     suite.addTests(
-        [make_doctest('../../../doc/element_classes.txt')])
+        [make_doctest('element_classes.txt')])
     return suite
 
 if __name__ == '__main__':

diff --git a/src/lxml/tests/test_objectify.py → src/tests/test_objectify.py b/src/lxml/tests/test_objectify.py → src/tests/test_objectify.py
@@ -2743,7 +2743,7 @@ def test_suite():
     suite = unittest.TestSuite()
     suite.addTests([unittest.defaultTestLoader.loadTestsFromTestCase(ObjectifyTestCase)])
     suite.addTests(doctest.DocTestSuite(objectify))
-    suite.addTests([make_doctest('../../../doc/objectify.txt')])
+    suite.addTests([make_doctest('objectify.txt')])
     return suite
 
 if __name__ == '__main__':

diff --git a/src/lxml/tests/test_pyclasslookup.py → src/tests/test_pyclasslookup.py b/src/lxml/tests/test_pyclasslookup.py → src/tests/test_pyclasslookup.py
diff --git a/src/lxml/tests/test_relaxng.py → src/tests/test_relaxng.py b/src/lxml/tests/test_relaxng.py → src/tests/test_relaxng.py
@@ -248,7 +248,7 @@ def test_suite():
     suite = unittest.TestSuite()
     suite.addTests([unittest.defaultTestLoader.loadTestsFromTestCase(ETreeRelaxNGTestCase)])
     suite.addTests(
-        [make_doctest('../../../doc/validation.txt')])
+        [make_doctest('validation.txt')])
     if rnc2rng is not None:
         suite.addTests([unittest.defaultTestLoader.loadTestsFromTestCase(RelaxNGCompactTestCase)])
     return suite

diff --git a/src/lxml/tests/test_sax.py → src/tests/test_sax.py b/src/lxml/tests/test_sax.py → src/tests/test_sax.py
@@ -405,7 +405,7 @@ def test_suite():
     suite.addTests([unittest.defaultTestLoader.loadTestsFromTestCase(ETreeSaxTestCase)])
     suite.addTests([unittest.defaultTestLoader.loadTestsFromTestCase(NSPrefixSaxTestCase)])
     suite.addTests(
-        [make_doctest('../../../doc/sax.txt')])
+        [make_doctest('sax.txt')])
     return suite
 
 

diff --git a/src/lxml/tests/test_schematron.py → src/tests/test_schematron.py b/src/lxml/tests/test_schematron.py → src/tests/test_schematron.py
@@ -72,7 +72,7 @@ def test_suite():
     suite = unittest.TestSuite()
     suite.addTests([unittest.defaultTestLoader.loadTestsFromTestCase(ETreeSchematronTestCase)])
     suite.addTests(
-        [make_doctest('../../../doc/validation.txt')])
+        [make_doctest('validation.txt')])
     return suite
 
 if __name__ == '__main__':

diff --git a/src/lxml/tests/test_threading.py → src/tests/test_threading.py b/src/lxml/tests/test_threading.py → src/tests/test_threading.py
diff --git a/src/lxml/tests/test_unicode.py → src/tests/test_unicode.py b/src/lxml/tests/test_unicode.py → src/tests/test_unicode.py
diff --git a/src/lxml/tests/test_xmlschema.py → src/tests/test_xmlschema.py b/src/lxml/tests/test_xmlschema.py → src/tests/test_xmlschema.py
@@ -499,7 +499,7 @@ def test_suite():
     suite.addTests([unittest.defaultTestLoader.loadTestsFromTestCase(ETreeXMLSchemaTestCase)])
     suite.addTests([unittest.defaultTestLoader.loadTestsFromTestCase(ETreeXMLSchemaResolversTestCase)])
     suite.addTests(
-        [make_doctest('../../../doc/validation.txt')])
+        [make_doctest('validation.txt')])
     return suite
 
 

diff --git a/src/lxml/tests/test_xpathevaluator.py → src/tests/test_xpathevaluator.py b/src/lxml/tests/test_xpathevaluator.py → src/tests/test_xpathevaluator.py
@@ -731,7 +731,7 @@ def test_suite():
     suite.addTests([unittest.defaultTestLoader.loadTestsFromTestCase(ETreeETXPathClassTestCase)])
     suite.addTests([doctest.DocTestSuite()])
     suite.addTests(
-        [make_doctest('../../../doc/xpathxslt.txt')])
+        [make_doctest('xpathxslt.txt')])
     return suite
 
 if __name__ == '__main__':

diff --git a/src/lxml/tests/test_xslt.py → src/tests/test_xslt.py b/src/lxml/tests/test_xslt.py → src/tests/test_xslt.py
@@ -2075,9 +2075,9 @@ def test_suite():
     suite.addTests([unittest.defaultTestLoader.loadTestsFromTestCase(ETreeXSLTExtElementTestCase)])
     suite.addTests([unittest.defaultTestLoader.loadTestsFromTestCase(Py3XSLTTestCase)])
     suite.addTests(
-        [make_doctest('../../../doc/extensions.txt')])
+        [make_doctest('extensions.txt')])
     suite.addTests(
-        [make_doctest('../../../doc/xpathxslt.txt')])
+        [make_doctest('xpathxslt.txt')])
     return suite
 
 if __name__ == '__main__':