From c4df3e2e9e82661d514a553a16ad841f91f38fc3 Mon Sep 17 00:00:00 2001 From: Stefan Behnel Date: Fri, 5 Apr 2024 11:36:51 +0200 Subject: [PATCH] Move tests from package directories to separate src/tests directory to move them out of the installed distribution. Closes https://bugs.launchpad.net/lxml/+bug/2059794 --- src/{lxml => }/tests/__init__.py | 0 src/{lxml => }/tests/c14n-20/c14nComment.xml | 0 src/{lxml => }/tests/c14n-20/c14nDefault.xml | 0 src/{lxml => }/tests/c14n-20/c14nPrefix.xml | 0 src/{lxml => }/tests/c14n-20/c14nPrefixQname.xml | 0 .../tests/c14n-20/c14nPrefixQnameXpathElem.xml | 0 src/{lxml => }/tests/c14n-20/c14nQname.xml | 0 src/{lxml => }/tests/c14n-20/c14nQnameElem.xml | 0 src/{lxml => }/tests/c14n-20/c14nQnameXpathElem.xml | 0 src/{lxml => }/tests/c14n-20/c14nTrim.xml | 0 src/{lxml => }/tests/c14n-20/doc.dtd | 0 src/{lxml => }/tests/c14n-20/doc.xsl | 0 src/{lxml => }/tests/c14n-20/inC14N1.xml | 0 src/{lxml => }/tests/c14n-20/inC14N2.xml | 0 src/{lxml => }/tests/c14n-20/inC14N3.xml | 0 src/{lxml => }/tests/c14n-20/inC14N4.xml | 0 src/{lxml => }/tests/c14n-20/inC14N5.xml | 0 src/{lxml => }/tests/c14n-20/inC14N6.xml | 0 src/{lxml => }/tests/c14n-20/inNsContent.xml | 0 src/{lxml => }/tests/c14n-20/inNsDefault.xml | 0 src/{lxml => }/tests/c14n-20/inNsPushdown.xml | 0 src/{lxml => }/tests/c14n-20/inNsRedecl.xml | 0 src/{lxml => }/tests/c14n-20/inNsSort.xml | 0 src/{lxml => }/tests/c14n-20/inNsSuperfluous.xml | 0 src/{lxml => }/tests/c14n-20/inNsXml.xml | 0 .../tests/c14n-20/out_inC14N1_c14nComment.xml | 0 .../tests/c14n-20/out_inC14N1_c14nDefault.xml | 0 .../tests/c14n-20/out_inC14N2_c14nDefault.xml | 0 src/{lxml => }/tests/c14n-20/out_inC14N2_c14nTrim.xml | 0 .../tests/c14n-20/out_inC14N3_c14nDefault.xml | 0 .../tests/c14n-20/out_inC14N3_c14nPrefix.xml | 0 src/{lxml => }/tests/c14n-20/out_inC14N3_c14nTrim.xml | 0 .../tests/c14n-20/out_inC14N4_c14nDefault.xml | 0 src/{lxml => }/tests/c14n-20/out_inC14N4_c14nTrim.xml | 0 .../tests/c14n-20/out_inC14N5_c14nDefault.xml | 0 src/{lxml => }/tests/c14n-20/out_inC14N5_c14nTrim.xml | 0 .../tests/c14n-20/out_inC14N6_c14nDefault.xml | 0 .../tests/c14n-20/out_inNsContent_c14nDefault.xml | 0 .../out_inNsContent_c14nPrefixQnameXpathElem.xml | 0 .../tests/c14n-20/out_inNsContent_c14nQnameElem.xml | 0 .../c14n-20/out_inNsContent_c14nQnameXpathElem.xml | 0 .../tests/c14n-20/out_inNsDefault_c14nDefault.xml | 0 .../tests/c14n-20/out_inNsDefault_c14nPrefix.xml | 0 .../tests/c14n-20/out_inNsPushdown_c14nDefault.xml | 0 .../tests/c14n-20/out_inNsPushdown_c14nPrefix.xml | 0 .../tests/c14n-20/out_inNsRedecl_c14nDefault.xml | 0 .../tests/c14n-20/out_inNsRedecl_c14nPrefix.xml | 0 .../tests/c14n-20/out_inNsSort_c14nDefault.xml | 0 .../tests/c14n-20/out_inNsSort_c14nPrefix.xml | 0 .../tests/c14n-20/out_inNsSuperfluous_c14nDefault.xml | 0 .../tests/c14n-20/out_inNsSuperfluous_c14nPrefix.xml | 0 .../tests/c14n-20/out_inNsXml_c14nDefault.xml | 0 .../tests/c14n-20/out_inNsXml_c14nPrefix.xml | 0 .../tests/c14n-20/out_inNsXml_c14nPrefixQname.xml | 0 src/{lxml => }/tests/c14n-20/out_inNsXml_c14nQname.xml | 0 src/{lxml => }/tests/c14n-20/world.txt | 0 src/{lxml => }/tests/common_imports.py | 10 +++------- src/{lxml => }/tests/dummy_http_server.py | 0 src/{lxml => }/tests/fuzz_xml_parse.py | 0 src/{lxml/html/tests => tests/html}/__init__.py | 0 .../html}/feedparser-data/entry_content_applet.data | 0 .../html}/feedparser-data/entry_content_blink.data | 0 .../html}/feedparser-data/entry_content_crazy.data | 0 .../html}/feedparser-data/entry_content_embed.data | 0 .../html}/feedparser-data/entry_content_frame.data | 0 .../html}/feedparser-data/entry_content_iframe.data | 0 .../html}/feedparser-data/entry_content_link.data | 0 .../html}/feedparser-data/entry_content_meta.data | 0 .../html}/feedparser-data/entry_content_object.data | 0 .../html}/feedparser-data/entry_content_onabort.data | 0 .../html}/feedparser-data/entry_content_onblur.data | 0 .../html}/feedparser-data/entry_content_onchange.data | 0 .../html}/feedparser-data/entry_content_onclick.data | 0 .../feedparser-data/entry_content_ondblclick.data | 0 .../html}/feedparser-data/entry_content_onerror.data | 0 .../html}/feedparser-data/entry_content_onfocus.data | 0 .../html}/feedparser-data/entry_content_onkeydown.data | 0 .../feedparser-data/entry_content_onkeypress.data | 0 .../html}/feedparser-data/entry_content_onkeyup.data | 0 .../html}/feedparser-data/entry_content_onload.data | 0 .../feedparser-data/entry_content_onmousedown.data | 0 .../feedparser-data/entry_content_onmouseout.data | 0 .../feedparser-data/entry_content_onmouseover.data | 0 .../html}/feedparser-data/entry_content_onmouseup.data | 0 .../html}/feedparser-data/entry_content_onreset.data | 0 .../html}/feedparser-data/entry_content_onresize.data | 0 .../html}/feedparser-data/entry_content_onsubmit.data | 0 .../html}/feedparser-data/entry_content_onunload.data | 0 .../html}/feedparser-data/entry_content_script.data | 0 .../feedparser-data/entry_content_script_cdata.data | 0 .../feedparser-data/entry_content_script_inline.data | 0 .../html}/feedparser-data/entry_content_style.data | 0 .../html}/hackers-org-data/background-image-plus.data | 0 .../background-image-with-unicoded.data | 0 .../html}/hackers-org-data/downlevel-hidden.data | 0 .../html}/hackers-org-data/html-plus-time.data | 0 .../html}/hackers-org-data/javascript-link.data | 0 .../html}/hackers-org-data/style-comment.data | 0 .../html}/hackers-org-data/style-expression.data | 0 .../html}/hackers-org-data/style-import.data | 0 .../html}/hackers-org-data/style-js-tag.data | 0 .../html}/hackers-org-data/style-url-js.data | 0 .../html}/hackers-org-data/xml-data-island.data | 0 .../html}/hackers-org-data/xml-embedded-js.data | 0 .../html}/hackers-org-data/xml-namespace.data.BROKEN | 0 src/{lxml/html/tests => tests/html}/test_basic.py | 0 src/{lxml/html/tests => tests/html}/test_basic.txt | 0 src/{lxml/html/tests => tests/html}/test_diff.py | 0 src/{lxml/html/tests => tests/html}/test_diff.txt | 0 .../html/tests => tests/html}/test_elementsoup.py | 2 +- .../html/tests => tests/html}/test_feedparser_data.py | 0 src/{lxml/html/tests => tests/html}/test_formfill.py | 0 src/{lxml/html/tests => tests/html}/test_formfill.txt | 0 src/{lxml/html/tests => tests/html}/test_forms.py | 0 src/{lxml/html/tests => tests/html}/test_forms.txt | 0 src/{lxml/html/tests => tests/html}/test_frames.py | 0 .../html/tests => tests/html}/test_html5parser.py | 0 .../html/tests => tests/html}/test_rewritelinks.py | 0 .../html/tests => tests/html}/test_rewritelinks.txt | 0 src/{lxml/html/tests => tests/html}/test_select.py | 0 src/{lxml/html/tests => tests/html}/test_xhtml.py | 0 src/{lxml/html/tests => tests/html}/test_xhtml.txt | 0 .../tests => tests/html}/transform_feedparser_data.py | 0 src/{lxml => }/tests/include/test_xinclude.xml | 0 src/{lxml => }/tests/selftest.py | 0 src/{lxml => }/tests/selftest2.py | 0 src/{lxml => }/tests/shakespeare.html | 0 src/{lxml => }/tests/test-document.xslt | 0 src/{lxml => }/tests/test-string.xml | 0 src/{lxml => }/tests/test.dtd | 0 src/{lxml => }/tests/test.rnc | 0 src/{lxml => }/tests/test.sch | 0 src/{lxml => }/tests/test.xml | 0 src/{lxml => }/tests/test.xsd | 0 src/{lxml => }/tests/test1.rng | 0 src/{lxml => }/tests/test1.xslt | 0 src/{lxml => }/tests/test2.rng | 0 src/{lxml => }/tests/test2.xslt | 0 src/{lxml => }/tests/test_broken.xml | 0 src/{lxml => }/tests/test_builder.py | 0 src/{lxml => }/tests/test_classlookup.py | 0 src/{lxml => }/tests/test_css.py | 0 src/{lxml => }/tests/test_doctestcompare.py | 0 src/{lxml => }/tests/test_dtd.py | 2 +- src/{lxml => }/tests/test_elementpath.py | 0 src/{lxml => }/tests/test_elementtree.py | 0 src/{lxml => }/tests/test_errors.py | 0 src/{lxml => }/tests/test_etree.py | 10 +++++----- src/{lxml => }/tests/test_external_document.py | 0 src/{lxml => }/tests/test_htmlparser.py | 0 src/{lxml => }/tests/test_http_io.py | 0 src/{lxml => }/tests/test_import.xsd | 0 src/{lxml => }/tests/test_inc.xsd | 0 src/{lxml => }/tests/test_incremental_xmlfile.py | 0 src/{lxml => }/tests/test_io.py | 0 src/{lxml => }/tests/test_isoschematron.py | 2 +- src/{lxml => }/tests/test_nsclasses.py | 2 +- src/{lxml => }/tests/test_objectify.py | 2 +- src/{lxml => }/tests/test_pyclasslookup.py | 0 src/{lxml => }/tests/test_relaxng.py | 2 +- src/{lxml => }/tests/test_sax.py | 2 +- src/{lxml => }/tests/test_schematron.py | 2 +- src/{lxml => }/tests/test_threading.py | 0 src/{lxml => }/tests/test_unicode.py | 0 src/{lxml => }/tests/test_xmlschema.py | 2 +- src/{lxml => }/tests/test_xpathevaluator.py | 2 +- src/{lxml => }/tests/test_xslt.py | 4 ++-- 167 files changed, 20 insertions(+), 24 deletions(-) rename src/{lxml => }/tests/__init__.py (100%) rename src/{lxml => }/tests/c14n-20/c14nComment.xml (100%) rename src/{lxml => }/tests/c14n-20/c14nDefault.xml (100%) rename src/{lxml => }/tests/c14n-20/c14nPrefix.xml (100%) rename src/{lxml => }/tests/c14n-20/c14nPrefixQname.xml (100%) rename src/{lxml => }/tests/c14n-20/c14nPrefixQnameXpathElem.xml (100%) rename src/{lxml => }/tests/c14n-20/c14nQname.xml (100%) rename src/{lxml => }/tests/c14n-20/c14nQnameElem.xml (100%) rename src/{lxml => }/tests/c14n-20/c14nQnameXpathElem.xml (100%) rename src/{lxml => }/tests/c14n-20/c14nTrim.xml (100%) rename src/{lxml => }/tests/c14n-20/doc.dtd (100%) rename src/{lxml => }/tests/c14n-20/doc.xsl (100%) rename src/{lxml => }/tests/c14n-20/inC14N1.xml (100%) rename src/{lxml => }/tests/c14n-20/inC14N2.xml (100%) rename src/{lxml => }/tests/c14n-20/inC14N3.xml (100%) rename src/{lxml => }/tests/c14n-20/inC14N4.xml (100%) rename src/{lxml => }/tests/c14n-20/inC14N5.xml (100%) rename src/{lxml => }/tests/c14n-20/inC14N6.xml (100%) rename src/{lxml => }/tests/c14n-20/inNsContent.xml (100%) rename src/{lxml => }/tests/c14n-20/inNsDefault.xml (100%) rename src/{lxml => }/tests/c14n-20/inNsPushdown.xml (100%) rename src/{lxml => }/tests/c14n-20/inNsRedecl.xml (100%) rename src/{lxml => }/tests/c14n-20/inNsSort.xml (100%) rename src/{lxml => }/tests/c14n-20/inNsSuperfluous.xml (100%) rename src/{lxml => }/tests/c14n-20/inNsXml.xml (100%) rename src/{lxml => }/tests/c14n-20/out_inC14N1_c14nComment.xml (100%) rename src/{lxml => }/tests/c14n-20/out_inC14N1_c14nDefault.xml (100%) rename src/{lxml => }/tests/c14n-20/out_inC14N2_c14nDefault.xml (100%) rename src/{lxml => }/tests/c14n-20/out_inC14N2_c14nTrim.xml (100%) rename src/{lxml => }/tests/c14n-20/out_inC14N3_c14nDefault.xml (100%) rename src/{lxml => }/tests/c14n-20/out_inC14N3_c14nPrefix.xml (100%) rename src/{lxml => }/tests/c14n-20/out_inC14N3_c14nTrim.xml (100%) rename src/{lxml => }/tests/c14n-20/out_inC14N4_c14nDefault.xml (100%) rename src/{lxml => }/tests/c14n-20/out_inC14N4_c14nTrim.xml (100%) rename src/{lxml => }/tests/c14n-20/out_inC14N5_c14nDefault.xml (100%) rename src/{lxml => }/tests/c14n-20/out_inC14N5_c14nTrim.xml (100%) rename src/{lxml => }/tests/c14n-20/out_inC14N6_c14nDefault.xml (100%) rename src/{lxml => }/tests/c14n-20/out_inNsContent_c14nDefault.xml (100%) rename src/{lxml => }/tests/c14n-20/out_inNsContent_c14nPrefixQnameXpathElem.xml (100%) rename src/{lxml => }/tests/c14n-20/out_inNsContent_c14nQnameElem.xml (100%) rename src/{lxml => }/tests/c14n-20/out_inNsContent_c14nQnameXpathElem.xml (100%) rename src/{lxml => }/tests/c14n-20/out_inNsDefault_c14nDefault.xml (100%) rename src/{lxml => }/tests/c14n-20/out_inNsDefault_c14nPrefix.xml (100%) rename src/{lxml => }/tests/c14n-20/out_inNsPushdown_c14nDefault.xml (100%) rename src/{lxml => }/tests/c14n-20/out_inNsPushdown_c14nPrefix.xml (100%) rename src/{lxml => }/tests/c14n-20/out_inNsRedecl_c14nDefault.xml (100%) rename src/{lxml => }/tests/c14n-20/out_inNsRedecl_c14nPrefix.xml (100%) rename src/{lxml => }/tests/c14n-20/out_inNsSort_c14nDefault.xml (100%) rename src/{lxml => }/tests/c14n-20/out_inNsSort_c14nPrefix.xml (100%) rename src/{lxml => }/tests/c14n-20/out_inNsSuperfluous_c14nDefault.xml (100%) rename src/{lxml => }/tests/c14n-20/out_inNsSuperfluous_c14nPrefix.xml (100%) rename src/{lxml => }/tests/c14n-20/out_inNsXml_c14nDefault.xml (100%) rename src/{lxml => }/tests/c14n-20/out_inNsXml_c14nPrefix.xml (100%) rename src/{lxml => }/tests/c14n-20/out_inNsXml_c14nPrefixQname.xml (100%) rename src/{lxml => }/tests/c14n-20/out_inNsXml_c14nQname.xml (100%) rename src/{lxml => }/tests/c14n-20/world.txt (100%) rename src/{lxml => }/tests/common_imports.py (95%) rename src/{lxml => }/tests/dummy_http_server.py (100%) rename src/{lxml => }/tests/fuzz_xml_parse.py (100%) rename src/{lxml/html/tests => tests/html}/__init__.py (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_applet.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_blink.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_crazy.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_embed.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_frame.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_iframe.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_link.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_meta.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_object.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_onabort.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_onblur.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_onchange.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_onclick.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_ondblclick.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_onerror.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_onfocus.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_onkeydown.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_onkeypress.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_onkeyup.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_onload.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_onmousedown.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_onmouseout.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_onmouseover.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_onmouseup.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_onreset.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_onresize.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_onsubmit.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_onunload.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_script.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_script_cdata.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_script_inline.data (100%) rename src/{lxml/html/tests => tests/html}/feedparser-data/entry_content_style.data (100%) rename src/{lxml/html/tests => tests/html}/hackers-org-data/background-image-plus.data (100%) rename src/{lxml/html/tests => tests/html}/hackers-org-data/background-image-with-unicoded.data (100%) rename src/{lxml/html/tests => tests/html}/hackers-org-data/downlevel-hidden.data (100%) rename src/{lxml/html/tests => tests/html}/hackers-org-data/html-plus-time.data (100%) rename src/{lxml/html/tests => tests/html}/hackers-org-data/javascript-link.data (100%) rename src/{lxml/html/tests => tests/html}/hackers-org-data/style-comment.data (100%) rename src/{lxml/html/tests => tests/html}/hackers-org-data/style-expression.data (100%) rename src/{lxml/html/tests => tests/html}/hackers-org-data/style-import.data (100%) rename src/{lxml/html/tests => tests/html}/hackers-org-data/style-js-tag.data (100%) rename src/{lxml/html/tests => tests/html}/hackers-org-data/style-url-js.data (100%) rename src/{lxml/html/tests => tests/html}/hackers-org-data/xml-data-island.data (100%) rename src/{lxml/html/tests => tests/html}/hackers-org-data/xml-embedded-js.data (100%) rename src/{lxml/html/tests => tests/html}/hackers-org-data/xml-namespace.data.BROKEN (100%) rename src/{lxml/html/tests => tests/html}/test_basic.py (100%) rename src/{lxml/html/tests => tests/html}/test_basic.txt (100%) rename src/{lxml/html/tests => tests/html}/test_diff.py (100%) rename src/{lxml/html/tests => tests/html}/test_diff.txt (100%) rename src/{lxml/html/tests => tests/html}/test_elementsoup.py (98%) rename src/{lxml/html/tests => tests/html}/test_feedparser_data.py (100%) rename src/{lxml/html/tests => tests/html}/test_formfill.py (100%) rename src/{lxml/html/tests => tests/html}/test_formfill.txt (100%) rename src/{lxml/html/tests => tests/html}/test_forms.py (100%) rename src/{lxml/html/tests => tests/html}/test_forms.txt (100%) rename src/{lxml/html/tests => tests/html}/test_frames.py (100%) rename src/{lxml/html/tests => tests/html}/test_html5parser.py (100%) rename src/{lxml/html/tests => tests/html}/test_rewritelinks.py (100%) rename src/{lxml/html/tests => tests/html}/test_rewritelinks.txt (100%) rename src/{lxml/html/tests => tests/html}/test_select.py (100%) rename src/{lxml/html/tests => tests/html}/test_xhtml.py (100%) rename src/{lxml/html/tests => tests/html}/test_xhtml.txt (100%) rename src/{lxml/html/tests => tests/html}/transform_feedparser_data.py (100%) rename src/{lxml => }/tests/include/test_xinclude.xml (100%) rename src/{lxml => }/tests/selftest.py (100%) rename src/{lxml => }/tests/selftest2.py (100%) rename src/{lxml => }/tests/shakespeare.html (100%) rename src/{lxml => }/tests/test-document.xslt (100%) rename src/{lxml => }/tests/test-string.xml (100%) rename src/{lxml => }/tests/test.dtd (100%) rename src/{lxml => }/tests/test.rnc (100%) rename src/{lxml => }/tests/test.sch (100%) rename src/{lxml => }/tests/test.xml (100%) rename src/{lxml => }/tests/test.xsd (100%) rename src/{lxml => }/tests/test1.rng (100%) rename src/{lxml => }/tests/test1.xslt (100%) rename src/{lxml => }/tests/test2.rng (100%) rename src/{lxml => }/tests/test2.xslt (100%) rename src/{lxml => }/tests/test_broken.xml (100%) rename src/{lxml => }/tests/test_builder.py (100%) rename src/{lxml => }/tests/test_classlookup.py (100%) rename src/{lxml => }/tests/test_css.py (100%) rename src/{lxml => }/tests/test_doctestcompare.py (100%) rename src/{lxml => }/tests/test_dtd.py (99%) rename src/{lxml => }/tests/test_elementpath.py (100%) rename src/{lxml => }/tests/test_elementtree.py (100%) rename src/{lxml => }/tests/test_errors.py (100%) rename src/{lxml => }/tests/test_etree.py (99%) rename src/{lxml => }/tests/test_external_document.py (100%) rename src/{lxml => }/tests/test_htmlparser.py (100%) rename src/{lxml => }/tests/test_http_io.py (100%) rename src/{lxml => }/tests/test_import.xsd (100%) rename src/{lxml => }/tests/test_inc.xsd (100%) rename src/{lxml => }/tests/test_incremental_xmlfile.py (100%) rename src/{lxml => }/tests/test_io.py (100%) rename src/{lxml => }/tests/test_isoschematron.py (99%) rename src/{lxml => }/tests/test_nsclasses.py (99%) rename src/{lxml => }/tests/test_objectify.py (99%) rename src/{lxml => }/tests/test_pyclasslookup.py (100%) rename src/{lxml => }/tests/test_relaxng.py (99%) rename src/{lxml => }/tests/test_sax.py (99%) rename src/{lxml => }/tests/test_schematron.py (97%) rename src/{lxml => }/tests/test_threading.py (100%) rename src/{lxml => }/tests/test_unicode.py (100%) rename src/{lxml => }/tests/test_xmlschema.py (99%) rename src/{lxml => }/tests/test_xpathevaluator.py (99%) rename src/{lxml => }/tests/test_xslt.py (99%) diff --git a/src/lxml/tests/__init__.py b/src/tests/__init__.py similarity index 100% rename from src/lxml/tests/__init__.py rename to src/tests/__init__.py diff --git a/src/lxml/tests/c14n-20/c14nComment.xml b/src/tests/c14n-20/c14nComment.xml similarity index 100% rename from src/lxml/tests/c14n-20/c14nComment.xml rename to src/tests/c14n-20/c14nComment.xml diff --git a/src/lxml/tests/c14n-20/c14nDefault.xml b/src/tests/c14n-20/c14nDefault.xml similarity index 100% rename from src/lxml/tests/c14n-20/c14nDefault.xml rename to src/tests/c14n-20/c14nDefault.xml diff --git a/src/lxml/tests/c14n-20/c14nPrefix.xml b/src/tests/c14n-20/c14nPrefix.xml similarity index 100% rename from src/lxml/tests/c14n-20/c14nPrefix.xml rename to src/tests/c14n-20/c14nPrefix.xml diff --git a/src/lxml/tests/c14n-20/c14nPrefixQname.xml b/src/tests/c14n-20/c14nPrefixQname.xml similarity index 100% rename from src/lxml/tests/c14n-20/c14nPrefixQname.xml rename to src/tests/c14n-20/c14nPrefixQname.xml diff --git a/src/lxml/tests/c14n-20/c14nPrefixQnameXpathElem.xml b/src/tests/c14n-20/c14nPrefixQnameXpathElem.xml similarity index 100% rename from src/lxml/tests/c14n-20/c14nPrefixQnameXpathElem.xml rename to src/tests/c14n-20/c14nPrefixQnameXpathElem.xml diff --git a/src/lxml/tests/c14n-20/c14nQname.xml b/src/tests/c14n-20/c14nQname.xml similarity index 100% rename from src/lxml/tests/c14n-20/c14nQname.xml rename to src/tests/c14n-20/c14nQname.xml diff --git a/src/lxml/tests/c14n-20/c14nQnameElem.xml b/src/tests/c14n-20/c14nQnameElem.xml similarity index 100% rename from src/lxml/tests/c14n-20/c14nQnameElem.xml rename to src/tests/c14n-20/c14nQnameElem.xml diff --git a/src/lxml/tests/c14n-20/c14nQnameXpathElem.xml b/src/tests/c14n-20/c14nQnameXpathElem.xml similarity index 100% rename from src/lxml/tests/c14n-20/c14nQnameXpathElem.xml rename to src/tests/c14n-20/c14nQnameXpathElem.xml diff --git a/src/lxml/tests/c14n-20/c14nTrim.xml b/src/tests/c14n-20/c14nTrim.xml similarity index 100% rename from src/lxml/tests/c14n-20/c14nTrim.xml rename to src/tests/c14n-20/c14nTrim.xml diff --git a/src/lxml/tests/c14n-20/doc.dtd b/src/tests/c14n-20/doc.dtd similarity index 100% rename from src/lxml/tests/c14n-20/doc.dtd rename to src/tests/c14n-20/doc.dtd diff --git a/src/lxml/tests/c14n-20/doc.xsl b/src/tests/c14n-20/doc.xsl similarity index 100% rename from src/lxml/tests/c14n-20/doc.xsl rename to src/tests/c14n-20/doc.xsl diff --git a/src/lxml/tests/c14n-20/inC14N1.xml b/src/tests/c14n-20/inC14N1.xml similarity index 100% rename from src/lxml/tests/c14n-20/inC14N1.xml rename to src/tests/c14n-20/inC14N1.xml diff --git a/src/lxml/tests/c14n-20/inC14N2.xml b/src/tests/c14n-20/inC14N2.xml similarity index 100% rename from src/lxml/tests/c14n-20/inC14N2.xml rename to src/tests/c14n-20/inC14N2.xml diff --git a/src/lxml/tests/c14n-20/inC14N3.xml b/src/tests/c14n-20/inC14N3.xml similarity index 100% rename from src/lxml/tests/c14n-20/inC14N3.xml rename to src/tests/c14n-20/inC14N3.xml diff --git a/src/lxml/tests/c14n-20/inC14N4.xml b/src/tests/c14n-20/inC14N4.xml similarity index 100% rename from src/lxml/tests/c14n-20/inC14N4.xml rename to src/tests/c14n-20/inC14N4.xml diff --git a/src/lxml/tests/c14n-20/inC14N5.xml b/src/tests/c14n-20/inC14N5.xml similarity index 100% rename from src/lxml/tests/c14n-20/inC14N5.xml rename to src/tests/c14n-20/inC14N5.xml diff --git a/src/lxml/tests/c14n-20/inC14N6.xml b/src/tests/c14n-20/inC14N6.xml similarity index 100% rename from src/lxml/tests/c14n-20/inC14N6.xml rename to src/tests/c14n-20/inC14N6.xml diff --git a/src/lxml/tests/c14n-20/inNsContent.xml b/src/tests/c14n-20/inNsContent.xml similarity index 100% rename from src/lxml/tests/c14n-20/inNsContent.xml rename to src/tests/c14n-20/inNsContent.xml diff --git a/src/lxml/tests/c14n-20/inNsDefault.xml b/src/tests/c14n-20/inNsDefault.xml similarity index 100% rename from src/lxml/tests/c14n-20/inNsDefault.xml rename to src/tests/c14n-20/inNsDefault.xml diff --git a/src/lxml/tests/c14n-20/inNsPushdown.xml b/src/tests/c14n-20/inNsPushdown.xml similarity index 100% rename from src/lxml/tests/c14n-20/inNsPushdown.xml rename to src/tests/c14n-20/inNsPushdown.xml diff --git a/src/lxml/tests/c14n-20/inNsRedecl.xml b/src/tests/c14n-20/inNsRedecl.xml similarity index 100% rename from src/lxml/tests/c14n-20/inNsRedecl.xml rename to src/tests/c14n-20/inNsRedecl.xml diff --git a/src/lxml/tests/c14n-20/inNsSort.xml b/src/tests/c14n-20/inNsSort.xml similarity index 100% rename from src/lxml/tests/c14n-20/inNsSort.xml rename to src/tests/c14n-20/inNsSort.xml diff --git a/src/lxml/tests/c14n-20/inNsSuperfluous.xml b/src/tests/c14n-20/inNsSuperfluous.xml similarity index 100% rename from src/lxml/tests/c14n-20/inNsSuperfluous.xml rename to src/tests/c14n-20/inNsSuperfluous.xml diff --git a/src/lxml/tests/c14n-20/inNsXml.xml b/src/tests/c14n-20/inNsXml.xml similarity index 100% rename from src/lxml/tests/c14n-20/inNsXml.xml rename to src/tests/c14n-20/inNsXml.xml diff --git a/src/lxml/tests/c14n-20/out_inC14N1_c14nComment.xml b/src/tests/c14n-20/out_inC14N1_c14nComment.xml similarity index 100% rename from src/lxml/tests/c14n-20/out_inC14N1_c14nComment.xml rename to src/tests/c14n-20/out_inC14N1_c14nComment.xml diff --git a/src/lxml/tests/c14n-20/out_inC14N1_c14nDefault.xml b/src/tests/c14n-20/out_inC14N1_c14nDefault.xml similarity index 100% rename from src/lxml/tests/c14n-20/out_inC14N1_c14nDefault.xml rename to src/tests/c14n-20/out_inC14N1_c14nDefault.xml diff --git a/src/lxml/tests/c14n-20/out_inC14N2_c14nDefault.xml b/src/tests/c14n-20/out_inC14N2_c14nDefault.xml similarity index 100% rename from src/lxml/tests/c14n-20/out_inC14N2_c14nDefault.xml rename to src/tests/c14n-20/out_inC14N2_c14nDefault.xml diff --git a/src/lxml/tests/c14n-20/out_inC14N2_c14nTrim.xml b/src/tests/c14n-20/out_inC14N2_c14nTrim.xml similarity index 100% rename from src/lxml/tests/c14n-20/out_inC14N2_c14nTrim.xml rename to src/tests/c14n-20/out_inC14N2_c14nTrim.xml diff --git a/src/lxml/tests/c14n-20/out_inC14N3_c14nDefault.xml b/src/tests/c14n-20/out_inC14N3_c14nDefault.xml similarity index 100% rename from src/lxml/tests/c14n-20/out_inC14N3_c14nDefault.xml rename to src/tests/c14n-20/out_inC14N3_c14nDefault.xml diff --git a/src/lxml/tests/c14n-20/out_inC14N3_c14nPrefix.xml b/src/tests/c14n-20/out_inC14N3_c14nPrefix.xml similarity index 100% rename from src/lxml/tests/c14n-20/out_inC14N3_c14nPrefix.xml rename to src/tests/c14n-20/out_inC14N3_c14nPrefix.xml diff --git a/src/lxml/tests/c14n-20/out_inC14N3_c14nTrim.xml b/src/tests/c14n-20/out_inC14N3_c14nTrim.xml similarity index 100% rename from src/lxml/tests/c14n-20/out_inC14N3_c14nTrim.xml rename to src/tests/c14n-20/out_inC14N3_c14nTrim.xml diff --git a/src/lxml/tests/c14n-20/out_inC14N4_c14nDefault.xml b/src/tests/c14n-20/out_inC14N4_c14nDefault.xml similarity index 100% rename from src/lxml/tests/c14n-20/out_inC14N4_c14nDefault.xml rename to src/tests/c14n-20/out_inC14N4_c14nDefault.xml diff --git a/src/lxml/tests/c14n-20/out_inC14N4_c14nTrim.xml b/src/tests/c14n-20/out_inC14N4_c14nTrim.xml similarity index 100% rename from src/lxml/tests/c14n-20/out_inC14N4_c14nTrim.xml rename to src/tests/c14n-20/out_inC14N4_c14nTrim.xml diff --git a/src/lxml/tests/c14n-20/out_inC14N5_c14nDefault.xml b/src/tests/c14n-20/out_inC14N5_c14nDefault.xml similarity index 100% rename from src/lxml/tests/c14n-20/out_inC14N5_c14nDefault.xml rename to src/tests/c14n-20/out_inC14N5_c14nDefault.xml diff --git a/src/lxml/tests/c14n-20/out_inC14N5_c14nTrim.xml b/src/tests/c14n-20/out_inC14N5_c14nTrim.xml similarity index 100% rename from src/lxml/tests/c14n-20/out_inC14N5_c14nTrim.xml rename to src/tests/c14n-20/out_inC14N5_c14nTrim.xml diff --git a/src/lxml/tests/c14n-20/out_inC14N6_c14nDefault.xml b/src/tests/c14n-20/out_inC14N6_c14nDefault.xml similarity index 100% rename from src/lxml/tests/c14n-20/out_inC14N6_c14nDefault.xml rename to src/tests/c14n-20/out_inC14N6_c14nDefault.xml diff --git a/src/lxml/tests/c14n-20/out_inNsContent_c14nDefault.xml b/src/tests/c14n-20/out_inNsContent_c14nDefault.xml similarity index 100% rename from src/lxml/tests/c14n-20/out_inNsContent_c14nDefault.xml rename to src/tests/c14n-20/out_inNsContent_c14nDefault.xml diff --git a/src/lxml/tests/c14n-20/out_inNsContent_c14nPrefixQnameXpathElem.xml b/src/tests/c14n-20/out_inNsContent_c14nPrefixQnameXpathElem.xml similarity index 100% rename from src/lxml/tests/c14n-20/out_inNsContent_c14nPrefixQnameXpathElem.xml rename to src/tests/c14n-20/out_inNsContent_c14nPrefixQnameXpathElem.xml diff --git a/src/lxml/tests/c14n-20/out_inNsContent_c14nQnameElem.xml b/src/tests/c14n-20/out_inNsContent_c14nQnameElem.xml similarity index 100% rename from src/lxml/tests/c14n-20/out_inNsContent_c14nQnameElem.xml rename to src/tests/c14n-20/out_inNsContent_c14nQnameElem.xml diff --git a/src/lxml/tests/c14n-20/out_inNsContent_c14nQnameXpathElem.xml b/src/tests/c14n-20/out_inNsContent_c14nQnameXpathElem.xml similarity index 100% rename from src/lxml/tests/c14n-20/out_inNsContent_c14nQnameXpathElem.xml rename to src/tests/c14n-20/out_inNsContent_c14nQnameXpathElem.xml diff --git a/src/lxml/tests/c14n-20/out_inNsDefault_c14nDefault.xml b/src/tests/c14n-20/out_inNsDefault_c14nDefault.xml similarity index 100% rename from src/lxml/tests/c14n-20/out_inNsDefault_c14nDefault.xml rename to src/tests/c14n-20/out_inNsDefault_c14nDefault.xml diff --git a/src/lxml/tests/c14n-20/out_inNsDefault_c14nPrefix.xml b/src/tests/c14n-20/out_inNsDefault_c14nPrefix.xml similarity index 100% rename from src/lxml/tests/c14n-20/out_inNsDefault_c14nPrefix.xml rename to src/tests/c14n-20/out_inNsDefault_c14nPrefix.xml diff --git a/src/lxml/tests/c14n-20/out_inNsPushdown_c14nDefault.xml b/src/tests/c14n-20/out_inNsPushdown_c14nDefault.xml similarity index 100% rename from src/lxml/tests/c14n-20/out_inNsPushdown_c14nDefault.xml rename to src/tests/c14n-20/out_inNsPushdown_c14nDefault.xml diff --git a/src/lxml/tests/c14n-20/out_inNsPushdown_c14nPrefix.xml b/src/tests/c14n-20/out_inNsPushdown_c14nPrefix.xml similarity index 100% rename from src/lxml/tests/c14n-20/out_inNsPushdown_c14nPrefix.xml rename to src/tests/c14n-20/out_inNsPushdown_c14nPrefix.xml diff --git a/src/lxml/tests/c14n-20/out_inNsRedecl_c14nDefault.xml b/src/tests/c14n-20/out_inNsRedecl_c14nDefault.xml similarity index 100% rename from src/lxml/tests/c14n-20/out_inNsRedecl_c14nDefault.xml rename to src/tests/c14n-20/out_inNsRedecl_c14nDefault.xml diff --git a/src/lxml/tests/c14n-20/out_inNsRedecl_c14nPrefix.xml b/src/tests/c14n-20/out_inNsRedecl_c14nPrefix.xml similarity index 100% rename from src/lxml/tests/c14n-20/out_inNsRedecl_c14nPrefix.xml rename to src/tests/c14n-20/out_inNsRedecl_c14nPrefix.xml diff --git a/src/lxml/tests/c14n-20/out_inNsSort_c14nDefault.xml b/src/tests/c14n-20/out_inNsSort_c14nDefault.xml similarity index 100% rename from src/lxml/tests/c14n-20/out_inNsSort_c14nDefault.xml rename to src/tests/c14n-20/out_inNsSort_c14nDefault.xml diff --git a/src/lxml/tests/c14n-20/out_inNsSort_c14nPrefix.xml b/src/tests/c14n-20/out_inNsSort_c14nPrefix.xml similarity index 100% rename from src/lxml/tests/c14n-20/out_inNsSort_c14nPrefix.xml rename to src/tests/c14n-20/out_inNsSort_c14nPrefix.xml diff --git a/src/lxml/tests/c14n-20/out_inNsSuperfluous_c14nDefault.xml b/src/tests/c14n-20/out_inNsSuperfluous_c14nDefault.xml similarity index 100% rename from src/lxml/tests/c14n-20/out_inNsSuperfluous_c14nDefault.xml rename to src/tests/c14n-20/out_inNsSuperfluous_c14nDefault.xml diff --git a/src/lxml/tests/c14n-20/out_inNsSuperfluous_c14nPrefix.xml b/src/tests/c14n-20/out_inNsSuperfluous_c14nPrefix.xml similarity index 100% rename from src/lxml/tests/c14n-20/out_inNsSuperfluous_c14nPrefix.xml rename to src/tests/c14n-20/out_inNsSuperfluous_c14nPrefix.xml diff --git a/src/lxml/tests/c14n-20/out_inNsXml_c14nDefault.xml b/src/tests/c14n-20/out_inNsXml_c14nDefault.xml similarity index 100% rename from src/lxml/tests/c14n-20/out_inNsXml_c14nDefault.xml rename to src/tests/c14n-20/out_inNsXml_c14nDefault.xml diff --git a/src/lxml/tests/c14n-20/out_inNsXml_c14nPrefix.xml b/src/tests/c14n-20/out_inNsXml_c14nPrefix.xml similarity index 100% rename from src/lxml/tests/c14n-20/out_inNsXml_c14nPrefix.xml rename to src/tests/c14n-20/out_inNsXml_c14nPrefix.xml diff --git a/src/lxml/tests/c14n-20/out_inNsXml_c14nPrefixQname.xml b/src/tests/c14n-20/out_inNsXml_c14nPrefixQname.xml similarity index 100% rename from src/lxml/tests/c14n-20/out_inNsXml_c14nPrefixQname.xml rename to src/tests/c14n-20/out_inNsXml_c14nPrefixQname.xml diff --git a/src/lxml/tests/c14n-20/out_inNsXml_c14nQname.xml b/src/tests/c14n-20/out_inNsXml_c14nQname.xml similarity index 100% rename from src/lxml/tests/c14n-20/out_inNsXml_c14nQname.xml rename to src/tests/c14n-20/out_inNsXml_c14nQname.xml diff --git a/src/lxml/tests/c14n-20/world.txt b/src/tests/c14n-20/world.txt similarity index 100% rename from src/lxml/tests/c14n-20/world.txt rename to src/tests/c14n-20/world.txt diff --git a/src/lxml/tests/common_imports.py b/src/tests/common_imports.py similarity index 95% rename from src/lxml/tests/common_imports.py rename to src/tests/common_imports.py index 99ea26714..fc1c99ef4 100644 --- a/src/lxml/tests/common_imports.py +++ b/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 b/src/tests/dummy_http_server.py similarity index 100% rename from src/lxml/tests/dummy_http_server.py rename to src/tests/dummy_http_server.py diff --git a/src/lxml/tests/fuzz_xml_parse.py b/src/tests/fuzz_xml_parse.py similarity index 100% rename from src/lxml/tests/fuzz_xml_parse.py rename to src/tests/fuzz_xml_parse.py diff --git a/src/lxml/html/tests/__init__.py b/src/tests/html/__init__.py similarity index 100% rename from src/lxml/html/tests/__init__.py rename to src/tests/html/__init__.py diff --git a/src/lxml/html/tests/feedparser-data/entry_content_applet.data b/src/tests/html/feedparser-data/entry_content_applet.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_applet.data rename to src/tests/html/feedparser-data/entry_content_applet.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_blink.data b/src/tests/html/feedparser-data/entry_content_blink.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_blink.data rename to src/tests/html/feedparser-data/entry_content_blink.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_crazy.data b/src/tests/html/feedparser-data/entry_content_crazy.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_crazy.data rename to src/tests/html/feedparser-data/entry_content_crazy.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_embed.data b/src/tests/html/feedparser-data/entry_content_embed.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_embed.data rename to src/tests/html/feedparser-data/entry_content_embed.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_frame.data b/src/tests/html/feedparser-data/entry_content_frame.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_frame.data rename to src/tests/html/feedparser-data/entry_content_frame.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_iframe.data b/src/tests/html/feedparser-data/entry_content_iframe.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_iframe.data rename to src/tests/html/feedparser-data/entry_content_iframe.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_link.data b/src/tests/html/feedparser-data/entry_content_link.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_link.data rename to src/tests/html/feedparser-data/entry_content_link.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_meta.data b/src/tests/html/feedparser-data/entry_content_meta.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_meta.data rename to src/tests/html/feedparser-data/entry_content_meta.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_object.data b/src/tests/html/feedparser-data/entry_content_object.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_object.data rename to src/tests/html/feedparser-data/entry_content_object.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_onabort.data b/src/tests/html/feedparser-data/entry_content_onabort.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_onabort.data rename to src/tests/html/feedparser-data/entry_content_onabort.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_onblur.data b/src/tests/html/feedparser-data/entry_content_onblur.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_onblur.data rename to src/tests/html/feedparser-data/entry_content_onblur.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_onchange.data b/src/tests/html/feedparser-data/entry_content_onchange.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_onchange.data rename to src/tests/html/feedparser-data/entry_content_onchange.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_onclick.data b/src/tests/html/feedparser-data/entry_content_onclick.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_onclick.data rename to src/tests/html/feedparser-data/entry_content_onclick.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_ondblclick.data b/src/tests/html/feedparser-data/entry_content_ondblclick.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_ondblclick.data rename to src/tests/html/feedparser-data/entry_content_ondblclick.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_onerror.data b/src/tests/html/feedparser-data/entry_content_onerror.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_onerror.data rename to src/tests/html/feedparser-data/entry_content_onerror.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_onfocus.data b/src/tests/html/feedparser-data/entry_content_onfocus.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_onfocus.data rename to src/tests/html/feedparser-data/entry_content_onfocus.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_onkeydown.data b/src/tests/html/feedparser-data/entry_content_onkeydown.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_onkeydown.data rename to src/tests/html/feedparser-data/entry_content_onkeydown.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_onkeypress.data b/src/tests/html/feedparser-data/entry_content_onkeypress.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_onkeypress.data rename to src/tests/html/feedparser-data/entry_content_onkeypress.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_onkeyup.data b/src/tests/html/feedparser-data/entry_content_onkeyup.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_onkeyup.data rename to src/tests/html/feedparser-data/entry_content_onkeyup.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_onload.data b/src/tests/html/feedparser-data/entry_content_onload.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_onload.data rename to src/tests/html/feedparser-data/entry_content_onload.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_onmousedown.data b/src/tests/html/feedparser-data/entry_content_onmousedown.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_onmousedown.data rename to src/tests/html/feedparser-data/entry_content_onmousedown.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_onmouseout.data b/src/tests/html/feedparser-data/entry_content_onmouseout.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_onmouseout.data rename to src/tests/html/feedparser-data/entry_content_onmouseout.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_onmouseover.data b/src/tests/html/feedparser-data/entry_content_onmouseover.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_onmouseover.data rename to src/tests/html/feedparser-data/entry_content_onmouseover.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_onmouseup.data b/src/tests/html/feedparser-data/entry_content_onmouseup.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_onmouseup.data rename to src/tests/html/feedparser-data/entry_content_onmouseup.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_onreset.data b/src/tests/html/feedparser-data/entry_content_onreset.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_onreset.data rename to src/tests/html/feedparser-data/entry_content_onreset.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_onresize.data b/src/tests/html/feedparser-data/entry_content_onresize.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_onresize.data rename to src/tests/html/feedparser-data/entry_content_onresize.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_onsubmit.data b/src/tests/html/feedparser-data/entry_content_onsubmit.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_onsubmit.data rename to src/tests/html/feedparser-data/entry_content_onsubmit.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_onunload.data b/src/tests/html/feedparser-data/entry_content_onunload.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_onunload.data rename to src/tests/html/feedparser-data/entry_content_onunload.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_script.data b/src/tests/html/feedparser-data/entry_content_script.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_script.data rename to src/tests/html/feedparser-data/entry_content_script.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_script_cdata.data b/src/tests/html/feedparser-data/entry_content_script_cdata.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_script_cdata.data rename to src/tests/html/feedparser-data/entry_content_script_cdata.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_script_inline.data b/src/tests/html/feedparser-data/entry_content_script_inline.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_script_inline.data rename to src/tests/html/feedparser-data/entry_content_script_inline.data diff --git a/src/lxml/html/tests/feedparser-data/entry_content_style.data b/src/tests/html/feedparser-data/entry_content_style.data similarity index 100% rename from src/lxml/html/tests/feedparser-data/entry_content_style.data rename to src/tests/html/feedparser-data/entry_content_style.data diff --git a/src/lxml/html/tests/hackers-org-data/background-image-plus.data b/src/tests/html/hackers-org-data/background-image-plus.data similarity index 100% rename from src/lxml/html/tests/hackers-org-data/background-image-plus.data rename to src/tests/html/hackers-org-data/background-image-plus.data diff --git a/src/lxml/html/tests/hackers-org-data/background-image-with-unicoded.data b/src/tests/html/hackers-org-data/background-image-with-unicoded.data similarity index 100% rename from src/lxml/html/tests/hackers-org-data/background-image-with-unicoded.data rename to src/tests/html/hackers-org-data/background-image-with-unicoded.data diff --git a/src/lxml/html/tests/hackers-org-data/downlevel-hidden.data b/src/tests/html/hackers-org-data/downlevel-hidden.data similarity index 100% rename from src/lxml/html/tests/hackers-org-data/downlevel-hidden.data rename to src/tests/html/hackers-org-data/downlevel-hidden.data diff --git a/src/lxml/html/tests/hackers-org-data/html-plus-time.data b/src/tests/html/hackers-org-data/html-plus-time.data similarity index 100% rename from src/lxml/html/tests/hackers-org-data/html-plus-time.data rename to src/tests/html/hackers-org-data/html-plus-time.data diff --git a/src/lxml/html/tests/hackers-org-data/javascript-link.data b/src/tests/html/hackers-org-data/javascript-link.data similarity index 100% rename from src/lxml/html/tests/hackers-org-data/javascript-link.data rename to src/tests/html/hackers-org-data/javascript-link.data diff --git a/src/lxml/html/tests/hackers-org-data/style-comment.data b/src/tests/html/hackers-org-data/style-comment.data similarity index 100% rename from src/lxml/html/tests/hackers-org-data/style-comment.data rename to src/tests/html/hackers-org-data/style-comment.data diff --git a/src/lxml/html/tests/hackers-org-data/style-expression.data b/src/tests/html/hackers-org-data/style-expression.data similarity index 100% rename from src/lxml/html/tests/hackers-org-data/style-expression.data rename to src/tests/html/hackers-org-data/style-expression.data diff --git a/src/lxml/html/tests/hackers-org-data/style-import.data b/src/tests/html/hackers-org-data/style-import.data similarity index 100% rename from src/lxml/html/tests/hackers-org-data/style-import.data rename to src/tests/html/hackers-org-data/style-import.data diff --git a/src/lxml/html/tests/hackers-org-data/style-js-tag.data b/src/tests/html/hackers-org-data/style-js-tag.data similarity index 100% rename from src/lxml/html/tests/hackers-org-data/style-js-tag.data rename to src/tests/html/hackers-org-data/style-js-tag.data diff --git a/src/lxml/html/tests/hackers-org-data/style-url-js.data b/src/tests/html/hackers-org-data/style-url-js.data similarity index 100% rename from src/lxml/html/tests/hackers-org-data/style-url-js.data rename to src/tests/html/hackers-org-data/style-url-js.data diff --git a/src/lxml/html/tests/hackers-org-data/xml-data-island.data b/src/tests/html/hackers-org-data/xml-data-island.data similarity index 100% rename from src/lxml/html/tests/hackers-org-data/xml-data-island.data rename to src/tests/html/hackers-org-data/xml-data-island.data diff --git a/src/lxml/html/tests/hackers-org-data/xml-embedded-js.data b/src/tests/html/hackers-org-data/xml-embedded-js.data similarity index 100% rename from src/lxml/html/tests/hackers-org-data/xml-embedded-js.data rename to src/tests/html/hackers-org-data/xml-embedded-js.data diff --git a/src/lxml/html/tests/hackers-org-data/xml-namespace.data.BROKEN b/src/tests/html/hackers-org-data/xml-namespace.data.BROKEN similarity index 100% rename from src/lxml/html/tests/hackers-org-data/xml-namespace.data.BROKEN rename to src/tests/html/hackers-org-data/xml-namespace.data.BROKEN diff --git a/src/lxml/html/tests/test_basic.py b/src/tests/html/test_basic.py similarity index 100% rename from src/lxml/html/tests/test_basic.py rename to src/tests/html/test_basic.py diff --git a/src/lxml/html/tests/test_basic.txt b/src/tests/html/test_basic.txt similarity index 100% rename from src/lxml/html/tests/test_basic.txt rename to src/tests/html/test_basic.txt diff --git a/src/lxml/html/tests/test_diff.py b/src/tests/html/test_diff.py similarity index 100% rename from src/lxml/html/tests/test_diff.py rename to src/tests/html/test_diff.py diff --git a/src/lxml/html/tests/test_diff.txt b/src/tests/html/test_diff.txt similarity index 100% rename from src/lxml/html/tests/test_diff.txt rename to src/tests/html/test_diff.txt diff --git a/src/lxml/html/tests/test_elementsoup.py b/src/tests/html/test_elementsoup.py similarity index 98% rename from src/lxml/html/tests/test_elementsoup.py rename to src/tests/html/test_elementsoup.py index 2b2b1a8cf..ec7f02604 100644 --- a/src/lxml/html/tests/test_elementsoup.py +++ b/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 b/src/tests/html/test_feedparser_data.py similarity index 100% rename from src/lxml/html/tests/test_feedparser_data.py rename to src/tests/html/test_feedparser_data.py diff --git a/src/lxml/html/tests/test_formfill.py b/src/tests/html/test_formfill.py similarity index 100% rename from src/lxml/html/tests/test_formfill.py rename to src/tests/html/test_formfill.py diff --git a/src/lxml/html/tests/test_formfill.txt b/src/tests/html/test_formfill.txt similarity index 100% rename from src/lxml/html/tests/test_formfill.txt rename to src/tests/html/test_formfill.txt diff --git a/src/lxml/html/tests/test_forms.py b/src/tests/html/test_forms.py similarity index 100% rename from src/lxml/html/tests/test_forms.py rename to src/tests/html/test_forms.py diff --git a/src/lxml/html/tests/test_forms.txt b/src/tests/html/test_forms.txt similarity index 100% rename from src/lxml/html/tests/test_forms.txt rename to src/tests/html/test_forms.txt diff --git a/src/lxml/html/tests/test_frames.py b/src/tests/html/test_frames.py similarity index 100% rename from src/lxml/html/tests/test_frames.py rename to src/tests/html/test_frames.py diff --git a/src/lxml/html/tests/test_html5parser.py b/src/tests/html/test_html5parser.py similarity index 100% rename from src/lxml/html/tests/test_html5parser.py rename to src/tests/html/test_html5parser.py diff --git a/src/lxml/html/tests/test_rewritelinks.py b/src/tests/html/test_rewritelinks.py similarity index 100% rename from src/lxml/html/tests/test_rewritelinks.py rename to src/tests/html/test_rewritelinks.py diff --git a/src/lxml/html/tests/test_rewritelinks.txt b/src/tests/html/test_rewritelinks.txt similarity index 100% rename from src/lxml/html/tests/test_rewritelinks.txt rename to src/tests/html/test_rewritelinks.txt diff --git a/src/lxml/html/tests/test_select.py b/src/tests/html/test_select.py similarity index 100% rename from src/lxml/html/tests/test_select.py rename to src/tests/html/test_select.py diff --git a/src/lxml/html/tests/test_xhtml.py b/src/tests/html/test_xhtml.py similarity index 100% rename from src/lxml/html/tests/test_xhtml.py rename to src/tests/html/test_xhtml.py diff --git a/src/lxml/html/tests/test_xhtml.txt b/src/tests/html/test_xhtml.txt similarity index 100% rename from src/lxml/html/tests/test_xhtml.txt rename to src/tests/html/test_xhtml.txt diff --git a/src/lxml/html/tests/transform_feedparser_data.py b/src/tests/html/transform_feedparser_data.py similarity index 100% rename from src/lxml/html/tests/transform_feedparser_data.py rename to src/tests/html/transform_feedparser_data.py diff --git a/src/lxml/tests/include/test_xinclude.xml b/src/tests/include/test_xinclude.xml similarity index 100% rename from src/lxml/tests/include/test_xinclude.xml rename to src/tests/include/test_xinclude.xml diff --git a/src/lxml/tests/selftest.py b/src/tests/selftest.py similarity index 100% rename from src/lxml/tests/selftest.py rename to src/tests/selftest.py diff --git a/src/lxml/tests/selftest2.py b/src/tests/selftest2.py similarity index 100% rename from src/lxml/tests/selftest2.py rename to src/tests/selftest2.py diff --git a/src/lxml/tests/shakespeare.html b/src/tests/shakespeare.html similarity index 100% rename from src/lxml/tests/shakespeare.html rename to src/tests/shakespeare.html diff --git a/src/lxml/tests/test-document.xslt b/src/tests/test-document.xslt similarity index 100% rename from src/lxml/tests/test-document.xslt rename to src/tests/test-document.xslt diff --git a/src/lxml/tests/test-string.xml b/src/tests/test-string.xml similarity index 100% rename from src/lxml/tests/test-string.xml rename to src/tests/test-string.xml diff --git a/src/lxml/tests/test.dtd b/src/tests/test.dtd similarity index 100% rename from src/lxml/tests/test.dtd rename to src/tests/test.dtd diff --git a/src/lxml/tests/test.rnc b/src/tests/test.rnc similarity index 100% rename from src/lxml/tests/test.rnc rename to src/tests/test.rnc diff --git a/src/lxml/tests/test.sch b/src/tests/test.sch similarity index 100% rename from src/lxml/tests/test.sch rename to src/tests/test.sch diff --git a/src/lxml/tests/test.xml b/src/tests/test.xml similarity index 100% rename from src/lxml/tests/test.xml rename to src/tests/test.xml diff --git a/src/lxml/tests/test.xsd b/src/tests/test.xsd similarity index 100% rename from src/lxml/tests/test.xsd rename to src/tests/test.xsd diff --git a/src/lxml/tests/test1.rng b/src/tests/test1.rng similarity index 100% rename from src/lxml/tests/test1.rng rename to src/tests/test1.rng diff --git a/src/lxml/tests/test1.xslt b/src/tests/test1.xslt similarity index 100% rename from src/lxml/tests/test1.xslt rename to src/tests/test1.xslt diff --git a/src/lxml/tests/test2.rng b/src/tests/test2.rng similarity index 100% rename from src/lxml/tests/test2.rng rename to src/tests/test2.rng diff --git a/src/lxml/tests/test2.xslt b/src/tests/test2.xslt similarity index 100% rename from src/lxml/tests/test2.xslt rename to src/tests/test2.xslt diff --git a/src/lxml/tests/test_broken.xml b/src/tests/test_broken.xml similarity index 100% rename from src/lxml/tests/test_broken.xml rename to src/tests/test_broken.xml diff --git a/src/lxml/tests/test_builder.py b/src/tests/test_builder.py similarity index 100% rename from src/lxml/tests/test_builder.py rename to src/tests/test_builder.py diff --git a/src/lxml/tests/test_classlookup.py b/src/tests/test_classlookup.py similarity index 100% rename from src/lxml/tests/test_classlookup.py rename to src/tests/test_classlookup.py diff --git a/src/lxml/tests/test_css.py b/src/tests/test_css.py similarity index 100% rename from src/lxml/tests/test_css.py rename to src/tests/test_css.py diff --git a/src/lxml/tests/test_doctestcompare.py b/src/tests/test_doctestcompare.py similarity index 100% rename from src/lxml/tests/test_doctestcompare.py rename to src/tests/test_doctestcompare.py diff --git a/src/lxml/tests/test_dtd.py b/src/tests/test_dtd.py similarity index 99% rename from src/lxml/tests/test_dtd.py rename to src/tests/test_dtd.py index 272e98398..0a99e6639 100644 --- a/src/lxml/tests/test_dtd.py +++ b/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 b/src/tests/test_elementpath.py similarity index 100% rename from src/lxml/tests/test_elementpath.py rename to src/tests/test_elementpath.py diff --git a/src/lxml/tests/test_elementtree.py b/src/tests/test_elementtree.py similarity index 100% rename from src/lxml/tests/test_elementtree.py rename to src/tests/test_elementtree.py diff --git a/src/lxml/tests/test_errors.py b/src/tests/test_errors.py similarity index 100% rename from src/lxml/tests/test_errors.py rename to src/tests/test_errors.py diff --git a/src/lxml/tests/test_etree.py b/src/tests/test_etree.py similarity index 99% rename from src/lxml/tests/test_etree.py rename to src/tests/test_etree.py index d2eccc03d..ef1130749 100644 --- a/src/lxml/tests/test_etree.py +++ b/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 b/src/tests/test_external_document.py similarity index 100% rename from src/lxml/tests/test_external_document.py rename to src/tests/test_external_document.py diff --git a/src/lxml/tests/test_htmlparser.py b/src/tests/test_htmlparser.py similarity index 100% rename from src/lxml/tests/test_htmlparser.py rename to src/tests/test_htmlparser.py diff --git a/src/lxml/tests/test_http_io.py b/src/tests/test_http_io.py similarity index 100% rename from src/lxml/tests/test_http_io.py rename to src/tests/test_http_io.py diff --git a/src/lxml/tests/test_import.xsd b/src/tests/test_import.xsd similarity index 100% rename from src/lxml/tests/test_import.xsd rename to src/tests/test_import.xsd diff --git a/src/lxml/tests/test_inc.xsd b/src/tests/test_inc.xsd similarity index 100% rename from src/lxml/tests/test_inc.xsd rename to src/tests/test_inc.xsd diff --git a/src/lxml/tests/test_incremental_xmlfile.py b/src/tests/test_incremental_xmlfile.py similarity index 100% rename from src/lxml/tests/test_incremental_xmlfile.py rename to src/tests/test_incremental_xmlfile.py diff --git a/src/lxml/tests/test_io.py b/src/tests/test_io.py similarity index 100% rename from src/lxml/tests/test_io.py rename to src/tests/test_io.py diff --git a/src/lxml/tests/test_isoschematron.py b/src/tests/test_isoschematron.py similarity index 99% rename from src/lxml/tests/test_isoschematron.py rename to src/tests/test_isoschematron.py index b4ca60117..8ee4c434b 100644 --- a/src/lxml/tests/test_isoschematron.py +++ b/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 b/src/tests/test_nsclasses.py similarity index 99% rename from src/lxml/tests/test_nsclasses.py rename to src/tests/test_nsclasses.py index 750dc1edf..0c33f20c6 100644 --- a/src/lxml/tests/test_nsclasses.py +++ b/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 b/src/tests/test_objectify.py similarity index 99% rename from src/lxml/tests/test_objectify.py rename to src/tests/test_objectify.py index 1c8ff47c1..39fe0098c 100644 --- a/src/lxml/tests/test_objectify.py +++ b/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 b/src/tests/test_pyclasslookup.py similarity index 100% rename from src/lxml/tests/test_pyclasslookup.py rename to src/tests/test_pyclasslookup.py diff --git a/src/lxml/tests/test_relaxng.py b/src/tests/test_relaxng.py similarity index 99% rename from src/lxml/tests/test_relaxng.py rename to src/tests/test_relaxng.py index 074f1dcf4..537bfc79f 100644 --- a/src/lxml/tests/test_relaxng.py +++ b/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 b/src/tests/test_sax.py similarity index 99% rename from src/lxml/tests/test_sax.py rename to src/tests/test_sax.py index ab728e740..e2d03c255 100644 --- a/src/lxml/tests/test_sax.py +++ b/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 b/src/tests/test_schematron.py similarity index 97% rename from src/lxml/tests/test_schematron.py rename to src/tests/test_schematron.py index 1f1c14741..99c261153 100644 --- a/src/lxml/tests/test_schematron.py +++ b/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 b/src/tests/test_threading.py similarity index 100% rename from src/lxml/tests/test_threading.py rename to src/tests/test_threading.py diff --git a/src/lxml/tests/test_unicode.py b/src/tests/test_unicode.py similarity index 100% rename from src/lxml/tests/test_unicode.py rename to src/tests/test_unicode.py diff --git a/src/lxml/tests/test_xmlschema.py b/src/tests/test_xmlschema.py similarity index 99% rename from src/lxml/tests/test_xmlschema.py rename to src/tests/test_xmlschema.py index bf5d882b6..0e7e03ccc 100644 --- a/src/lxml/tests/test_xmlschema.py +++ b/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 b/src/tests/test_xpathevaluator.py similarity index 99% rename from src/lxml/tests/test_xpathevaluator.py rename to src/tests/test_xpathevaluator.py index 9398f9b8e..5d3806537 100644 --- a/src/lxml/tests/test_xpathevaluator.py +++ b/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 b/src/tests/test_xslt.py similarity index 99% rename from src/lxml/tests/test_xslt.py rename to src/tests/test_xslt.py index e867174a5..2081ae20f 100644 --- a/src/lxml/tests/test_xslt.py +++ b/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__':