From 3f7f7f276d80e7e43f5f4cb1c2d91c5005e8909c Mon Sep 17 00:00:00 2001 From: sobolevn Date: Sat, 20 Jan 2024 15:16:31 +0300 Subject: [PATCH 1/4] gh-108303: Move all XML-related test files to `test_xml` --- .gitattributes | 2 +- Doc/license.rst | 2 +- Lib/test/libregrtest/findtests.py | 1 + Lib/test/ssltests.py | 2 +- Lib/test/support/__init__.py | 2 ++ Lib/test/test_xml/__init__.py | 5 +++++ Lib/test/{ => test_xml}/test_docxmlrpc.py | 0 Lib/test/{ => test_xml}/test_minidom.py | 2 +- Lib/test/{ => test_xml}/test_pulldom.py | 2 +- Lib/test/{ => test_xml}/test_pyexpat.py | 0 Lib/test/{ => test_xml}/test_sax.py | 4 ++-- .../{ => test_xml}/test_xml_dom_minicompat.py | 0 Lib/test/{ => test_xml}/test_xml_etree.py | 8 +++---- Lib/test/{ => test_xml}/test_xml_etree_c.py | 4 ++-- Lib/test/{ => test_xml}/test_xmlrpc.py | 0 .../{ => test_xml}/xmltestdata/c14n-20/README | 0 .../xmltestdata/c14n-20/c14nComment.xml | 0 .../xmltestdata/c14n-20/c14nDefault.xml | 0 .../xmltestdata/c14n-20/c14nPrefix.xml | 0 .../xmltestdata/c14n-20/c14nPrefixQname.xml | 0 .../c14n-20/c14nPrefixQnameXpathElem.xml | 0 .../xmltestdata/c14n-20/c14nQname.xml | 0 .../xmltestdata/c14n-20/c14nQnameElem.xml | 0 .../c14n-20/c14nQnameXpathElem.xml | 0 .../xmltestdata/c14n-20/c14nTrim.xml | 0 .../xmltestdata/c14n-20/doc.dtd | 0 .../xmltestdata/c14n-20/doc.xsl | 0 .../xmltestdata/c14n-20/inC14N1.xml | 0 .../xmltestdata/c14n-20/inC14N2.xml | 0 .../xmltestdata/c14n-20/inC14N3.xml | 0 .../xmltestdata/c14n-20/inC14N4.xml | 0 .../xmltestdata/c14n-20/inC14N5.xml | 0 .../xmltestdata/c14n-20/inC14N6.xml | 0 .../xmltestdata/c14n-20/inNsContent.xml | 0 .../xmltestdata/c14n-20/inNsDefault.xml | 0 .../xmltestdata/c14n-20/inNsPushdown.xml | 0 .../xmltestdata/c14n-20/inNsRedecl.xml | 0 .../xmltestdata/c14n-20/inNsSort.xml | 0 .../xmltestdata/c14n-20/inNsSuperfluous.xml | 0 .../xmltestdata/c14n-20/inNsXml.xml | 0 .../c14n-20/out_inC14N1_c14nComment.xml | 0 .../c14n-20/out_inC14N1_c14nDefault.xml | 0 .../c14n-20/out_inC14N2_c14nDefault.xml | 0 .../c14n-20/out_inC14N2_c14nTrim.xml | 0 .../c14n-20/out_inC14N3_c14nDefault.xml | 0 .../c14n-20/out_inC14N3_c14nPrefix.xml | 0 .../c14n-20/out_inC14N3_c14nTrim.xml | 0 .../c14n-20/out_inC14N4_c14nDefault.xml | 0 .../c14n-20/out_inC14N4_c14nTrim.xml | 0 .../c14n-20/out_inC14N5_c14nDefault.xml | 0 .../c14n-20/out_inC14N5_c14nTrim.xml | 0 .../c14n-20/out_inC14N6_c14nDefault.xml | 0 .../c14n-20/out_inNsContent_c14nDefault.xml | 0 ...t_inNsContent_c14nPrefixQnameXpathElem.xml | 0 .../c14n-20/out_inNsContent_c14nQnameElem.xml | 0 .../out_inNsContent_c14nQnameXpathElem.xml | 0 .../c14n-20/out_inNsDefault_c14nDefault.xml | 0 .../c14n-20/out_inNsDefault_c14nPrefix.xml | 0 .../c14n-20/out_inNsPushdown_c14nDefault.xml | 0 .../c14n-20/out_inNsPushdown_c14nPrefix.xml | 0 .../c14n-20/out_inNsRedecl_c14nDefault.xml | 0 .../c14n-20/out_inNsRedecl_c14nPrefix.xml | 0 .../c14n-20/out_inNsSort_c14nDefault.xml | 0 .../c14n-20/out_inNsSort_c14nPrefix.xml | 0 .../out_inNsSuperfluous_c14nDefault.xml | 0 .../out_inNsSuperfluous_c14nPrefix.xml | 0 .../c14n-20/out_inNsXml_c14nDefault.xml | 0 .../c14n-20/out_inNsXml_c14nPrefix.xml | 0 .../c14n-20/out_inNsXml_c14nPrefixQname.xml | 0 .../c14n-20/out_inNsXml_c14nQname.xml | 0 .../xmltestdata/c14n-20/world.txt | 0 .../xmltestdata/expat224_utf8_bug.xml | 0 .../{ => test_xml}/xmltestdata/simple-ns.xml | 0 .../{ => test_xml}/xmltestdata/simple.xml | 0 Lib/test/{ => test_xml}/xmltestdata/test.xml | 0 .../{ => test_xml}/xmltestdata/test.xml.out | 0 Lib/test/xmltests.py | 21 ------------------- Makefile.pre.in | 5 +++-- 78 files changed, 24 insertions(+), 36 deletions(-) create mode 100644 Lib/test/test_xml/__init__.py rename Lib/test/{ => test_xml}/test_docxmlrpc.py (100%) rename Lib/test/{ => test_xml}/test_minidom.py (99%) rename Lib/test/{ => test_xml}/test_pulldom.py (99%) rename Lib/test/{ => test_xml}/test_pyexpat.py (100%) rename Lib/test/{ => test_xml}/test_sax.py (99%) rename Lib/test/{ => test_xml}/test_xml_dom_minicompat.py (100%) rename Lib/test/{ => test_xml}/test_xml_etree.py (99%) rename Lib/test/{ => test_xml}/test_xml_etree_c.py (99%) rename Lib/test/{ => test_xml}/test_xmlrpc.py (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/README (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/c14nComment.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/c14nDefault.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/c14nPrefix.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/c14nPrefixQname.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/c14nPrefixQnameXpathElem.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/c14nQname.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/c14nQnameElem.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/c14nQnameXpathElem.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/c14nTrim.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/doc.dtd (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/doc.xsl (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/inC14N1.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/inC14N2.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/inC14N3.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/inC14N4.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/inC14N5.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/inC14N6.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/inNsContent.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/inNsDefault.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/inNsPushdown.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/inNsRedecl.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/inNsSort.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/inNsSuperfluous.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/inNsXml.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/out_inC14N1_c14nComment.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/out_inC14N1_c14nDefault.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/out_inC14N2_c14nDefault.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/out_inC14N2_c14nTrim.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/out_inC14N3_c14nDefault.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/out_inC14N3_c14nPrefix.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/out_inC14N3_c14nTrim.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/out_inC14N4_c14nDefault.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/out_inC14N4_c14nTrim.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/out_inC14N5_c14nDefault.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/out_inC14N5_c14nTrim.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/out_inC14N6_c14nDefault.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/out_inNsContent_c14nDefault.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/out_inNsContent_c14nPrefixQnameXpathElem.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/out_inNsContent_c14nQnameElem.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/out_inNsContent_c14nQnameXpathElem.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/out_inNsDefault_c14nDefault.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/out_inNsDefault_c14nPrefix.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/out_inNsPushdown_c14nDefault.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/out_inNsPushdown_c14nPrefix.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/out_inNsRedecl_c14nDefault.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/out_inNsRedecl_c14nPrefix.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/out_inNsSort_c14nDefault.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/out_inNsSort_c14nPrefix.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/out_inNsSuperfluous_c14nDefault.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/out_inNsSuperfluous_c14nPrefix.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/out_inNsXml_c14nDefault.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/out_inNsXml_c14nPrefix.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/out_inNsXml_c14nPrefixQname.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/out_inNsXml_c14nQname.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/c14n-20/world.txt (100%) rename Lib/test/{ => test_xml}/xmltestdata/expat224_utf8_bug.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/simple-ns.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/simple.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/test.xml (100%) rename Lib/test/{ => test_xml}/xmltestdata/test.xml.out (100%) delete mode 100644 Lib/test/xmltests.py diff --git a/.gitattributes b/.gitattributes index 2a48df079e1aeb..1a8f30b4347ebe 100644 --- a/.gitattributes +++ b/.gitattributes @@ -29,7 +29,7 @@ Lib/test/decimaltestdata/*.decTest noeol Lib/test/test_email/data/*.txt noeol Lib/test/test_importlib/resources/data01/* noeol Lib/test/test_importlib/resources/namespacedata01/* noeol -Lib/test/xmltestdata/* noeol +Lib/test/test_xml/xmltestdata/* noeol # Shell scripts should have LF even on Windows because of Cygwin Lib/venv/scripts/common/activate text eol=lf diff --git a/Doc/license.rst b/Doc/license.rst index 9fc0ff7161a591..14fd86872b2d66 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -1009,7 +1009,7 @@ W3C C14N test suite ------------------- The C14N 2.0 test suite in the :mod:`test` package -(``Lib/test/xmltestdata/c14n-20/``) was retrieved from the W3C website at +(``Lib/test/test_xml/xmltestdata/c14n-20/``) was retrieved from the W3C website at https://www.w3.org/TR/xml-c14n2-testcases/ and is distributed under the 3-clause BSD license:: diff --git a/Lib/test/libregrtest/findtests.py b/Lib/test/libregrtest/findtests.py index ee890b5b1db4cd..12cf9b09ca33e0 100644 --- a/Lib/test/libregrtest/findtests.py +++ b/Lib/test/libregrtest/findtests.py @@ -26,6 +26,7 @@ "test_multiprocessing_fork", "test_multiprocessing_forkserver", "test_multiprocessing_spawn", + "test_xml", } diff --git a/Lib/test/ssltests.py b/Lib/test/ssltests.py index ee03aed5cca532..a8206a33fb70aa 100644 --- a/Lib/test/ssltests.py +++ b/Lib/test/ssltests.py @@ -9,7 +9,7 @@ 'test_asyncio', 'test_ensurepip.py', 'test_ftplib', 'test_hashlib', 'test_hmac', 'test_httplib', 'test_imaplib', 'test_poplib', 'test_ssl', 'test_smtplib', 'test_smtpnet', - 'test_urllib2_localnet', 'test_venv', 'test_xmlrpc' + 'test_urllib2_localnet', 'test_venv', 'test_xml.test_xmlrpc' ] def run_regrtests(*extra_args): diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py index 8344dd1849c61d..5aca3e4bbf56a0 100644 --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -613,6 +613,8 @@ def findfile(filename, subdir=None): if os.path.isabs(filename): return filename if subdir is not None: + if not isinstance(subdir, str): + subdir = os.path.join(*subdir) filename = os.path.join(subdir, filename) path = [TEST_HOME_DIR] + sys.path for dn in path: diff --git a/Lib/test/test_xml/__init__.py b/Lib/test/test_xml/__init__.py new file mode 100644 index 00000000000000..4b16ecc31156a5 --- /dev/null +++ b/Lib/test/test_xml/__init__.py @@ -0,0 +1,5 @@ +import os +from test.support import load_package_tests + +def load_tests(*args): + return load_package_tests(os.path.dirname(__file__), *args) diff --git a/Lib/test/test_docxmlrpc.py b/Lib/test/test_xml/test_docxmlrpc.py similarity index 100% rename from Lib/test/test_docxmlrpc.py rename to Lib/test/test_xml/test_docxmlrpc.py diff --git a/Lib/test/test_minidom.py b/Lib/test/test_xml/test_minidom.py similarity index 99% rename from Lib/test/test_minidom.py rename to Lib/test/test_xml/test_minidom.py index 3ecd1af31eea77..b690eceaa7c265 100644 --- a/Lib/test/test_minidom.py +++ b/Lib/test/test_xml/test_minidom.py @@ -13,7 +13,7 @@ from xml.parsers.expat import ExpatError -tstfile = support.findfile("test.xml", subdir="xmltestdata") +tstfile = support.findfile("test.xml", subdir=("test_xml", "xmltestdata")) sample = ("\n" " @@ -4094,7 +4094,7 @@ def test_c14n_exclusion(self): # output, not roundtripped C14N (see above). def test_xml_c14n2(self): - datadir = findfile("c14n-20", subdir="xmltestdata") + datadir = findfile("c14n-20", subdir=("test_xml", "xmltestdata")) full_path = partial(os.path.join, datadir) files = [filename[:-4] for filename in sorted(os.listdir(datadir)) diff --git a/Lib/test/test_xml_etree_c.py b/Lib/test/test_xml/test_xml_etree_c.py similarity index 99% rename from Lib/test/test_xml_etree_c.py rename to Lib/test/test_xml/test_xml_etree_c.py index 3a0fc572f457ff..49c801c4fd1730 100644 --- a/Lib/test/test_xml_etree_c.py +++ b/Lib/test/test_xml/test_xml_etree_c.py @@ -257,7 +257,7 @@ def test_element_with_children(self): def install_tests(): # Test classes should have __module__ referring to this module. - from test import test_xml_etree + from test.test_xml import test_xml_etree for name, base in vars(test_xml_etree).items(): if isinstance(base, type) and issubclass(base, unittest.TestCase): class Temp(base): @@ -270,7 +270,7 @@ class Temp(base): install_tests() def setUpModule(): - from test import test_xml_etree + from test.test_xml import test_xml_etree test_xml_etree.setUpModule(module=cET) diff --git a/Lib/test/test_xmlrpc.py b/Lib/test/test_xml/test_xmlrpc.py similarity index 100% rename from Lib/test/test_xmlrpc.py rename to Lib/test/test_xml/test_xmlrpc.py diff --git a/Lib/test/xmltestdata/c14n-20/README b/Lib/test/test_xml/xmltestdata/c14n-20/README similarity index 100% rename from Lib/test/xmltestdata/c14n-20/README rename to Lib/test/test_xml/xmltestdata/c14n-20/README diff --git a/Lib/test/xmltestdata/c14n-20/c14nComment.xml b/Lib/test/test_xml/xmltestdata/c14n-20/c14nComment.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/c14nComment.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/c14nComment.xml diff --git a/Lib/test/xmltestdata/c14n-20/c14nDefault.xml b/Lib/test/test_xml/xmltestdata/c14n-20/c14nDefault.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/c14nDefault.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/c14nDefault.xml diff --git a/Lib/test/xmltestdata/c14n-20/c14nPrefix.xml b/Lib/test/test_xml/xmltestdata/c14n-20/c14nPrefix.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/c14nPrefix.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/c14nPrefix.xml diff --git a/Lib/test/xmltestdata/c14n-20/c14nPrefixQname.xml b/Lib/test/test_xml/xmltestdata/c14n-20/c14nPrefixQname.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/c14nPrefixQname.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/c14nPrefixQname.xml diff --git a/Lib/test/xmltestdata/c14n-20/c14nPrefixQnameXpathElem.xml b/Lib/test/test_xml/xmltestdata/c14n-20/c14nPrefixQnameXpathElem.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/c14nPrefixQnameXpathElem.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/c14nPrefixQnameXpathElem.xml diff --git a/Lib/test/xmltestdata/c14n-20/c14nQname.xml b/Lib/test/test_xml/xmltestdata/c14n-20/c14nQname.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/c14nQname.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/c14nQname.xml diff --git a/Lib/test/xmltestdata/c14n-20/c14nQnameElem.xml b/Lib/test/test_xml/xmltestdata/c14n-20/c14nQnameElem.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/c14nQnameElem.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/c14nQnameElem.xml diff --git a/Lib/test/xmltestdata/c14n-20/c14nQnameXpathElem.xml b/Lib/test/test_xml/xmltestdata/c14n-20/c14nQnameXpathElem.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/c14nQnameXpathElem.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/c14nQnameXpathElem.xml diff --git a/Lib/test/xmltestdata/c14n-20/c14nTrim.xml b/Lib/test/test_xml/xmltestdata/c14n-20/c14nTrim.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/c14nTrim.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/c14nTrim.xml diff --git a/Lib/test/xmltestdata/c14n-20/doc.dtd b/Lib/test/test_xml/xmltestdata/c14n-20/doc.dtd similarity index 100% rename from Lib/test/xmltestdata/c14n-20/doc.dtd rename to Lib/test/test_xml/xmltestdata/c14n-20/doc.dtd diff --git a/Lib/test/xmltestdata/c14n-20/doc.xsl b/Lib/test/test_xml/xmltestdata/c14n-20/doc.xsl similarity index 100% rename from Lib/test/xmltestdata/c14n-20/doc.xsl rename to Lib/test/test_xml/xmltestdata/c14n-20/doc.xsl diff --git a/Lib/test/xmltestdata/c14n-20/inC14N1.xml b/Lib/test/test_xml/xmltestdata/c14n-20/inC14N1.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/inC14N1.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/inC14N1.xml diff --git a/Lib/test/xmltestdata/c14n-20/inC14N2.xml b/Lib/test/test_xml/xmltestdata/c14n-20/inC14N2.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/inC14N2.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/inC14N2.xml diff --git a/Lib/test/xmltestdata/c14n-20/inC14N3.xml b/Lib/test/test_xml/xmltestdata/c14n-20/inC14N3.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/inC14N3.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/inC14N3.xml diff --git a/Lib/test/xmltestdata/c14n-20/inC14N4.xml b/Lib/test/test_xml/xmltestdata/c14n-20/inC14N4.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/inC14N4.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/inC14N4.xml diff --git a/Lib/test/xmltestdata/c14n-20/inC14N5.xml b/Lib/test/test_xml/xmltestdata/c14n-20/inC14N5.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/inC14N5.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/inC14N5.xml diff --git a/Lib/test/xmltestdata/c14n-20/inC14N6.xml b/Lib/test/test_xml/xmltestdata/c14n-20/inC14N6.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/inC14N6.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/inC14N6.xml diff --git a/Lib/test/xmltestdata/c14n-20/inNsContent.xml b/Lib/test/test_xml/xmltestdata/c14n-20/inNsContent.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/inNsContent.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/inNsContent.xml diff --git a/Lib/test/xmltestdata/c14n-20/inNsDefault.xml b/Lib/test/test_xml/xmltestdata/c14n-20/inNsDefault.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/inNsDefault.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/inNsDefault.xml diff --git a/Lib/test/xmltestdata/c14n-20/inNsPushdown.xml b/Lib/test/test_xml/xmltestdata/c14n-20/inNsPushdown.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/inNsPushdown.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/inNsPushdown.xml diff --git a/Lib/test/xmltestdata/c14n-20/inNsRedecl.xml b/Lib/test/test_xml/xmltestdata/c14n-20/inNsRedecl.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/inNsRedecl.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/inNsRedecl.xml diff --git a/Lib/test/xmltestdata/c14n-20/inNsSort.xml b/Lib/test/test_xml/xmltestdata/c14n-20/inNsSort.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/inNsSort.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/inNsSort.xml diff --git a/Lib/test/xmltestdata/c14n-20/inNsSuperfluous.xml b/Lib/test/test_xml/xmltestdata/c14n-20/inNsSuperfluous.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/inNsSuperfluous.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/inNsSuperfluous.xml diff --git a/Lib/test/xmltestdata/c14n-20/inNsXml.xml b/Lib/test/test_xml/xmltestdata/c14n-20/inNsXml.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/inNsXml.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/inNsXml.xml diff --git a/Lib/test/xmltestdata/c14n-20/out_inC14N1_c14nComment.xml b/Lib/test/test_xml/xmltestdata/c14n-20/out_inC14N1_c14nComment.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/out_inC14N1_c14nComment.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/out_inC14N1_c14nComment.xml diff --git a/Lib/test/xmltestdata/c14n-20/out_inC14N1_c14nDefault.xml b/Lib/test/test_xml/xmltestdata/c14n-20/out_inC14N1_c14nDefault.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/out_inC14N1_c14nDefault.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/out_inC14N1_c14nDefault.xml diff --git a/Lib/test/xmltestdata/c14n-20/out_inC14N2_c14nDefault.xml b/Lib/test/test_xml/xmltestdata/c14n-20/out_inC14N2_c14nDefault.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/out_inC14N2_c14nDefault.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/out_inC14N2_c14nDefault.xml diff --git a/Lib/test/xmltestdata/c14n-20/out_inC14N2_c14nTrim.xml b/Lib/test/test_xml/xmltestdata/c14n-20/out_inC14N2_c14nTrim.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/out_inC14N2_c14nTrim.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/out_inC14N2_c14nTrim.xml diff --git a/Lib/test/xmltestdata/c14n-20/out_inC14N3_c14nDefault.xml b/Lib/test/test_xml/xmltestdata/c14n-20/out_inC14N3_c14nDefault.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/out_inC14N3_c14nDefault.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/out_inC14N3_c14nDefault.xml diff --git a/Lib/test/xmltestdata/c14n-20/out_inC14N3_c14nPrefix.xml b/Lib/test/test_xml/xmltestdata/c14n-20/out_inC14N3_c14nPrefix.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/out_inC14N3_c14nPrefix.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/out_inC14N3_c14nPrefix.xml diff --git a/Lib/test/xmltestdata/c14n-20/out_inC14N3_c14nTrim.xml b/Lib/test/test_xml/xmltestdata/c14n-20/out_inC14N3_c14nTrim.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/out_inC14N3_c14nTrim.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/out_inC14N3_c14nTrim.xml diff --git a/Lib/test/xmltestdata/c14n-20/out_inC14N4_c14nDefault.xml b/Lib/test/test_xml/xmltestdata/c14n-20/out_inC14N4_c14nDefault.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/out_inC14N4_c14nDefault.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/out_inC14N4_c14nDefault.xml diff --git a/Lib/test/xmltestdata/c14n-20/out_inC14N4_c14nTrim.xml b/Lib/test/test_xml/xmltestdata/c14n-20/out_inC14N4_c14nTrim.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/out_inC14N4_c14nTrim.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/out_inC14N4_c14nTrim.xml diff --git a/Lib/test/xmltestdata/c14n-20/out_inC14N5_c14nDefault.xml b/Lib/test/test_xml/xmltestdata/c14n-20/out_inC14N5_c14nDefault.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/out_inC14N5_c14nDefault.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/out_inC14N5_c14nDefault.xml diff --git a/Lib/test/xmltestdata/c14n-20/out_inC14N5_c14nTrim.xml b/Lib/test/test_xml/xmltestdata/c14n-20/out_inC14N5_c14nTrim.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/out_inC14N5_c14nTrim.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/out_inC14N5_c14nTrim.xml diff --git a/Lib/test/xmltestdata/c14n-20/out_inC14N6_c14nDefault.xml b/Lib/test/test_xml/xmltestdata/c14n-20/out_inC14N6_c14nDefault.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/out_inC14N6_c14nDefault.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/out_inC14N6_c14nDefault.xml diff --git a/Lib/test/xmltestdata/c14n-20/out_inNsContent_c14nDefault.xml b/Lib/test/test_xml/xmltestdata/c14n-20/out_inNsContent_c14nDefault.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/out_inNsContent_c14nDefault.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/out_inNsContent_c14nDefault.xml diff --git a/Lib/test/xmltestdata/c14n-20/out_inNsContent_c14nPrefixQnameXpathElem.xml b/Lib/test/test_xml/xmltestdata/c14n-20/out_inNsContent_c14nPrefixQnameXpathElem.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/out_inNsContent_c14nPrefixQnameXpathElem.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/out_inNsContent_c14nPrefixQnameXpathElem.xml diff --git a/Lib/test/xmltestdata/c14n-20/out_inNsContent_c14nQnameElem.xml b/Lib/test/test_xml/xmltestdata/c14n-20/out_inNsContent_c14nQnameElem.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/out_inNsContent_c14nQnameElem.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/out_inNsContent_c14nQnameElem.xml diff --git a/Lib/test/xmltestdata/c14n-20/out_inNsContent_c14nQnameXpathElem.xml b/Lib/test/test_xml/xmltestdata/c14n-20/out_inNsContent_c14nQnameXpathElem.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/out_inNsContent_c14nQnameXpathElem.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/out_inNsContent_c14nQnameXpathElem.xml diff --git a/Lib/test/xmltestdata/c14n-20/out_inNsDefault_c14nDefault.xml b/Lib/test/test_xml/xmltestdata/c14n-20/out_inNsDefault_c14nDefault.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/out_inNsDefault_c14nDefault.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/out_inNsDefault_c14nDefault.xml diff --git a/Lib/test/xmltestdata/c14n-20/out_inNsDefault_c14nPrefix.xml b/Lib/test/test_xml/xmltestdata/c14n-20/out_inNsDefault_c14nPrefix.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/out_inNsDefault_c14nPrefix.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/out_inNsDefault_c14nPrefix.xml diff --git a/Lib/test/xmltestdata/c14n-20/out_inNsPushdown_c14nDefault.xml b/Lib/test/test_xml/xmltestdata/c14n-20/out_inNsPushdown_c14nDefault.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/out_inNsPushdown_c14nDefault.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/out_inNsPushdown_c14nDefault.xml diff --git a/Lib/test/xmltestdata/c14n-20/out_inNsPushdown_c14nPrefix.xml b/Lib/test/test_xml/xmltestdata/c14n-20/out_inNsPushdown_c14nPrefix.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/out_inNsPushdown_c14nPrefix.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/out_inNsPushdown_c14nPrefix.xml diff --git a/Lib/test/xmltestdata/c14n-20/out_inNsRedecl_c14nDefault.xml b/Lib/test/test_xml/xmltestdata/c14n-20/out_inNsRedecl_c14nDefault.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/out_inNsRedecl_c14nDefault.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/out_inNsRedecl_c14nDefault.xml diff --git a/Lib/test/xmltestdata/c14n-20/out_inNsRedecl_c14nPrefix.xml b/Lib/test/test_xml/xmltestdata/c14n-20/out_inNsRedecl_c14nPrefix.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/out_inNsRedecl_c14nPrefix.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/out_inNsRedecl_c14nPrefix.xml diff --git a/Lib/test/xmltestdata/c14n-20/out_inNsSort_c14nDefault.xml b/Lib/test/test_xml/xmltestdata/c14n-20/out_inNsSort_c14nDefault.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/out_inNsSort_c14nDefault.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/out_inNsSort_c14nDefault.xml diff --git a/Lib/test/xmltestdata/c14n-20/out_inNsSort_c14nPrefix.xml b/Lib/test/test_xml/xmltestdata/c14n-20/out_inNsSort_c14nPrefix.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/out_inNsSort_c14nPrefix.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/out_inNsSort_c14nPrefix.xml diff --git a/Lib/test/xmltestdata/c14n-20/out_inNsSuperfluous_c14nDefault.xml b/Lib/test/test_xml/xmltestdata/c14n-20/out_inNsSuperfluous_c14nDefault.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/out_inNsSuperfluous_c14nDefault.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/out_inNsSuperfluous_c14nDefault.xml diff --git a/Lib/test/xmltestdata/c14n-20/out_inNsSuperfluous_c14nPrefix.xml b/Lib/test/test_xml/xmltestdata/c14n-20/out_inNsSuperfluous_c14nPrefix.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/out_inNsSuperfluous_c14nPrefix.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/out_inNsSuperfluous_c14nPrefix.xml diff --git a/Lib/test/xmltestdata/c14n-20/out_inNsXml_c14nDefault.xml b/Lib/test/test_xml/xmltestdata/c14n-20/out_inNsXml_c14nDefault.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/out_inNsXml_c14nDefault.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/out_inNsXml_c14nDefault.xml diff --git a/Lib/test/xmltestdata/c14n-20/out_inNsXml_c14nPrefix.xml b/Lib/test/test_xml/xmltestdata/c14n-20/out_inNsXml_c14nPrefix.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/out_inNsXml_c14nPrefix.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/out_inNsXml_c14nPrefix.xml diff --git a/Lib/test/xmltestdata/c14n-20/out_inNsXml_c14nPrefixQname.xml b/Lib/test/test_xml/xmltestdata/c14n-20/out_inNsXml_c14nPrefixQname.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/out_inNsXml_c14nPrefixQname.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/out_inNsXml_c14nPrefixQname.xml diff --git a/Lib/test/xmltestdata/c14n-20/out_inNsXml_c14nQname.xml b/Lib/test/test_xml/xmltestdata/c14n-20/out_inNsXml_c14nQname.xml similarity index 100% rename from Lib/test/xmltestdata/c14n-20/out_inNsXml_c14nQname.xml rename to Lib/test/test_xml/xmltestdata/c14n-20/out_inNsXml_c14nQname.xml diff --git a/Lib/test/xmltestdata/c14n-20/world.txt b/Lib/test/test_xml/xmltestdata/c14n-20/world.txt similarity index 100% rename from Lib/test/xmltestdata/c14n-20/world.txt rename to Lib/test/test_xml/xmltestdata/c14n-20/world.txt diff --git a/Lib/test/xmltestdata/expat224_utf8_bug.xml b/Lib/test/test_xml/xmltestdata/expat224_utf8_bug.xml similarity index 100% rename from Lib/test/xmltestdata/expat224_utf8_bug.xml rename to Lib/test/test_xml/xmltestdata/expat224_utf8_bug.xml diff --git a/Lib/test/xmltestdata/simple-ns.xml b/Lib/test/test_xml/xmltestdata/simple-ns.xml similarity index 100% rename from Lib/test/xmltestdata/simple-ns.xml rename to Lib/test/test_xml/xmltestdata/simple-ns.xml diff --git a/Lib/test/xmltestdata/simple.xml b/Lib/test/test_xml/xmltestdata/simple.xml similarity index 100% rename from Lib/test/xmltestdata/simple.xml rename to Lib/test/test_xml/xmltestdata/simple.xml diff --git a/Lib/test/xmltestdata/test.xml b/Lib/test/test_xml/xmltestdata/test.xml similarity index 100% rename from Lib/test/xmltestdata/test.xml rename to Lib/test/test_xml/xmltestdata/test.xml diff --git a/Lib/test/xmltestdata/test.xml.out b/Lib/test/test_xml/xmltestdata/test.xml.out similarity index 100% rename from Lib/test/xmltestdata/test.xml.out rename to Lib/test/test_xml/xmltestdata/test.xml.out diff --git a/Lib/test/xmltests.py b/Lib/test/xmltests.py deleted file mode 100644 index bf685a466d7f1f..00000000000000 --- a/Lib/test/xmltests.py +++ /dev/null @@ -1,21 +0,0 @@ -# Convenience test module to run all of the XML-related tests in the -# standard library. - -import sys -import test.support - -test.support.verbose = 0 - -def runtest(name): - __import__(name) - module = sys.modules[name] - if hasattr(module, "test_main"): - module.test_main() - -runtest("test.test_minidom") -runtest("test.test_pyexpat") -runtest("test.test_sax") -runtest("test.test_xml_dom_minicompat") -runtest("test.test_xml_etree") -runtest("test.test_xml_etree_c") -runtest("test.test_xmlrpc") diff --git a/Makefile.pre.in b/Makefile.pre.in index d251e7c481b52b..03cd9e69c11d1c 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -2317,8 +2317,9 @@ TESTSUBDIRS= idlelib/idle_test \ test/tokenizedata \ test/tracedmodules \ test/typinganndata \ - test/xmltestdata \ - test/xmltestdata/c14n-20 + test/test_xml \ + test/test_xml/xmltestdata \ + test/test_xml/xmltestdata/c14n-20 COMPILEALL_OPTS=-j0 From 57e9b75815e9a449ac69ace08982f97ead8d04b6 Mon Sep 17 00:00:00 2001 From: sobolevn Date: Sun, 21 Jan 2024 19:52:07 +0300 Subject: [PATCH 2/4] Do not touch xmlrpc --- Lib/test/{test_xml => }/test_docxmlrpc.py | 0 Lib/test/{test_xml => }/test_xmlrpc.py | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename Lib/test/{test_xml => }/test_docxmlrpc.py (100%) rename Lib/test/{test_xml => }/test_xmlrpc.py (100%) diff --git a/Lib/test/test_xml/test_docxmlrpc.py b/Lib/test/test_docxmlrpc.py similarity index 100% rename from Lib/test/test_xml/test_docxmlrpc.py rename to Lib/test/test_docxmlrpc.py diff --git a/Lib/test/test_xml/test_xmlrpc.py b/Lib/test/test_xmlrpc.py similarity index 100% rename from Lib/test/test_xml/test_xmlrpc.py rename to Lib/test/test_xmlrpc.py From 13fdbc79f1694d184011902d6c0131a6f3c78bda Mon Sep 17 00:00:00 2001 From: sobolevn Date: Sun, 21 Jan 2024 19:57:14 +0300 Subject: [PATCH 3/4] Do not touch xmlrpc --- Lib/test/ssltests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/ssltests.py b/Lib/test/ssltests.py index a8206a33fb70aa..ee03aed5cca532 100644 --- a/Lib/test/ssltests.py +++ b/Lib/test/ssltests.py @@ -9,7 +9,7 @@ 'test_asyncio', 'test_ensurepip.py', 'test_ftplib', 'test_hashlib', 'test_hmac', 'test_httplib', 'test_imaplib', 'test_poplib', 'test_ssl', 'test_smtplib', 'test_smtpnet', - 'test_urllib2_localnet', 'test_venv', 'test_xml.test_xmlrpc' + 'test_urllib2_localnet', 'test_venv', 'test_xmlrpc' ] def run_regrtests(*extra_args): From 55274c2e202a02d240bfcf13186ec8875ef40512 Mon Sep 17 00:00:00 2001 From: sobolevn Date: Tue, 23 Jan 2024 13:31:44 +0300 Subject: [PATCH 4/4] Better `findfile` docs --- Lib/test/support/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py index 5aca3e4bbf56a0..aed63bd92d3538 100644 --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -609,11 +609,13 @@ def findfile(filename, subdir=None): Setting *subdir* indicates a relative path to use to find the file rather than looking directly in the path directories. + It can be either a string or a tuple of strings, + which will be joined with the correct path separator. """ if os.path.isabs(filename): return filename if subdir is not None: - if not isinstance(subdir, str): + if isinstance(subdir, tuple): subdir = os.path.join(*subdir) filename = os.path.join(subdir, filename) path = [TEST_HOME_DIR] + sys.path