Bump pytest from 7.4.4 to 8.2.1 in /tools (#46383)

* ---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* Remove vendored pytest

* Squashed 'tools/third_party/pytest/' content from commit 66ff8dffdf9

git-subtree-dir: tools/third_party/pytest
git-subtree-split: 66ff8dffdf9eee9b3dd6686de34542c49ff80dcd

* Remove unused py library

* Update resources tests to work with pytest 8

The single class implementing both a test collector and a test item no longer works;
these need to be split into separate classes.

* Update pytest_ignore_collect argument for pytest 8

* Update pytest-cov to 5.0.0

* Remove old attrs library

* Squashed 'tools/third_party/attrs/' content from commit 9e443b18527

git-subtree-dir: tools/third_party/attrs
git-subtree-split: 9e443b18527dc96b194e92805fa751cbf8434ba9

* Remove vendored pluggy

* Fix log message formatting

* Squashed 'tools/third_party/pluggy/' content from commit f8aa4a00971

git-subtree-dir: tools/third_party/pluggy
git-subtree-split: f8aa4a009716a7994f2f6c1947d9fa69feccbdd5

* Add exceptiongroup library for Python < 3.11

* Readd _version.py file for pytest

* Reset internal state of Stash class in unit tests

* Fix indent in conftest.py

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: James Graham <[email protected]>

Author: dependabot[bot]

resources/test/conftest.py

@@ -40,11 +40,7 @@ def pytest_collect_file(file_path, path, parent):
         return
     test_type = test_type.split(os.path.sep)[1]
 
-    # Handle the deprecation of Node construction in pytest6
-    # https://docs.pytest.org/en/stable/deprecations.html#node-construction-changed-to-node-from-parent
-    if hasattr(HTMLItem, "from_parent"):
-        return HTMLItem.from_parent(parent, filename=str(file_path), test_type=test_type)
-    return HTMLItem(parent, str(file_path), test_type)
+    return HTMLFile.from_parent(parent, path=file_path, test_type=test_type)
 
 
 def pytest_configure(config):
@@ -144,26 +140,29 @@ def _summarize_status(status_obj):
     return summarized
 
 
-class HTMLItem(pytest.Item, pytest.Collector):
-    def __init__(self, parent, filename, test_type):
-        self.url = parent.session.config.server.url(filename)
-        self.type = test_type
+class HTMLFile(pytest.File):
+    def __init__(self, test_type=None, **kwargs):
+        super().__init__(**kwargs)
+        self.test_type = test_type
+
+    def collect(self):
+        url = self.session.config.server.url(self.path)
         # Some tests are reliant on the WPT servers substitution functionality,
         # so tests must be retrieved from the server rather than read from the
         # file system directly.
-        handle = urllib.request.urlopen(self.url,
-                                        context=parent.session.config.ssl_context)
+        handle = urllib.request.urlopen(url,
+                                        context=self.parent.session.config.ssl_context)
         try:
             markup = handle.read()
         finally:
             handle.close()
 
-        if test_type not in TEST_TYPES:
-            raise ValueError('Unrecognized test type: "%s"' % test_type)
+        if self.test_type not in TEST_TYPES:
+            raise ValueError('Unrecognized test type: "%s"' % self.test_type)
 
         parsed = html5lib.parse(markup, namespaceHTMLElements=False)
         name = None
-        self.expected = None
+        expected = None
 
         for element in parsed.iter():
             if not name and element.tag == 'title':
@@ -172,39 +171,37 @@ def __init__(self, parent, filename, test_type):
             if element.tag == 'script':
                 if element.attrib.get('id') == 'expected':
                     try:
-                        self.expected = json.loads(element.text)
+                        expected = json.loads(element.text)
                     except ValueError:
                         print("Failed parsing JSON in %s" % filename)
                         raise
 
         if not name:
             raise ValueError('No name found in %s add a <title> element' % filename)
-        elif self.type == 'functional':
-            if not self.expected:
+        elif self.test_type == 'functional':
+            if not expected:
                 raise ValueError('Functional tests must specify expected report data')
-        elif self.type == 'unit' and self.expected:
+        elif self.test_type == 'unit' and expected:
             raise ValueError('Unit tests must not specify expected report data')
 
-        # Ensure that distinct items have distinct fspath attributes.
-        # This is necessary because pytest has an internal cache keyed on it,
-        # and only the first test with any given fspath will be run.
-        #
-        # This cannot use super(HTMLItem, self).__init__(..) because only the
-        # Collector constructor takes the fspath argument.
-        pytest.Item.__init__(self, name, parent)
-        pytest.Collector.__init__(self, name, parent, fspath=py.path.local(filename))
+        yield HTMLItem.from_parent(self, name=name, url=url, expected=expected)
+
 
+class HTMLItem(pytest.Item):
+    def __init__(self, name, parent=None, config=None, session=None, nodeid=None, test_type=None, url=None, expected=None, **kwargs):
+        super().__init__(name, parent, config, session, nodeid, **kwargs)
+
+        self.test_type = self.parent.test_type
+        self.url = url
+        self.expected = expected
 
     def reportinfo(self):
         return self.fspath, None, self.url
 
-    def repr_failure(self, excinfo):
-        return pytest.Collector.repr_failure(self, excinfo)
-
     def runtest(self):
-        if self.type == 'unit':
+        if self.test_type == 'unit':
             self._run_unit_test()
-        elif self.type == 'functional':
+        elif self.test_type == 'functional':
             self._run_functional_test()
         else:
             raise NotImplementedError

tools/conftest.py

@@ -17,7 +17,7 @@
                                 "default" if impl != "PyPy" else "pypy"))
 
 
-def pytest_ignore_collect(collection_path, path, config):
+def pytest_ignore_collect(collection_path, config):
     # ignore directories which have their own tox.ini
     assert collection_path != config.rootpath
     if (collection_path / "tox.ini").is_file():

tools/localpaths.py

@@ -11,6 +11,7 @@
 sys.path.insert(0, os.path.join(here, "third_party", "attrs", "src"))
 sys.path.insert(0, os.path.join(here, "third_party", "html5lib"))
 sys.path.insert(0, os.path.join(here, "third_party", "zipp"))
+sys.path.insert(0, os.path.join(here, "third_party", "exceptiongroup", "src"))
 sys.path.insert(0, os.path.join(here, "third_party", "more-itertools"))
 sys.path.insert(0, os.path.join(here, "third_party", "packaging"))
 sys.path.insert(0, os.path.join(here, "third_party", "pathlib2"))

tools/requirements_pytest.txt

@@ -1,3 +1,3 @@
-pytest==7.4.4
-pytest-cov==4.1.0
+pytest==8.2.1
+pytest-cov==5.0.0
 hypothesis==6.100.2

tools/third_party/attrs/.git_archival.txt

@@ -0,0 +1,4 @@
+node: $Format:%H$
+node-date: $Format:%cI$
+describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$
+ref-names: $Format:%D$

tools/third_party/attrs/.gitattributes

@@ -0,0 +1,5 @@
+# Force LF line endings for text files
+* text=auto eol=lf
+
+# Needed for setuptools-scm-git-archive
+.git_archival.txt  export-subst