From fe2a1a9e9dce3f5f0e699f6162c7cbef22b9a51e Mon Sep 17 00:00:00 2001
From: WPT Sync Bot <josh+wptsync@joshmatthews.net>
Date: Wed, 16 Dec 2020 08:23:35 +0000
Subject: [PATCH] Update web-platform-tests to revision
 48e3fd2f4d41fa00640d27738bdda07db95594cc

---
 .../CSS2/floats/hit-test-floats-004.html.ini  |    4 -
 .../image-orientation-exif-png.html.ini       |    2 +
 ...before-first-ideographic-char-001.html.ini |    2 +
 ...before-first-ideographic-char-002.html.ini |    2 +
 ...before-first-ideographic-char-003.html.ini |    2 +
 ...before-first-ideographic-char-004.html.ini |    2 +
 ...before-first-ideographic-char-005.html.ini |    2 +
 ...before-first-ideographic-char-006.html.ini |    2 +
 ...before-first-ideographic-char-007.html.ini |    2 +
 ...before-first-ideographic-char-008.html.ini |    2 +
 ...before-first-ideographic-char-009.html.ini |    2 +
 ...before-first-ideographic-char-010.html.ini |    2 +
 ...before-first-ideographic-char-011.html.ini |    2 +
 ...before-first-ideographic-char-012.html.ini |    2 +
 ...before-first-ideographic-char-013.html.ini |    2 +
 ...before-first-ideographic-char-014.html.ini |    2 +
 ...before-first-ideographic-char-015.html.ini |    2 +
 ...before-first-ideographic-char-016.html.ini |    2 +
 ...before-first-ideographic-char-017.html.ini |    2 +
 ...before-first-ideographic-char-018.html.ini |    2 +
 ...spaces-with-ideographic-space-001.html.ini |    2 +
 ...spaces-with-ideographic-space-002.html.ini |    2 +
 ...spaces-with-ideographic-space-003.html.ini |    2 +
 ...spaces-with-ideographic-space-005.html.ini |    2 +
 ...spaces-with-ideographic-space-006.html.ini |    2 +
 ...spaces-with-ideographic-space-008.html.ini |    2 +
 ...spaces-with-ideographic-space-009.html.ini |    2 +
 ...spaces-with-ideographic-space-010.html.ini |    2 +
 .../white-space/eol-spaces-bidi-003.html.ini  |    2 +
 ...deographic-space-break-spaces-001.html.ini |    2 +
 ...deographic-space-break-spaces-002.html.ini |    2 +
 ...deographic-space-break-spaces-003.html.ini |    2 +
 ...deographic-space-break-spaces-004.html.ini |    2 +
 ...deographic-space-break-spaces-005.html.ini |    2 +
 ...deographic-space-break-spaces-006.html.ini |    2 +
 ...deographic-space-break-spaces-007.html.ini |    2 +
 .../transform-scale-hittest.html.ini          |    3 +
 .../css/cssom-view/CaretPosition-001.html.ini |    4 -
 .../cssom-view/elementFromPoint-001.html.ini  |    4 +
 .../elementsFromPoint-invalid-cases.html.ini  |    4 -
 .../reactions/HTMLMediaElement.html.ini       |    2 +
 .../fetch/content-type/response.window.js.ini |   21 +-
 .../fetch/content-type/script.window.js.ini   |    3 -
 .../nosniff/parsing-nosniff.window.js.ini     |    2 +-
 .../traverse_the_history_1.html.ini           |    4 -
 .../traverse_the_history_3.html.ini}          |    2 +-
 ...ml.ini => traverse_the_history_4.html.ini} |    2 +-
 ...ross-origin-objects-on-new-window.html.ini |    2 +
 .../sandbox-window-open-srcdoc.html.ini       |    4 +
 .../supported-elements.html.ini               |    5 +-
 .../hash-name-reference.html.ini              |    3 -
 .../iframe_sandbox_popups_escaping-3.html.ini |    3 +-
 ...rame_sandbox_popups_nonescaping-2.html.ini |    2 +-
 ...rame_sandbox_popups_nonescaping-3.html.ini |    2 +-
 .../form-double-submit-2.html.ini             |    4 +
 .../form-double-submit.html.ini               |    4 +
 .../document-write/module-delayed.html.ini    |    4 +
 .../iframe-inheritance-srcdoc.html.ini        |    7 +
 .../sub-sample-buffer-stitching.html.ini      |    6 +
 .../webdriver/tests/find_elements/find.py.ini |    6 +
 .../find_elements_from_element/find.py.ini    |    6 +
 .../webmessaging/with-ports/017.html.ini      |    5 -
 .../018.html.ini                              |    0
 .../Worker/Worker-constructor.html.ini        |    2 +
 tests/wpt/metadata/MANIFEST.json              | 2892 +++++++++++++----
 .../CSS2/floats/hit-test-floats-004.html.ini  |    4 -
 .../image-orientation-exif-png.html.ini       |    2 +
 ...before-first-ideographic-char-001.html.ini |    2 +
 ...before-first-ideographic-char-002.html.ini |    2 +
 ...before-first-ideographic-char-003.html.ini |    2 +
 ...before-first-ideographic-char-004.html.ini |    2 +
 ...before-first-ideographic-char-005.html.ini |    2 +
 ...before-first-ideographic-char-006.html.ini |    2 +
 ...before-first-ideographic-char-007.html.ini |    2 +
 ...before-first-ideographic-char-008.html.ini |    2 +
 ...before-first-ideographic-char-009.html.ini |    2 +
 ...before-first-ideographic-char-010.html.ini |    2 +
 ...before-first-ideographic-char-011.html.ini |    2 +
 ...before-first-ideographic-char-012.html.ini |    2 +
 ...before-first-ideographic-char-013.html.ini |    2 +
 ...before-first-ideographic-char-014.html.ini |    2 +
 ...before-first-ideographic-char-015.html.ini |    2 +
 ...before-first-ideographic-char-016.html.ini |    2 +
 ...before-first-ideographic-char-017.html.ini |    2 +
 ...before-first-ideographic-char-018.html.ini |    2 +
 ...spaces-with-ideographic-space-001.html.ini |    2 +
 ...spaces-with-ideographic-space-002.html.ini |    2 +
 ...spaces-with-ideographic-space-003.html.ini |    2 +
 ...spaces-with-ideographic-space-005.html.ini |    2 +
 ...spaces-with-ideographic-space-006.html.ini |    2 +
 ...spaces-with-ideographic-space-008.html.ini |    2 +
 ...spaces-with-ideographic-space-009.html.ini |    2 +
 ...spaces-with-ideographic-space-010.html.ini |    2 +
 .../white-space/eol-spaces-bidi-003.html.ini  |    2 +
 ...deographic-space-break-spaces-001.html.ini |    2 +
 ...deographic-space-break-spaces-002.html.ini |    2 +
 ...deographic-space-break-spaces-003.html.ini |    2 +
 ...deographic-space-break-spaces-004.html.ini |    2 +
 ...deographic-space-break-spaces-005.html.ini |    2 +
 ...deographic-space-break-spaces-006.html.ini |    2 +
 ...deographic-space-break-spaces-007.html.ini |    2 +
 .../transform-scale-hittest.html.ini          |    3 +
 .../css/cssom-view/CaretPosition-001.html.ini |    4 -
 .../cssom-view/elementFromPoint-001.html.ini  |    4 +
 .../elementsFromPoint-invalid-cases.html.ini  |    4 -
 .../ui3/box-sizing-border-box-004.xht.ini     |    3 -
 .../ui3/box-sizing-content-box-003.xht.ini    |    3 -
 .../reactions/HTMLMediaElement.html.ini       |    2 +
 .../fetch/content-type/response.window.js.ini |   21 +-
 .../fetch/content-type/script.window.js.ini   |    3 -
 .../nosniff/parsing-nosniff.window.js.ini     |    2 +-
 .../traverse_the_history_1.html.ini           |    4 -
 .../traverse_the_history_3.html.ini           |    4 +
 .../traverse_the_history_4.html.ini           |    4 +
 ...ross-origin-objects-on-new-window.html.ini |    2 +
 .../sandbox-window-open-srcdoc.html.ini       |    4 +
 .../supported-elements.html.ini               |    5 +-
 .../hash-name-reference.html.ini              |    3 -
 .../iframe_sandbox_popups_escaping-3.html.ini |    3 +-
 ...rame_sandbox_popups_nonescaping-2.html.ini |    2 +-
 ...rame_sandbox_popups_nonescaping-3.html.ini |    2 +-
 .../form-double-submit-2.html.ini             |    4 +
 .../form-double-submit.html.ini               |    4 +
 .../document-write/module-delayed.html.ini    |    4 +
 .../iframe-inheritance-srcdoc.html.ini        |    7 +
 .../sub-sample-buffer-stitching.html.ini      |    6 +
 .../webdriver/tests/find_elements/find.py.ini |    6 +
 .../find_elements_from_element/find.py.ini    |    6 +
 .../webmessaging/with-ports/017.html.ini      |    5 -
 .../018.html.ini                              |    0
 .../Worker/Worker-constructor.html.ini        |    2 +
 ...=> progress_event_bubbles_cancelable.html} |    0
 .../css/css-contain/contain-size-064.html     |   39 +
 .../reference/contain-size-064-ref.html       |   28 +
 .../image-orientation-exif-png.html           |    8 +
 .../image-orientation-exif-png-ref.html       |    6 +
 .../support/F-exif-early.png                  |  Bin 0 -> 18826 bytes
 .../image-orientation/support/F-exif-late.png |  Bin 0 -> 15343 bytes
 .../image-orientation/support/F-rotated.png   |  Bin 0 -> 15355 bytes
 .../image-orientation/support/F-upright.png   |  Bin 0 -> 15204 bytes
 .../file-selector-button-after-part.html      |   16 +
 .../box-sizing-border-box-001-ref.xht         |    0
 .../box-sizing-border-box-001.xht             |    2 +-
 .../box-sizing-border-box-002-ref.xht         |    0
 .../box-sizing-border-box-002.xht             |    2 +-
 .../box-sizing-border-box-003-ref.xht         |    0
 .../box-sizing-border-box-003.xht             |    2 +-
 .../box-sizing-border-box-004-ref.xht         |    0
 .../box-sizing-border-box-004.xht             |    2 +-
 .../box-sizing-content-box-001-ref.xht        |    0
 .../box-sizing-content-box-001.xht            |    2 +-
 .../box-sizing-content-box-002-ref.xht        |    0
 .../box-sizing-content-box-002.xht            |    2 +-
 .../box-sizing-content-box-003-ref.xht        |    0
 .../box-sizing-content-box-003.xht            |    2 +-
 .../box-sizing-replaced-001-ref.xht           |    2 +-
 .../box-sizing-replaced-001.xht               |    2 +-
 .../box-sizing-replaced-002-ref.xht           |    2 +-
 .../box-sizing-replaced-002.xht               |    2 +-
 .../box-sizing-replaced-003-ref.xht           |    2 +-
 .../box-sizing-replaced-003.xht               |    2 +-
 .../support/replaced-min-max-1.png            |  Bin
 .../support/replaced-min-max-10.png           |  Bin
 .../support/replaced-min-max-11.png           |  Bin
 .../support/replaced-min-max-12.png           |  Bin
 .../support/replaced-min-max-13.png           |  Bin
 .../support/replaced-min-max-14.png           |  Bin
 .../support/replaced-min-max-15.png           |  Bin
 .../support/replaced-min-max-16.png           |  Bin
 .../support/replaced-min-max-17.png           |  Bin
 .../support/replaced-min-max-18.png           |  Bin
 .../support/replaced-min-max-19.png           |  Bin
 .../support/replaced-min-max-2.png            |  Bin
 .../support/replaced-min-max-3.png            |  Bin
 .../support/replaced-min-max-4.png            |  Bin
 .../support/replaced-min-max-5.png            |  Bin
 .../support/replaced-min-max-6.png            |  Bin
 .../support/replaced-min-max-7.png            |  Bin
 .../support/replaced-min-max-8.png            |  Bin
 .../support/replaced-min-max-9.png            |  Bin
 .../support/replaced-min-max.png              |  Bin
 ...ces-before-first-ideographic-char-001.html |   33 +
 ...ces-before-first-ideographic-char-002.html |   36 +
 ...ces-before-first-ideographic-char-003.html |   36 +
 ...ces-before-first-ideographic-char-004.html |   36 +
 ...ces-before-first-ideographic-char-005.html |   39 +
 ...ces-before-first-ideographic-char-006.html |   39 +
 ...ces-before-first-ideographic-char-007.html |   36 +
 ...ces-before-first-ideographic-char-008.html |   39 +
 ...ces-before-first-ideographic-char-009.html |   39 +
 ...ces-before-first-ideographic-char-010.html |   39 +
 ...ces-before-first-ideographic-char-011.html |   42 +
 ...ces-before-first-ideographic-char-012.html |   36 +
 ...ces-before-first-ideographic-char-013.html |   36 +
 ...ces-before-first-ideographic-char-014.html |   36 +
 ...ces-before-first-ideographic-char-015.html |   39 +
 ...ces-before-first-ideographic-char-016.html |   39 +
 ...ces-before-first-ideographic-char-017.html |   42 +
 ...ces-before-first-ideographic-char-018.html |   36 +
 ...eak-spaces-with-ideographic-space-001.html |   27 +
 ...eak-spaces-with-ideographic-space-002.html |   37 +
 ...eak-spaces-with-ideographic-space-003.html |   37 +
 ...eak-spaces-with-ideographic-space-004.html |   35 +
 ...eak-spaces-with-ideographic-space-005.html |   33 +
 ...eak-spaces-with-ideographic-space-006.html |   35 +
 ...eak-spaces-with-ideographic-space-007.html |   34 +
 ...eak-spaces-with-ideographic-space-008.html |   35 +
 ...eak-spaces-with-ideographic-space-009.html |   37 +
 ...eak-spaces-with-ideographic-space-010.html |   31 +
 .../white-space/eol-spaces-bidi-003.html      |    9 +-
 .../reference/eol-spaces-bidi-003-ref.html    |    3 +-
 .../eol-spaces-bidi-alt-003-ref.html          |    3 +-
 ...deographic-space-break-spaces-001-ref.html |   10 +
 ...ng-ideographic-space-break-spaces-001.html |   17 +
 ...ng-ideographic-space-break-spaces-002.html |   17 +
 ...ng-ideographic-space-break-spaces-003.html |   17 +
 ...ng-ideographic-space-break-spaces-004.html |   17 +
 ...ng-ideographic-space-break-spaces-005.html |   17 +
 ...ng-ideographic-space-break-spaces-006.html |   17 +
 ...ng-ideographic-space-break-spaces-007.html |   30 +
 ...ng-ideographic-space-break-spaces-008.html |   32 +
 .../mozilla-central-reftests/reftest.list     |    3 -
 .../mozilla-central-reftests/ui3/reftest.list |   10 -
 .../pseudo-class-defined-print-ref.html       |    9 +
 .../pseudo-class-defined-print.html           |   17 +
 .../wpt/web-platform-tests/docs/commands.json |    1 +
 tests/wpt/web-platform-tests/docs/conf.py     |    5 +-
 .../sandbox-window-open-srcdoc.html           |   52 +
 .../contenteditable-overflow-height-ref.html  |    9 +
 .../contenteditable-overflow-height.html      |   14 +
 .../selection-start-end.html                  |   15 +-
 tests/wpt/web-platform-tests/lint.ignore      |    4 +-
 ...icy-javascript-url-frame-policy.https.html |   40 +
 .../iframe-inheritance-srcdoc.html            |   37 +-
 ...-policy-unsafe-url-navigate-to-srcdoc.html |   11 +
 .../selectionchange.tentative.html            |  210 +-
 ...s-imperative-api-slotchange.tentative.html |   15 -
 .../detection-HTMLCanvasElement.https.html    |   34 +-
 ...tion-HTMLImageElement-empty-src.https.html |   33 +
 ...ageElement-zero-dimension-image.https.html |   34 +
 .../shapedetection-empty-input.https.html     |   37 -
 .../web-platform-tests/tools/ci/pr_preview.py |    6 +
 .../web-platform-tests/tools/localpaths.py    |    6 +-
 .../tools/serve/test_functional.py            |    3 -
 .../tools/third_party/funcsigs/.gitignore     |   19 +
 .../tools/third_party/funcsigs/.travis.yml    |   11 +-
 .../tools/third_party/funcsigs/CHANGELOG      |    5 +
 .../tools/third_party/funcsigs/README.rst     |  344 +-
 .../tools/third_party/funcsigs/docs/index.rst |   78 +-
 .../third_party/funcsigs/funcsigs/__init__.py |   43 +-
 .../third_party/funcsigs/funcsigs/odict.py    |  261 --
 .../third_party/funcsigs/funcsigs/version.py  |    2 +-
 .../funcsigs/requirements/development.txt     |    3 +-
 .../tools/third_party/funcsigs/setup.py       |   23 +-
 .../funcsigs/tests/test_formatannotation.py   |   12 +-
 .../funcsigs/tests/test_funcsigs.py           |   36 +-
 .../funcsigs/tests/test_inspect.py            |   39 +-
 .../tools/third_party/funcsigs/tox.ini        |    8 +
 .../.github/workflows/main.yml                |  126 +
 .../third_party/importlib_metadata/.gitignore |   13 +
 .../importlib_metadata/.readthedocs.yml       |    5 +
 .../third_party/importlib_metadata/LICENSE    |   13 +
 .../importlib_metadata/MANIFEST.in            |    5 +
 .../third_party/importlib_metadata/README.rst |   42 +
 .../importlib_metadata/codecov.yml            |    2 +
 .../importlib_metadata/coverage.ini           |   24 +
 .../importlib_metadata/coverplug.py           |   21 +
 .../docs/__init__.py}                         |    0
 .../importlib_metadata/docs/changelog.rst     |  314 ++
 .../importlib_metadata/docs/conf.py           |  185 ++
 .../importlib_metadata/docs/index.rst         |   52 +
 .../importlib_metadata/docs/using.rst         |  260 ++
 .../importlib_metadata/__init__.py            |  627 ++++
 .../importlib_metadata/_compat.py             |  152 +
 .../prepare/example/example/__init__.py       |    2 +
 .../prepare/example/setup.py                  |   10 +
 .../importlib_metadata/pyproject.toml         |    2 +
 .../third_party/importlib_metadata/setup.cfg  |   47 +
 .../third_party/importlib_metadata/setup.py   |    3 +
 .../importlib_metadata/tests/__init__.py      |    0
 .../importlib_metadata/tests/data/__init__.py |    0
 .../tests/data/example-21.12-py3-none-any.whl |  Bin 0 -> 1455 bytes
 .../tests/data/example-21.12-py3.6.egg        |  Bin 0 -> 1497 bytes
 .../importlib_metadata/tests/fixtures.py      |  263 ++
 .../importlib_metadata/tests/py39compat.py    |    4 +
 .../importlib_metadata/tests/test_api.py      |  196 ++
 .../tests/test_integration.py                 |   54 +
 .../importlib_metadata/tests/test_main.py     |  285 ++
 .../importlib_metadata/tests/test_zip.py      |   80 +
 .../third_party/importlib_metadata/tox.ini    |   97 +
 .../tools/third_party/packaging/.coveragerc   |    9 +
 .../tools/third_party/packaging/.flake8       |    3 +
 .../packaging/.github/workflows/docs.yml      |   30 +
 .../packaging/.github/workflows/lint.yml      |   59 +
 .../packaging/.github/workflows/test.yml      |   75 +
 .../tools/third_party/packaging/.gitignore    |   18 +
 .../packaging/.pre-commit-config.yaml         |   32 +
 .../third_party/packaging/.readthedocs.yml    |   15 +
 .../tools/third_party/packaging/.travis.yml   |   42 +
 .../tools/third_party/packaging/CHANGELOG.rst |  295 ++
 .../third_party/packaging/CONTRIBUTING.rst    |   23 +
 .../tools/third_party/packaging/LICENSE       |    3 +
 .../third_party/packaging/LICENSE.APACHE      |  177 +
 .../tools/third_party/packaging/LICENSE.BSD   |   23 +
 .../tools/third_party/packaging/README.rst    |   73 +
 .../tools/third_party/packaging/docs/Makefile |  153 +
 .../third_party/packaging/docs/_static/.empty |    0
 .../third_party/packaging/docs/changelog.rst  |    1 +
 .../tools/third_party/packaging/docs/conf.py  |  113 +
 .../docs/development/getting-started.rst      |   80 +
 .../packaging/docs/development/index.rst      |   19 +
 .../docs/development/release-process.rst      |   21 +
 .../docs/development/reviewing-patches.rst    |   37 +
 .../docs/development/submitting-patches.rst   |   81 +
 .../third_party/packaging/docs/index.rst      |   38 +
 .../third_party/packaging/docs/markers.rst    |   93 +
 .../packaging/docs/requirements.rst           |   89 +
 .../packaging/docs/requirements.txt           |    1 +
 .../third_party/packaging/docs/security.rst   |   18 +
 .../third_party/packaging/docs/specifiers.rst |  222 ++
 .../tools/third_party/packaging/docs/tags.rst |  220 ++
 .../third_party/packaging/docs/utils.rst      |   41 +
 .../third_party/packaging/docs/version.rst    |  292 ++
 .../tools/third_party/packaging/mypy.ini      |   20 +
 .../tools/third_party/packaging/noxfile.py    |  309 ++
 .../packaging/packaging/__init__.py           |    5 +
 .../packaging/packaging/_compat.py            |   38 +
 .../packaging/packaging/_structures.py        |   86 +
 .../packaging/packaging/_typing.py            |   48 +
 .../packaging/packaging/markers.py            |  328 ++
 .../third_party/packaging/packaging/py.typed  |    0
 .../packaging/packaging/requirements.py       |  151 +
 .../packaging/packaging/specifiers.py         |  864 +++++
 .../third_party/packaging/packaging/tags.py   |  856 +++++
 .../third_party/packaging/packaging/utils.py  |   67 +
 .../packaging/packaging/version.py            |  556 ++++
 .../third_party/packaging/pyproject.toml      |   37 +
 .../third_party/packaging/tasks/__init__.py   |   10 +
 .../third_party/packaging/tasks/check.py      |  147 +
 .../third_party/packaging/tasks/paths.py      |   10 +
 .../packaging/tasks/requirements.txt          |    3 +
 .../third_party/packaging/tests/__init__.py   |    4 +
 .../packaging/tests/build-hello-world.sh      |   39 +
 .../packaging/tests/hello-world-armv7l-armel  |  Bin 0 -> 52 bytes
 .../packaging/tests/hello-world-armv7l-armhf  |  Bin 0 -> 52 bytes
 .../packaging/tests/hello-world-invalid-class |  Bin 0 -> 52 bytes
 .../packaging/tests/hello-world-invalid-data  |  Bin 0 -> 52 bytes
 .../packaging/tests/hello-world-invalid-magic |  Bin 0 -> 52 bytes
 .../packaging/tests/hello-world-s390x-s390x   |  Bin 0 -> 64 bytes
 .../packaging/tests/hello-world-too-short     |  Bin 0 -> 40 bytes
 .../packaging/tests/hello-world-x86_64-amd64  |  Bin 0 -> 64 bytes
 .../packaging/tests/hello-world-x86_64-i386   |  Bin 0 -> 52 bytes
 .../packaging/tests/hello-world-x86_64-x32    |  Bin 0 -> 52 bytes
 .../third_party/packaging/tests/hello-world.c |    7 +
 .../packaging/tests/test_markers.py           |  384 +++
 .../packaging/tests/test_requirements.py      |  197 ++
 .../packaging/tests/test_specifiers.py        |  999 ++++++
 .../packaging/tests/test_structures.py        |   60 +
 .../third_party/packaging/tests/test_tags.py  | 1364 ++++++++
 .../third_party/packaging/tests/test_utils.py |   49 +
 .../packaging/tests/test_version.py           |  905 ++++++
 .../tools/third_party/pathlib2/.gitignore     |   54 +
 .../tools/third_party/pathlib2/.travis.yml    |   47 +
 .../tools/third_party/pathlib2/CHANGELOG.rst  |  163 +
 .../tools/third_party/pathlib2/LICENSE.rst    |   23 +
 .../tools/third_party/pathlib2/MANIFEST.in    |   10 +
 .../tools/third_party/pathlib2/README.rst     |   66 +
 .../tools/third_party/pathlib2/VERSION        |    1 +
 .../tools/third_party/pathlib2/appveyor.yml   |   30 +
 .../third_party/pathlib2/appveyor/install.ps1 |   44 +
 .../tools/third_party/pathlib2/codecov.yml    |    1 +
 .../third_party/pathlib2/pathlib2/__init__.py | 1809 +++++++++++
 .../third_party/pathlib2/requirements.txt     |    3 +
 .../tools/third_party/pathlib2/setup.cfg      |    8 +
 .../tools/third_party/pathlib2/setup.py       |   48 +
 .../pathlib2/tests/test_pathlib2.py           | 2406 ++++++++++++++
 .../tools/third_party/pluggy/.coveragerc      |   14 +
 .../tools/third_party/pluggy/.gitignore       |    6 +
 .../pluggy/.pre-commit-config.yaml            |   32 +
 .../tools/third_party/pluggy/.travis.yml      |   75 +-
 .../tools/third_party/pluggy/CHANGELOG.rst    |  213 +-
 .../tools/third_party/pluggy/HOWTORELEASE.rst |   23 +
 .../tools/third_party/pluggy/LICENSE          |    3 +-
 .../tools/third_party/pluggy/README.rst       |   42 +-
 .../tools/third_party/pluggy/appveyor.yml     |   24 +-
 .../third_party/pluggy/changelog/README.rst   |   32 +
 .../pluggy/changelog/_template.rst            |   40 +
 .../third_party/pluggy/docs/api_reference.rst |   13 +-
 .../third_party/pluggy/docs/changelog.rst     |    1 +
 .../tools/third_party/pluggy/docs/conf.py     |   90 +-
 .../examples/eggsample-spam/eggsample_spam.py |   22 +
 .../docs/examples/eggsample-spam/setup.py     |    8 +
 .../examples/eggsample/eggsample/__init__.py  |    4 +
 .../examples/eggsample/eggsample/hookspecs.py |   21 +
 .../docs/examples/eggsample/eggsample/host.py |   57 +
 .../docs/examples/eggsample/eggsample/lib.py  |   14 +
 .../pluggy/docs/examples/eggsample/setup.py   |    8 +
 .../{firstexample.py => toy-example.py}       |   17 +-
 .../tools/third_party/pluggy/docs/index.rst   |  500 ++-
 .../third_party/pluggy/pluggy/__init__.py     |  684 ----
 .../tools/third_party/pluggy/pyproject.toml   |   44 +
 .../third_party/pluggy/scripts/release.py     |   69 +
 .../tools/third_party/pluggy/setup.py         |   70 +-
 .../third_party/pluggy/src/pluggy/__init__.py |   18 +
 .../third_party/pluggy/src/pluggy/_tracing.py |   62 +
 .../pluggy/{ => src}/pluggy/callers.py        |   31 +-
 .../third_party/pluggy/src/pluggy/hooks.py    |  359 ++
 .../third_party/pluggy/src/pluggy/manager.py  |  394 +++
 .../third_party/pluggy/testing/benchmark.py   |   24 +-
 .../third_party/pluggy/testing/conftest.py    |   12 +-
 .../pluggy/testing/test_deprecations.py       |   54 +
 .../pluggy/testing/test_details.py            |   58 +-
 .../pluggy/testing/test_helpers.py            |   30 +-
 .../pluggy/testing/test_hookcaller.py         |  215 ++
 ...{test_hookrelay.py => test_invocations.py} |   56 +-
 .../pluggy/testing/test_method_ordering.py    |  322 --
 .../pluggy/testing/test_multicall.py          |   22 +-
 .../pluggy/testing/test_pluginmanager.py      |  288 +-
 .../third_party/pluggy/testing/test_tracer.py |   65 +-
 .../tools/third_party/pluggy/tox.ini          |   48 +-
 .../tools/third_party/pytest/.coveragerc      |   20 +-
 .../tools/third_party/pytest/.gitattributes   |    2 +-
 .../third_party/pytest/.github/FUNDING.yml    |    4 +
 .../pytest/.github/ISSUE_TEMPLATE.md          |   10 +-
 .../pytest/.github/PULL_REQUEST_TEMPLATE.md   |    8 +-
 .../third_party/pytest/.github/config.yml     |    2 +
 .../third_party/pytest/.github/labels.toml    |  149 +
 .../pytest/.github/workflows/main.yml         |  191 ++
 .../tools/third_party/pytest/.gitignore       |   10 +
 .../pytest/.pre-commit-config.yaml            |   61 +-
 .../tools/third_party/pytest/.travis.yml      |  147 +-
 .../tools/third_party/pytest/AUTHORS          |   54 +-
 .../tools/third_party/pytest/CHANGELOG.rst    | 2061 +++++++++++-
 .../tools/third_party/pytest/CITATION         |   16 +
 .../tools/third_party/pytest/CONTRIBUTING.rst |   55 +-
 .../tools/third_party/pytest/HOWTORELEASE.rst |   15 +-
 .../tools/third_party/pytest/LICENSE          |    2 +-
 .../tools/third_party/pytest/README.rst       |   54 +-
 .../tools/third_party/pytest/TIDELIFT.rst     |   57 +
 .../tools/third_party/pytest/appveyor.yml     |   48 -
 .../third_party/pytest/azure-pipelines.yml    |  107 +
 .../tools/third_party/pytest/bench/bench.py   |    3 +-
 .../pytest/bench/bench_argcomplete.py         |    6 +-
 .../tools/third_party/pytest/bench/empty.py   |    5 +-
 .../third_party/pytest/bench/manyparam.py     |    2 +-
 .../tools/third_party/pytest/bench/skip.py    |    3 +-
 .../third_party/pytest/changelog/README.rst   |    9 +-
 .../pytest/changelog/_template.rst            |    2 +-
 .../tools/third_party/pytest/codecov.yml      |    7 +
 .../tools/third_party/pytest/doc/en/Makefile  |    6 +-
 .../doc/en/_themes/flask_theme_support.py     |   27 +-
 .../pytest/doc/en/announce/index.rst          |   41 +
 .../pytest/doc/en/announce/release-2.4.0.rst  |    2 +-
 .../pytest/doc/en/announce/release-2.9.0.rst  |    2 +-
 .../pytest/doc/en/announce/release-3.10.0.rst |   43 +
 .../pytest/doc/en/announce/release-3.10.1.rst |   24 +
 .../pytest/doc/en/announce/release-3.6.3.rst  |   27 +
 .../pytest/doc/en/announce/release-3.6.4.rst  |   24 +
 .../pytest/doc/en/announce/release-3.7.0.rst  |   41 +
 .../pytest/doc/en/announce/release-3.7.1.rst  |   21 +
 .../pytest/doc/en/announce/release-3.7.2.rst  |   25 +
 .../pytest/doc/en/announce/release-3.7.3.rst  |   32 +
 .../pytest/doc/en/announce/release-3.7.4.rst  |   22 +
 .../pytest/doc/en/announce/release-3.8.0.rst  |   38 +
 .../pytest/doc/en/announce/release-3.8.1.rst  |   25 +
 .../pytest/doc/en/announce/release-3.8.2.rst  |   28 +
 .../pytest/doc/en/announce/release-3.9.0.rst  |   43 +
 .../pytest/doc/en/announce/release-3.9.1.rst  |   20 +
 .../pytest/doc/en/announce/release-3.9.2.rst  |   23 +
 .../pytest/doc/en/announce/release-3.9.3.rst  |   24 +
 .../pytest/doc/en/announce/release-4.0.0.rst  |   30 +
 .../pytest/doc/en/announce/release-4.0.1.rst  |   23 +
 .../pytest/doc/en/announce/release-4.0.2.rst  |   24 +
 .../pytest/doc/en/announce/release-4.1.0.rst  |   44 +
 .../pytest/doc/en/announce/release-4.1.1.rst  |   27 +
 .../pytest/doc/en/announce/release-4.2.0.rst  |   37 +
 .../pytest/doc/en/announce/release-4.2.1.rst  |   30 +
 .../pytest/doc/en/announce/release-4.3.0.rst  |   36 +
 .../pytest/doc/en/announce/release-4.3.1.rst  |   29 +
 .../pytest/doc/en/announce/release-4.4.0.rst  |   39 +
 .../pytest/doc/en/announce/release-4.4.1.rst  |   20 +
 .../pytest/doc/en/announce/release-4.4.2.rst  |   33 +
 .../pytest/doc/en/announce/release-4.5.0.rst  |   35 +
 .../pytest/doc/en/announce/release-4.6.0.rst  |   43 +
 .../pytest/doc/en/announce/release-4.6.1.rst  |   19 +
 .../pytest/doc/en/announce/release-4.6.10.rst |   20 +
 .../pytest/doc/en/announce/release-4.6.11.rst |   20 +
 .../pytest/doc/en/announce/release-4.6.2.rst  |   18 +
 .../pytest/doc/en/announce/release-4.6.3.rst  |   21 +
 .../pytest/doc/en/announce/release-4.6.4.rst  |   22 +
 .../pytest/doc/en/announce/release-4.6.5.rst  |   21 +
 .../pytest/doc/en/announce/release-4.6.6.rst  |   20 +
 .../pytest/doc/en/announce/release-4.6.7.rst  |   19 +
 .../pytest/doc/en/announce/release-4.6.8.rst  |   20 +
 .../pytest/doc/en/announce/release-4.6.9.rst  |   21 +
 .../third_party/pytest/doc/en/assert.rst      |  206 +-
 .../pytest/doc/en/backwards-compatibility.rst |   10 +-
 .../pytest/doc/en/bash-completion.rst         |   22 +-
 .../third_party/pytest/doc/en/builtin.rst     |   98 +-
 .../tools/third_party/pytest/doc/en/cache.rst |  107 +-
 .../third_party/pytest/doc/en/capture.rst     |   23 +-
 .../third_party/pytest/doc/en/changelog.rst   |    3 -
 .../tools/third_party/pytest/doc/en/conf.py   |   16 +-
 .../third_party/pytest/doc/en/conftest.py     |    1 +
 .../third_party/pytest/doc/en/contents.rst    |    4 +
 .../third_party/pytest/doc/en/customize.rst   |   40 +-
 .../pytest/doc/en/deprecations.rst            |  535 +++
 .../pytest/doc/en/development_guide.rst       |    5 +
 .../third_party/pytest/doc/en/doctest.rst     |  213 +-
 .../doc/en/example/assertion/failure_demo.py  |   62 +-
 .../global_testmodule_config/conftest.py      |    6 +-
 .../test_hello_world.py                       |    3 +-
 .../doc/en/example/assertion/test_failures.py |    6 +-
 .../assertion/test_setup_flow_example.py      |    2 +-
 .../pytest/doc/en/example/attic.rst           |    6 +-
 .../pytest/doc/en/example/conftest.py         |    1 +
 .../doc/en/example/costlysetup/conftest.py    |    3 +-
 .../en/example/costlysetup/sub_a/__init__.py  |    1 +
 .../example/costlysetup/sub_a/test_quick.py   |    1 +
 .../en/example/costlysetup/sub_b/__init__.py  |    1 +
 .../en/example/costlysetup/sub_b/test_two.py  |    1 +
 .../pytest/doc/en/example/markers.rst         |  425 ++-
 .../pytest/doc/en/example/multipython.py      |   56 +-
 .../pytest/doc/en/example/nonpython.rst       |   35 +-
 .../doc/en/example/nonpython/conftest.py      |    4 +-
 .../pytest/doc/en/example/parametrize.rst     |  227 +-
 .../pytest/doc/en/example/py2py3/conftest.py  |    3 +-
 .../pytest/doc/en/example/py2py3/test_py2.py  |    5 +-
 .../pytest/doc/en/example/py2py3/test_py3.py  |    3 +-
 .../pytest/doc/en/example/pythoncollection.py |    2 +-
 .../doc/en/example/pythoncollection.rst       |  140 +-
 .../pytest/doc/en/example/reportingdemo.rst   |  205 +-
 .../pytest/doc/en/example/simple.rst          |  136 +-
 .../pytest/doc/en/example/special.rst         |   20 +-
 .../pytest/doc/en/example/xfail_demo.py       |    1 +
 .../third_party/pytest/doc/en/fixture.rst     |  372 ++-
 .../tools/third_party/pytest/doc/en/flaky.rst |  125 +
 .../pytest/doc/en/funcarg_compare.rst         |    6 +-
 .../pytest/doc/en/getting-started.rst         |   46 +-
 .../pytest/doc/en/goodpractices.rst           |   55 +-
 .../pytest/doc/en/historical-notes.rst        |  182 +-
 .../tools/third_party/pytest/doc/en/index.rst |   11 +-
 .../third_party/pytest/doc/en/license.rst     |    4 +-
 .../tools/third_party/pytest/doc/en/links.inc |    1 +
 .../third_party/pytest/doc/en/logging.rst     |   28 +-
 .../tools/third_party/pytest/doc/en/mark.rst  |  163 +-
 .../third_party/pytest/doc/en/monkeypatch.rst |   80 +-
 .../tools/third_party/pytest/doc/en/nose.rst  |    4 +-
 .../third_party/pytest/doc/en/parametrize.rst |  123 +-
 .../third_party/pytest/doc/en/plugins.rst     |   21 +-
 .../proposals/parametrize_with_fixtures.rst   |    2 +-
 .../pytest/doc/en/py27-py34-deprecation.rst   |   26 +
 .../third_party/pytest/doc/en/reference.rst   |  268 +-
 .../pytest/doc/en/requirements.txt            |    6 +-
 .../third_party/pytest/doc/en/skipping.rst    |   86 +-
 .../tools/third_party/pytest/doc/en/talks.rst |    8 +
 .../third_party/pytest/doc/en/tidelift.rst    |    4 +
 .../third_party/pytest/doc/en/tmpdir.rst      |   92 +-
 .../third_party/pytest/doc/en/unittest.rst    |   18 +-
 .../tools/third_party/pytest/doc/en/usage.rst |  395 ++-
 .../third_party/pytest/doc/en/warnings.rst    |  272 +-
 .../pytest/doc/en/writing_plugins.rst         |   81 +-
 .../third_party/pytest/doc/en/xunit_setup.rst |    8 +
 .../pytest/doc/en/yieldfixture.rst            |    4 +-
 .../third_party/pytest/extra/get_issues.py    |    6 +-
 .../pytest/extra/setup-py.test/setup.py       |    1 +
 .../tools/third_party/pytest/pyproject.toml   |   12 +-
 .../pytest/scripts/append_codecov_token.py    |   35 +
 .../third_party/pytest/scripts/call-tox.bat   |    8 -
 .../pytest/scripts/install-pypy.bat           |    6 -
 .../scripts/publish_gh_release_notes.py       |   96 +
 .../{tasks => scripts}/release.minor.rst      |    4 +-
 .../{tasks => scripts}/release.patch.rst      |    2 +-
 .../third_party/pytest/scripts/release.py     |  116 +
 .../pytest/scripts/report-coverage.sh         |   18 +
 .../third_party/pytest/scripts/retry.cmd      |   21 +
 .../pytest/scripts/setup-coverage-vars.bat    |    7 +
 .../pytest/scripts/upload-coverage.bat        |   16 +
 .../tools/third_party/pytest/setup.cfg        |   57 +-
 .../tools/third_party/pytest/setup.py         |  141 +-
 .../pytest/src/_pytest/__init__.py            |    1 +
 .../pytest/src/_pytest/_argcomplete.py        |    9 +-
 .../pytest/src/_pytest/_code/__init__.py      |   11 +-
 .../pytest/src/_pytest/_code/_py2traceback.py |   22 +-
 .../pytest/src/_pytest/_code/code.py          |  289 +-
 .../pytest/src/_pytest/_code/source.py        |  123 +-
 .../pytest/src/_pytest/_io/__init__.py        |    0
 .../pytest/src/_pytest/_io/saferepr.py        |   83 +
 .../pytest/src/_pytest/assertion/__init__.py  |    9 +-
 .../pytest/src/_pytest/assertion/rewrite.py   |  307 +-
 .../pytest/src/_pytest/assertion/truncate.py  |    7 +-
 .../pytest/src/_pytest/assertion/util.py      |  275 +-
 .../pytest/src/_pytest/cacheprovider.py       |  297 +-
 .../third_party/pytest/src/_pytest/capture.py |  340 +-
 .../third_party/pytest/src/_pytest/compat.py  |  171 +-
 .../pytest/src/_pytest/config/__init__.py     |  542 ++-
 .../pytest/src/_pytest/config/argparsing.py   |   54 +-
 .../pytest/src/_pytest/config/exceptions.py   |    2 +
 .../pytest/src/_pytest/config/findpaths.py    |   71 +-
 .../pytest/src/_pytest/debugging.py           |  298 +-
 .../pytest/src/_pytest/deprecated.py          |  115 +-
 .../third_party/pytest/src/_pytest/doctest.py |  101 +-
 .../pytest/src/_pytest/fixtures.py            |  495 +--
 .../pytest/src/_pytest/freeze_support.py      |    5 +-
 .../pytest/src/_pytest/helpconfig.py          |   71 +-
 .../pytest/src/_pytest/hookspec.py            |  130 +-
 .../pytest/src/_pytest/junitxml.py            |  252 +-
 .../third_party/pytest/src/_pytest/logging.py |  315 +-
 .../third_party/pytest/src/_pytest/main.py    |  303 +-
 .../pytest/src/_pytest/mark/__init__.py       |   52 +-
 .../pytest/src/_pytest/mark/evaluate.py       |   15 +-
 .../pytest/src/_pytest/mark/legacy.py         |   18 +-
 .../pytest/src/_pytest/mark/structures.py     |  292 +-
 .../pytest/src/_pytest/monkeypatch.py         |   73 +-
 .../third_party/pytest/src/_pytest/nodes.py   |  188 +-
 .../third_party/pytest/src/_pytest/nose.py    |   28 +-
 .../pytest/src/_pytest/outcomes.py            |  104 +-
 .../pytest/src/_pytest/pastebin.py            |   17 +-
 .../third_party/pytest/src/_pytest/pathlib.py |  380 +++
 .../pytest/src/_pytest/pytester.py            |  467 ++-
 .../third_party/pytest/src/_pytest/python.py  |  937 +++---
 .../pytest/src/_pytest/python_api.py          |  279 +-
 .../third_party/pytest/src/_pytest/recwarn.py |  118 +-
 .../third_party/pytest/src/_pytest/reports.py |  435 +++
 .../pytest/src/_pytest/resultlog.py           |   40 +-
 .../third_party/pytest/src/_pytest/runner.py  |  331 +-
 .../pytest/src/_pytest/setuponly.py           |   11 +-
 .../pytest/src/_pytest/setupplan.py           |    5 +-
 .../pytest/src/_pytest/skipping.py            |  141 +-
 .../pytest/src/_pytest/stepwise.py            |  109 +
 .../pytest/src/_pytest/terminal.py            |  617 +++-
 .../third_party/pytest/src/_pytest/tmpdir.py  |  186 +-
 .../pytest/src/_pytest/unittest.py            |  102 +-
 .../pytest/src/_pytest/warning_types.py       |  112 +
 .../pytest/src/_pytest/warnings.py            |  168 +-
 .../tools/third_party/pytest/src/pytest.py    |  119 +-
 .../third_party/pytest/tasks/__init__.py      |   10 -
 .../third_party/pytest/tasks/generate.py      |  118 -
 .../third_party/pytest/tasks/requirements.txt |    6 -
 .../pytest/testing/acceptance_test.py         |  377 ++-
 .../pytest/testing/code/test_code.py          |   79 +-
 .../pytest/testing/code/test_excinfo.py       |  249 +-
 .../pytest/testing/code/test_source.py        |  136 +-
 .../code/test_source_multiline_block.py       |   29 -
 .../third_party/pytest/testing/conftest.py    |   58 +
 .../pytest/testing/deprecated_test.py         |  220 +-
 .../pytest/testing/example_scripts/README.rst |    9 +
 .../acceptance/fixture_mock_integration.py    |   21 +
 .../collect/collect_init_tests/pytest.ini     |    2 +
 .../collect_init_tests/tests/__init__.py      |    3 +
 .../collect_init_tests/tests/test_foo.py      |    3 +
 .../package_infinite_recursion/conftest.py    |    3 +
 .../tests/__init__.py                         |    0
 .../tests/test_basic.py                       |    3 +
 .../package_init_given_as_arg/pkg/__init__.py |    0
 .../package_init_given_as_arg/pkg/test_foo.py |    3 +
 .../config/collect_pytest_prefix/conftest.py  |    3 +
 .../config/collect_pytest_prefix/test_foo.py  |    3 +
 .../conftest_usageerror/conftest.py           |    9 +
 .../dataclasses/test_compare_dataclasses.py   |   15 +
 ...ompare_dataclasses_field_comparison_off.py |   15 +
 .../test_compare_dataclasses_verbose.py       |   15 +
 .../test_compare_two_different_dataclasses.py |   20 +
 .../deprecated/test_fixture_named_request.py  |   11 +
 .../fixtures/custom_item/conftest.py          |   11 +
 .../fixtures/custom_item/foo/__init__.py      |    0
 .../fixtures/custom_item/foo/test_foo.py      |    3 +
 .../sub1/__init__.py                          |    0
 .../sub1/conftest.py                          |    8 +
 .../sub1/test_in_sub1.py                      |    3 +
 .../sub2/__init__.py                          |    0
 .../sub2/conftest.py                          |    7 +
 .../sub2/test_in_sub2.py                      |    3 +
 .../test_detect_recursive_dependency_error.py |   16 +
 .../conftest.py                               |    7 +
 .../pkg/__init__.py                           |    0
 .../pkg/conftest.py                           |    7 +
 .../pkg/test_spam.py                          |    3 +
 .../conftest.py                               |    7 +
 .../test_extend_fixture_conftest_module.py    |   11 +
 .../test_extend_fixture_module_class.py       |   16 +
 .../fill_fixtures/test_funcarg_basic.py       |   16 +
 .../test_funcarg_lookup_classlevel.py         |   11 +
 .../test_funcarg_lookup_modulelevel.py        |   16 +
 .../fill_fixtures/test_funcarg_lookupfails.py |   11 +
 .../fixtures/test_getfixturevalue_dynamic.py  |   21 +
 .../conftest.py                               |   15 +
 .../test_hello.py                             |    3 +
 .../testing/example_scripts/issue_519.py      |   52 +
 .../marks_considered_keywords/conftest.py     |    0
 .../test_marks_as_keywords.py                 |    7 +
 .../perf_examples/collect_stats/.gitignore    |    1 +
 .../collect_stats/generate_folders.py         |   28 +
 .../collect_stats/template_test.py            |    3 +
 .../example_scripts/tmpdir/tmpdir_fixture.py  |    8 +
 ...test_parametrized_fixture_error_message.py |   15 +
 .../unittest/test_setup_skip.py               |   14 +
 .../unittest/test_setup_skip_class.py         |   15 +
 .../unittest/test_setup_skip_module.py        |   13 +
 .../test_group_warnings_by_message.py         |   17 +
 .../pytest/testing/examples/test_issue519.py  |    4 +
 .../testing/freeze/create_executable.py       |    2 +
 .../pytest/testing/freeze/runtests_script.py  |    1 +
 .../testing/freeze/tests/test_trivial.py      |    1 +
 .../pytest/testing/freeze/tox_run.py          |    1 +
 .../pytest/testing/io/test_saferepr.py        |   66 +
 .../pytest/testing/logging/test_fixture.py    |   25 +-
 .../pytest/testing/logging/test_formatter.py  |   40 +-
 .../pytest/testing/logging/test_reporting.py  |  374 ++-
 .../pytest/testing/python/approx.py           |  147 +-
 .../pytest/testing/python/collect.py          |  669 ++--
 .../python/{fixture.py => fixtures.py}        | 1424 ++++----
 .../pytest/testing/python/integration.py      |   12 +-
 .../pytest/testing/python/metafunc.py         |  658 ++--
 .../pytest/testing/python/raises.py           |  182 +-
 .../pytest/testing/python/setup_only.py       |    1 +
 .../pytest/testing/python/setup_plan.py       |    1 +
 .../testing/python/test_deprecations.py       |   22 -
 .../pytest/testing/test_argcomplete.py        |   22 +-
 .../pytest/testing/test_assertion.py          |  357 +-
 .../pytest/testing/test_assertrewrite.py      |  511 ++-
 .../pytest/testing/test_cacheprovider.py      |  428 ++-
 .../pytest/testing/test_capture.py            |  547 ++--
 .../pytest/testing/test_collection.py         |  427 ++-
 .../third_party/pytest/testing/test_compat.py |   74 +-
 .../third_party/pytest/testing/test_config.py |  561 +++-
 .../pytest/testing/test_conftest.py           |  336 +-
 .../pytest/testing/test_doctest.py            |  128 +-
 .../pytest/testing/test_entry_points.py       |   18 +-
 .../pytest/testing/test_helpconfig.py         |   12 +-
 .../pytest/testing/test_junitxml.py           |  466 ++-
 .../third_party/pytest/testing/test_mark.py   |  530 ++-
 .../pytest/testing/test_modimport.py          |   24 +-
 .../pytest/testing/test_monkeypatch.py        |  138 +-
 .../third_party/pytest/testing/test_nodes.py  |   43 +-
 .../third_party/pytest/testing/test_nose.py   |  100 +-
 .../pytest/testing/test_parseopt.py           |   62 +-
 .../pytest/testing/test_pastebin.py           |   17 +-
 .../pytest/testing/test_pathlib.py            |   87 +
 .../third_party/pytest/testing/test_pdb.py    |  737 ++++-
 .../pytest/testing/test_pluginmanager.py      |  162 +-
 .../pytest/testing/test_pytester.py           |  330 +-
 .../pytest/testing/test_recwarn.py            |   76 +-
 .../pytest/testing/test_reports.py            |  314 ++
 .../pytest/testing/test_resultlog.py          |   46 +-
 .../third_party/pytest/testing/test_runner.py |  175 +-
 .../pytest/testing/test_runner_xunit.py       |   62 +-
 .../pytest/testing/test_session.py            |  103 +-
 .../pytest/testing/test_skipping.py           |  101 +-
 .../pytest/testing/test_stepwise.py           |  224 ++
 .../pytest/testing/test_terminal.py           |  656 +++-
 .../third_party/pytest/testing/test_tmpdir.py |  327 +-
 .../pytest/testing/test_unittest.py           |  101 +-
 .../pytest/testing/test_warnings.py           |  453 ++-
 .../tools/third_party/pytest/tox.ini          |  245 +-
 tests/wpt/web-platform-tests/tools/tox.ini    |    3 +-
 .../wpt/web-platform-tests/tools/wave/tox.ini |    3 +-
 .../tools/wpt/tests/test_wpt.py               |    4 -
 .../wpt/web-platform-tests/tools/wpt/tox.ini  |    3 +-
 .../tools/wptrunner/tox.ini                   |    3 +-
 .../wptserve/tests/functional/test_stash.py   |    3 -
 .../TextEvent.inputMode.keyboard.html         |    2 +-
 .../resources/urlpatterntestdata.json         |  230 ++
 .../urlpattern/urlpattern.https.any.js        |   13 +-
 .../webdriver/tests/support/fixtures.py       |    4 +-
 .../webdriver/tests/support/helpers.py        |   17 +
 .../tests/support/merge_dictionaries.py       |    7 +-
 ...nvasContext_create_xrcompatible.https.html |   28 +-
 768 files changed, 50260 insertions(+), 12336 deletions(-)
 delete mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-images/image-orientation/image-orientation-exif-png.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-001.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-002.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-003.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-004.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-005.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-006.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-007.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-008.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-009.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-010.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-011.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-012.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-013.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-014.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-015.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-016.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-017.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-018.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-001.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-002.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-003.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-005.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-006.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-008.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-009.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-010.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/eol-spaces-bidi-003.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ideographic-space-break-spaces-001.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ideographic-space-break-spaces-002.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ideographic-space-break-spaces-003.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ideographic-space-break-spaces-004.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ideographic-space-break-spaces-005.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ideographic-space-break-spaces-006.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ideographic-space-break-spaces-007.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/custom-elements/reactions/HTMLMediaElement.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
 rename tests/wpt/{metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini => metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini} (71%)
 rename tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/{traverse_the_history_5.html.ini => traverse_the_history_4.html.ini} (71%)
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/sandboxing/sandbox-window-open-srcdoc.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
 rename tests/wpt/metadata-layout-2020/webmessaging/{without-ports => with-ports}/018.html.ini (100%)
 create mode 100644 tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini
 delete mode 100644 tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
 create mode 100644 tests/wpt/metadata/css/css-images/image-orientation/image-orientation-exif-png.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-001.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-002.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-003.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-004.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-005.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-006.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-007.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-008.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-009.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-010.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-011.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-012.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-013.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-014.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-015.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-016.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-017.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-018.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-001.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-002.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-003.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-005.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-006.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-008.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-009.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-010.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/eol-spaces-bidi-003.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-break-spaces-001.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-break-spaces-002.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-break-spaces-003.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-break-spaces-004.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-break-spaces-005.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-break-spaces-006.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-break-spaces-007.html.ini
 delete mode 100644 tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
 create mode 100644 tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
 delete mode 100644 tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
 delete mode 100644 tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-border-box-004.xht.ini
 delete mode 100644 tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-content-box-003.xht.ini
 create mode 100644 tests/wpt/metadata/custom-elements/reactions/HTMLMediaElement.html.ini
 delete mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/sandboxing/sandbox-window-open-srcdoc.html.ini
 create mode 100644 tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
 create mode 100644 tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini
 create mode 100644 tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
 delete mode 100644 tests/wpt/metadata/webmessaging/with-ports/017.html.ini
 rename tests/wpt/metadata/webmessaging/{without-ports => with-ports}/018.html.ini (100%)
 create mode 100644 tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
 rename tests/wpt/web-platform-tests/FileAPI/FileReader/{Progress_event_bubbles_cancelable.html => progress_event_bubbles_cancelable.html} (100%)
 create mode 100644 tests/wpt/web-platform-tests/css/css-contain/contain-size-064.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-064-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-exif-png.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-exif-png-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-images/image-orientation/support/F-exif-early.png
 create mode 100644 tests/wpt/web-platform-tests/css/css-images/image-orientation/support/F-exif-late.png
 create mode 100644 tests/wpt/web-platform-tests/css/css-images/image-orientation/support/F-rotated.png
 create mode 100644 tests/wpt/web-platform-tests/css/css-images/image-orientation/support/F-upright.png
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-after-part.html
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/box-sizing-border-box-001-ref.xht (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/box-sizing-border-box-001.xht (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/box-sizing-border-box-002-ref.xht (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/box-sizing-border-box-002.xht (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/box-sizing-border-box-003-ref.xht (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/box-sizing-border-box-003.xht (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/box-sizing-border-box-004-ref.xht (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/box-sizing-border-box-004.xht (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/box-sizing-content-box-001-ref.xht (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/box-sizing-content-box-001.xht (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/box-sizing-content-box-002-ref.xht (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/box-sizing-content-box-002.xht (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/box-sizing-content-box-003-ref.xht (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/box-sizing-content-box-003.xht (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/box-sizing-replaced-001-ref.xht (97%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/box-sizing-replaced-001.xht (98%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/box-sizing-replaced-002-ref.xht (97%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/box-sizing-replaced-002.xht (98%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/box-sizing-replaced-003-ref.xht (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/box-sizing-replaced-003.xht (98%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/support/replaced-min-max-1.png (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/support/replaced-min-max-10.png (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/support/replaced-min-max-11.png (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/support/replaced-min-max-12.png (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/support/replaced-min-max-13.png (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/support/replaced-min-max-14.png (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/support/replaced-min-max-15.png (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/support/replaced-min-max-16.png (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/support/replaced-min-max-17.png (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/support/replaced-min-max-18.png (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/support/replaced-min-max-19.png (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/support/replaced-min-max-2.png (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/support/replaced-min-max-3.png (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/support/replaced-min-max-4.png (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/support/replaced-min-max-5.png (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/support/replaced-min-max-6.png (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/support/replaced-min-max-7.png (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/support/replaced-min-max-8.png (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/support/replaced-min-max-9.png (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/ui3 => css-sizing}/support/replaced-min-max.png (100%)
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-002.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-003.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-004.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-005.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-006.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-007.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-008.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-009.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-010.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-011.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-012.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-013.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-014.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-015.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-016.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-017.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-018.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-002.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-003.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-004.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-005.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-006.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-007.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-008.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-009.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-010.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-ideographic-space-break-spaces-001-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-002.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-003.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-004.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-005.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-006.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-007.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-008.html
 delete mode 100644 tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/reftest.list
 create mode 100644 tests/wpt/web-platform-tests/custom-elements/pseudo-class-defined-print-ref.html
 create mode 100644 tests/wpt/web-platform-tests/custom-elements/pseudo-class-defined-print.html
 create mode 100644 tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-window-open-srcdoc.html
 create mode 100644 tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/contenteditable-overflow-height-ref.html
 create mode 100644 tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/contenteditable-overflow-height.html
 create mode 100644 tests/wpt/web-platform-tests/permissions-policy/permissions-policy-javascript-url-frame-policy.https.html
 create mode 100644 tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/resources/referrer-policy-unsafe-url-navigate-to-srcdoc.html
 create mode 100644 tests/wpt/web-platform-tests/shape-detection/detection-HTMLImageElement-empty-src.https.html
 create mode 100644 tests/wpt/web-platform-tests/shape-detection/detection-HTMLImageElement-zero-dimension-image.https.html
 delete mode 100644 tests/wpt/web-platform-tests/shape-detection/shapedetection-empty-input.https.html
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/funcsigs/.gitignore
 delete mode 100644 tests/wpt/web-platform-tests/tools/third_party/funcsigs/funcsigs/odict.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/funcsigs/tox.ini
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/.github/workflows/main.yml
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/.gitignore
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/.readthedocs.yml
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/LICENSE
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/MANIFEST.in
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/README.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/codecov.yml
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/coverage.ini
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/coverplug.py
 rename tests/wpt/web-platform-tests/tools/third_party/{funcsigs/requirements/production.txt => importlib_metadata/docs/__init__.py} (100%)
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/docs/changelog.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/docs/conf.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/docs/index.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/docs/using.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/importlib_metadata/__init__.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/importlib_metadata/_compat.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/prepare/example/example/__init__.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/prepare/example/setup.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/pyproject.toml
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/setup.cfg
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/setup.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/__init__.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/data/__init__.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/data/example-21.12-py3-none-any.whl
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/data/example-21.12-py3.6.egg
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/fixtures.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/py39compat.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/test_api.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/test_integration.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/test_main.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/test_zip.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tox.ini
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/.coveragerc
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/.flake8
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/.github/workflows/docs.yml
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/.github/workflows/lint.yml
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/.github/workflows/test.yml
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/.gitignore
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/.pre-commit-config.yaml
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/.readthedocs.yml
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/.travis.yml
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/CHANGELOG.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/CONTRIBUTING.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/LICENSE
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/LICENSE.APACHE
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/LICENSE.BSD
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/README.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/docs/Makefile
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/docs/_static/.empty
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/docs/changelog.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/docs/conf.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/docs/development/getting-started.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/docs/development/index.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/docs/development/release-process.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/docs/development/reviewing-patches.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/docs/development/submitting-patches.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/docs/index.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/docs/markers.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/docs/requirements.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/docs/requirements.txt
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/docs/security.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/docs/specifiers.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/docs/tags.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/docs/utils.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/docs/version.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/mypy.ini
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/noxfile.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/__init__.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/_compat.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/_structures.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/_typing.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/markers.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/py.typed
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/requirements.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/specifiers.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/tags.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/utils.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/version.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/pyproject.toml
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/tasks/__init__.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/tasks/check.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/tasks/paths.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/tasks/requirements.txt
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/tests/__init__.py
 create mode 100755 tests/wpt/web-platform-tests/tools/third_party/packaging/tests/build-hello-world.sh
 create mode 100755 tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world-armv7l-armel
 create mode 100755 tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world-armv7l-armhf
 create mode 100755 tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world-invalid-class
 create mode 100755 tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world-invalid-data
 create mode 100755 tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world-invalid-magic
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world-s390x-s390x
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world-too-short
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world-x86_64-amd64
 create mode 100755 tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world-x86_64-i386
 create mode 100755 tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world-x86_64-x32
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world.c
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_markers.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_requirements.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_specifiers.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_structures.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_tags.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_utils.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_version.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pathlib2/.gitignore
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pathlib2/.travis.yml
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pathlib2/CHANGELOG.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pathlib2/LICENSE.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pathlib2/MANIFEST.in
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pathlib2/README.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pathlib2/VERSION
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pathlib2/appveyor.yml
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pathlib2/appveyor/install.ps1
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pathlib2/codecov.yml
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pathlib2/pathlib2/__init__.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pathlib2/requirements.txt
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pathlib2/setup.cfg
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pathlib2/setup.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pathlib2/tests/test_pathlib2.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pluggy/.coveragerc
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pluggy/.pre-commit-config.yaml
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pluggy/HOWTORELEASE.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pluggy/changelog/README.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pluggy/changelog/_template.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/changelog.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample-spam/eggsample_spam.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample-spam/setup.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/__init__.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/hookspecs.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/host.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/lib.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample/setup.py
 rename tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/{firstexample.py => toy-example.py} (76%)
 delete mode 100644 tests/wpt/web-platform-tests/tools/third_party/pluggy/pluggy/__init__.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pluggy/pyproject.toml
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pluggy/scripts/release.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/__init__.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/_tracing.py
 rename tests/wpt/web-platform-tests/tools/third_party/pluggy/{ => src}/pluggy/callers.py (92%)
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/hooks.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/manager.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_deprecations.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_hookcaller.py
 rename tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/{test_hookrelay.py => test_invocations.py} (89%)
 delete mode 100644 tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_method_ordering.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/.github/FUNDING.yml
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/.github/config.yml
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/.github/labels.toml
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/.github/workflows/main.yml
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/CITATION
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/TIDELIFT.rst
 delete mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/appveyor.yml
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/azure-pipelines.yml
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/codecov.yml
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.10.0.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.10.1.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.6.3.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.6.4.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.7.0.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.7.1.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.7.2.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.7.3.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.7.4.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.8.0.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.8.1.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.8.2.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.9.0.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.9.1.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.9.2.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.9.3.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.0.0.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.0.1.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.0.2.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.1.0.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.1.1.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.2.0.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.2.1.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.3.0.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.3.1.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.4.0.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.4.1.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.4.2.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.5.0.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.0.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.1.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.10.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.11.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.2.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.3.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.4.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.5.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.6.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.7.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.8.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.9.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/deprecations.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/flaky.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/py27-py34-deprecation.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/tidelift.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/append_codecov_token.py
 delete mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/call-tox.bat
 delete mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/install-pypy.bat
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/publish_gh_release_notes.py
 rename tests/wpt/web-platform-tests/tools/third_party/pytest/{tasks => scripts}/release.minor.rst (86%)
 rename tests/wpt/web-platform-tests/tools/third_party/pytest/{tasks => scripts}/release.patch.rst (79%)
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/release.py
 create mode 100755 tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/report-coverage.sh
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/retry.cmd
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/setup-coverage-vars.bat
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/upload-coverage.bat
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_io/__init__.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_io/saferepr.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/pathlib.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/reports.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/stepwise.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/warning_types.py
 delete mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/tasks/__init__.py
 delete mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/tasks/generate.py
 delete mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/tasks/requirements.txt
 delete mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/code/test_source_multiline_block.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/conftest.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/README.rst
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/acceptance/fixture_mock_integration.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/collect_init_tests/pytest.ini
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/collect_init_tests/tests/__init__.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/collect_init_tests/tests/test_foo.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/package_infinite_recursion/conftest.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/package_infinite_recursion/tests/__init__.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/package_infinite_recursion/tests/test_basic.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/package_init_given_as_arg/pkg/__init__.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/package_init_given_as_arg/pkg/test_foo.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/config/collect_pytest_prefix/conftest.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/config/collect_pytest_prefix/test_foo.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/conftest_usageerror/conftest.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_dataclasses.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_dataclasses_field_comparison_off.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_dataclasses_verbose.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_two_different_dataclasses.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/deprecated/test_fixture_named_request.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/custom_item/conftest.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/custom_item/foo/__init__.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/custom_item/foo/test_foo.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/__init__.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/conftest.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/test_in_sub1.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/__init__.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/conftest.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/test_in_sub2.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_detect_recursive_dependency_error.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/conftest.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/__init__.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/conftest.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/test_spam.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/conftest.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/test_extend_fixture_conftest_module.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_module_class.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_basic.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_classlevel.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_modulelevel.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookupfails.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/test_getfixturevalue_dynamic.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/issue88_initial_file_multinodes/conftest.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/issue88_initial_file_multinodes/test_hello.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/issue_519.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/marks/marks_considered_keywords/conftest.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/marks/marks_considered_keywords/test_marks_as_keywords.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/perf_examples/collect_stats/.gitignore
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/perf_examples/collect_stats/generate_folders.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/perf_examples/collect_stats/template_test.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/tmpdir/tmpdir_fixture.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/unittest/test_parametrized_fixture_error_message.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/unittest/test_setup_skip.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/unittest/test_setup_skip_class.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/unittest/test_setup_skip_module.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/warnings/test_group_warnings_by_message.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/examples/test_issue519.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/io/test_saferepr.py
 rename tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/{fixture.py => fixtures.py} (82%)
 delete mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/test_deprecations.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_pathlib.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_reports.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_stepwise.py

diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
deleted file mode 100644
index 4bfb0c2053a..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-004.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-images/image-orientation/image-orientation-exif-png.html.ini b/tests/wpt/metadata-layout-2020/css/css-images/image-orientation/image-orientation-exif-png.html.ini
new file mode 100644
index 00000000000..275dbb2cf9c
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-images/image-orientation/image-orientation-exif-png.html.ini
@@ -0,0 +1,2 @@
+[image-orientation-exif-png.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-001.html.ini
new file mode 100644
index 00000000000..b0a2d225cce
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-001.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-002.html.ini
new file mode 100644
index 00000000000..8e97669fed6
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-002.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-003.html.ini
new file mode 100644
index 00000000000..f0dd89fa1b1
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-003.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-004.html.ini
new file mode 100644
index 00000000000..045ceea66db
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-004.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-005.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-005.html.ini
new file mode 100644
index 00000000000..a7cd09a3cfa
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-005.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-005.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-006.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-006.html.ini
new file mode 100644
index 00000000000..f16cd3ae462
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-006.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-006.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-007.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-007.html.ini
new file mode 100644
index 00000000000..e427e24bcf4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-007.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-007.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-008.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-008.html.ini
new file mode 100644
index 00000000000..d0388d0fc97
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-008.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-008.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-009.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-009.html.ini
new file mode 100644
index 00000000000..3e591a03e4c
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-009.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-009.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-010.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-010.html.ini
new file mode 100644
index 00000000000..dbdda94be3a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-010.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-010.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-011.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-011.html.ini
new file mode 100644
index 00000000000..3ca48ed9303
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-011.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-011.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-012.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-012.html.ini
new file mode 100644
index 00000000000..a19cc51680c
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-012.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-012.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-013.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-013.html.ini
new file mode 100644
index 00000000000..a2f5fb778a0
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-013.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-013.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-014.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-014.html.ini
new file mode 100644
index 00000000000..ebc19e6adb0
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-014.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-014.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-015.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-015.html.ini
new file mode 100644
index 00000000000..f82451ddd4c
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-015.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-015.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-016.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-016.html.ini
new file mode 100644
index 00000000000..1ce6cb3cc36
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-016.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-016.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-017.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-017.html.ini
new file mode 100644
index 00000000000..ae5c13993b0
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-017.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-017.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-018.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-018.html.ini
new file mode 100644
index 00000000000..56c3d82d87b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-before-first-ideographic-char-018.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-018.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-001.html.ini
new file mode 100644
index 00000000000..74000679733
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-001.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-with-ideographic-space-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-002.html.ini
new file mode 100644
index 00000000000..448f267c19f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-002.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-with-ideographic-space-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-003.html.ini
new file mode 100644
index 00000000000..5aeb89e9cc8
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-003.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-with-ideographic-space-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-005.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-005.html.ini
new file mode 100644
index 00000000000..e26882f1fc4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-005.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-with-ideographic-space-005.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-006.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-006.html.ini
new file mode 100644
index 00000000000..fa5d2ad5308
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-006.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-with-ideographic-space-006.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-008.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-008.html.ini
new file mode 100644
index 00000000000..9c070ac6577
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-008.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-with-ideographic-space-008.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-009.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-009.html.ini
new file mode 100644
index 00000000000..c36e2e88642
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-009.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-with-ideographic-space-009.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-010.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-010.html.ini
new file mode 100644
index 00000000000..0a4bb2bb172
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/break-spaces-with-ideographic-space-010.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-with-ideographic-space-010.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/eol-spaces-bidi-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/eol-spaces-bidi-003.html.ini
new file mode 100644
index 00000000000..3da751bb971
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/eol-spaces-bidi-003.html.ini
@@ -0,0 +1,2 @@
+[eol-spaces-bidi-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ideographic-space-break-spaces-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ideographic-space-break-spaces-001.html.ini
new file mode 100644
index 00000000000..5508103befb
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ideographic-space-break-spaces-001.html.ini
@@ -0,0 +1,2 @@
+[trailing-ideographic-space-break-spaces-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ideographic-space-break-spaces-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ideographic-space-break-spaces-002.html.ini
new file mode 100644
index 00000000000..3abdd7bdc53
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ideographic-space-break-spaces-002.html.ini
@@ -0,0 +1,2 @@
+[trailing-ideographic-space-break-spaces-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ideographic-space-break-spaces-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ideographic-space-break-spaces-003.html.ini
new file mode 100644
index 00000000000..4dd937c5e2b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ideographic-space-break-spaces-003.html.ini
@@ -0,0 +1,2 @@
+[trailing-ideographic-space-break-spaces-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ideographic-space-break-spaces-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ideographic-space-break-spaces-004.html.ini
new file mode 100644
index 00000000000..d10e9cde0bb
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ideographic-space-break-spaces-004.html.ini
@@ -0,0 +1,2 @@
+[trailing-ideographic-space-break-spaces-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ideographic-space-break-spaces-005.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ideographic-space-break-spaces-005.html.ini
new file mode 100644
index 00000000000..1f4601220cd
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ideographic-space-break-spaces-005.html.ini
@@ -0,0 +1,2 @@
+[trailing-ideographic-space-break-spaces-005.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ideographic-space-break-spaces-006.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ideographic-space-break-spaces-006.html.ini
new file mode 100644
index 00000000000..6b95cc216ef
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ideographic-space-break-spaces-006.html.ini
@@ -0,0 +1,2 @@
+[trailing-ideographic-space-break-spaces-006.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ideographic-space-break-spaces-007.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ideographic-space-break-spaces-007.html.ini
new file mode 100644
index 00000000000..615de21c400
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ideographic-space-break-spaces-007.html.ini
@@ -0,0 +1,2 @@
+[trailing-ideographic-space-break-spaces-007.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
index 4a1e8110f6f..f8e7e539aae 100644
--- a/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
@@ -2,3 +2,6 @@
   [Hit test intersecting scaled box]
     expected: FAIL
 
+  [Hit test within unscaled box]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini
deleted file mode 100644
index 4c79907309b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[CaretPosition-001.html]
-  [Element at (400, 100)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
new file mode 100644
index 00000000000..e38782d8c85
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
@@ -0,0 +1,4 @@
+[elementFromPoint-001.html]
+  [CSSOM View - 5 - extensions to the Document interface]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
deleted file mode 100644
index e181af5397f..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[elementsFromPoint-invalid-cases.html]
-  [The root element is the last element returned for otherwise empty queries within the viewport]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/custom-elements/reactions/HTMLMediaElement.html.ini b/tests/wpt/metadata-layout-2020/custom-elements/reactions/HTMLMediaElement.html.ini
new file mode 100644
index 00000000000..2ca05f57bb0
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/custom-elements/reactions/HTMLMediaElement.html.ini
@@ -0,0 +1,2 @@
+[HTMLMediaElement.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
index 4b2c91acad2..dcf6f402e63 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -309,21 +309,24 @@
   [Response: combined response Content-Type: text/html;" \\" text/plain ";charset=GBK]
     expected: NOTRUN
 
-  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: */* text/html]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
+  [<iframe>: separate response Content-Type: text/html;" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html */*]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
index d2df9b78483..e67f0406fc3 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
@@ -53,6 +53,3 @@
   [combined text/javascript ]
     expected: FAIL
 
-  [separate text/javascript x/x]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
index 70efd28ddfc..aa6eb8f6085 100644
--- a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,6 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20no%0D%0AX-Content-Type-Options%3A%20nosniff]
+  [X-Content-Type-Options%3A%20'NosniFF']
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
similarity index 71%
rename from tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
rename to tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
index dc2e45516de..51f8272a6de 100644
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_5.html]
+[traverse_the_history_3.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
similarity index 71%
rename from tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
rename to tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
index dc2e45516de..385376c7321 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_5.html]
+[traverse_the_history_4.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
new file mode 100644
index 00000000000..735a9a75a2a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
@@ -0,0 +1,2 @@
+[cross-origin-objects-on-new-window.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/sandboxing/sandbox-window-open-srcdoc.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/sandboxing/sandbox-window-open-srcdoc.html.ini
new file mode 100644
index 00000000000..45f6e82c8cf
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/sandboxing/sandbox-window-open-srcdoc.html.ini
@@ -0,0 +1,4 @@
+[sandbox-window-open-srcdoc.html]
+  [window.open('about:srcdoc') from sandboxed srcdoc doesn't crash.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index 4e69eb752b6..f45aaafe1c5 100644
--- a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -1,16 +1,15 @@
 [supported-elements.html]
-  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Element with tabindex should support autofocus]
     expected: FAIL
 
   [Area element should support autofocus]
-    expected: NOTRUN
+    expected: FAIL
 
   [Host element with delegatesFocus should support autofocus]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
index 09ae27d7480..5c3ac06f42a 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
@@ -171,6 +171,3 @@
   [XHTML img usemap="#hash-id"]
     expected: FAIL
 
-  [HTML (standards) IMG usemap="no-hash-name"]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index 295031c1812..338d283eb0e 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,5 +1,4 @@
 [iframe_sandbox_popups_escaping-3.html]
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 9eb581fcf1f..0407f0cc2b7 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-2.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index f4f994c5d6f..0fbc49ea1c1 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-3.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
new file mode 100644
index 00000000000..633a99517d3
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
@@ -0,0 +1,4 @@
+[form-double-submit-2.html]
+  [preventDefault should allow onclick submit() to succeed]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit.html.ini
new file mode 100644
index 00000000000..b193c33c2b6
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit.html.ini
@@ -0,0 +1,4 @@
+[form-double-submit.html]
+  [default submit action should supersede onclick submit()]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
new file mode 100644
index 00000000000..59a54fe88e4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-delayed.html]
+  [async document.write in a module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html.ini
index e7f2f20a202..7e1a385b339 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html.ini
@@ -1,4 +1,11 @@
 [iframe-inheritance-srcdoc.html]
+  expected: TIMEOUT
   [iframes srcdoc correctly inherit the ancestor's referrer policy]
     expected: FAIL
 
+  [Even after a navigation from another initiator, srcdoc iframe still inherits referrer policy from the parent.]
+    expected: TIMEOUT
+
+  [Srcdoc iframe inherits referrer policy from parent on creation.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index aaf45e314d7..cd8d278104e 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -410,3 +410,9 @@
   [X SNR (-384.7973725474673 dB) is not greater than or equal to 65.737. Got -384.7973725474673.]
     expected: FAIL
 
+  [X SNR (-432.56915701763694 dB) is not greater than or equal to 65.737. Got -432.56915701763694.]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t6.3119296254606011e+23\t9.3139332532882690e-1\t6.3119296254606011e+23\t6.7768680038931826e+23\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 6.3119296254606011e+23 at index of 28696.\n\tMax RelError of 6.7768680038931826e+23 at index of 28696.\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webdriver/tests/find_elements/find.py.ini b/tests/wpt/metadata-layout-2020/webdriver/tests/find_elements/find.py.ini
index fa43493b644..9fe75d56a1a 100644
--- a/tests/wpt/metadata-layout-2020/webdriver/tests/find_elements/find.py.ini
+++ b/tests/wpt/metadata-layout-2020/webdriver/tests/find_elements/find.py.ini
@@ -26,3 +26,9 @@
   [test_no_browsing_context]
     expected: ERROR
 
+  [test_find_elements_link_text[<a href=#>link<br>text</a>-link\\ntext\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>partial link<br>text</a>-k\\nt\]]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webdriver/tests/find_elements_from_element/find.py.ini b/tests/wpt/metadata-layout-2020/webdriver/tests/find_elements_from_element/find.py.ini
index 3ce1e49e365..e309193fd66 100644
--- a/tests/wpt/metadata-layout-2020/webdriver/tests/find_elements_from_element/find.py.ini
+++ b/tests/wpt/metadata-layout-2020/webdriver/tests/find_elements_from_element/find.py.ini
@@ -29,3 +29,9 @@
   [test_no_browsing_context]
     expected: ERROR
 
+  [test_find_elements_link_text[<a href=#>link<br>text</a>-link\\ntext\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>partial link<br>text</a>-k\\nt\]]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
deleted file mode 100644
index 064cf47545b..00000000000
--- a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
similarity index 100%
rename from tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
rename to tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
diff --git a/tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini
new file mode 100644
index 00000000000..80f9a4f15b8
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini
@@ -0,0 +1,2 @@
+[Worker-constructor.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 643a30ffb4b..f6b271b8bf8 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -25136,6 +25136,21 @@
      }
     }
    },
+   "custom-elements": {
+    "pseudo-class-defined-print.html": [
+     "24e1bb7b03fa43ce2fa264711a247d5977e763f6",
+     [
+      null,
+      [
+       [
+        "/custom-elements/pseudo-class-defined-print-ref.html",
+        "=="
+       ]
+      ],
+      {}
+     ]
+    ]
+   },
    "html": {
     "browsers": {
      "windows": {
@@ -133923,6 +133938,19 @@
        {}
       ]
      ],
+     "contain-size-064.html": [
+      "043a569eb40edbe576a6073a7686087d5bf43239",
+      [
+       null,
+       [
+        [
+         "/css/css-contain/reference/contain-size-064-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "contain-size-baseline-001.html": [
       "0ffed1b3b6a08831792b0a5ac40d1340c142c48d",
       [
@@ -157746,6 +157774,19 @@
         }
        ]
       ],
+      "image-orientation-exif-png.html": [
+       "85d807e39869cfc5f847bb7454b2465de9eb8c40",
+       [
+        null,
+        [
+         [
+          "/css/css-images/image-orientation/reference/image-orientation-exif-png-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "image-orientation-from-image-composited-dynamic1.html": [
        "29355518fdef34a1579592bf4b3b70967ee74f1c",
        [
@@ -172194,6 +172235,19 @@
        {}
       ]
      ],
+     "file-selector-button-after-part.html": [
+      "0bd28fa5d528cfa2f4bb6fb2cb181746c3005781",
+      [
+       null,
+       [
+        [
+         "/css/css-pseudo/file-selector-button-001-notref.html",
+         "!="
+        ]
+       ],
+       {}
+      ]
+     ],
      "first-letter-001.html": [
       "afe1f9b60391b5fb8ca0b222345b869c899208a1",
       [
@@ -180104,6 +180158,136 @@
        {}
       ]
      ],
+     "box-sizing-border-box-001.xht": [
+      "c66cda94eba49cd4006c7d1dd13869de621aadc4",
+      [
+       null,
+       [
+        [
+         "/css/css-sizing/box-sizing-border-box-001-ref.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "box-sizing-border-box-002.xht": [
+      "ea4c9e4f67d1d231eb0868b1d55ddc38d25a83fc",
+      [
+       null,
+       [
+        [
+         "/css/css-sizing/box-sizing-border-box-002-ref.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "box-sizing-border-box-003.xht": [
+      "835abeb3c3cbc060c00f1bbd224eaad3893dc139",
+      [
+       null,
+       [
+        [
+         "/css/css-sizing/box-sizing-border-box-003-ref.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "box-sizing-border-box-004.xht": [
+      "b9429eeecbdf9858c98dd2bf88dc24bf5324dc4c",
+      [
+       null,
+       [
+        [
+         "/css/css-sizing/box-sizing-border-box-004-ref.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "box-sizing-content-box-001.xht": [
+      "9835c25699bbbab38f1b8c8ef8c71ef0cf543145",
+      [
+       null,
+       [
+        [
+         "/css/css-sizing/box-sizing-content-box-001-ref.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "box-sizing-content-box-002.xht": [
+      "536cdbc7eff4f040bdd2aecada7220e68034e0c7",
+      [
+       null,
+       [
+        [
+         "/css/css-sizing/box-sizing-content-box-002-ref.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "box-sizing-content-box-003.xht": [
+      "411d001eb3b867c51247668677e94f54cf5c6d1a",
+      [
+       null,
+       [
+        [
+         "/css/css-sizing/box-sizing-content-box-003-ref.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "box-sizing-replaced-001.xht": [
+      "a56829e70b3b7e017eadf2fd17d3a4f16dd0accf",
+      [
+       null,
+       [
+        [
+         "/css/css-sizing/box-sizing-replaced-001-ref.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "box-sizing-replaced-002.xht": [
+      "60490e48082ac7e69608fe4effffd43a56835dd1",
+      [
+       null,
+       [
+        [
+         "/css/css-sizing/box-sizing-replaced-002-ref.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "box-sizing-replaced-003.xht": [
+      "39ce63ea9e2feef230d85d7afcba27542dc100fd",
+      [
+       null,
+       [
+        [
+         "/css/css-sizing/box-sizing-replaced-003-ref.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "canvas-intrinsic-dynamic.html": [
       "4a33716e5c64e8c6fb76dc777ff30c757943e3ec",
       [
@@ -190569,6 +190753,240 @@
         {}
        ]
       ],
+      "break-spaces-before-first-ideographic-char-001.html": [
+       "733da5334bdc11cdc1383ec2803480722e3ad575",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "break-spaces-before-first-ideographic-char-002.html": [
+       "faa69b6b01d19d9e58e9bab2f074b63fb3f2e2f4",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "break-spaces-before-first-ideographic-char-003.html": [
+       "71bb366668bad5abacc70cd9418880465c2fe4ad",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "break-spaces-before-first-ideographic-char-004.html": [
+       "9d8829b70ef1f640f193328d089c2cb531ed32ca",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "break-spaces-before-first-ideographic-char-005.html": [
+       "0bb0673fd867aa097fc49f6b0546549b1feb2af7",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "break-spaces-before-first-ideographic-char-006.html": [
+       "acd6fa20c6cead28a585a2a5dedc742fecaf06d7",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "break-spaces-before-first-ideographic-char-007.html": [
+       "c8c53b573776bd5856485e0b07739aa80175c63c",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "break-spaces-before-first-ideographic-char-008.html": [
+       "f3ffdf28d977673492a1ce5dedbf97553d1862e9",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "break-spaces-before-first-ideographic-char-009.html": [
+       "39118f4b4f7e2c415a4f1648ff185bf0c9ce7520",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "break-spaces-before-first-ideographic-char-010.html": [
+       "0fb4dccd7fcd574940ee0e16b0079ecf4bebe1e2",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "break-spaces-before-first-ideographic-char-011.html": [
+       "6aae96fd7bec4201f25927c1ed7d5e708033fab3",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "break-spaces-before-first-ideographic-char-012.html": [
+       "bcc68e038544d3151694806ce5ec6e7b6d9733bc",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "break-spaces-before-first-ideographic-char-013.html": [
+       "d888f6c9e40b5d45a3bdd516aa0ac837d2e43974",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "break-spaces-before-first-ideographic-char-014.html": [
+       "71bb366668bad5abacc70cd9418880465c2fe4ad",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "break-spaces-before-first-ideographic-char-015.html": [
+       "02ca9c2d1b55f747a6da48eeba1e7b7fff1a1702",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "break-spaces-before-first-ideographic-char-016.html": [
+       "39118f4b4f7e2c415a4f1648ff185bf0c9ce7520",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "break-spaces-before-first-ideographic-char-017.html": [
+       "df8a8d58c781d7183941ac7c0f99acbf07240348",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "break-spaces-before-first-ideographic-char-018.html": [
+       "d888f6c9e40b5d45a3bdd516aa0ac837d2e43974",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "break-spaces-newline-011.html": [
        "068119c29290fdded0dee4e7fa425af397706ea9",
        [
@@ -190725,6 +191143,136 @@
         {}
        ]
       ],
+      "break-spaces-with-ideographic-space-001.html": [
+       "60e0dcae302599810085eadae9440064cd654e55",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/pre-wrap-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "break-spaces-with-ideographic-space-002.html": [
+       "9d060e090448bb948ca07600bfde8c2cdcb04bd2",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "break-spaces-with-ideographic-space-003.html": [
+       "9d060e090448bb948ca07600bfde8c2cdcb04bd2",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "break-spaces-with-ideographic-space-004.html": [
+       "c61fcced0dd16c3294ef74613c2e518bd479bd2a",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/pre-wrap-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "break-spaces-with-ideographic-space-005.html": [
+       "7df2f06eec799b31fbcc64ec2f9bf270d4f7df08",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "break-spaces-with-ideographic-space-006.html": [
+       "a04970f9848d405d689298e7060d3971a6bbb390",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "break-spaces-with-ideographic-space-007.html": [
+       "44fb3d2fc6550de5f56c5bb37a71a5032f49ed08",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "break-spaces-with-ideographic-space-008.html": [
+       "7102439d4697e9d49e29afbc52ab9d2040c95af8",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "break-spaces-with-ideographic-space-009.html": [
+       "52bd181af6b2ce946be432b0495862af6077eb9c",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "break-spaces-with-ideographic-space-010.html": [
+       "d59afcf56d97d4fa5bf900085cd8da487321af8a",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "break-spaces-with-overflow-wrap-001.html": [
        "6912bafee9ebd55cfeddd878f9145048b235566b",
        [
@@ -191701,7 +192249,7 @@
        ]
       ],
       "eol-spaces-bidi-003.html": [
-       "14f31ec0d85fcbbbae45d155aa40efae20ea977c",
+       "4161c95514085dbefedd4ce6cde65e21090ae4a4",
        [
         null,
         [
@@ -193047,6 +193595,110 @@
         {}
        ]
       ],
+      "trailing-ideographic-space-break-spaces-001.html": [
+       "2ab5edffc0c6bee14382cb35c5960a36c62cee46",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/trailing-ideographic-space-break-spaces-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "trailing-ideographic-space-break-spaces-002.html": [
+       "423dd8e1dbdbd196851b1d6669d2ca1c2cdd041f",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/trailing-ideographic-space-break-spaces-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "trailing-ideographic-space-break-spaces-003.html": [
+       "fe09ba7eb3aea007c4f1f29aa3b628b22657f8a8",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/trailing-ideographic-space-break-spaces-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "trailing-ideographic-space-break-spaces-004.html": [
+       "bdc042e815c43f5368ca86fdbe1b78a22114f7b0",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/trailing-ideographic-space-break-spaces-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "trailing-ideographic-space-break-spaces-005.html": [
+       "2d31870cc27a0a7297fca04179896bb69e481d8a",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/trailing-ideographic-space-break-spaces-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "trailing-ideographic-space-break-spaces-006.html": [
+       "5ac80ad1b342888e35eaed187dc301eaef599b5a",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/trailing-ideographic-space-break-spaces-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "trailing-ideographic-space-break-spaces-007.html": [
+       "79c23acba98ab9e0de078c2ff6c3b427a8b02a5d",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "trailing-ideographic-space-break-spaces-008.html": [
+       "386083f10077fd6def5a45ccfe25f6a513fcd521",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "trailing-ogham-001.html": [
        "f687c7cdc377679a3eeb392254e6f68c883c504f",
        [
@@ -238918,138 +239570,6 @@
          ]
         ]
        },
-       "ui3": {
-        "box-sizing-border-box-001.xht": [
-         "3118bc40b54435384c2566b999225c21293b15b8",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-border-box-001-ref.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "box-sizing-border-box-002.xht": [
-         "c18147f7ca960e6828655d523ff630ecd28f44b6",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-border-box-002-ref.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "box-sizing-border-box-003.xht": [
-         "b66b812e4dd4faa2838fc659f5f21cfe2cdf470c",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-border-box-003-ref.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "box-sizing-border-box-004.xht": [
-         "62698821434fae55934a61fd844754a3f3939204",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-border-box-004-ref.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "box-sizing-content-box-001.xht": [
-         "8a076923962d1425ca82e77812dce235d8334097",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-content-box-001-ref.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "box-sizing-content-box-002.xht": [
-         "83853e6a71d57b1b171df23b6349fba2b22b0556",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-content-box-002-ref.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "box-sizing-content-box-003.xht": [
-         "a6cee3c4c79481a782ff40d6e6137b4c9dfa4a1b",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-content-box-003-ref.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "box-sizing-replaced-001.xht": [
-         "003556b36e39885c5eafa67759ce71ea7ed31eff",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-replaced-001-ref.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "box-sizing-replaced-002.xht": [
-         "fc062f4eb62d28778eacc95eb5497f58c1d11972",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-replaced-002-ref.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "box-sizing-replaced-003.xht": [
-         "ed75c02d73ceea1aa57305b2b2a54a321d66d615",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-replaced-003-ref.xht",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ]
-       },
        "values3": {
         "calc-background-image-gradient-1.html": [
          "b2c02897425f7dfc4b6c06ce56adbf03f0a78dfe",
@@ -244570,6 +245090,19 @@
     "editing": {
      "editing-0": {
       "contenteditable": {
+       "contenteditable-overflow-height.html": [
+        "8470b02c2b9d53e6bfe2d537389fa79c9d6577bf",
+        [
+         null,
+         [
+          [
+           "/html/editing/editing-0/contenteditable/contenteditable-overflow-height-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
        "contenteditable-with-empty-block.html": [
         "7bcc6110723643f3a26f39420586e5ead549d7eb",
         [
@@ -303421,6 +303954,10 @@
        "9544ebcac23af0c2caaa279154878c10349990ae",
        []
       ],
+      "contain-size-064-ref.html": [
+       "6d2876ae9bce54ab51254b21036aeb70bdc3bfd6",
+       []
+      ],
       "contain-size-breaks-001-ref.html": [
        "b807ea5a1160a4d29e46b91ca283c45b3c2fdeb5",
        []
@@ -314232,6 +314769,10 @@
         "a146af365758be1453c769e01b7cfb999ba2a525",
         []
        ],
+       "image-orientation-exif-png-ref.html": [
+        "39e361d80c1204a3dbee2601767a6dd89375b459",
+        []
+       ],
        "image-orientation-from-image-content-images-ref.html": [
         "c0d29909f9068803dfcfe9bd6818f354d4fb6ca8",
         []
@@ -314294,6 +314835,22 @@
        ]
       },
       "support": {
+       "F-exif-early.png": [
+        "6714cec8253723237cfbe95b319e0ae2162120e6",
+        []
+       ],
+       "F-exif-late.png": [
+        "38f6defc58e9ddd8f00562455db70f764aa0a2fe",
+        []
+       ],
+       "F-rotated.png": [
+        "f515edd823253f7b3d61cae8f7f82cba4d7ab4f1",
+        []
+       ],
+       "F-upright.png": [
+        "c44e72d0f4f7f62f0379e0f625b6a5a4a84d8a21",
+        []
+       ],
        "cursor-8-llo.jpg": [
         "ef26ad4aaaee12269323379e36c5274aad44d00b",
         []
@@ -319000,6 +319557,46 @@
       "7fdc142534eb768cb403666614d1c3df8cc1d7bb",
       []
      ],
+     "box-sizing-border-box-001-ref.xht": [
+      "e886a0f05e3afb7c2a43c66649def5287383de35",
+      []
+     ],
+     "box-sizing-border-box-002-ref.xht": [
+      "7c6bc218a0bb28e7e0fe61e1eb08d32dc0ae6da8",
+      []
+     ],
+     "box-sizing-border-box-003-ref.xht": [
+      "c468c5b5b9914b149d159bff57521b614c68d739",
+      []
+     ],
+     "box-sizing-border-box-004-ref.xht": [
+      "a635acd13e493809080c88c013965ab04eb05207",
+      []
+     ],
+     "box-sizing-content-box-001-ref.xht": [
+      "ca3ff0f7ec02ab4d91296f818f3fecd0916953ad",
+      []
+     ],
+     "box-sizing-content-box-002-ref.xht": [
+      "b280e57693c065e3b694608386cc8b712ea19fb2",
+      []
+     ],
+     "box-sizing-content-box-003-ref.xht": [
+      "042b5628aa8329d367e28b35bc3dca87e1d29cfe",
+      []
+     ],
+     "box-sizing-replaced-001-ref.xht": [
+      "c7ccf666f7d99e420270bcd4887994d235e31b87",
+      []
+     ],
+     "box-sizing-replaced-002-ref.xht": [
+      "d0f4b08ccc2d86902da00f6d70f84e1f20dbb9b7",
+      []
+     ],
+     "box-sizing-replaced-003-ref.xht": [
+      "a54b2df1a348d0a29880b56804ff418cfe4ab183",
+      []
+     ],
      "clone-intrinsic-size-ref.html": [
       "e5e70f0e963fbdb42a5cee8cd9ba3bd18d95dfb0",
       []
@@ -319192,6 +319789,86 @@
       "dynamic-available-size-iframe.html": [
        "8b61c876389e1fbd0792dd58763e3e2a3d4ef133",
        []
+      ],
+      "replaced-min-max-1.png": [
+       "d6946724d9eaee8f1f5942e391355ca0c08256ed",
+       []
+      ],
+      "replaced-min-max-10.png": [
+       "bfdca3e6f35ac49120a0c275a7e963e384cbe68c",
+       []
+      ],
+      "replaced-min-max-11.png": [
+       "38ee90dda0fcc589c4901753744c19878192a381",
+       []
+      ],
+      "replaced-min-max-12.png": [
+       "87433d4d7b98e24a730a1e3c5538d62442ed4847",
+       []
+      ],
+      "replaced-min-max-13.png": [
+       "c07d66e7881f814ac1fa35a1dffe178b88805740",
+       []
+      ],
+      "replaced-min-max-14.png": [
+       "e89dbe975864415755ff116815ab121d4d742f0d",
+       []
+      ],
+      "replaced-min-max-15.png": [
+       "717ea111b6f06c2a208e9f417a51b30b8dcccd0f",
+       []
+      ],
+      "replaced-min-max-16.png": [
+       "0a49bbf1c33b343eec3dd73687bd749131ab2784",
+       []
+      ],
+      "replaced-min-max-17.png": [
+       "a2ee273d798d83b92ea4c32515746d59f7a2f077",
+       []
+      ],
+      "replaced-min-max-18.png": [
+       "d18f4534179e40597bfabce7ad83a7c42ceddbc6",
+       []
+      ],
+      "replaced-min-max-19.png": [
+       "8900f36c41cdb1eb31fe409670f6e6bfbaf6ac9d",
+       []
+      ],
+      "replaced-min-max-2.png": [
+       "58338097fe2380226db6946a2fd399e0b9f86a66",
+       []
+      ],
+      "replaced-min-max-3.png": [
+       "e5e7d6e8a8cff1de901c531cd0e1f9c17c66c140",
+       []
+      ],
+      "replaced-min-max-4.png": [
+       "c099ae4271a7adf8100f5bf40afa87d43274c15c",
+       []
+      ],
+      "replaced-min-max-5.png": [
+       "9d9d8105ff2aba67ab2ec69e6e5f854cab58345b",
+       []
+      ],
+      "replaced-min-max-6.png": [
+       "781f894a5ec68093bdc3aaf0d25df54da6be844d",
+       []
+      ],
+      "replaced-min-max-7.png": [
+       "3f91a11f8e20fc4b3a083cdba03505eeb7c3b008",
+       []
+      ],
+      "replaced-min-max-8.png": [
+       "69951ec2571fc91117bb4d0589c85e023cdca9bc",
+       []
+      ],
+      "replaced-min-max-9.png": [
+       "3ac586daa5ad0639d1f53d9a9f3e77e2f9a405fb",
+       []
+      ],
+      "replaced-min-max.png": [
+       "3ef233005ae9122c3b4145a93b1510d07c57713f",
+       []
       ]
      },
      "thin-element-render-ref.html": [
@@ -321965,11 +322642,11 @@
         []
        ],
        "eol-spaces-bidi-003-ref.html": [
-        "0fe8f48c25a107e10a77f18791fb608d5f64e3c0",
+        "57e23bdc1059ec0b93b33f9986ff6d9eb6051034",
         []
        ],
        "eol-spaces-bidi-alt-003-ref.html": [
-        "6f610aa935f1d9b21f6880e3b81eec78b2f0988e",
+        "6861ec61de66efd296faa67d0f544e8e8128a8e9",
         []
        ],
        "full-width-leading-spaces-001-ref.html": [
@@ -322076,6 +322753,10 @@
         "03023f5359c62f71138696f8e90c6468de65b9d8",
         []
        ],
+       "trailing-ideographic-space-break-spaces-001-ref.html": [
+        "ad629e94eec037153e8e2be3efba09571134a270",
+        []
+       ],
        "trailing-ogham-001-ref.html": [
         "1b6fddd30e2389f5cd3cba0f794d13c8a9ce98b5",
         []
@@ -332131,7 +332812,7 @@
         }
        },
        "reftest.list": [
-        "3bf278e19892b4e8cb16b47ba6db9c10f373d9d7",
+        "c3ec6c1263d0dc301e7e7442caf427b3a9e01eff",
         []
        ],
        "ruby": {
@@ -332696,134 +333377,6 @@
          []
         ]
        },
-       "ui3": {
-        "box-sizing-border-box-001-ref.xht": [
-         "e886a0f05e3afb7c2a43c66649def5287383de35",
-         []
-        ],
-        "box-sizing-border-box-002-ref.xht": [
-         "7c6bc218a0bb28e7e0fe61e1eb08d32dc0ae6da8",
-         []
-        ],
-        "box-sizing-border-box-003-ref.xht": [
-         "c468c5b5b9914b149d159bff57521b614c68d739",
-         []
-        ],
-        "box-sizing-border-box-004-ref.xht": [
-         "a635acd13e493809080c88c013965ab04eb05207",
-         []
-        ],
-        "box-sizing-content-box-001-ref.xht": [
-         "ca3ff0f7ec02ab4d91296f818f3fecd0916953ad",
-         []
-        ],
-        "box-sizing-content-box-002-ref.xht": [
-         "b280e57693c065e3b694608386cc8b712ea19fb2",
-         []
-        ],
-        "box-sizing-content-box-003-ref.xht": [
-         "042b5628aa8329d367e28b35bc3dca87e1d29cfe",
-         []
-        ],
-        "box-sizing-replaced-001-ref.xht": [
-         "815813c51e7747e9d83ad4ed94db8e4d94af0276",
-         []
-        ],
-        "box-sizing-replaced-002-ref.xht": [
-         "64204a68a760a58b01864c9698d1ae79ad436e28",
-         []
-        ],
-        "box-sizing-replaced-003-ref.xht": [
-         "85524daf4a90ebb8c9ef84c0a6f65fa3401fceed",
-         []
-        ],
-        "reftest.list": [
-         "c63b1f5a97823ece085c709db809d648cfcdbdce",
-         []
-        ],
-        "support": {
-         "replaced-min-max-1.png": [
-          "d6946724d9eaee8f1f5942e391355ca0c08256ed",
-          []
-         ],
-         "replaced-min-max-10.png": [
-          "bfdca3e6f35ac49120a0c275a7e963e384cbe68c",
-          []
-         ],
-         "replaced-min-max-11.png": [
-          "38ee90dda0fcc589c4901753744c19878192a381",
-          []
-         ],
-         "replaced-min-max-12.png": [
-          "87433d4d7b98e24a730a1e3c5538d62442ed4847",
-          []
-         ],
-         "replaced-min-max-13.png": [
-          "c07d66e7881f814ac1fa35a1dffe178b88805740",
-          []
-         ],
-         "replaced-min-max-14.png": [
-          "e89dbe975864415755ff116815ab121d4d742f0d",
-          []
-         ],
-         "replaced-min-max-15.png": [
-          "717ea111b6f06c2a208e9f417a51b30b8dcccd0f",
-          []
-         ],
-         "replaced-min-max-16.png": [
-          "0a49bbf1c33b343eec3dd73687bd749131ab2784",
-          []
-         ],
-         "replaced-min-max-17.png": [
-          "a2ee273d798d83b92ea4c32515746d59f7a2f077",
-          []
-         ],
-         "replaced-min-max-18.png": [
-          "d18f4534179e40597bfabce7ad83a7c42ceddbc6",
-          []
-         ],
-         "replaced-min-max-19.png": [
-          "8900f36c41cdb1eb31fe409670f6e6bfbaf6ac9d",
-          []
-         ],
-         "replaced-min-max-2.png": [
-          "58338097fe2380226db6946a2fd399e0b9f86a66",
-          []
-         ],
-         "replaced-min-max-3.png": [
-          "e5e7d6e8a8cff1de901c531cd0e1f9c17c66c140",
-          []
-         ],
-         "replaced-min-max-4.png": [
-          "c099ae4271a7adf8100f5bf40afa87d43274c15c",
-          []
-         ],
-         "replaced-min-max-5.png": [
-          "9d9d8105ff2aba67ab2ec69e6e5f854cab58345b",
-          []
-         ],
-         "replaced-min-max-6.png": [
-          "781f894a5ec68093bdc3aaf0d25df54da6be844d",
-          []
-         ],
-         "replaced-min-max-7.png": [
-          "3f91a11f8e20fc4b3a083cdba03505eeb7c3b008",
-          []
-         ],
-         "replaced-min-max-8.png": [
-          "69951ec2571fc91117bb4d0589c85e023cdca9bc",
-          []
-         ],
-         "replaced-min-max-9.png": [
-          "3ac586daa5ad0639d1f53d9a9f3e77e2f9a405fb",
-          []
-         ],
-         "replaced-min-max.png": [
-          "3ef233005ae9122c3b4145a93b1510d07c57713f",
-          []
-         ]
-        }
-       },
        "values3": {
         "calc-background-image-gradient-1-ref.html": [
          "3fefef23ff7ea3811064c953bddc327098454199",
@@ -333095,6 +333648,10 @@
      "e30f6fc97f95f78e10c0ada540fbe17528512b63",
      []
     ],
+    "pseudo-class-defined-print-ref.html": [
+     "1ed6da59582b3c6cad43768def8136b36af496c4",
+     []
+    ],
     "reactions": {
      "resources": {
       "reactions.js": [
@@ -333310,11 +333867,11 @@
      ]
     },
     "commands.json": [
-     "55408d83dbc590f530cee36f7d2012b2e36aa2cd",
+     "f3494b8cd939593b670d99f0eba274839b68cc32",
      []
     ],
     "conf.py": [
-     "96e8290455e20cec5088b7f1f7036ac39a8cf6c3",
+     "022a4bdb6b7d4566c4237073d21428ec1b0681e7",
      []
     ],
     "frontend.py": [
@@ -345370,6 +345927,10 @@
      },
      "editing-0": {
       "contenteditable": {
+       "contenteditable-overflow-height-ref.html": [
+        "e88e904f96da7df9d5ff26c249934248239fd556",
+        []
+       ],
        "contenteditable-with-empty-block-ref.html": [
         "fe68571013cc4cb98227fec47bdb0f8cd2e74410",
         []
@@ -352107,7 +352668,7 @@
     ]
    },
    "lint.ignore": [
-    "b11dd75219223f82eb448453330de56c533a7f07",
+    "b571175fbdf5fc009fe58ea31f57fa136179d682",
     []
    ],
    "loading": {
@@ -357225,6 +357786,10 @@
        "make-html-script.js": [
         "a013fa64b305b3ceca8a1014afd7e59ff7be7d10",
         []
+       ],
+       "referrer-policy-unsafe-url-navigate-to-srcdoc.html": [
+        "dfdfae1f0d83db7850149c516747a04cb393f795",
+        []
        ]
       }
      },
@@ -362633,7 +363198,7 @@
       []
      ],
      "pr_preview.py": [
-      "c7107334d4fc9107b313134540d641c03ad21a5f",
+      "c6932dab2554565897e865ff75dbfb0374d6ee17",
       []
      ],
      "regen_certs.py": [
@@ -363028,7 +363593,7 @@
      }
     },
     "localpaths.py": [
-     "51aecea7712a2f90ab1778d62fe8b74d722785e6",
+     "87eafccf4d23367d765cffd9754543c72aec38a7",
      []
     ],
     "manifest": {
@@ -363283,7 +363848,7 @@
       []
      ],
      "test_functional.py": [
-      "5a918c2ee473e55886dfc70878d3df17b728e6f1",
+      "894479d111c90dad925c683cb0e93ac13fc68619",
       []
      ],
      "test_serve.py": [
@@ -364289,12 +364854,16 @@
       ]
      },
      "funcsigs": {
+      ".gitignore": [
+       "c8d2af85d3c617aa3f2551349af10d61cff65c2a",
+       []
+      ],
       ".travis.yml": [
-       "d2a7ab3051a0accdb2bf7af6728dcc31baee00bc",
+       "c1e7abe0b44a89c167a79cac33cfc9c4c79ed8e4",
        []
       ],
       "CHANGELOG": [
-       "602eec5e7c2ab143bbbecd43e1a771e6b96ab502",
+       "e1366d2668d03de8102d04953c55e4940055cb00",
        []
       ],
       "LICENSE": [
@@ -364310,7 +364879,7 @@
        []
       ],
       "README.rst": [
-       "f04b7b422cf51b67586703f2ae09eb86c1ce6ba9",
+       "5fbca27e6e6b019887ddf1b86faf84b7f7d2ab98",
        []
       ],
       "docs": {
@@ -364329,31 +364898,23 @@
         []
        ],
        "index.rst": [
-        "5d0f42f9368b76d7ef58bc908744d87243c14857",
+        "5fbca27e6e6b019887ddf1b86faf84b7f7d2ab98",
         []
        ]
       },
       "funcsigs": {
        "__init__.py": [
-        "fd2f47b1d4df6ec2affe6f678a1a583df95435b5",
-        []
-       ],
-       "odict.py": [
-        "6221e971b3794dee6e077564e5c6f854357d2344",
+        "5f5378b42a6d27cf490d66ae2b79c76bb466cedf",
         []
        ],
        "version.py": [
-        "896a370cad16cf1836ce13f3b54d49c191df8281",
+        "7863915fa5f8f014c64c8abff41a138e9b3cd4d3",
         []
        ]
       },
       "requirements": {
        "development.txt": [
-        "ecafb0a527d3e796c7080f10085b537a7300e986",
-        []
-       ],
-       "production.txt": [
-        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+        "40dedd92bf06ac34337fe27ba97422baa481b7e1",
         []
        ]
       },
@@ -364362,7 +364923,7 @@
        []
       ],
       "setup.py": [
-       "98b091260453c14638f70fce9f502dd82bbe8b3e",
+       "f3696888f9ebea73153034323e8a16fff6ba829f",
        []
       ],
       "tests": {
@@ -364371,18 +364932,22 @@
         []
        ],
        "test_formatannotation.py": [
-        "fd7a8873f855cae8ebe293e44e8e05721ceef601",
+        "4b98e6037d8302151a5ae93cc4793be1d49e08e3",
         []
        ],
        "test_funcsigs.py": [
-        "eecc0a8a709198c699cd19773ab42328017b2b6e",
+        "a7b9cca7679f4bb04994c6d0215837adcb21ec95",
         []
        ],
        "test_inspect.py": [
-        "323c323eafd98603105ba057ecef3495fa162f69",
+        "98d6592fcc7222632cd69fdf4889663ae1718d23",
         []
        ]
-      }
+      },
+      "tox.ini": [
+       "1873c744a005e89780e61f37ff6e05a70eb5bbe1",
+       []
+      ]
      },
      "h2": {
       "CONTRIBUTORS.rst": [
@@ -365824,6 +366389,154 @@
        ]
       }
      },
+     "importlib_metadata": {
+      ".github": {
+       "workflows": {
+        "main.yml": [
+         "b56320fd0003d5613d11a8c53a85a168cf050abc",
+         []
+        ]
+       }
+      },
+      ".gitignore": [
+       "ae864d61259798452c3ac395bcfa7ee2733549a0",
+       []
+      ],
+      ".readthedocs.yml": [
+       "8ae4468428bedf7441c4b43928425055a4453191",
+       []
+      ],
+      "LICENSE": [
+       "be7e092b0b050da7385b1a5f1670f4c134cfa168",
+       []
+      ],
+      "MANIFEST.in": [
+       "3fcf6d633ada2e608fa5f4f6f6b571f3de410ab9",
+       []
+      ],
+      "README.rst": [
+       "5655d9ab9876b2d5a39fb247e42ea8a1592881d2",
+       []
+      ],
+      "codecov.yml": [
+       "66c7f4bd1909c9be2e4ffe58c9138d3fe2bc628e",
+       []
+      ],
+      "coverage.ini": [
+       "b4d3102f42561886b2eb4b96ee1cbd028eefe0fd",
+       []
+      ],
+      "coverplug.py": [
+       "0b0c7cb5490bbb0d84c1a415253a944433b3c587",
+       []
+      ],
+      "docs": {
+       "__init__.py": [
+        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+        []
+       ],
+       "changelog.rst": [
+        "396535744a5e68880122eec1b68a35afb23a5226",
+        []
+       ],
+       "conf.py": [
+        "129a7a4eaed10e3876f82789f85ca736870d3bf1",
+        []
+       ],
+       "index.rst": [
+        "57332f5e8d11e05a089addfc7c3e09f09721a9a1",
+        []
+       ],
+       "using.rst": [
+        "11965147f45c8290fd7c14e57161dcd727f28a4d",
+        []
+       ]
+      },
+      "importlib_metadata": {
+       "__init__.py": [
+        "d5cbc2d03c415109c1960ffd16c27b210dcc9eb7",
+        []
+       ],
+       "_compat.py": [
+        "303d4a22e851f867741b93958ec035a907717775",
+        []
+       ]
+      },
+      "prepare": {
+       "example": {
+        "example": {
+         "__init__.py": [
+          "ba73b743394169c330e45fce1b4e5ff6264f8b71",
+          []
+         ]
+        },
+        "setup.py": [
+         "8663ad389a243be2c24ddcbaa288892375bab7e7",
+         []
+        ]
+       }
+      },
+      "pyproject.toml": [
+       "e5c3a6a455234dcc352bed67da71b72d7a037208",
+       []
+      ],
+      "setup.cfg": [
+       "fa10c8d358ca272afcbb2ae70acbaebba7da3162",
+       []
+      ],
+      "setup.py": [
+       "d5d43d7c93acf853a103e353a91b3972aa884d5c",
+       []
+      ],
+      "tests": {
+       "__init__.py": [
+        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+        []
+       ],
+       "data": {
+        "__init__.py": [
+         "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+         []
+        ],
+        "example-21.12-py3-none-any.whl": [
+         "641ab07f7aadd5c3ffe199b1e397b84504444994",
+         []
+        ],
+        "example-21.12-py3.6.egg": [
+         "cdb298a19b09d360d18f72a91e9dd70d7d7f54ec",
+         []
+        ]
+       },
+       "fixtures.py": [
+        "0d834c6580c3acfd48261b473ebe8dcceb454505",
+        []
+       ],
+       "py39compat.py": [
+        "a175d4c355af81306c06a3c005b6b2c7036c358e",
+        []
+       ],
+       "test_api.py": [
+        "efa9799642314030018c91f25831819d170ede30",
+        []
+       ],
+       "test_integration.py": [
+        "377574c448f1b8ff7a202d8ec5d5bfd06fcb57bc",
+        []
+       ],
+       "test_main.py": [
+        "847750bc3016640e2133c47c07d0d06466372485",
+        []
+       ],
+       "test_zip.py": [
+        "5cebcd02f7a48372849d5d5918aca4c5270dcdba",
+        []
+       ]
+      },
+      "tox.ini": [
+       "1f0e97578373de0a631fcaeb876e06888b501e29",
+       []
+      ]
+     },
      "more-itertools": {
       ".gitattributes": [
        "9aaba7a9fe8ebe94a6354dbd72f8ec3985b4b811",
@@ -365924,6 +366637,372 @@
        []
       ]
      },
+     "packaging": {
+      ".flake8": [
+       "b5a35be92af25523637c1402e42a59d97b02a35a",
+       []
+      ],
+      ".github": {
+       "workflows": {
+        "docs.yml": [
+         "2c1573877903e40f72535f497f145ec1da9a71c3",
+         []
+        ],
+        "lint.yml": [
+         "d03f16fd681f884e5bbc1f1443ee84811e315289",
+         []
+        ],
+        "test.yml": [
+         "180310716e66db31b5589b0f7824fd3249d31237",
+         []
+        ]
+       }
+      },
+      ".gitignore": [
+       "05e554a64c244d96c21dd2d8ce06f0060b65cac9",
+       []
+      ],
+      ".pre-commit-config.yaml": [
+       "ec7765edd108087a408efa64f65d1cf464b90f80",
+       []
+      ],
+      ".readthedocs.yml": [
+       "d8ac21668799ac6dc004e5f78b394f7e0a92eff4",
+       []
+      ],
+      ".travis.yml": [
+       "7f0973ae2c10d32d9b1fdbf78e825cd13c3b5d74",
+       []
+      ],
+      "CHANGELOG.rst": [
+       "8b275b06460e920f29aac91b78fd8f5863e15e15",
+       []
+      ],
+      "CONTRIBUTING.rst": [
+       "d9d70ec047aa80db9f0c548942472a8bc408a4ce",
+       []
+      ],
+      "LICENSE": [
+       "6f62d44e4ef733c0e713afcd2371fed7f2b3de67",
+       []
+      ],
+      "LICENSE.APACHE": [
+       "f433b1a53f5b830a205fd2df78e2b34974656c7b",
+       []
+      ],
+      "LICENSE.BSD": [
+       "42ce7b75c92fb01a3f6ed17eea363f756b7da582",
+       []
+      ],
+      "README.rst": [
+       "e8bebe74dc1df7b71c2055c220f8c26ae2c372db",
+       []
+      ],
+      "docs": {
+       "Makefile": [
+        "9d683b40247cd7bd8d91519ae41c1bacdea61a28",
+        []
+       ],
+       "_static": {
+        ".empty": [
+         "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+         []
+        ]
+       },
+       "changelog.rst": [
+        "565b0521d0c2cdbfe493d19765b04d5c119fa7eb",
+        []
+       ],
+       "conf.py": [
+        "3bd4b13aa340d95ecbf3b88aab7a9afd141dddd7",
+        []
+       ],
+       "development": {
+        "getting-started.rst": [
+         "c8e9487827b342c665949e7d953b961be06907e6",
+         []
+        ],
+        "index.rst": [
+         "c0aea8acb3934e124959c1cab81570dc1b637ea1",
+         []
+        ],
+        "release-process.rst": [
+         "f634ac40bde26486250ccdec53fd23efc068f319",
+         []
+        ],
+        "reviewing-patches.rst": [
+         "c476c7512de7aa728304520265e4ce4120b75e7b",
+         []
+        ],
+        "submitting-patches.rst": [
+         "cf433c45f20a053ead86cb1032f54eed0b9f584b",
+         []
+        ]
+       },
+       "index.rst": [
+        "aafdae83c462f772c40120794dd38730c94df22b",
+        []
+       ],
+       "markers.rst": [
+        "ad253616476aaf2e171f16fb0198cfb14caf6e50",
+        []
+       ],
+       "requirements.rst": [
+        "e7c5a85a5e59dff526c560bceb30f31e58630bde",
+        []
+       ],
+       "requirements.txt": [
+        "a95ae18b4f9d331091bc5ac036985c7fb1f96cd3",
+        []
+       ],
+       "security.rst": [
+        "f7fdb00029ee217beac1f61d6ad36f2dd7f0ad36",
+        []
+       ],
+       "specifiers.rst": [
+        "e1e458b8789a55cee04454d4bc7dbeaa8194ee0f",
+        []
+       ],
+       "tags.rst": [
+        "4d7e10ab636351aa61582edb1d3f73da453d6469",
+        []
+       ],
+       "utils.rst": [
+        "134094aa30e0278370bdf37bc9220825aa0c0eb2",
+        []
+       ],
+       "version.rst": [
+        "a43cf7868e901ea20a5be40949f4ad5bfb35eff3",
+        []
+       ]
+      },
+      "mypy.ini": [
+       "e19734855035a8ba38aefb7d96c38991da61d71d",
+       []
+      ],
+      "noxfile.py": [
+       "75845ab804778fd3ff867056d78a4dff97fca7be",
+       []
+      ],
+      "packaging": {
+       "__init__.py": [
+        "18fecb867a89326898cc0cf28bc5826f6a1c8fdc",
+        []
+       ],
+       "_compat.py": [
+        "e54bd4ede8761df5882a3354bc22bdee7a5e8a8b",
+        []
+       ],
+       "_structures.py": [
+        "800d5c5588c99dc216cdea5084da440efb641945",
+        []
+       ],
+       "_typing.py": [
+        "77a8b9185a07d0338e652810f48757dfe9e0c90c",
+        []
+       ],
+       "markers.py": [
+        "87cd3f958572141f13f305b2915f9f0ddfedfd26",
+        []
+       ],
+       "py.typed": [
+        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+        []
+       ],
+       "requirements.py": [
+        "2226e984e246711d449bc0c4c420ec5684a6ebb0",
+        []
+       ],
+       "specifiers.py": [
+        "a42cbfef3325fc2425c765ddf12c296053d53f48",
+        []
+       ],
+       "tags.py": [
+        "842447d863b3439b0a2c64fc7ccb6018ee3d8b20",
+        []
+       ],
+       "utils.py": [
+        "92c7b00b778919bbc51c514c775cd511d4140b0b",
+        []
+       ],
+       "version.py": [
+        "517d91f24859e7f18f4f7fbd6d6cf2e56d97a829",
+        []
+       ]
+      },
+      "pyproject.toml": [
+       "e6cda6be50189fd84ec4e9b534eee071386cf837",
+       []
+      ],
+      "tasks": {
+       "__init__.py": [
+        "2ae24688b5954cd731c874a7e5784a6a1b2ed820",
+        []
+       ],
+       "check.py": [
+        "930ab490f3c1f23c567d11bab7da91eefe1f3932",
+        []
+       ],
+       "paths.py": [
+        "13d49423bef7bc1bf3bf1e140ab267d490ca7794",
+        []
+       ],
+       "requirements.txt": [
+        "5677c0e89bd9c84b10b0239a0c26a799d3e646b8",
+        []
+       ]
+      },
+      "tests": {
+       "__init__.py": [
+        "0e11301413d5e3dbafa3112bd5460380e54f5253",
+        []
+       ],
+       "build-hello-world.sh": [
+        "9c3e1e181909c8ffef8b0871d017eaf0b613b01b",
+        []
+       ],
+       "hello-world-armv7l-armel": [
+        "1dfd23fa3c0eb944358b1eee0b7c241c79da3cd3",
+        []
+       ],
+       "hello-world-armv7l-armhf": [
+        "965ab3003af97dc37d31878feeff574b59dae17b",
+        []
+       ],
+       "hello-world-invalid-class": [
+        "5e9899fc07609f37f5251f0da5a5af97d4d79234",
+        []
+       ],
+       "hello-world-invalid-data": [
+        "2659b8ee25768ba38932177ae91d4f44a482917a",
+        []
+       ],
+       "hello-world-invalid-magic": [
+        "46066ad2ded1af7c68a4f5d4d3ccc66933b89f43",
+        []
+       ],
+       "hello-world-s390x-s390x": [
+        "c4e9578889efc3eee73f12a0d8df70fe89ddd67e",
+        []
+       ],
+       "hello-world-too-short": [
+        "4e5c0396b94d8f3c6b5ef6fcd1cc67317edd3e85",
+        []
+       ],
+       "hello-world-x86_64-amd64": [
+        "c7f5b0b5e5bb69550d594b8d181f6f881356e404",
+        []
+       ],
+       "hello-world-x86_64-i386": [
+        "ff1d540a30c6df244d013bf411ad8ea63eb3f16f",
+        []
+       ],
+       "hello-world-x86_64-x32": [
+        "daf85d34737e237b7d1473929363340fb7402e3c",
+        []
+       ],
+       "hello-world.c": [
+        "5e591c3ec5dde987c61ed21c0d7fa52582dc1b34",
+        []
+       ],
+       "test_markers.py": [
+        "01e4aa6b374bed45077ec9dfeaf7b176f0e74b8e",
+        []
+       ],
+       "test_requirements.py": [
+        "50e38d6adca5a84c73c932eb4515ee178860058c",
+        []
+       ],
+       "test_specifiers.py": [
+        "c9a44466f7525f46695f316b86049a88b9057725",
+        []
+       ],
+       "test_structures.py": [
+        "33b1896c7973d4c4713a10650cd82dd3a3e5e59a",
+        []
+       ],
+       "test_tags.py": [
+        "68b109a89f331a048e00491b0310a62c43b719d7",
+        []
+       ],
+       "test_utils.py": [
+        "a8ea6bdb90ac43e5e3515a96b356b53fc772b433",
+        []
+       ],
+       "test_version.py": [
+        "961fca201dd479ba7829ca1da26ec1ae8b1ab765",
+        []
+       ]
+      }
+     },
+     "pathlib2": {
+      ".gitignore": [
+       "db4561eaa1d4f3ed01af114a315a0053776ffed0",
+       []
+      ],
+      ".travis.yml": [
+       "316674122011b337a76a450c02e52cce4267e67a",
+       []
+      ],
+      "CHANGELOG.rst": [
+       "867c1b38e9bc7caca4a8da9a7cf106771e27dff2",
+       []
+      ],
+      "LICENSE.rst": [
+       "1715d3d7a2cd2aa937af86adaf52e290f071371d",
+       []
+      ],
+      "MANIFEST.in": [
+       "2f03369dc681a85da0e41f208e920f3735d7be11",
+       []
+      ],
+      "README.rst": [
+       "6378f284dd1c80a3a83e35bdfa3e225c48993bd8",
+       []
+      ],
+      "VERSION": [
+       "cc6c9a491e0be7fc30975eca1071ed288cc21a03",
+       []
+      ],
+      "appveyor": {
+       "install.ps1": [
+        "ebfbb8db9618b3e2f686a8118c67607a1311249f",
+        []
+       ]
+      },
+      "appveyor.yml": [
+       "aae7f25f34f4ef11e22b75c479ee81623479092d",
+       []
+      ],
+      "codecov.yml": [
+       "db2472009c60acc72ca2f6f065bb4b674dc66746",
+       []
+      ],
+      "pathlib2": {
+       "__init__.py": [
+        "d5a47a66c66742718d1de8019ee7857f795a35f6",
+        []
+       ]
+      },
+      "requirements.txt": [
+       "9d432127900eca7b4c1b4f4a05874026f585cc01",
+       []
+      ],
+      "setup.cfg": [
+       "32afc861d3154e6e93742b9161a334d5c816f2c5",
+       []
+      ],
+      "setup.py": [
+       "cbb6aaa0dfae5f77a71486e02c8fb171b335b69d",
+       []
+      ],
+      "tests": {
+       "test_pathlib2.py": [
+        "65a5281a9d724f6d193e3d6a83ff0e0ed3e531f7",
+        []
+       ]
+      }
+     },
      "pdf_js": {
       "LICENSE": [
        "f433b1a53f5b830a205fd2df78e2b34974656c7b",
@@ -365940,19 +367019,27 @@
      },
      "pluggy": {
       ".gitignore": [
-       "e5c7e98041cfb049c00c0a618cb224267004fd5a",
+       "4580536c7ade74858b0564b36facee8dcd497940",
+       []
+      ],
+      ".pre-commit-config.yaml": [
+       "5c08d983777598f857cc9e4a4d15bb49228cb33f",
        []
       ],
       ".travis.yml": [
-       "6fd136baf37ca909620715c14161089f794a8c76",
+       "8ba5966e5d5a96184590d12634cca50523ec8fcd",
        []
       ],
       "CHANGELOG.rst": [
-       "91bf53fdccb532e0a504f5851a88359df3bcd384",
+       "0536dda03a867a5be36d586caa22efafab0c9f17",
+       []
+      ],
+      "HOWTORELEASE.rst": [
+       "a0cc4fdeec0e967c7a9012b982a38c8f2f3c9089",
        []
       ],
       "LICENSE": [
-       "121017d0866afc6174bcbd9214fadffd8006f834",
+       "85f4dd63d2da8e31d7e84d5180f016fdfe315c2c",
        []
       ],
       "MANIFEST.in": [
@@ -365960,13 +367047,23 @@
        []
       ],
       "README.rst": [
-       "3636b6ec642502320aecb738746dc5c889082f47",
+       "b79ef024601855799118f1f8064110c41209d036",
        []
       ],
       "appveyor.yml": [
-       "c3903f8bfcc671bbe860b1913fc5cca06dab885a",
+       "1fc12fff3972d8648eff68fa95a930210fb1cc49",
        []
       ],
+      "changelog": {
+       "README.rst": [
+        "47e21fb33fb340081246a3831f09fa06597096bf",
+        []
+       ],
+       "_template.rst": [
+        "974e5c1b2ded0e34f8d0e53c53deea191c068c2a",
+        []
+       ]
+      },
       "docs": {
        "_static": {
         "img": {
@@ -365977,31 +367074,69 @@
         }
        },
        "api_reference.rst": [
-        "aa15135ad3df04e2b59483678dc8464bbac68be2",
+        "393d0aebea062901571729fb3e78fa36fb549441",
+        []
+       ],
+       "changelog.rst": [
+        "565b0521d0c2cdbfe493d19765b04d5c119fa7eb",
         []
        ],
        "conf.py": [
-        "04065218fda031c63b4d95fe1ebbfff8b8e389f7",
+        "42829850d89419d749b909591816bd2778c32708",
         []
        ],
        "examples": {
-        "firstexample.py": [
-         "3cec7cd2144743ca1abfbb2a7cb8248a441d2291",
+        "eggsample": {
+         "eggsample": {
+          "__init__.py": [
+           "4dc4b36dec3ac5f3b4663afc18d5a539c0e4272e",
+           []
+          ],
+          "hookspecs.py": [
+           "48866b2491287bafef248711c1d0da5262d72353",
+           []
+          ],
+          "host.py": [
+           "ac1d33b4539922b0ac862bad0676c911a33e8893",
+           []
+          ],
+          "lib.py": [
+           "62cea7458ea491cc7b860122e7e390c1fcfe201f",
+           []
+          ]
+         },
+         "setup.py": [
+          "8b3facb3b6718ddda2d8f1d7e2c3efefb8628b13",
+          []
+         ]
+        },
+        "eggsample-spam": {
+         "eggsample_spam.py": [
+          "8d71b138d00ac724125b5717ceff2b952ba7afc4",
+          []
+         ],
+         "setup.py": [
+          "f81a8eb4038792e22038b2696ef7d7986628c20b",
+          []
+         ]
+        },
+        "toy-example.py": [
+         "dfdc7e9228db28698044a69870713f6eebef2627",
          []
         ]
        },
        "index.rst": [
-        "db65a1023fdd5050dbf53529c1532c2142890888",
+        "72546dc243c7c35cf794d8014a2e2530a771203b",
         []
        ]
       },
-      "pluggy": {
-       "__init__.py": [
-        "ab5175d956614b02f3ee5aa8bc933183eb751233",
-        []
-       ],
-       "callers.py": [
-        "3ff67becffbcb4c3e0cdc2fe1bdb8b6834dbd769",
+      "pyproject.toml": [
+       "811cf53ed3bedafaf97650415206fccc0d57587b",
+       []
+      ],
+      "scripts": {
+       "release.py": [
+        "a4a18a4c78de7e09e333922a0d7ae7a9db5d0ed8",
         []
        ]
       },
@@ -366010,49 +367145,77 @@
        []
       ],
       "setup.py": [
-       "b7c0f697120ad4cc097872bd010fadd2016d2be9",
+       "ae2cd84c119ed8973f4c423623e7263b34c3f938",
        []
       ],
+      "src": {
+       "pluggy": {
+        "__init__.py": [
+         "fb4f991a610343c2cb7da06e5e26d8182cd07ebe",
+         []
+        ],
+        "_tracing.py": [
+         "8b9715f0261a2e0a43723de9253ccb0f9c83ad31",
+         []
+        ],
+        "callers.py": [
+         "e7ea464b0da81a5b3fb54a93c709529870908a66",
+         []
+        ],
+        "hooks.py": [
+         "0a1c287198f2f2a1896099041656f6cff8320916",
+         []
+        ],
+        "manager.py": [
+         "07b42cba2d5ed15f14ae8ee2d23f9510f56b4e1e",
+         []
+        ]
+       }
+      },
       "testing": {
        "benchmark.py": [
-        "5a913e9d418dfa39ddd9a726d47a1755feab9b8d",
+        "aa8de92911bbeed454977820835117860e0ad06a",
         []
        ],
        "conftest.py": [
-        "3d61a349c88c687f311b1005cad5ccb04b1b8986",
+        "e44667ef5f1c41882934b66230e577ca1545431b",
+        []
+       ],
+       "test_deprecations.py": [
+        "7151921b6685e7f0c804f80d08073319c4260821",
         []
        ],
        "test_details.py": [
-        "2fad198d9585d4c3b19f5ef2052e743ecf4e8e67",
+        "fc49fc308dec10ce5c3f6891454f7d24325b2d94",
         []
        ],
        "test_helpers.py": [
-        "b17809684465083e4d00134f23751bf0c4c2a349",
+        "64c3edaa0a1e8aff7c79c8b5d352dbb1cf40babf",
         []
        ],
-       "test_hookrelay.py": [
-        "5e7821bed8f9d0d3a1b98cfe9c07724169c5c41c",
+       "test_hookcaller.py": [
+        "5664f2bbf66c668d635059992537106bbd4730d3",
         []
        ],
-       "test_method_ordering.py": [
-        "9584a0ae5a8244f1d063e73b9b23972993e611fb",
+       "test_invocations.py": [
+        "a6ec63cfc7dc423fa054e4751509df091e67147a",
         []
        ],
        "test_multicall.py": [
-        "860a209b6690e6138e77e876877d29a0b367b3e4",
+        "eaf534a0166a42e4f7205bc83c0f0beba2e68818",
         []
        ],
        "test_pluginmanager.py": [
-        "e2c86cc64426b136980a89814b568ebdb96db89f",
+        "67261aaa7bbaeafd25d066676cfab38eb043b56f",
         []
        ],
        "test_tracer.py": [
-        "4a3e16cec43638cd0362bd949d43d25909d96ef9",
+        "992ec679149b5d26f68a2734cedbc6debdd9352e",
         []
        ]
       },
       "tox.ini": [
-       "89d44e352dba42f72611f0eece06f6336ea981ea",
+       "1a4e3f528835db17eb72e4bf3aa92949e372ffeb",
        []
       ]
      },
@@ -366642,95 +367805,125 @@
      },
      "pytest": {
       ".gitattributes": [
-       "242d3da0d74bbdee4bc4fd4ca0ca5794d9c138df",
+       "ec1c66dc1e91540ee991343be9aba518a991b5bf",
        []
       ],
       ".github": {
+       "FUNDING.yml": [
+        "1307445ebbde611691d23f0708258bb2e289c80e",
+        []
+       ],
        "ISSUE_TEMPLATE.md": [
-        "fbcbb16fc351de7b7ce72c28c0e7b336eadc4c9e",
+        "fb81416dd5e0f66c38b1104e7c5fba7d77dab142",
         []
        ],
        "PULL_REQUEST_TEMPLATE.md": [
-        "23a9f8c568325507b0e7a5a5293b93d0f1927b35",
+        "590cc9958ae7b58e7ee4507922008a099dbce934",
         []
-       ]
+       ],
+       "config.yml": [
+        "86a8a97e785d2a08797136d6416c31328d24cffd",
+        []
+       ],
+       "labels.toml": [
+        "aef1e913af84cc7a9fff44f8e42dd407edfde821",
+        []
+       ],
+       "workflows": {
+        "main.yml": [
+         "a006fb092c87d20fac6e1334e2a025d1925cdba1",
+         []
+        ]
+       }
       },
       ".gitignore": [
-       "afb6bf9fd3f96f87497e4cf4344b6f082e88b8ef",
+       "a008b4363230d731cf3000b1d900cb307394acf5",
        []
       ],
       ".pre-commit-config.yaml": [
-       "e50891bbc1cbdbe7cebc9a85449b4c93c3dff0a7",
+       "3aee45c62c516b3c8f6030c6075023d47646fbdb",
        []
       ],
       ".travis.yml": [
-       "1d092149b5d5826c2165edfb432b41fffa2b43b8",
+       "d4f2d80483d6b65bcc62cec0f18fad7635dc73da",
        []
       ],
       "AUTHORS": [
-       "3edfdcf85ea62a83c32c8e31e356d04d035dbebd",
+       "80fce5392943341e08f507dc73d880859ee865dc",
        []
       ],
       "CHANGELOG.rst": [
-       "21a090414a0da7aaeba95228cd29ae98310e5157",
+       "89437663f59a1d37fea89ec989fdda37b7622a1a",
+       []
+      ],
+      "CITATION": [
+       "d4e9d8ec7a1375349258f9cf53508bb0e441e25b",
        []
       ],
       "CONTRIBUTING.rst": [
-       "c005c2fb2545052df29a1f096dc30a57d276933b",
+       "57628a34bdf70d45a7006dc67b5b8cc7ef6ce3f6",
        []
       ],
       "HOWTORELEASE.rst": [
-       "97bddf7202b1fa0fa931a1b570902ed9cdd94598",
+       "b37a245c0be37bd75f5f6d299c877207cba72ba2",
        []
       ],
       "LICENSE": [
-       "629df45ac405532c107eb233217bc2ac1ad70c88",
+       "d14fb7ff4b34be8cfb361a3ce90a0e881475a97a",
        []
       ],
       "README.rst": [
-       "564ffff6c91efcace736ac2521e456b5233f76e8",
+       "694089787032dbd6b6625c12d708f34089af0e93",
        []
       ],
-      "appveyor.yml": [
-       "b808fa6d91a9f7e07cd5bfb4d86b4e8629c239a7",
+      "TIDELIFT.rst": [
+       "f7081817dfd8225fec645d35f20790ed87a5f55e",
+       []
+      ],
+      "azure-pipelines.yml": [
+       "5184610fd185758b7bc48e0b254f2a834bb02024",
        []
       ],
       "bench": {
        "bench.py": [
-        "4e72444e7d7a27cf4a8174abd9164a5f32ebf3ea",
+        "468ef521957f0884d806b51d72aaaf7a6d24e098",
         []
        ],
        "bench_argcomplete.py": [
-        "495e2c4ed3b13061fed8c417f98ce15e24d9f4ad",
+        "297637bad0d674c0a8289c10267b285ec9a5b675",
         []
        ],
        "empty.py": [
-        "b90319936b3e0b25035d44167da28201baf93051",
+        "bfda88235dec59792076a1016cf68b53a7111039",
         []
        ],
        "manyparam.py": [
-        "a25b098de868e159e443a2419c5fc7a145f77dce",
+        "c47e25f518279432bdd0da62b4410ec19b13831a",
         []
        ],
        "skip.py": [
-        "b105e79f82ebf9f65b864a94b14f484dcc2c636c",
+        "29e03e54fc663acb3c25175ca27c89a6e07d6f80",
         []
        ]
       },
       "changelog": {
        "README.rst": [
-        "e34bd4da267cff906c6a32d19dca1744f39c4c18",
+        "e471409b023c91036de25d049250127aa60de94f",
         []
        ],
        "_template.rst": [
-        "a898abc15af17123e7a47fa4d896615ca5bc0a5a",
+        "5de4ae97ea8dc7ece592e6c7851abf39af318520",
         []
        ]
       },
+      "codecov.yml": [
+       "a0a308588e20127cc7ad0ab58356b6b677391be1",
+       []
+      ],
       "doc": {
        "en": {
         "Makefile": [
-         "fa8e8266a29e71f49d70e79cafee0da44e5f78ea",
+         "341a5cb852431dae0be07ed346fbc209434adf88",
          []
         ],
         "_templates": {
@@ -366785,7 +367978,7 @@
           ]
          },
          "flask_theme_support.py": [
-          "0dcf53b7542b7093e2bd89615e532023605417eb",
+          "c5dcdbe27370bd3751e5436bbc9e6b02f9f84f1a",
           []
          ]
         },
@@ -366795,7 +367988,7 @@
         ],
         "announce": {
          "index.rst": [
-          "107fcd2ad33f7ecccccf6ab18e5d3f483749b32f",
+          "74ad0285509fe536069568098b9683f5e3708f12",
           []
          ],
          "release-2.0.0.rst": [
@@ -366871,7 +368064,7 @@
           []
          ],
          "release-2.4.0.rst": [
-          "25f6254c5299b8fbb7780bf871bdb2bfc9c88abc",
+          "1b016884146f4153dd3579bd89b693e5eb6d7d71",
           []
          ],
          "release-2.4.1.rst": [
@@ -366947,7 +368140,7 @@
           []
          ],
          "release-2.9.0.rst": [
-          "8d829996d83cdf3bf9d52a6496862819c39940fe",
+          "c079fdf6bfd62d8d62034005aa3790e33ac278af",
           []
          ],
          "release-2.9.1.rst": [
@@ -367006,6 +368199,14 @@
           "d7771f922326e741a24cd58fcc29ef1d9d17e602",
           []
          ],
+         "release-3.10.0.rst": [
+          "b53df27021967ed397a339c376a67fe998cd0f87",
+          []
+         ],
+         "release-3.10.1.rst": [
+          "556b24ae15bcf70cdb638d9d48f40df4e0e83d27",
+          []
+         ],
          "release-3.2.0.rst": [
           "4d2830edd2dede787e2e1edccf3a28e932be14f3",
           []
@@ -367074,45 +368275,201 @@
           "a1215f57689cdba6441297a9ee71069066cd6960",
           []
          ],
+         "release-3.6.3.rst": [
+          "07bb05a3d72b82fb18e56109c5eb0b00d4eadc65",
+          []
+         ],
+         "release-3.6.4.rst": [
+          "fd6cff503055320a6a91ab32a98115d246431831",
+          []
+         ],
+         "release-3.7.0.rst": [
+          "922b22517e9c49d05f291524d911d6ea7743f852",
+          []
+         ],
+         "release-3.7.1.rst": [
+          "e1c35123dbfa65d0bc42292ef31bc66d623f4407",
+          []
+         ],
+         "release-3.7.2.rst": [
+          "4f7e0744d50de88b74283dd817c0c416966832b1",
+          []
+         ],
+         "release-3.7.3.rst": [
+          "454d4fdfee7398437048dad0136dbd513ec40665",
+          []
+         ],
+         "release-3.7.4.rst": [
+          "0ab8938f4f699da49a94ae4586b95e4ff53d570d",
+          []
+         ],
+         "release-3.8.0.rst": [
+          "1fc344ea23e882fd4dd37bee28429c72771113f2",
+          []
+         ],
+         "release-3.8.1.rst": [
+          "3e05e58cb3f05530497b3b345ab9884c779fb5f3",
+          []
+         ],
+         "release-3.8.2.rst": [
+          "124c33aa40ea93eecba6687a22b68315acb0fdd9",
+          []
+         ],
+         "release-3.9.0.rst": [
+          "14cfbe9037df970c6f88ac722c2cfc6131969c39",
+          []
+         ],
+         "release-3.9.1.rst": [
+          "f050e46530572340aa2fb840842bbe681b280271",
+          []
+         ],
+         "release-3.9.2.rst": [
+          "1440831cb93241038337e64d08c4f32aae262a6e",
+          []
+         ],
+         "release-3.9.3.rst": [
+          "8d84b4cabcb7f1907aa3a576a373464ef6aad646",
+          []
+         ],
+         "release-4.0.0.rst": [
+          "e5ad69b5fd6539570184c5638624a3575c1a0352",
+          []
+         ],
+         "release-4.0.1.rst": [
+          "31b222c03b50fc44085f3fd18dd64534c33cbbfd",
+          []
+         ],
+         "release-4.0.2.rst": [
+          "3b6e4be7183fe8847baad8f2dec80a79f8aae243",
+          []
+         ],
+         "release-4.1.0.rst": [
+          "b7a076f61c911bafa4f6069f89db83d492193e37",
+          []
+         ],
+         "release-4.1.1.rst": [
+          "80644fc84ef5cd9d75204e5284072ac2dab345a1",
+          []
+         ],
+         "release-4.2.0.rst": [
+          "6c262c1e01bd20ff878afb4921b48f8715c06efe",
+          []
+         ],
+         "release-4.2.1.rst": [
+          "5aec022df0be9efa8de68004f71a509488165dd5",
+          []
+         ],
+         "release-4.3.0.rst": [
+          "593938148463ecc19bdd2101c45513af4d15c74c",
+          []
+         ],
+         "release-4.3.1.rst": [
+          "45d14fffed9d89539b72e33bd82c556f99f5e2eb",
+          []
+         ],
+         "release-4.4.0.rst": [
+          "4c5bcbc7d35a33b0e75623c4ebc28cf8221228db",
+          []
+         ],
+         "release-4.4.1.rst": [
+          "12c0ee7798b6e21b333e96f3b7c45657b97c4506",
+          []
+         ],
+         "release-4.4.2.rst": [
+          "4fe2dac56b3a952f6c4d9805eba36bf52a1feeef",
+          []
+         ],
+         "release-4.5.0.rst": [
+          "084579ac419a7cb8dfd82f324d11059d8e366cae",
+          []
+         ],
+         "release-4.6.0.rst": [
+          "373f5d66eb74aee592bd6283ac9e4922877f66d6",
+          []
+         ],
+         "release-4.6.1.rst": [
+          "78d017544d20df1e332fc501f108f3cadb363202",
+          []
+         ],
+         "release-4.6.10.rst": [
+          "57938b8751a2788970ce0acdc99d8c0eae8512d7",
+          []
+         ],
+         "release-4.6.11.rst": [
+          "276584bdf523555780274060d333cd28412c27bc",
+          []
+         ],
+         "release-4.6.2.rst": [
+          "8526579b9e7790cd311646171f03f5aa1b31baff",
+          []
+         ],
+         "release-4.6.3.rst": [
+          "0bfb355a15ad9dce5290f6d76cf1193f4d0c808c",
+          []
+         ],
+         "release-4.6.4.rst": [
+          "7b35ed4f0d4c026daed738de90ee9940fc6298ac",
+          []
+         ],
+         "release-4.6.5.rst": [
+          "6998d4e4c5f0a145be38d23992c678c77e6ef978",
+          []
+         ],
+         "release-4.6.6.rst": [
+          "c47a31695b2adfe9487f6f5a3850789701bb4062",
+          []
+         ],
+         "release-4.6.7.rst": [
+          "0e6cf6a950a084824bb50470ccaa02141b9ff9eb",
+          []
+         ],
+         "release-4.6.8.rst": [
+          "3c04e5dbe9b71cb2d00f0631856babeef47695b0",
+          []
+         ],
+         "release-4.6.9.rst": [
+          "ae0478c52d92f8aa83b6dbe8c300de0d19b8b12f",
+          []
+         ],
          "sprint2016.rst": [
           "8e706589876710d40e76d76a7b62a26afb8a57cc",
           []
          ]
         },
         "assert.rst": [
-         "e0e9b9305875ef812d8962b06d298d5028bb443b",
+         "1e06d9757b30b148d5af9966296450fb1228ef6d",
          []
         ],
         "backwards-compatibility.rst": [
-         "55506e7c338ed65605f8b3cc4f56a3e9e90efdcb",
+         "56afd98afa76d56a6ea7ba6fa0846da8e7f5d921",
          []
         ],
         "bash-completion.rst": [
-         "08d9782090ca0a1c9289f46a1445aad47ae1f9a6",
+         "eaa07881414ddaf8c6f0a4ea21a83257bfe1a2df",
          []
         ],
         "builtin.rst": [
-         "c2d23469bc847c097c007aa2edf1611988c31d16",
+         "a4c20695c3bcfc7ed9861997c1f8b3c95c89afee",
          []
         ],
         "cache.rst": [
-         "37bcf7070d42baf98d08da4dc2b5a0ad0c4a9273",
+         "27a8449108c92c4148e0cd3198219c8a035d5c11",
          []
         ],
         "capture.rst": [
-         "ab86fb55f3d882340e208ff7921f30fa4f447b9b",
+         "90403d23ab710abdf88a4ceba59b6b5881a292a2",
          []
         ],
         "changelog.rst": [
-         "a59b3c7e250eeaa111e2bf3fedf0a449ffb38b3f",
+         "f9a219a92ae32a10a1e5bb0a66af64e22df9281c",
          []
         ],
         "conf.py": [
-         "ebff6ff3bfa48c8840d2116422c7fdfb29564b53",
+         "39ba5e4f8545212692a835817652bbde6d54778a",
          []
         ],
         "conftest.py": [
-         "1a62e1b5df53503e8e33e5e10595c3b51b5c8613",
+         "b51aae5b685a8dfa7a1756a7cd75a7d11704d901",
          []
         ],
         "contact.rst": [
@@ -367120,7 +368477,7 @@
          []
         ],
         "contents.rst": [
-         "9f1d8d85ac25a6a788bb106284229da4c11ff90b",
+         "1ec502c1f2b8c5ae77d36d88b6444c9deb687cd5",
          []
         ],
         "contributing.rst": [
@@ -367128,72 +368485,76 @@
          []
         ],
         "customize.rst": [
-         "c1a3498c7b67d48ecc9bccd421b5e38e388cae72",
+         "77217e9d2e3ec783254f627739f9bb6ca674a66b",
+         []
+        ],
+        "deprecations.rst": [
+         "a505c0a94ac9d92fcbc2bf69ed45ab69e9b41b0d",
          []
         ],
         "development_guide.rst": [
-         "69e866943e57581034104daa2fa770303f6c9fd4",
+         "649419316d186ee7609b081dce94775e223b3458",
          []
         ],
         "doctest.rst": [
-         "9488ee82657292f137fde3d4221afb0f64d39a1a",
+         "2cb70af7258869d5ca07170958be8b39543edc72",
          []
         ],
         "example": {
          "assertion": {
           "failure_demo.py": [
-           "dc27f5dfbc12d906a12a4be19b38c6cccfb6ae63",
+           "ba910ef6a88c013e888b08b2208a3bd1c81c9524",
            []
           ],
           "global_testmodule_config": {
            "conftest.py": [
-            "4859bea78e68f82d953482f1eb9568f210814fd9",
+            "8e04ac2ac469c6f50d65ed7a0e8b0e539ddebdc8",
             []
            ],
            "test_hello_world.py": [
-            "828e6b9fd7d7be3c2720c9b1de5ebe36df17373a",
+            "bfccc94f712db27fd1ab22f07b2b0e9387542405",
             []
            ]
           },
           "test_failures.py": [
-           "1150ec12f66d8e35c3c7667ca1c24b23f6c361c3",
+           "60b5e2131181995051b25fe15355f838d564ef5b",
            []
           ],
           "test_setup_flow_example.py": [
-           "c00711dc2381baa075fc80c9ef55aa3869129f02",
+           "f49d6d8ed31880c7fc822a5e2fb58e0996360bce",
            []
           ]
          },
          "attic.rst": [
-          "d6fecf340b621e6594911b8c75e15bdd92a0c110",
+          "9bf3703ce1a3b28b88e7ac39fb284ab92255c1de",
           []
          ],
          "conftest.py": [
-          "f905738c4f6c7ae5ef6d89b19feb1835d749e005",
+          "1f5a961ada03fa694772befc790b2ac7c8441b78",
           []
          ],
          "costlysetup": {
           "conftest.py": [
-           "466c62c06ab8803e1c4b7483c78740e631061dfa",
+           "b90c774733bb99cc841c65cef873e9b77cbc94a0",
            []
           ],
           "sub_a": {
            "__init__.py": [
-            "792d6005489ebee62cde02066f19c5521e620451",
+            "ec51c5a2b9dd623073fa752065a5b5a615780c7f",
             []
            ],
            "test_quick.py": [
-            "38dda2660d246f1e1da67c4565245ed10a8976b7",
+            "4f7b9f1ac7d5dc3441c3560ed70672006ae73317",
             []
            ]
           },
           "sub_b": {
            "__init__.py": [
-            "792d6005489ebee62cde02066f19c5521e620451",
+            "ec51c5a2b9dd623073fa752065a5b5a615780c7f",
             []
            ],
            "test_two.py": [
-            "b1653aaab88a517a6672b62538d764943cd4c683",
+            "4e08bc2b69eaa9d088da8c2a11445010bef22e3e",
             []
            ]
           }
@@ -367203,11 +368564,11 @@
           []
          ],
          "markers.rst": [
-          "bf352bc81298ad44afb5471e146867b9d77f05a0",
+          "b8d8bef0cb18969648c65f49f81b3448e71cd389",
           []
          ],
          "multipython.py": [
-          "970800c7e614c68cfff708f7cfa54ef4b6970126",
+          "dc722aac91d061936a164af2a6eb44ad5fd0a106",
           []
          ],
          "nonpython": {
@@ -367216,7 +368577,7 @@
            []
           ],
           "conftest.py": [
-           "8429dd114b1851b09fda2f3ba37b6b20a64cf61a",
+           "306aa250379586e296751304c25e3b856ef28b04",
            []
           ],
           "test_simple.yml": [
@@ -367225,49 +368586,49 @@
           ]
          },
          "nonpython.rst": [
-          "4f5adf63fd761f94859c873aeaf913fb422e096e",
+          "0910071c14a65a04acb45d083fb995b092118f67",
           []
          ],
          "parametrize.rst": [
-          "882700fec11ef63e93a13da716613ec285bcc48f",
+          "2ab5e3ab10c6bca12a29dd4dfa468a2f9d84b809",
           []
          ],
          "py2py3": {
           "conftest.py": [
-           "5d9a07e3e32acb4bfb406d301df4ae537c4ed72c",
+           "a6b9af7a860e5a342b60c322411b752bbd56b832",
            []
           ],
           "test_py2.py": [
-           "664acf178a000d66feb99d1fb96c2b237463eb28",
+           "1f665086e60ad040221c86a37c847769a1bc4246",
            []
           ],
           "test_py3.py": [
-           "baf0ffbd82206e324263d89b3c7a69ce5a0b57ad",
+           "30151f914a874afce801b76272579c5688d19d6e",
            []
           ]
          },
          "pythoncollection.py": [
-          "3603361c3dcf8ab17875b6aa262ec84824b5ba36",
+          "bbc3fe868ea28cec4354657c3ac2b3d7e97df928",
           []
          ],
          "pythoncollection.rst": [
-          "8e9d3ae62a7dcffd656fa074878764d8ed58cfe7",
+          "02c12f6bc9f091bf4c38c99d65bcceb0b9b27e9f",
           []
          ],
          "reportingdemo.rst": [
-          "4691b128bb83f8b34f7354d22f44b0b7a6520dd8",
+          "d00c9836265c48840bbd5b69d273b5acfca999f9",
           []
          ],
          "simple.rst": [
-          "180637ae994bf110d119f450f22181944a9efb50",
+          "1dee981be778c76be3745270cce482adddd5954f",
           []
          ],
          "special.rst": [
-          "1fc32f6c8173a5ac0f127f9c159e933ea0f4c5ca",
+          "800cb8e901058f87b8de0907c03cec38ea1713d1",
           []
          ],
          "xfail_demo.py": [
-          "01e6da1ad2ed20b633508c668df5805251de0f60",
+          "88384a1562a4d267320a48195e9b79f4c7387f36",
           []
          ]
         },
@@ -367280,11 +368641,15 @@
          []
         ],
         "fixture.rst": [
-         "d4d386792e0887d0c0dcc0b1d22629b5ca2428be",
+         "ed9c11b2ea7900714c817d7e2dea447e60ec38db",
+         []
+        ],
+        "flaky.rst": [
+         "8e340316ea0728c5fa6987b32862a1e5119ffe79",
          []
         ],
         "funcarg_compare.rst": [
-         "c29ba1f3c35757f57aa4cd0a234ff9b1dd683957",
+         "4fa9b79ae7ac09b3e76b1c7de22843f08b7bccb7",
          []
         ],
         "funcargs.rst": [
@@ -367292,15 +368657,15 @@
          []
         ],
         "getting-started.rst": [
-         "f2dbec5e9328dad64eb595805a5a34c875c02ee2",
+         "882385b29606f0522d8995fc738afa54b9044532",
          []
         ],
         "goodpractices.rst": [
-         "2bbd9d0ae584197731f5ce661a2a7d6c67a2f5a9",
+         "f08bd5c4078fb0d41b0afa84f665c6e20347772f",
          []
         ],
         "historical-notes.rst": [
-         "028ceff9b174861bcd950ea9e7a8734538e332a9",
+         "c8403728f2f89d17f8d8379e4b96b75dbb867459",
          []
         ],
         "img": {
@@ -367342,27 +368707,27 @@
          ]
         },
         "index.rst": [
-         "6a382e57173ae6791956dfc93acc4ea2d67c5eb2",
+         "edcbbeb84e701dc757e098fd8f77be06024be523",
          []
         ],
         "license.rst": [
-         "b8c0dce1bea8e17057503cba204199905b9491f1",
+         "c6c10bbf358c4b1b16241b113c67a6dbff0e18f3",
          []
         ],
         "links.inc": [
-         "4d5a4b1eebf2c8048a29cae9fdc4a9096eba73c0",
+         "1b7cbd05b00a18876349872e442683a574924736",
          []
         ],
         "logging.rst": [
-         "00829c15eef780fd3259d8a382b0c1635efcc56f",
+         "a53509184f6814eb2d30e827e83f033b117a0e01",
          []
         ],
         "mark.rst": [
-         "aa1210bb6b5af4f14e6471cf0f745f8c70951b59",
+         "de6ab78222cd9807a4c5701263a0f4eef4139fdb",
          []
         ],
         "monkeypatch.rst": [
-         "1a69c3a429d28fc5fcba18b122a57ee5676c94dc",
+         "c9304e0fb700062afa06a4d78a6d0a3e912e7558",
          []
         ],
         "naming20.rst": [
@@ -367370,15 +368735,15 @@
          []
         ],
         "nose.rst": [
-         "1f7b7b638448fb27358d5a4f0cd31e11ddd411b6",
+         "701ea44eca1e9d95aa9d7e4da3221ffd5ee1bab2",
          []
         ],
         "parametrize.rst": [
-         "693cf1913bf8bf030f32dd28b9644fd8f9d95335",
+         "0abe7d7013729ec8cbb7a90e315bc580f19c5757",
          []
         ],
         "plugins.rst": [
-         "9ddba5d38ca69ca07651d0f3265ade80ce0ec8fe",
+         "e80969193abd4f34e7b625b49fee12493d16d8e4",
          []
         ],
         "projects.rst": [
@@ -367387,10 +368752,14 @@
         ],
         "proposals": {
          "parametrize_with_fixtures.rst": [
-          "92e7993f3906ae06f3cd23e5094efd53db1255c8",
+          "b7295f27ab218be44be5a5705791dbf1579fd7c4",
           []
          ]
         },
+        "py27-py34-deprecation.rst": [
+         "0ca97539c827c39a55183dbac7ea7109a58e2b7a",
+         []
+        ],
         "pytest.ini": [
          "7604360561cc2ae94bc117140b449f76629276e1",
          []
@@ -367404,357 +368773,679 @@
          []
         ],
         "reference.rst": [
-         "fe9e87042f9a1f5e78d55f66bb21a5fa8e66a8e6",
+         "cc5fe8d8bf65ead72042dad2161f99ccc7d732aa",
          []
         ],
         "requirements.txt": [
-         "e3cc47ed5a50d8dbee545c38941cc757bbb04293",
+         "be22b7db872dcad9ad0db69ba2739ad7f07aa0ca",
          []
         ],
         "skipping.rst": [
-         "bfa6f3e75a62954496f52ea9c5d65c069de0eedf",
+         "8d0c499b328fef63684d329b52b02690b0ae2293",
          []
         ],
         "talks.rst": [
-         "79534ea6e9a6f795fe37f70c84887d1ab650b0e9",
+         "be0c6fb9fd44e9c3987f35df27d3925cfaf9ca84",
+         []
+        ],
+        "tidelift.rst": [
+         "728bf221905d48c1f906dc79ffa097c20d544e12",
          []
         ],
         "tmpdir.rst": [
-         "421b4c898c5ae19260720737e563b4d9d70a50d9",
+         "330011bb34827fcd969e477b25426889080da10f",
          []
         ],
         "unittest.rst": [
-         "53192b3469d3fce0a3acd8d6b0238291761a8230",
+         "05632aef4b25ca5ebfb29cf20cc6d32eddf03bfe",
          []
         ],
         "usage.rst": [
-         "25be54395af7b399e8099ed3f276cf9389728310",
+         "acf736f211e121a52bda7abdfbb323a8583c13dc",
          []
         ],
         "warnings.rst": [
-         "df93a02b540ad0eab1d731ca782435db53049382",
+         "8f8d6f3e1c633d6da073323925986b800e336ff4",
          []
         ],
         "writing_plugins.rst": [
-         "95b810bcb36f485cc8da787749576c7da991303a",
+         "04dc68b642de2fe1003e70cb87a82487c5fda484",
          []
         ],
         "xunit_setup.rst": [
-         "7a6c099f55909e0b64316b7aa22ddeb2ceb87914",
+         "466873302557bd2948ed2ca4a7583e1e034e37da",
          []
         ],
         "yieldfixture.rst": [
-         "6fd1edac2f5e0042eee1863eabd393540fc86323",
+         "47590f9db96f654a13dfb46a2541f2e170e454bf",
          []
         ]
        }
       },
       "extra": {
        "get_issues.py": [
-        "c026972b145da05462c1ba678a6cea56e401b8d6",
+        "598a1af409f32a428d9a831773a9ee6ca55fd5d6",
         []
        ],
        "setup-py.test": {
         "setup.py": [
-         "d0560ce1f5f4437e574aebc52ddf8b8a37b8605d",
+         "cfe18c28f521127f8267c39a009f24f4c82c1703",
          []
         ]
        }
       },
       "pyproject.toml": [
-       "65e6bf59bf1c2955230138d9080149049f2cff20",
+       "2a4cd65c118e06e977e9adfdfb007dc057835cbc",
        []
       ],
       "scripts": {
-       "call-tox.bat": [
-        "86fb25c1df1d101a1948d9cbc96e969b524cbba7",
+       "append_codecov_token.py": [
+        "b3a82075fa1985e9cd29fc3358a1f30d25c1d132",
         []
        ],
-       "install-pypy.bat": [
-        "8012ea46aca45ff3207f3cef89ba4cb2d6dc17f2",
+       "publish_gh_release_notes.py": [
+        "3ff946b58a3b4c7f720c3ca9755d6675bce46460",
+        []
+       ],
+       "release.minor.rst": [
+        "9a488edbc52ecb09bd6d5182849de869b50b5dbe",
+        []
+       ],
+       "release.patch.rst": [
+        "b1ad2dbd775a9eb4773f83aaaf1047e2db92a2cf",
+        []
+       ],
+       "release.py": [
+        "32178fcf6741fca6730d9fa87aa8eceaabbb5561",
+        []
+       ],
+       "report-coverage.sh": [
+        "fbcf20ca929fde76a05a86cb964c5f817023e382",
+        []
+       ],
+       "retry.cmd": [
+        "ac3836508576b869ec0fb87acfefaf3665a9532b",
+        []
+       ],
+       "setup-coverage-vars.bat": [
+        "7a4a6d4deb8e4678179f8f9657fc738394c5af09",
+        []
+       ],
+       "upload-coverage.bat": [
+        "08ed577912217faf48582f68de0e7abe5150eafc",
         []
        ]
       },
       "setup.cfg": [
-       "816539e2ec6fb8d79e08049e54b596510028aad9",
+       "368df1e1ac077adbb2d7699b6e96c86603f30555",
        []
       ],
       "setup.py": [
-       "3d60d6becf8473c0bd953b07e8889a95b0eb43e0",
+       "1053bce4a5a04b7a4d1bd62ef3d95eb868bf8419",
        []
       ],
       "src": {
        "_pytest": {
         "__init__.py": [
-         "46c7827ed5ec62b4613bf31d8331f731a24d34a9",
+         "17cc20b615ac0f023e4aca540a75577313388274",
          []
         ],
         "_argcomplete.py": [
-         "8f480d71d79fa931f164427a58d984ad8d415125",
+         "c6cf1d8fddd1a0f1184afe79fdaf1a89c95c7b25",
          []
         ],
         "_code": {
          "__init__.py": [
-          "815c13b42c25bd314988dbaa7ff9f4e3d1d2e5c2",
+          "1394b2b10e69fcec0c4e0c79f869efabdbd7d22a",
           []
          ],
          "_py2traceback.py": [
-          "2dd100c33bddaed8f0e2312220c1b89ad1b97c66",
+          "faacc02166e165842f56b15244bad0b8f93dc7bc",
           []
          ],
          "code.py": [
-          "cb788c17f04bae72e3bca521459afc066fb42be2",
+          "175d6fda01d40c700e402a6e292cd949d800aeb7",
           []
          ],
          "source.py": [
-          "6b982a4cac47ad6690c603e33aa109d246512ddd",
+          "b35e97b9cec23562838a1b249f3ff745ee2d8622",
+          []
+         ]
+        },
+        "_io": {
+         "__init__.py": [
+          "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+          []
+         ],
+         "saferepr.py": [
+          "9b412dccad9d198e2672fc15c675e106a40edfa0",
           []
          ]
         },
         "assertion": {
          "__init__.py": [
-          "2c9a8890c9aff859ea79eaaf0fcbbb24560a3847",
+          "6b6abb863a3ff1bb27d4a43d5b109f5fb8a7b754",
           []
          ],
          "rewrite.py": [
-          "eceed611ffb1d0f18638c93979a56a3984e327ce",
+          "1c6161b212da3bb514e88a42816ff3d420f6ffc9",
           []
          ],
          "truncate.py": [
-          "79adeca6a9ab1e3906f2129178d4bc97281b4bcf",
+          "525896ea9add214dd4a424c77a6a2bb065d72017",
           []
          ],
          "util.py": [
-          "bcb800a4a07da3326c52a8e8760a3d50e77b2484",
+          "c382f1c6091f47209d74ceaa34270aa72e1a9b7c",
           []
          ]
         },
         "cacheprovider.py": [
-         "eb0fcc06f9bd280e1eeca9e1cfe4f3bfaf3181aa",
+         "f5c554548498c9abc9f0d58e7492938791830fcc",
          []
         ],
         "capture.py": [
-         "7a57adb752a7267120310daa287514ac929696d8",
+         "68c17772f39dfc086355ac1374312f736598a0d6",
          []
         ],
         "compat.py": [
-         "7abd3d53ff9122ba796e3f7a0bafdab636090382",
+         "d0add530268204b07c70cc06aa9275deb4997f7e",
          []
         ],
         "config": {
          "__init__.py": [
-          "11348b80d0f0983e7d3a20baa530add5bf9dd982",
+          "0737ff9d51c4d98147ed8e69fb04f11ab2ea9b52",
           []
          ],
          "argparsing.py": [
-          "781d8e8c4ee5c814296bc37964db34e02b7eb265",
+          "37fb772db997ec8821ece63f904f9381cf3cf036",
           []
          ],
          "exceptions.py": [
-          "64bae834d1ce4000eb0c209b78e93354a5505fb0",
+          "bf58fde5dbf837d8e21eb3b424eca3aadd06cc28",
           []
          ],
          "findpaths.py": [
-          "fde7bddb939bb5aeb6344e458d65f2a17705777d",
+          "e6779b289bcfa05591f1214f6c09a1aae2612d72",
           []
          ]
         },
         "debugging.py": [
-         "2e253aaa2af30ad1b415fdeed4f7022c76dcf057",
+         "99d35a5ab77e180e9933af75d39d4f54f6ceedcd",
          []
         ],
         "deprecated.py": [
-         "7ebdcf9997222c20d3bd07f70692f88de5ed144a",
+         "12394aca3f522f337093ead47c23d0f9706a3f20",
          []
         ],
         "doctest.py": [
-         "b0a3ad08dfc4fd92586c696d57c745b5a1fef590",
+         "659d24aeebcee9333635ed7c06f33fcd299bcb0c",
          []
         ],
         "fixtures.py": [
-         "495e6b9b332a9dee7232a05c6a582ecd115d7086",
+         "280a48608b683a2cf95f6fd62a98ff587373782e",
          []
         ],
         "freeze_support.py": [
-         "002e077301f93a5518a08f378e35a2d0d99b0bd6",
+         "aeeec2a56b4d35820837dd296400f44fb98e24d0",
          []
         ],
         "helpconfig.py": [
-         "5514fec404daac365af7178c9e94006a7562db4f",
+         "56811601608e352766a4ca4b65b5cdbcf8987a4e",
          []
         ],
         "hookspec.py": [
-         "fec43a400991b0a1d29d2fe6f302d02c0c318e2e",
+         "7ab6154b1766b9774dcfe4f11fd932c178173333",
          []
         ],
         "junitxml.py": [
-         "29da27de7ccf60cfded9ca75500b95c1460e7bc5",
+         "853dcb774492ffc364d0440af2ccab05e8da703d",
          []
         ],
         "logging.py": [
-         "00bb9aeb54a704db8580d2e703966abc2edc37b4",
+         "2400737ee4e119e6b7350b715c2431e007f3413e",
          []
         ],
         "main.py": [
-         "23562358d7c3a03412000e4bdca0832bfb70e947",
+         "a9d310cb62d9f253784f1932a927a9996bfe4668",
          []
         ],
         "mark": {
          "__init__.py": [
-          "e3918ca6a4fb7fcce576dc3cfe3eebfb4cd2b05e",
+          "6bc22fe27da96c38a347f3b49505c5e6b55e86db",
           []
          ],
          "evaluate.py": [
-          "a3d11ee0f81a24879ce1e7072dcbcae8ecfa4279",
+          "506546e253a3b9fcd288febfe81ac73ad54ec517",
           []
          ],
          "legacy.py": [
-          "ab016a0355b73366055cb722acc3ee557d421547",
+          "c56482f14d0d9de71f29e67d9439ae68aa89195a",
           []
          ],
          "structures.py": [
-          "1a2bd73de5688db8455965952c4aedd8b6be2fd4",
+          "0ccd8141dd9b9c42f14196d8ba0b60bb95cc275c",
           []
          ]
         },
         "monkeypatch.py": [
-         "16080b5d5cb247045fef4fe374da984f1d7ca504",
+         "e8671b0c7024fcef48b3cd9ce558dc6d639cf64b",
          []
         ],
         "nodes.py": [
-         "ef74c53eba4e1cca645ec6f6fb96d73a9ba2852f",
+         "206e9ae163e38b7dbba11693bab7968d00e5d19c",
          []
         ],
         "nose.py": [
-         "bb2e4277d1c834f28df410f438a056ca80eb7db6",
+         "fbab91da2499b783c70eac2417073239babc95c8",
          []
         ],
         "outcomes.py": [
-         "8a3662e1b3e741173263d8d027e8b842aec9939f",
+         "4620f957c7da66bbcdff57ee8da82e703f686d83",
          []
         ],
         "pastebin.py": [
-         "6af202d1f0a93f92343db65c039e095bd29d8e86",
+         "7a3e80231c27e85ecc169dcc5d4f107dcf149d39",
+         []
+        ],
+        "pathlib.py": [
+         "42071f4310497d3098e2cd5e74509e013361c6e0",
          []
         ],
         "pytester.py": [
-         "c9defe03a6681ef47b6143658f77de32212b3c48",
+         "f1d739c9917d949f7125c4c5cae0ca61ef17f0dd",
          []
         ],
         "python.py": [
-         "48516199fff79570c6071318f06e7880bf86b467",
+         "5f1e6885be337d7d95942a84e7eb93759fa682ce",
          []
         ],
         "python_api.py": [
-         "9257d210c2701d7b56dea2ccf87f6654f7feedcf",
+         "f6e475c3a249967b68bcb9994bc4615d1acc94b3",
          []
         ],
         "recwarn.py": [
-         "7839f5700c875bc7235428c95f847c0d960ce542",
+         "7abf2e935502de3c333dcdb141302fd6aad524a7",
+         []
+        ],
+        "reports.py": [
+         "0bba6762c33a75ea7891b3e3fe6fe7bad53289f9",
          []
         ],
         "resultlog.py": [
-         "8f300c983001029173be8b2dbb8ecc0c609c90ce",
+         "bd30b5071e9f0f8d8584e79926265dcfca945b77",
          []
         ],
         "runner.py": [
-         "18e925509ecc35f846c65643fc15b451d9b4daeb",
+         "d51e859f1d1bd62ea699d51513df794efdf32eef",
          []
         ],
         "setuponly.py": [
-         "81240d9d055efc6bf0f6b56f38fc4c84f9545a3c",
+         "0859011241a9cff3fc76c9c7ca9d78a42b2417ec",
          []
         ],
         "setupplan.py": [
-         "23f4f97e6d977e21cded357b1eb34081bfbac515",
+         "47b0fe82ef6dbd3afeadec8bc369763e9f64a6cb",
          []
         ],
         "skipping.py": [
-         "a348d5484cdb939e5a6a5890624ae91af609496f",
+         "bc8b88e7178d867e36f7579ce5af9c90110e4882",
+         []
+        ],
+        "stepwise.py": [
+         "8890259589698838ed264f0139b5774e2d230e39",
          []
         ],
         "terminal.py": [
-         "9c4eec7531a997e841ce904353f504b69d5bb5e1",
+         "4418338c65612b6fd29f71d31c2d22e089095386",
          []
         ],
         "tmpdir.py": [
-         "260d28422343102d4fb8d4e5d31654a7cfec8cb5",
+         "a8a7037713c8c786be0a507507e5d9588f694895",
          []
         ],
         "unittest.py": [
-         "6ad9fda8870525a70868f22dada445a33790f1a8",
+         "3ff6f45d8dbe78300ef6105312223456f962eacd",
+         []
+        ],
+        "warning_types.py": [
+         "861010a1275d62cfe3357a9663d35e90181f5776",
          []
         ],
         "warnings.py": [
-         "e023d0ab491bdd966c2ece5e7c48216fbe3e0f13",
+         "a3debae462fc149e74788bc5cdf3c0276c9df07a",
          []
         ]
        },
        "pytest.py": [
-        "f27f5a1955b298b48fe244deb0a3e9500efe9126",
-        []
-       ]
-      },
-      "tasks": {
-       "__init__.py": [
-        "ea5b1293e33ea758228a4ddab9ecaec4c6ce7556",
-        []
-       ],
-       "generate.py": [
-        "398af70c9427a76ac21851bc4cd485b170e223e6",
-        []
-       ],
-       "release.minor.rst": [
-        "bdd8282cfad99f7e7b190b506ddf68d5e046b9b9",
-        []
-       ],
-       "release.patch.rst": [
-        "1982dc353c4b6c45e971c01c294ce83878e80895",
-        []
-       ],
-       "requirements.txt": [
-        "db54e76e85c8b6b75f5ddf6da5f87910a3388d67",
+        "ccc77b476f5970a1fdc201222189559775028ca7",
         []
        ]
       },
       "testing": {
        "acceptance_test.py": [
-        "c2eed419c9cb019f8bfc35143433dc684dacdf44",
+        "9b33930a06cd0463174f4ef2fb002307efe781b3",
         []
        ],
        "code": {
         "test_code.py": [
-         "bfae3691882efac164a45b81ede4eb3401137b60",
+         "0b63fcf4d421d8bc383dfe2c698845de1d616440",
          []
         ],
         "test_excinfo.py": [
-         "f4044b6ecc4489e33e3209b367c4505862886701",
+         "a76797301ddd5473271b7ed53a62ac6960918abd",
          []
         ],
         "test_source.py": [
-         "56dad75671fa6232e8bc3dfc64f3a5a16ed826ee",
-         []
-        ],
-        "test_source_multiline_block.py": [
-         "92f7412eb8cf369b6e195d73d6c13e8ddf873491",
+         "d2e3c134cd5e3dfcbfd3bf0510b6ad5791641833",
          []
         ]
        },
-       "deprecated_test.py": [
-        "39ff1f1fc385ceae45b18ae23ec6d68edf89caf8",
+       "conftest.py": [
+        "627ee763d2f350079fae3391fef0688fc383fc10",
         []
        ],
+       "deprecated_test.py": [
+        "70460214fbda8cb46480e0424a5c918196d2dc78",
+        []
+       ],
+       "example_scripts": {
+        "README.rst": [
+         "97d0fda5c5dea08e2e54ec8c0e15ee5f9fe96e5c",
+         []
+        ],
+        "acceptance": {
+         "fixture_mock_integration.py": [
+          "c8ccdf1b488a2f1cf768511fc4e5c4698c9b72fa",
+          []
+         ]
+        },
+        "collect": {
+         "collect_init_tests": {
+          "pytest.ini": [
+           "7c47955402511d523be5ea85cf04b90662e6fd06",
+           []
+          ],
+          "tests": {
+           "__init__.py": [
+            "6211055718f0b1e6aaab5f08624d3081cb247b4a",
+            []
+           ],
+           "test_foo.py": [
+            "8c560fd139f1739dd95c8066303da11f4f10ec2b",
+            []
+           ]
+          }
+         },
+         "package_infinite_recursion": {
+          "conftest.py": [
+           "9c3d9a791c0967f68a6859c4e36aaf594ad26d58",
+           []
+          ],
+          "tests": {
+           "__init__.py": [
+            "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+            []
+           ],
+           "test_basic.py": [
+            "10c5f6052025a44bebd2dd05e3be539989db9689",
+            []
+           ]
+          }
+         },
+         "package_init_given_as_arg": {
+          "pkg": {
+           "__init__.py": [
+            "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+            []
+           ],
+           "test_foo.py": [
+            "10c5f6052025a44bebd2dd05e3be539989db9689",
+            []
+           ]
+          }
+         }
+        },
+        "config": {
+         "collect_pytest_prefix": {
+          "conftest.py": [
+           "13397ccc4c88bae5dbe7b35afb3d37251bb7efcd",
+           []
+          ],
+          "test_foo.py": [
+           "8c560fd139f1739dd95c8066303da11f4f10ec2b",
+           []
+          ]
+         }
+        },
+        "conftest_usageerror": {
+         "conftest.py": [
+          "d2f040578fa7f60bd2c0febd318f46f6c8f1db3c",
+          []
+         ]
+        },
+        "dataclasses": {
+         "test_compare_dataclasses.py": [
+          "5381b5ed0714d75ecbd4d220cf3971e88907b97c",
+          []
+         ],
+         "test_compare_dataclasses_field_comparison_off.py": [
+          "d418dd6b0cfe5e1d7a06050c5f2e9a702f1b7da3",
+          []
+         ],
+         "test_compare_dataclasses_verbose.py": [
+          "a72ca5119e6d9b4df28f7b141da67eb44a70469b",
+          []
+         ],
+         "test_compare_two_different_dataclasses.py": [
+          "b77b70d3c2dc142a56a00d4c8a0e19b2f5b95981",
+          []
+         ]
+        },
+        "deprecated": {
+         "test_fixture_named_request.py": [
+          "36addc299548e02403c2b89d2f1f85c00e574a0e",
+          []
+         ]
+        },
+        "fixtures": {
+         "custom_item": {
+          "conftest.py": [
+           "fa41d0fba6878e046fdbde31f572a500a36b95ca",
+           []
+          ],
+          "foo": {
+           "__init__.py": [
+            "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+            []
+           ],
+           "test_foo.py": [
+            "10c5f6052025a44bebd2dd05e3be539989db9689",
+            []
+           ]
+          }
+         },
+         "fill_fixtures": {
+          "test_conftest_funcargs_only_available_in_subdir": {
+           "sub1": {
+            "__init__.py": [
+             "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+             []
+            ],
+            "conftest.py": [
+             "952e7d60a697f3ec248cbdd75a33fc1dd4e7dfd9",
+             []
+            ],
+            "test_in_sub1.py": [
+             "b824f4e99ef801d402a92a60adb06affeb427f81",
+             []
+            ]
+           },
+           "sub2": {
+            "__init__.py": [
+             "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+             []
+            ],
+            "conftest.py": [
+             "2be90b4dfe707f0d8b6107bfb27a53e53134a678",
+             []
+            ],
+            "test_in_sub2.py": [
+             "a1432042bfd2ac86f18f18fd2705d432903b8199",
+             []
+            ]
+           }
+          },
+          "test_detect_recursive_dependency_error.py": [
+           "d1e54eea7e4645b0ee04ba0fbcc5acceac0fc30a",
+           []
+          ],
+          "test_extend_fixture_conftest_conftest": {
+           "conftest.py": [
+            "87756e6491f8dbb81980f329fbdfcf0c4645565a",
+            []
+           ],
+           "pkg": {
+            "__init__.py": [
+             "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+             []
+            ],
+            "conftest.py": [
+             "1cd88524b6f081f7491aab0216a470a11cd252f6",
+             []
+            ],
+            "test_spam.py": [
+             "65690c49f23153fdd3c631e6c9a08825fe222c8a",
+             []
+            ]
+           }
+          },
+          "test_extend_fixture_conftest_module": {
+           "conftest.py": [
+            "87756e6491f8dbb81980f329fbdfcf0c4645565a",
+            []
+           ],
+           "test_extend_fixture_conftest_module.py": [
+            "5b344c122f1ab3c00a65a1e219e8031270996322",
+            []
+           ]
+          },
+          "test_extend_fixture_module_class.py": [
+           "4332c66017b375d8cfc9c7bb742e249a3d7043a7",
+           []
+          ],
+          "test_funcarg_basic.py": [
+           "ba302c49e6ca3d1426d7cc3f9fb279e9ed12d5b1",
+           []
+          ],
+          "test_funcarg_lookup_classlevel.py": [
+           "1004d5d1352ca00f839781cf25e52c4f661f3e59",
+           []
+          ],
+          "test_funcarg_lookup_modulelevel.py": [
+           "79d283e9f665de94b047a66e047d858d0ec641dd",
+           []
+          ],
+          "test_funcarg_lookupfails.py": [
+           "18f426af9c931d93dcabfa8fd2bebaa40e709c71",
+           []
+          ]
+         },
+         "test_getfixturevalue_dynamic.py": [
+          "219e57421d8fb6f1e745887a77aeb81f3246161d",
+          []
+         ]
+        },
+        "issue88_initial_file_multinodes": {
+         "conftest.py": [
+          "8f3e7b4e52a9ba2ce5b16eb440c8f6d2ad95ba12",
+          []
+         ],
+         "test_hello.py": [
+          "653d570a88c55b5f8c707341eb8de93f740a1281",
+          []
+         ]
+        },
+        "issue_519.py": [
+         "24d864a53809a7fff66b975baeb0b18038fdf8cc",
+         []
+        ],
+        "marks": {
+         "marks_considered_keywords": {
+          "conftest.py": [
+           "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+           []
+          ],
+          "test_marks_as_keywords.py": [
+           "61d969a36b8a4befeaf9c49d05885f4b782de22e",
+           []
+          ]
+         }
+        },
+        "perf_examples": {
+         "collect_stats": {
+          ".gitignore": [
+           "1c45c2ea351a709822b79d16aa36146baba80c92",
+           []
+          ],
+          "generate_folders.py": [
+           "32ca818ead9a195c90438929c7f6f212a6152975",
+           []
+          ],
+          "template_test.py": [
+           "5d0cd5a7164e3784470654ba4e2e399f73a4c21e",
+           []
+          ]
+         }
+        },
+        "tmpdir": {
+         "tmpdir_fixture.py": [
+          "33f0315d52f84218b885123c591f9d16478e1410",
+          []
+         ]
+        },
+        "unittest": {
+         "test_parametrized_fixture_error_message.py": [
+          "cef950ee7826c6e0ff7e9d9149c1cc2fc13e67b1",
+          []
+         ],
+         "test_setup_skip.py": [
+          "26b6195e96dd9783790952ac886c43c6a770d924",
+          []
+         ],
+         "test_setup_skip_class.py": [
+          "0c4a3775723b4fdad1ef0b40154ca6f2a34362cb",
+          []
+         ],
+         "test_setup_skip_module.py": [
+          "abf782a62177c4ba5a4a2d4c2c5f26be971314f0",
+          []
+         ]
+        },
+        "warnings": {
+         "test_group_warnings_by_message.py": [
+          "29d89597452c033583d03679a1f81805b59cf305",
+          []
+         ]
+        }
+       },
+       "examples": {
+        "test_issue519.py": [
+         "7da1f4ee6647660da4742fb1ed43c1d17f6aa385",
+         []
+        ]
+       },
        "freeze": {
         ".gitignore": [
          "b533190872485742d0f0770921e77e8e7b8b5ed0",
          []
         ],
         "create_executable.py": [
-         "98aa2034c9d79335d6b67f9eef4b404e34cdbfb4",
+         "ab8013317b2c418bcdde680273045a72c9348a58",
          []
         ],
         "runtests_script.py": [
-         "d03bca8406de2e4e1a5ba899e7fb08b4b07998dd",
+         "f7381f56863525771b7576c8adc3d03ab7574454",
          []
         ],
         "tests": {
@@ -367763,206 +369454,220 @@
           []
          ],
          "test_trivial.py": [
-          "08a55552abbf6252e8505ea9dffbdd32ece5b4c5",
+          "449dbf9d36256679cf448529e69b2f835b436d83",
           []
          ]
         },
         "tox_run.py": [
-         "678a69c858a2cd4094307acf90e6e996c9800ee3",
+         "29b7279238421d7fd3761f7f800ee879c8facc0c",
+         []
+        ]
+       },
+       "io": {
+        "test_saferepr.py": [
+         "9012030888914d00ef51203f4b4f5ef708fa1f2d",
          []
         ]
        },
        "logging": {
         "test_fixture.py": [
-         "8d9ae6b518da846d54ccd1be1823be77a14fe0e2",
+         "ff772e7ec62d60a79b3ec0f27af025c2bcbae87c",
          []
         ],
         "test_formatter.py": [
-         "ca2a41065376753c2eadc256cbcad3f19822dada",
+         "c851c34d784d507c19a035567e91dc183fddefa6",
          []
         ],
         "test_reporting.py": [
-         "91ed2e4758cbbed2fc71c5fa9856478976f2ba30",
+         "6ff5ccfb55a4bc8dae2c135e01d4b5ac9cd4a58a",
          []
         ]
        },
        "python": {
         "approx.py": [
-         "9e25feb0b4d630ac8db86853561869cb2aaa17eb",
+         "cd8df5d274f9c634ce94b5331c29491650d7ad63",
          []
         ],
         "collect.py": [
-         "724504b1af701f53fd7dc7d1fe1c1a5d563a38ec",
+         "501b30a49b002333270f1f0d05de115e813eaa13",
          []
         ],
-        "fixture.py": [
-         "6d2bb663b6cd0a672c513a79db639d7e05682492",
+        "fixtures.py": [
+         "4869431c6399e30d807e3f037b1472d4acc48cb5",
          []
         ],
         "integration.py": [
-         "f348fdc29fd2eb819847018a9e4d314d5178a224",
+         "d2fea2dc5ca06b5c5f1abc426c283ea2ad38a56f",
          []
         ],
         "metafunc.py": [
-         "e181d3131f5770faa34065e3fdfa459ee9fd1ece",
+         "d90787894ae34b3da5d7d6aa65991b2a99771fab",
          []
         ],
         "raises.py": [
-         "64199c3b6f5fd209b0688ad53a047d8b78cc7c1e",
+         "fa25d9f73ee7ff9129b9e44778ae79263e9f667a",
          []
         ],
         "setup_only.py": [
-         "4ae24b15a6da92d43518cfbc76ce4a4737c85622",
+         "ba4ceb00fce5bc9749df05446b34af40b79fbe55",
          []
         ],
         "setup_plan.py": [
-         "0321939a8aac4bd919da7264c435d4064d71d45a",
+         "ad64e42c29c7e7a3dcf412a39f420cfa45f13fa0",
          []
         ],
         "show_fixtures_per_test.py": [
          "e14344d4ebf7f2193ae70c69c10722da5fd5c962",
          []
-        ],
-        "test_deprecations.py": [
-         "b0c11f0b03b45891e0d816c91a46cf4ead190b1d",
-         []
         ]
        },
        "test_argcomplete.py": [
-        "b042de5ce5bea455512a64588806de47765eb38f",
+        "da7758e8e9e7508656e76b536dd07a38c172e503",
         []
        ],
        "test_assertion.py": [
-        "393cf817c7e9b3b139fb27c05ae47d9a8494ad41",
+        "225362e64ef093a8a730a0c248606d78aa8d9d82",
         []
        ],
        "test_assertrewrite.py": [
-        "144f625bc6c3cdea7a55a82cf967c7cab916c2e9",
+        "87dada213d652b01f940df7dea175fae80178501",
         []
        ],
        "test_cacheprovider.py": [
-        "33d1dd8448c15bc41a2f1ebd6fa037ed8d5b3ecc",
+        "6de0b312929212c5b8cc092d6dd2568adec03995",
         []
        ],
        "test_capture.py": [
-        "e14b3af78517211ad19004fc61891e840db83e96",
+        "01123bf5b403706be4afb2501246be95f1fe957e",
         []
        ],
        "test_collection.py": [
-        "657d64c74e24aaeb11a86dffe5ab27a47d96adf9",
+        "0fbbbec54dfcf98c90b543b135504974343db176",
         []
        ],
        "test_compat.py": [
-        "550a8f1b3544d2a93308ef0f3d20ba83fc3b537e",
+        "b4298d1531d60c54db896cfccc951ad614075f6d",
         []
        ],
        "test_config.py": [
-        "5fb048364f7cabff9c56a30ce6744b47e0956378",
+        "d13f119b020a25ab6a77fe5ca426bbfd94d42dff",
         []
        ],
        "test_conftest.py": [
-        "61b640976f1195e2a511c6e2e6680edbd682c351",
+        "f8e3dfa92e4ab248cf96fd7c7b6ded4c012a2fc9",
         []
        ],
        "test_doctest.py": [
-        "7f3aff3b0e1072206184629c519dde17034bd15d",
+        "723f1fe96423d0cab94e75bc675a7d4f4d79e23c",
         []
        ],
        "test_entry_points.py": [
-        "8f734778faa8c8b483197af489411f6a2875915a",
+        "95ebc415b15b3d05387ca2faaf0f089d91fc591e",
         []
        ],
        "test_helpconfig.py": [
-        "b5424235b1687e3deae140e26f02fb8f6fc8c1fa",
+        "75888fe14cb76f2225f257d6873fefb52d071150",
         []
        ],
        "test_junitxml.py": [
-        "d0be5f2675963802b55396cdbf65de6fa4932bb7",
+        "ba529cf331d6f14a7b5dfd0fdf41cd551d014a36",
         []
        ],
        "test_mark.py": [
-        "e2e7369dc7984d731e503545ac9b4c615c474601",
+        "727bd9420c265c58c8ef39c91daf64aa4111789c",
         []
        ],
        "test_modimport.py": [
-        "f7b92a0b6f67153169bc0ab1ef9e59e83d286473",
+        "5dd057c55e2fd604df404c7dfaec0425cb309ce7",
         []
        ],
        "test_monkeypatch.py": [
-        "c298ce0d9290288c84b4e30f42e0454057f45246",
+        "961c57e06a3138f7241e2d60a4364d4f10d0ddbf",
         []
        ],
        "test_nodes.py": [
-        "eee3ac8e9e4c0cbe4a953d3ccbbd85fccd4ba72c",
+        "e86bd5f793e99856f51e689739ee03a7bf8e1f0c",
         []
        ],
        "test_nose.py": [
-        "abe7323754ed43470ef1e34d434c67ea4b01f883",
+        "6eb5f085e843bd4fed52ab6216fff537557ee0ca",
         []
        ],
        "test_parseopt.py": [
-        "79076cafd810b7f65fffd21ff597d388ea804694",
+        "c570ed60b2f17c8f6a43ce6b27274c0f2ba22931",
         []
        ],
        "test_pastebin.py": [
-        "ad7c4d0c1c061241cabaa7e9c1c360528629eed7",
+        "02efdb5540786ca9995c3cd8849b6e51bb62699f",
+        []
+       ],
+       "test_pathlib.py": [
+        "541d289f7773408fe7f77ebc7f279690a01c8e56",
         []
        ],
        "test_pdb.py": [
-        "615d52e834545d9d209acbde743eead7eea9149c",
+        "d31d60469cd121befae21fb951111d6dacae29f0",
         []
        ],
        "test_pluginmanager.py": [
-        "22cea4207c64607673c92ec9c89594565f31c197",
+        "2365516434335953d5759e84e2ef8c549f0af4c9",
         []
        ],
        "test_pytester.py": [
-        "b74c0b7f70c25368e5955623d692870526d0021e",
+        "f7cc0936ccea7e19d3f13217949878ee0255178c",
         []
        ],
        "test_recwarn.py": [
-        "a8e2fb803780c58ee1988ec21da461f8a08095c8",
+        "d652219df3efc0106f2ab8970edc9d8d3242ec99",
+        []
+       ],
+       "test_reports.py": [
+        "5c6851e49bd140e79482ee6b2493569af96daa3d",
         []
        ],
        "test_resultlog.py": [
-        "173384ffb30bf632e290914d80648a1bc75874f1",
+        "1ef49d5e2d98fd76b4c1ef030b0f920d5ce1a77f",
         []
        ],
        "test_runner.py": [
-        "f5430a90da533de939883481ec62c9344ec4c8d7",
+        "6906efb910c88b31581d00ece606db2dd8f64761",
         []
        ],
        "test_runner_xunit.py": [
-        "8316aafbf561c48c54e0a9579406b4d5916c4a5f",
+        "5be7297f6c5ac172866c8befb5c3dea319825e65",
         []
        ],
        "test_session.py": [
-        "4a594009bab512f52d785e9834a99aa479e5984b",
+        "9acad5deafd5d83924ea55d8d7a9d5cd67b7e23e",
         []
        ],
        "test_skipping.py": [
-        "5d970e2fea0af5e3667e83f97a60a5255734410e",
+        "7834971125a13abdcd45e4e7dfc6ef83cf1dbe4d",
+        []
+       ],
+       "test_stepwise.py": [
+        "d8d11917ade8c4bf8113b616068dbe1067ab49c7",
         []
        ],
        "test_terminal.py": [
-        "8f08ad34fa1f46dc4b78d97f422edcb861db2aed",
+        "752c894ca938e566a2c1ffbdccd541ae2555ddd6",
         []
        ],
        "test_tmpdir.py": [
-        "33624909495785423265b8c44648eeb72a8c9f4d",
+        "7622342b1d74376b7f3f9663bb5b9f6229a357d2",
         []
        ],
        "test_unittest.py": [
-        "65ffdb97538bee513eb1544414decdc302bbf02a",
+        "6b721d1c0ce50398ca9fb72d505157b588fc405e",
         []
        ],
        "test_warnings.py": [
-        "c5bea052a47e30edef45180226a6a09ce0bf2d54",
+        "65f57e024f3d6177ad961e129ccff33305895cd7",
         []
        ]
       },
       "tox.ini": [
-       "cb3846d5422ad9cbf66547a46256d05ef4494585",
+       "f75a061048218f8570d2a10604925f120a16d771",
        []
       ]
      },
@@ -368440,7 +370145,7 @@
      }
     },
     "tox.ini": [
-     "1a94ec340216417584bc54bf3527d90920993789",
+     "c72d728239a1640f0babe916fa8c44f99b50023c",
      []
     ],
     "wave": {
@@ -368805,7 +370510,7 @@
       ]
      },
      "tox.ini": [
-      "8e3e26e135b4d376a492aea5adbd242797b03fe0",
+      "2feec8d1a4ab5decc48aa89219a87c6f3c4ca2c6",
       []
      ],
      "utils": {
@@ -369132,12 +370837,12 @@
        []
       ],
       "test_wpt.py": [
-       "69a649a3d2dc1f8c3a48201f70a387c7f249804c",
+       "ee338a33f83053f9fe3e83bd49f48b3e7e8a5068",
        []
       ]
      },
      "tox.ini": [
-      "50717135539484322043372b19da080a765bd86e",
+      "03f4ab5aba0ea0724609b9fdc80917cf68eeed26",
       []
      ],
      "update.py": [
@@ -369391,7 +371096,7 @@
       }
      },
      "tox.ini": [
-      "798f64a3e422e4da0b4e4b6fe15d686b20af572e",
+      "b39b5eb7e95bf327dca39b6a32295381da2d6c90",
       []
      ],
      "wptrunner": {
@@ -370163,7 +371868,7 @@
         []
        ],
        "test_stash.py": [
-        "0b960c1e9f8609dcbd82dbb333434fe0d2700185",
+        "1c4c9ad933a37746623a0195f553ad8cfe70688f",
         []
        ]
       },
@@ -370817,7 +372522,7 @@
    "urlpattern": {
     "resources": {
      "urlpatterntestdata.json": [
-      "66038e03d23bbb14f6d890a02e3e8dbefcb5aefe",
+      "5a1a3ec01eb2d504c6dd76010c17a8a680e0dd67",
       []
      ]
     }
@@ -372318,11 +374023,11 @@
        []
       ],
       "fixtures.py": [
-       "78a8a981e353b970fccb58f085b67d3c03a54820",
+       "888c42b1f7211d2a28210987007440d3877299e9",
        []
       ],
       "helpers.py": [
-       "f857083b47743e0925e7baf8b0b964008be7923c",
+       "a1082caf58cf0466185268a3c95e59b643a76bcb",
        []
       ],
       "html": {
@@ -372360,7 +374065,7 @@
        []
       ],
       "merge_dictionaries.py": [
-       "cf06c9b433cee167c5c98e06d64cc7a2e68faff3",
+       "c13ab904e40e82faad1b9c4905003b1d5185baa7",
        []
       ],
       "sync.py": [
@@ -376843,7 +378548,7 @@
    },
    "FileAPI": {
     "FileReader": {
-     "Progress_event_bubbles_cancelable.html": [
+     "progress_event_bubbles_cancelable.html": [
       "6a03243f934081b18cf456d741c3fc2d1660f9c3",
       [
        null,
@@ -458580,6 +460285,13 @@
         null,
         {}
        ]
+      ],
+      "sandbox-window-open-srcdoc.html": [
+       "6fbff6df82f57fce61f4d1affe5a965cb45f5e60",
+       [
+        null,
+        {}
+       ]
       ]
      },
      "the-window-object": {
@@ -486405,7 +488117,7 @@
         ]
        ],
        "selection-start-end.html": [
-        "919d1a4d658367ef845c584d470db0e98509a584",
+        "768bce41298e6400371819f25cefbb42d62281af",
         [
          null,
          {}
@@ -509289,6 +511001,13 @@
       {}
      ]
     ],
+    "permissions-policy-javascript-url-frame-policy.https.html": [
+     "48385485802d220dd1d98198f14bd2302f9417aa",
+     [
+      null,
+      {}
+     ]
+    ],
     "permissions-policy-nested-header-policy-allowed-for-all.https.sub.html": [
      "46ca378d0b9f9d451c0566b8169daa26093cb7b3",
      [
@@ -523203,7 +524922,7 @@
        ]
       ],
       "iframe-inheritance-srcdoc.html": [
-       "c4dffd3ed70607f0caaddb99d0b0291e719e1e96",
+       "356eedd4f48e6263d3f89b1557dfe285738924ac",
        [
         null,
         {}
@@ -525648,7 +527367,7 @@
     ],
     "textcontrols": {
      "selectionchange.tentative.html": [
-      "061d21f20466eefdf573a76ba3a911c10e36eb69",
+      "2216a4b514f9932118c2f8b645b4e4a1656117f2",
       [
        null,
        {}
@@ -529327,7 +531046,7 @@
      ]
     ],
     "slots-imperative-api-slotchange.tentative.html": [
-     "1f4ef1531a2b678e016b170244ec47422ff49481",
+     "43627a246cce9d92fdb3e758c113c5fde8e198fb",
      [
       null,
       {}
@@ -529795,7 +531514,21 @@
      ]
     ],
     "detection-HTMLCanvasElement.https.html": [
-     "e66b70241a60bb2f871438f3fa5c25427729c7c4",
+     "4773bc8a66102f22a2897c22a93054165402903f",
+     [
+      null,
+      {}
+     ]
+    ],
+    "detection-HTMLImageElement-empty-src.https.html": [
+     "40eee244946231b73f0064f5f2202cecb00b1c6b",
+     [
+      null,
+      {}
+     ]
+    ],
+    "detection-HTMLImageElement-zero-dimension-image.https.html": [
+     "621dd4e23fce2e6171e54644677f86008ca65064",
      [
       null,
       {}
@@ -529956,13 +531689,6 @@
       null,
       {}
      ]
-    ],
-    "shapedetection-empty-input.https.html": [
-     "a0d4490d825a7a385743a0c72585b92376f9fc14",
-     [
-      null,
-      {}
-     ]
     ]
    },
    "signed-exchange": {
@@ -541990,7 +543716,7 @@
    },
    "urlpattern": {
     "urlpattern.https.any.js": [
-     "27b03d0ff03261d50721edb7b22b8205e0610238",
+     "3d47f57f1184cf06f112e4d4ef59ea6daca7740c",
      [
       "urlpattern/urlpattern.https.any.html",
       {
@@ -557981,7 +559707,7 @@
      ]
     ],
     "webGLCanvasContext_create_xrcompatible.https.html": [
-     "e3e83a50eeec07c090660a3cd2b83af41129123a",
+     "3cdbce99ccd140abe6911e0e3afce6e35382f211",
      [
       null,
       {}
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
deleted file mode 100644
index 4bfb0c2053a..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-004.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-images/image-orientation/image-orientation-exif-png.html.ini b/tests/wpt/metadata/css/css-images/image-orientation/image-orientation-exif-png.html.ini
new file mode 100644
index 00000000000..275dbb2cf9c
--- /dev/null
+++ b/tests/wpt/metadata/css/css-images/image-orientation/image-orientation-exif-png.html.ini
@@ -0,0 +1,2 @@
+[image-orientation-exif-png.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-001.html.ini b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-001.html.ini
new file mode 100644
index 00000000000..b0a2d225cce
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-001.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-002.html.ini b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-002.html.ini
new file mode 100644
index 00000000000..8e97669fed6
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-002.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-003.html.ini b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-003.html.ini
new file mode 100644
index 00000000000..f0dd89fa1b1
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-003.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-004.html.ini b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-004.html.ini
new file mode 100644
index 00000000000..045ceea66db
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-004.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-005.html.ini b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-005.html.ini
new file mode 100644
index 00000000000..a7cd09a3cfa
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-005.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-005.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-006.html.ini b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-006.html.ini
new file mode 100644
index 00000000000..f16cd3ae462
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-006.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-006.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-007.html.ini b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-007.html.ini
new file mode 100644
index 00000000000..e427e24bcf4
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-007.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-007.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-008.html.ini b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-008.html.ini
new file mode 100644
index 00000000000..d0388d0fc97
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-008.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-008.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-009.html.ini b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-009.html.ini
new file mode 100644
index 00000000000..3e591a03e4c
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-009.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-009.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-010.html.ini b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-010.html.ini
new file mode 100644
index 00000000000..dbdda94be3a
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-010.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-010.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-011.html.ini b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-011.html.ini
new file mode 100644
index 00000000000..3ca48ed9303
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-011.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-011.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-012.html.ini b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-012.html.ini
new file mode 100644
index 00000000000..a19cc51680c
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-012.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-012.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-013.html.ini b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-013.html.ini
new file mode 100644
index 00000000000..a2f5fb778a0
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-013.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-013.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-014.html.ini b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-014.html.ini
new file mode 100644
index 00000000000..ebc19e6adb0
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-014.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-014.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-015.html.ini b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-015.html.ini
new file mode 100644
index 00000000000..f82451ddd4c
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-015.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-015.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-016.html.ini b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-016.html.ini
new file mode 100644
index 00000000000..1ce6cb3cc36
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-016.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-016.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-017.html.ini b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-017.html.ini
new file mode 100644
index 00000000000..ae5c13993b0
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-017.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-017.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-018.html.ini b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-018.html.ini
new file mode 100644
index 00000000000..56c3d82d87b
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/break-spaces-before-first-ideographic-char-018.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-before-first-ideographic-char-018.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-001.html.ini b/tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-001.html.ini
new file mode 100644
index 00000000000..74000679733
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-001.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-with-ideographic-space-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-002.html.ini b/tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-002.html.ini
new file mode 100644
index 00000000000..448f267c19f
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-002.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-with-ideographic-space-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-003.html.ini b/tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-003.html.ini
new file mode 100644
index 00000000000..5aeb89e9cc8
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-003.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-with-ideographic-space-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-005.html.ini b/tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-005.html.ini
new file mode 100644
index 00000000000..e26882f1fc4
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-005.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-with-ideographic-space-005.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-006.html.ini b/tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-006.html.ini
new file mode 100644
index 00000000000..fa5d2ad5308
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-006.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-with-ideographic-space-006.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-008.html.ini b/tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-008.html.ini
new file mode 100644
index 00000000000..9c070ac6577
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-008.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-with-ideographic-space-008.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-009.html.ini b/tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-009.html.ini
new file mode 100644
index 00000000000..c36e2e88642
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-009.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-with-ideographic-space-009.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-010.html.ini b/tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-010.html.ini
new file mode 100644
index 00000000000..0a4bb2bb172
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/break-spaces-with-ideographic-space-010.html.ini
@@ -0,0 +1,2 @@
+[break-spaces-with-ideographic-space-010.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/eol-spaces-bidi-003.html.ini b/tests/wpt/metadata/css/css-text/white-space/eol-spaces-bidi-003.html.ini
new file mode 100644
index 00000000000..3da751bb971
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/eol-spaces-bidi-003.html.ini
@@ -0,0 +1,2 @@
+[eol-spaces-bidi-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-break-spaces-001.html.ini b/tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-break-spaces-001.html.ini
new file mode 100644
index 00000000000..5508103befb
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-break-spaces-001.html.ini
@@ -0,0 +1,2 @@
+[trailing-ideographic-space-break-spaces-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-break-spaces-002.html.ini b/tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-break-spaces-002.html.ini
new file mode 100644
index 00000000000..3abdd7bdc53
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-break-spaces-002.html.ini
@@ -0,0 +1,2 @@
+[trailing-ideographic-space-break-spaces-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-break-spaces-003.html.ini b/tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-break-spaces-003.html.ini
new file mode 100644
index 00000000000..4dd937c5e2b
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-break-spaces-003.html.ini
@@ -0,0 +1,2 @@
+[trailing-ideographic-space-break-spaces-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-break-spaces-004.html.ini b/tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-break-spaces-004.html.ini
new file mode 100644
index 00000000000..d10e9cde0bb
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-break-spaces-004.html.ini
@@ -0,0 +1,2 @@
+[trailing-ideographic-space-break-spaces-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-break-spaces-005.html.ini b/tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-break-spaces-005.html.ini
new file mode 100644
index 00000000000..1f4601220cd
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-break-spaces-005.html.ini
@@ -0,0 +1,2 @@
+[trailing-ideographic-space-break-spaces-005.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-break-spaces-006.html.ini b/tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-break-spaces-006.html.ini
new file mode 100644
index 00000000000..6b95cc216ef
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-break-spaces-006.html.ini
@@ -0,0 +1,2 @@
+[trailing-ideographic-space-break-spaces-006.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-break-spaces-007.html.ini b/tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-break-spaces-007.html.ini
new file mode 100644
index 00000000000..615de21c400
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-break-spaces-007.html.ini
@@ -0,0 +1,2 @@
+[trailing-ideographic-space-break-spaces-007.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini b/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
index 4a1e8110f6f..f8e7e539aae 100644
--- a/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
+++ b/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
@@ -2,3 +2,6 @@
   [Hit test intersecting scaled box]
     expected: FAIL
 
+  [Hit test within unscaled box]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini b/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
deleted file mode 100644
index 4c79907309b..00000000000
--- a/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[CaretPosition-001.html]
-  [Element at (400, 100)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
new file mode 100644
index 00000000000..e38782d8c85
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
@@ -0,0 +1,4 @@
+[elementFromPoint-001.html]
+  [CSSOM View - 5 - extensions to the Document interface]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
deleted file mode 100644
index e181af5397f..00000000000
--- a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[elementsFromPoint-invalid-cases.html]
-  [The root element is the last element returned for otherwise empty queries within the viewport]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-border-box-004.xht.ini b/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-border-box-004.xht.ini
deleted file mode 100644
index 5bfc1583490..00000000000
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-border-box-004.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[box-sizing-border-box-004.xht]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-content-box-003.xht.ini b/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-content-box-003.xht.ini
deleted file mode 100644
index ab0d0526aa0..00000000000
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-content-box-003.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[box-sizing-content-box-003.xht]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/custom-elements/reactions/HTMLMediaElement.html.ini b/tests/wpt/metadata/custom-elements/reactions/HTMLMediaElement.html.ini
new file mode 100644
index 00000000000..2ca05f57bb0
--- /dev/null
+++ b/tests/wpt/metadata/custom-elements/reactions/HTMLMediaElement.html.ini
@@ -0,0 +1,2 @@
+[HTMLMediaElement.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 5df18ced386..84c6ad5cca8 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -309,21 +309,24 @@
   [fetch(): separate response Content-Type: text/plain ]
     expected: NOTRUN
 
-  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: */* text/html]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
+  [<iframe>: separate response Content-Type: text/html;" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html */*]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index d2df9b78483..e67f0406fc3 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -53,6 +53,3 @@
   [combined text/javascript ]
     expected: FAIL
 
-  [separate text/javascript x/x]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index 70efd28ddfc..aa6eb8f6085 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,6 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20no%0D%0AX-Content-Type-Options%3A%20nosniff]
+  [X-Content-Type-Options%3A%20'NosniFF']
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
new file mode 100644
index 00000000000..51f8272a6de
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_3.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
new file mode 100644
index 00000000000..385376c7321
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_4.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
new file mode 100644
index 00000000000..735a9a75a2a
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
@@ -0,0 +1,2 @@
+[cross-origin-objects-on-new-window.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/browsers/sandboxing/sandbox-window-open-srcdoc.html.ini b/tests/wpt/metadata/html/browsers/sandboxing/sandbox-window-open-srcdoc.html.ini
new file mode 100644
index 00000000000..45f6e82c8cf
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/sandboxing/sandbox-window-open-srcdoc.html.ini
@@ -0,0 +1,4 @@
+[sandbox-window-open-srcdoc.html]
+  [window.open('about:srcdoc') from sandboxed srcdoc doesn't crash.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index f4d11768961..6b68e9094e4 100644
--- a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -1,5 +1,4 @@
 [supported-elements.html]
-  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
@@ -7,10 +6,10 @@
     expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Area element should support autofocus]
-    expected: NOTRUN
+    expected: FAIL
 
   [Host element with delegatesFocus should support autofocus]
     expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
index 98163335e40..1de3f8d68b2 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
@@ -172,6 +172,3 @@
   [XHTML img usemap="http://example.org/#garbage-before-hash-id"]
     expected: FAIL
 
-  [HTML (standards) IMG usemap="no-hash-name"]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index 5f60c78e73c..f6a7aca3306 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,6 +1,5 @@
 [iframe_sandbox_popups_escaping-3.html]
   type: testharness
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 45d8be1c898..d43f38b40cd 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-2.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index f4f994c5d6f..0fbc49ea1c1 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-3.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
new file mode 100644
index 00000000000..633a99517d3
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
@@ -0,0 +1,4 @@
+[form-double-submit-2.html]
+  [preventDefault should allow onclick submit() to succeed]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini
new file mode 100644
index 00000000000..b193c33c2b6
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini
@@ -0,0 +1,4 @@
+[form-double-submit.html]
+  [default submit action should supersede onclick submit()]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
new file mode 100644
index 00000000000..59a54fe88e4
--- /dev/null
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-delayed.html]
+  [async document.write in a module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html.ini b/tests/wpt/metadata/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html.ini
index e7f2f20a202..7e1a385b339 100644
--- a/tests/wpt/metadata/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html.ini
+++ b/tests/wpt/metadata/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html.ini
@@ -1,4 +1,11 @@
 [iframe-inheritance-srcdoc.html]
+  expected: TIMEOUT
   [iframes srcdoc correctly inherit the ancestor's referrer policy]
     expected: FAIL
 
+  [Even after a navigation from another initiator, srcdoc iframe still inherits referrer policy from the parent.]
+    expected: TIMEOUT
+
+  [Srcdoc iframe inherits referrer policy from parent on creation.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index dfbefe53f1c..da7d8f99c57 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -638,3 +638,9 @@
   [X SNR (-384.7973725474673 dB) is not greater than or equal to 65.737. Got -384.7973725474673.]
     expected: FAIL
 
+  [X SNR (-432.56915701763694 dB) is not greater than or equal to 65.737. Got -432.56915701763694.]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t6.3119296254606011e+23\t9.3139332532882690e-1\t6.3119296254606011e+23\t6.7768680038931826e+23\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 6.3119296254606011e+23 at index of 28696.\n\tMax RelError of 6.7768680038931826e+23 at index of 28696.\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webdriver/tests/find_elements/find.py.ini b/tests/wpt/metadata/webdriver/tests/find_elements/find.py.ini
index 27156778ecd..c0ddeb5159f 100644
--- a/tests/wpt/metadata/webdriver/tests/find_elements/find.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/find_elements/find.py.ini
@@ -26,3 +26,9 @@
   [test_no_top_browsing_context]
     expected: ERROR
 
+  [test_find_elements_link_text[<a href=#>link<br>text</a>-link\\ntext\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>partial link<br>text</a>-k\\nt\]]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webdriver/tests/find_elements_from_element/find.py.ini b/tests/wpt/metadata/webdriver/tests/find_elements_from_element/find.py.ini
index 368f94a3e20..bb03774e849 100644
--- a/tests/wpt/metadata/webdriver/tests/find_elements_from_element/find.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/find_elements_from_element/find.py.ini
@@ -29,3 +29,9 @@
   [test_no_top_browsing_context]
     expected: ERROR
 
+  [test_find_elements_link_text[<a href=#>link<br>text</a>-link\\ntext\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>partial link<br>text</a>-k\\nt\]]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
deleted file mode 100644
index 064cf47545b..00000000000
--- a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
similarity index 100%
rename from tests/wpt/metadata/webmessaging/without-ports/018.html.ini
rename to tests/wpt/metadata/webmessaging/with-ports/018.html.ini
diff --git a/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
new file mode 100644
index 00000000000..80f9a4f15b8
--- /dev/null
+++ b/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
@@ -0,0 +1,2 @@
+[Worker-constructor.html]
+  expected: ERROR
diff --git a/tests/wpt/web-platform-tests/FileAPI/FileReader/Progress_event_bubbles_cancelable.html b/tests/wpt/web-platform-tests/FileAPI/FileReader/progress_event_bubbles_cancelable.html
similarity index 100%
rename from tests/wpt/web-platform-tests/FileAPI/FileReader/Progress_event_bubbles_cancelable.html
rename to tests/wpt/web-platform-tests/FileAPI/FileReader/progress_event_bubbles_cancelable.html
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-064.html b/tests/wpt/web-platform-tests/css/css-contain/contain-size-064.html
new file mode 100644
index 00000000000..043a569eb40
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-size-064.html
@@ -0,0 +1,39 @@
+<!doctype html>
+<html lang=en>
+  <meta charset=utf-8>
+  <title>CSS-contain test: size containment: layout in place</title>
+  <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net">
+  <meta name=flags content="">
+  <meta name=assert content="The size containment box's content (including any pseudo-elements) must be laid out into the now fixed-size size containment box normally.">
+  <link rel="match" href="reference/contain-size-064-ref.html">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-size">
+
+<style>
+div { font-size: 50px; }
+.red { background: red; }
+.green { background: green; }
+.grid {
+    display: grid;
+    grid-template-columns: min-content max-content;
+}
+#test { contain: size; }
+#test::after { content: "\a0" ; }
+</style>
+
+<p>This test passes if there are two green rectangles and no red.
+
+<div class=grid>
+    <div style="grid-area: 1/1">&nbsp;</div>
+    <div style="grid-area: 1/2"class=red></div><!-- will show if the size containment doesn't result in 0x0-->
+    <div style="grid-area: 1/3"></div>
+
+    <div class=red></div><!-- will show if the size containment doesn't result in 0x0-->
+    <div id=test class="grid red"><!-- will show if the size containment doesn't result in 0x0-->
+        <div>&nbsp;</div>
+        <div class=green></div><!-- won't show unless ::after is inserted and grid tracks are properly sized-->
+        <div class=green></div><!-- won't show unless ::after is inserted and grid tracks are properly sized-->
+    </div>
+</div>
+
+
+
diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-064-ref.html b/tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-064-ref.html
new file mode 100644
index 00000000000..6d2876ae9bc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-064-ref.html
@@ -0,0 +1,28 @@
+<!doctype html>
+<html lang=en>
+  <meta charset=utf-8>
+  <title>test reference</title>
+  <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net">
+<style>
+div { font-size: 50px; }
+.green { background: green; }
+.grid {
+    display: grid;
+    grid-template-columns: min-content max-content;
+}
+</style>
+
+<p>This test passes if there are two green rectangles and no red.
+
+<div class=grid>
+    <div style="grid-area: 1/1">&nbsp;</div>
+    <div style="grid-area: 2/2"id=test class="grid">
+        <div>&nbsp;</div>
+        <div class=green></div>
+        <div class=green></div>
+        <div>&nbsp;</div>
+    </div>
+</div>
+
+
+
diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-exif-png.html b/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-exif-png.html
new file mode 100644
index 00000000000..85d807e3986
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-exif-png.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Images Module Level 3: late EXIF data is ignored</title>
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+<link rel="help" href="https://drafts.csswg.org/css-images-3/#url-metadata">
+<link rel="match" href="reference/image-orientation-exif-png-ref.html">
+<img src="support/F-exif-early.png">
+<img src="support/F-exif-late.png">
diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-exif-png-ref.html b/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-exif-png-ref.html
new file mode 100644
index 00000000000..39e361d80c1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-exif-png-ref.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Images Module Level 3: late EXIF data is ignored (PNG)</title>
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+<img src="../support/F-rotated.png">
+<img src="../support/F-upright.png">
diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/F-exif-early.png b/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/F-exif-early.png
new file mode 100644
index 0000000000000000000000000000000000000000..6714cec8253723237cfbe95b319e0ae2162120e6
GIT binary patch
literal 18826
zcmcF~WmHvBw>F@3N;lGVC_y@;q`NyLrMo+nln{`XPDyDbMY>zMK}x#euH$>(aese5
zzC8wx;fAyKin-=|Vx9<PMJaR?ViXt{7<3tF2~`*v*f{795*)aLxs;O*?q7JTYrCqN
zc)WCUcCfIvHGk>q<!JuW+|$|u2FCOEVX9s-DPOF_Q&Xf49CBNVIQA-EZHSJ)k*9=(
zOvw>biR=Rp(SV~;z?e*jv4tc2UHj9IwSa5Jk{;#v6n6FaH;lFNItS6$xAUVOky|(Z
z{@cBVw~wCJf|RzL3-@iJ%OOO)^Ge6<J9m_O8@Hc=OntJoNlODVwD<jd0|I>85kH@}
zeZ7jvFjR`YZCevkPQHpB*grnYQc2GXXy6h$rq8&_Iq7xiH_){!A!v*Gxx8Q&APvd%
zELHj*{fX#@)IIOto2xrj6Gc<Lt!v*;vyiiW4=0JNW8%iR$@>>BYc0Yl$sYc<y=^;z
zdW5mKQ4~sN>0d=SBlq{w^|P{f14xEO4+E}|MQ}dwRJ3&~+y@u^?T(;0`Mj+5z`8_H
zWpYP~X{3~YyA^(aLwJL+wsF>Zx)iMm*S+%S`z*xAZPBK3`rCxIvk%*!ceISx<OKFo
z!!CLolQ-WEu68(Y(43uN3Vw;h+h1B@*Ep-mq-i!&&eyt3n8ZrT^XtWnS3JzUBv2bk
z99++KE!auL>ys8XW_D3OLO*WG-)TDYT9yf+w^>(}LEHX%H>h--8ufVKQaP(l^|o@i
zNGrH!FxlF3`#ycJPrCW|>kNGdMfNf5jiN1G*ah;LaS-#-ELKaQNL5m{gk?pUtx-~3
zbKB8X5XxwUJe|2J775-L-AIG{B8iuX$Z(|M&hZKes^4<uRb@wF7L}h1@;fRijn=7d
zxsf*0;=FEH>>nPAGD}kJRAPIE_ASk(q^|z=esOI@vL3R!w#^SdhsrFUy}E|wyWQH#
zcqt;c@8i9MF6E4z;`?r@u`WY=v+Jo*@mi=+`vg+;2d#q@Er)HrSw3W|E(0Y+nf||0
zElaF4|7fSXlkvOhy!vX^^S;VrDO^F1pnS=9@LR)@e{ZITpT%M3G=*?`T;2Idnqcbb
z{;lN<@9#Ss67p8|k2}%PGBReZJ_s=1JxA813qD$oxFA$2<7s>`yI8c!T~7ZT7e!mb
z<F|eEY3M<9S&TU#jpt^52wrJPWN0z5!T2J*^&!2y1a-^n)n%#JC+i_~idhKJeF&a;
z=%>tp=7&o3@0^4D(gkyiUT94%^_kqN0fSZbh)pe)Lv<eIJNX#87HX(5wHu2QA27bG
z$BHUjoCT%$#AYvr8~s?@=O#cg?U2H6NN}=^4rZm?ugCj1EmVZpl;Cl!+GwG%;KM?~
zS%fV6oy$h5^Jl(ehstP!Ddc-r`Ww*=A|8bW>x(aM^1i_SaXr*d@go?ra9Q@ODe#kO
zp)2|Ha^`l~BL(rxn`VYCm-JlzIJ%0wK(+TFw*o9|tuSHiuk^>2%+qSBa_IV03Z4%n
z&6Fu(d7$eXMyFl+>+QS<HMBh(<X`_55xho%`LVz>wC4LpeAfx15)NSq-0y<g^LLO{
zUD+v(f!X2+`*eO43(7;fZ`3=yXOw}sLgp}*sF$ydUalbP2K^ksfunL=&wrbeEfD6-
zuZNwZ#<GPLkPFLCzWUiyjM5fzl#haOTq>@Oo@l^q<hc{vlcdRw(sCer`K4>Q<$Ls=
zL@g$!P?71wo9?CVkISvyspips((b}}Ht%t_Iae}m(rLey<gL@VmhG|9+YHvu_&w8i
z{{ZRr7;^VGQjFlddv=<|GHuF^5L(|KzFiL^O|^)H&RacGzxGj=a5TE`NR7TRFop*=
zIZ8mz%HA2%BoI|-<=O5cx?^FX9q#%-YL{9r_E&j(*yk_mKSao+#s(i+C)O?3XN0jy
z6gzb|jp0n{!mPL(9YWM*vac}UW9gm?cm6@^IBnJZ9Y(&<v$R>qlC@N4&xCYXOz!{l
z9ZgS_1rJT|=rW^N_|^9*G`>FJl!x<I@nOjKN~ffFF;cZ{1$X3?bY+3|iOAo@t6yim
zD1{>%@UX|ywhh)=chW1PzvAdwB;)RXzM-gs*&~mO(9{B%Q_gu&C=|HgG`z*Av#|?@
zF#Wc2{#MW!LC5AxvX66fbfKzWM0ApH!`gljMLiOq*96i}*{cFhAMqD2HVOsu<UdDa
z*ecNeRz<GkkNgUgBW?Wh+AP}%{>S+5+mqX{x1G;eFNiaeDkrfs$utNUT15TtI&vbv
zZ!b=*!Wab@zO9?+$`qJX2(+?YeAyDCjm@SgR7`Il)G>{UKz@n1Wu3&qln581!%Qq^
zP#y$hqv$iQE-~v)vzMpohm}~qgjG_tj26ce)3Q61LaXUqTw^?rdZcvvP>dBWn`HsV
z$+3q+biHOT8yc2-`o>;<y<6=K;_8?rDe_@PN#x>M7;C7*o$(xcaZJLQ&c*sYg*dh6
z3sUua)HDe<)_S43M}1A6>ftH%96V|6>TGH?+|p{JJ`N$9L2vOFc%4P8jUU~R@jDJh
z?zMN|W34IXe9Rf;Eka(VMS8Qbei*t4Di*Y9p<Hk$r{oK*iQ*B<^D2pp@x{u}oy;7@
z=oBFcbmYl2o!tlwV_;kTorqD>-EWC^7!?sLk_W$jJ1-T16WPILcaJPus)Wv!?)Vtw
zojuY);x|s7t*cfQYE4?|*NZq@#TwatI`-{|tMzM0Zn*@L4cXX?WX0c)uP@CjF-{dB
zX^+;a_r0g0BnFjM2;w4MtTd%YcDa#s;$qrwK31+De!=(|h$}`#1V>E5A%2VTI^5H!
z=ujq-g~t6Z=VgP`q8eu6x*@5+ra0Rm^Y;*&%psOJK9ww8AvL+ftEPA((p^=VNC!9R
z_&|GfMb<ueb;-Qf2D9WpalM&sa5cq=%(~l@^_ML}5>N=kB11I$(Y(Y(q)XG|H?B-u
z=g~{ATz%iZ)?=?u^d35z&r|#O@`v)DvFR5-CzTU}*0FM9f~nnbGMpvUzVsLdo4pJ)
zeD2}6IQ?c}Inb0P?yj(?#m06He-WFGJo6nt@87ox)W%5tAH0-LM(ag*;&^yQ9>+;k
z>rsCVt)|wHc;LQ&h47B3Uw<mQxj&M0oopwlq3{gr3Z~$FQe<I=eg0)t2kyWy13~LS
zbZvL17|y{YEwM*sDBAeDMgy@eC%B?xdfkmx<i8)sNd4JT#O0lwzi{s6>JlCy+&T}d
zVz*fEcVD``x7La!Ds(o=r?^5C>SSIf?An)Q;YqoTF&QM@wX^V`$Cmk?dZqBCCxS9x
zEq5~gF_^Xj9hb^X=U#G_W##n??Obb7?Y~ZwJ1(7d&H|Zq{JX)&&QjVz^mQ?ud_ToW
z>ZJB9c1+WZO>|ia={~#dvZRqHtJKap3i=Ea=-kQmH~W{?AqTY64_v=+*zt~d4(D^g
z7((;@JLj%<kmP&zQ5~G=<8VYBI}wc@GGwPvKA+6ra?>aqo3iitx?Nu+a3Me-M=Fhj
zQP}8pdD6T~=lLhmF^e5l2+tG`o}a&crsm)tbU|ps%rX6uZ<J-1L0eN}>ZNA6kIr`V
z8YR5W@=qaMOb@h!mVAERY$vx};_%|2M27v{Z`ZxMrZEQGJr8QcVOa%@xk<?D#N`JQ
z5u%GE>C!&hlnF1wCrDLRCsQWm7jqApty?tSOtw-`a+P<Wqp3c1d1Z|^xEI=BRGh|B
zFQU}yk{|}yS_UB}Mv<|o$qqhLFX-m2Z?2bE6JxyPB>LRM?AFXM-0?m7XrN?qR|tkE
zs7n~`KsS%o?waO{LX!83fC8je?NMK|U*AGKj_Bd9<Xwpfb1MvISyzmm5*n6&4c?-|
z_?uKcIMd>lHR(00q_^KlQ*$~JB4Wymq&jLwi%tJ+9bdJ-PwkqBA%DA@ay-8`9+b1J
z>+mr_yefoec@~aI3(@5rtt;t=ZH}$C$G`8`kAM7dPtzED41cG6dY?v(x+|$)lX(!E
zZOrDx8e+T4&z4H7tzH-<SP*rIJ@&yYRt}qM{UJj@g)ib)z)z~c*aAC_Q0t<5-bOEW
z-GH+5E~8mGSCcQy<;=fhNoQ)8<Yb<eY46AI!BBOg%zVr}d$bnsII8MdL{e~=g6|0O
z_zF9NT0dgk=z>lAA-fQH*S_1K9Tt;$N0c!Iy+9#}QB02Lq?%3m`R==>-OMm_A*6^g
zRo_&fYXvr&N7t|NE2u@eurHsHNO+A+vlGp}Jb5~NX>m080v*|J2^|lu*mAXDyE8~x
zqS4&b1Ck>0TdQ$(_2<VI@rB5alZq)M6wbN%n&_-|KV!qmKVzFoN>|Od5XEBP?EILC
zL{)v~8W%h@U%+z~oA@U<hFF*<tBTqZmT74~R;B*eWkW9RqsbQ;E?BWSxaor3WDj*a
zm4Mp1DQY26qi2!YoNCt?bvsEI3Yd>`Zq9jH@JYky9PPL)g@MT(_X;c(UTxkY@D9rS
zLvR`s0k+MlLtn7+pR#8%i&Xy3%b)`oPmW$I*Q5JFdo@aZ{9ZW5`P(w*`rj9L0jT#{
z+?@9a;&*Oe?HofZx;~dQ{=pGfAVEQT{ukZw?HC;g^CNbMq+P&M6x-5yib+QRitk>x
ziG|e*=K`Ogo;7AUooZ2aUccfGxN@QBlFwA0ox_Vb9kG*7g%DZWkhkBQ^RqW^-|pMV
zTu+nuFJ8VoH-~+l7S}SPpY_xtfxBAR*5Yw{RArUnBp3Jlf)!^n&_Yzob-mI<tC)Xr
znH-0b*TafT>TL&>fWte+)XP@=oKBJRAB=<hnbf)sBVy|P$g>@Ab1gJ$F!N&1WOc2i
zqFk0;<J=tX7fZ${P0+Jbjy?-3c-k9&Qx=9}52|nX;|kzO=w!)C@k+V88f3l4_r8A$
z@*jP}^#x1N@1Y$gO;PpE!Y70mu)%O^adBlCaq<5WKtTI4{NjbAyOnXnl++5S@ZbeL
z@|qQ6m`bYuR4G#qMaj{$n(o{z5D`lZr|IcYab)4WuGMyPbefs&)WCWk@Fs&a6W1XB
z=UswW6d{}7a<A7F>2eDu)_dAQ9lLjdg$ou;F9<m2@i@*S*}btk*x#C45Y;Ap4t4Nb
zQlp<Xh_<}BdeAX=KVtgk4NaCwxHV2Cj*{JPgdM+iB<2C86TXv=G6XdKo6YMdBs;-_
zaHG**_NGXkLbV~^t0ub2t=|7k{HdZb$!OH)S?;{NUY^8M?xghC<)~<6xX%9#mZmCD
zQW`7gYcTp}W9qjpijiTsnZ17Z4;4mKDPk4q?9M}ZXy`Tjh)*FawRNXB8-}X97~k7@
zM|xjk{f7Ue(R(B8o^gwe<%>{pUf8bxtWZRzlDlsA#n=yYeSMzS=9rC(u(w%g^PdeE
zrRDl|g047k3n61ZsIC>>E;bn(=djX~<q13;os{hAUk_eqdw6^wIb6y5b?*-otL<F#
zx4XLoFmq%_X&o0B7*rhS4=hYt1|hhK=qjTiiMWY|1qTniM5;poZV|akYP*U%*x8xe
zyTXV&o13_ro4xd~cC~sbC8MCM6@&r)=p~Gdgs3_o@|o7Q`a5n{*)1c&i!ye&!#&uN
zDyVg18ni75JVEvo`E~pC)*)2Y&l;@a{N=O=gT|?(Be}C9yJVIm9n(9|QD`{EcuTg_
z>rGk;X?3d2WM0UmQYoYg@ZBvQJ~$d?2{(%ysv>(a>O8F=np$}7jARP9Jh_Z`jpTY}
z(Zj&3y1(gRgn@Ze1%@3A4-;q%3j^~U6%0=s1_lZL|L-q4f!gukcVIza{_o}g&%gM4
zBHGJ{gx>3fE2*MUr_Llv6>nNi81ps^i>>|sw6CvkY;0_6Fr{|Be8(#$CT5}DZlTrd
zEKA78{a`L<zj=eVVxKsC%_}RHA#2AgtEjXTtIN$mLxZeWMMFac*PBvdG8C)cZok=H
zCmE}Y9c{&A6$iF~EON(-7d1x|g(|df%Q-^A)XHjivp<oo^>0_pahrg!@R64x4K`zv
zERD>#6&H5I)a)#UfcpVw_Km!Qg98_F9VE(Zqz0m)A@fDMM}M|}Ah*|Cf40s}PX$+#
z6>Na9Qy<2uV5K@!{JMUV^OnQowuAru1_dTMdi>)3N>MIDTA^2#)VeAJKMYGjL1AfW
zNlEy|Oipfa=9`|)`}gZ7yn6EWb|m4V_{k8<WOM7Zw`>Ye7lNO-e|>;^sr^#AN?KML
z@_4TFbiQx&#Gf6YFxi*nLfU(!zY-E5ky}=_zxIJb7%Y&1$C8GYmX?9RFu!CLHD845
zLIcly=5r7(_#e9EV>j+M=|yh32-?`WxNtx9qK3f*pfp!3)GIV>oHTCm7O2V~nGl8-
zTKAa7L)cVF4Q6d@Y<zrtj(=P&8??9|{;spx_!T3(GFbx|J>ycKrjK{S0a1aZ%B(Os
z$8o>7BYbt}5YVE}T8mCA^)(c$(0U@k&0v-*#>^&uR7u5Z<IkTzes`B-{I0uWIpT<z
z<mIKMHFhoPOtjd@*@~TAa9EHkv@Pd(E`?d}v1zv--@e&-dd@kK&PP+dpcJL#P}P`r
zGia0J@vX=9iHgi+h^%qi_$B@UgG|`>`tMpdA_ge~E(-1+XM<TM(o-xGOIRd)ZG?q-
z#@M4~)(DJm$O%j;Uo-DT6Ua4L>+=Oi6aC&Mvm4CHgzOr97oX&6a9CMhSh(v~@;|*k
z*%-INMMeh;XWvD;NkXHPbaJ8bVY8&Z-u>?KP{89Tzx~^{Zy-1mg(Q|I5T8=)$Kog3
zrOj?C?r}BeWUqDFW-nx1wqPN*x=CzWUg|Zd2YQhghn6Mp+DbOoy1zEi?ez9nVjFM%
zu4l>K89?mctr*e|G7i${zEUvvaQJ4F^3KFIo+$jqr(O^r+;+dGrl;#{W-G`9++AH=
zZI@fYB2k*#stAW3o7UT<vx*taZbiwu8|>*86q6dwZDOpb^Y`RZ)fAguZ+^NrYHm42
zO~?4MjFgG;+pdb6FSdI@{k?g|$zbe#u9O%)N0_iRa!*6d25-_Q@v06c8+@bbw)3(&
z?mApa%7}cD0}B*NwC>{4Qdzo0Op$v>DXHEzzdI0bDn>?1v){0&(udzty~tjSOY~98
zedGM5bl9fQmpv&!hX1AuV<uKIMu5*#%i4rxi%u(zFLt9(^bNPm=9MC!ePnJ`Y!wo#
zPx3CW*Mo<O`Q})sY_up6{&iT~517(=<jy`Sfsg(%Tcc?gQ55PL(_9L&s<ab(u3!L<
z4|ffA3-vx%N0*nEGc%g}+XE}UZQ<4*%3V*}L)9tIU833!T>1->M?dFfBPR4D33v-P
znZ>N~=&`13JvX?CI8Bq;iqhntt%3iukQJ@(U!|IJG-r;3q&a5-;a@9JXG$3iJ13HJ
zCp93+5bM-}8`LQXAHa+1H>=6X$!Th8%E{?;%DB0?k)Se3vtUYkZ)<C7Z*OmBXJ>C;
zQ3Aa<&_WJhEMw|$l_v>{mPDJKT-JotPt_4)eMo>;^p7Z@@@QpW_cEkQB%+|m{_^EZ
zb~b_7*wX%N<><%=e=H6-*yC0<Hv7pedb)ag`}_N9CF(TTCxVsQkUz~wXPNWCXN+wJ
z(*u^#Bfd@gmpU#U7Br~Abr`_~46<r!lh@atR>4~>n*9@$A4V))PPTNLD4LBKa5R<;
zxhHp>P`D?P<h4E*TE|P%U`N=_RZ$Yh&?WXuP=WuKmX(2^OXxRqajCUV1LG(yEp3Kg
z{7JIo1ti9@bM={nTiZK3mKGM<+uJB%V%+Hk&zMsNU0hsn{#~i^7T(^?r)49}GJH1k
zw%m#RX0`LC)w^C<<~jwcU~O+^-fDCBIq1*2)tKQ)%FrchXlRUEeFv`~j`?NE!6c%r
zG0l!<FuSm@&|o_+Hr^c`9xhF@j-y}t@$a<CQvaGe(#-A8s$B;?y@kF$qze@!mT=m^
zWC;H<-081VYG>A-Tu09=Uj`jm=B-aGkhZ}aQV1eVY-H|FQ;y$XHbb^lm%ngp4>TF7
zS28PM*kI}L2#drUGG7Zq@IL2Xb**{n9LrCZS5_9eEyR%U*e|y>{rK?%Y&zK1iV8)D
z*<YRHy5a(aPB@c3O)ah2v9UN(c3o;-uV6Opo95EiFXkz6A?s%G)vW_cDFssaFXov{
za2Q`2@8EnKAiMQeQICXJ%0ZZvoTp^k_6I%Ae(X#7{VAY{$nI*(KbD5`$JXYuTTrA+
z#O*ExZ>+3zu(sYiI9RNHC#9#S2i_NsPV$p%ks2u&54*-jjWs3U=_=q!VC80{rbK(u
zGCV(~ZPIm5GyEM>tvoYZ6Z<S}=O5y}bG4#<Z?L~blVAhzqo!wP_nQ@sSR_@}Pdq``
zf*p{OlCre4eE061AbFA9ro-0*UHqsXUttkpVa1Wxd_A0;oM3msCXZWzvlts23u>p&
z)8j+6wyodjGve#8Kk?%OU#-)?!>YB*l^LFw;nl5hqHT;zQIHW4dEFg0oZSevSV!i@
zO>f``do9VvI!1-H(x8m3iZ=~Mqe?m%H0ZOY3~r^SrWWX{C`_VtGvG(XOaF8tm971{
zbNff8KfXwrj*<AA?(Kn&h6Y#)0Re%4GoFC6j-Y2CC+nLeusq+dZ>Zv(|4~ptJD0Vi
z|J?g%N95@yD=VwBvlEA2F+<qzb|{szNk2C8B}Vx*X^bpEG$&K1-POZM57iAp-;S<o
z+ZSzV6dayp*uJ~XFKPF9>kee;XR#Y-|GCi74;LDaN1yITJr3rovncVf;I^Do9rThf
zevvpRle8DSTu7HZRC?T0y52iGJ3DSY8xgth77@Ihd#6`#o3qj{do#%uQ_kMp8T+hJ
zVVK$Id&R4us3;uYZ6zA)wJ^z%*^9#%0)Ah%_i2TtrS}G}70#HAZcteK%27XBg`#}B
zMxwM`u(!4bIm77vbVSU(1eFQ{uD6fRisuG;%_q+~hV<db^CA(ytt73H3_h1XQzc?K
zaf4gIoGLd0!x#Lk+>s_M&0mynUX~~oydE~cYy&CxE17rJ?9$RhjDzn+CnAMD#ag&=
zScE=`&(p(I`{@8PEXiQ?<?r9W!5W&q>W63kyepxHj}q3f;(vF4b5^97`RDkUf{d(y
z4vRErm5o{WXklr@bT_YDAI^}QhKWhFfAav}X=A{eDxM)p_JAH+N$}*S$m51c7wtW-
z_z7I3dGg?vY4!DVrT^>eJQE>Rjn~)__aLHq>Oyz?2Bz7Q%~dWpuCK34)QYmawo|)5
zVA3bbWDj;2>FeJ&l&HghF>b@ACFT_ilSmp(T9Pp;4_p#&N{|O&2H_^0jEu|?`55Ue
zGCdZBawJQrCE)3?z#or~Vt^fO;Fs_1UQxFHt@ZC`0Z+y2Lswxgr1U9+!y_XWuTtew
zSpBZoKBTZ3G<%+`udc4n&1wIgplLKXmm3*0m}36iuB)!Ba3N&NeDgj~LXsZ2I*xNF
zwYyEyvN4oGuaWN+>M*F;M@>6f{r&v|p^Uf89^nx^rU0f~S3cc>Jia~HP1Ekcm=|#o
zuWDOZRP-S{yu$DYKR>_s#h>Y`WuM~^OyRGkzgDCFu5K!=OlWMu<5Zok&Khv_K#YAb
z>L4V$Cx?z<9GR=niieQ3z1Gt+s&wZ&RfG$C70oVmzVGE78*7qNpS_Nbew(*RB$21W
zeMYHG5wQ6@d2erT<vM1C*X_^eMvjNyT3Fpi10a=y6GAHF{ke@lUfPVdiM`z1xgA$_
zVokQAy1E*Sr?S00z}WaJ_}AOp+t)WEge+>iM$1r<8IzptR?d)-t8@53YyC|GNxCJ=
zMTEL=b<J~2#!QqkHltsH3ljQ&`sgNdBj`G@*#cxX>4-X+ZqD2gBYHP79;C9>K_UmR
ze|8H+4DxPCx<D1IlIO*=){V_DI#d5%o=v#ydxP1`v^4LXOpjP{A=#3mMa95vX|@Zd
zR%MoS<5pRP6*ndm0snhmp)dVrZ{NNR|L}p$sLl8CKnMF3%9)n`lEUQXPm1g~mQowx
zTDhZvH;6JK7ng8RX=1`_WuJX!)|0fAgxwPLURQ;)>ZVca(H?vmq$p^tj_jkCS2x@c
z!2V;#k|M8}%zxt_XRrD5+2ej$-q-I4{`kWuZlpVX@zncn({HM}P>uU<*gj`gS&n9T
z3XYJcR{D|oSvQ7cZt(7mX7Bvbu}38!6}>VTa-~&XG{9&XATVS~`VA7hrR7dHrpVA8
zpT`ktPgjM0(<@=&k-?O#9XymUc{)xJk!*uNK^-sBRBbD`H39PMeHtTw+^elAo$PgW
z!wzQ~Wt~#qGrbCm&mtdXc_IT?HmP%7a&7hQH7g1c?s{Je9{-sxb7i_lSG_2Jl(dmD
z7&V~P1n_nB=}jEN_OcRO3@}H{F&iuu$n)Kxt}bwT1(<EB>V$3Z9v&Wo<NEyhek{`G
z0r!|(20&gwCTsFMF%2XdHL6i9IUf-?9=i(nPKvYZVX;Ye?%Ykw-xob9YbbuE%9Lca
z(?)hQUkjE)$j{HO?cF;$34F4JdU`s#)0_K)f7jyT;yLtk1yG2Dq}DF|wqs}%dhIwj
zIXB5$6q@UR9IGj~g{py%JAvUH8JGNBS~+)|p`AcA##4|yLZaS&i3xw-YCw_+z?V$L
z*=guSiyiSzuVKPva?jPx%}qlCudbz}b!5-Vn(IXm3Ozl2@2_7B%Dh}$>P$(eHvmEv
z@<<EOvl_N)L+}AJLac4-%lKUIirD~zQ8}HswDkoZS&(l|abVYJpcU~kXOgV>E25*~
zlg&gWa$#T3C044RRWswi2P|p>u0I4^-=B>R&VD-h-B-q$wbNr-?JLa2bH9m~VJt8>
zi=ebPhgPY2uvt?x@as@mO=Yq1?Z~kh{(!8@sE6B$bCKP`jjuldlkV=^*`uFgV-xtq
z$qE4~o804Sm`@m{;?^_Mo7PHNw^12J?0}<G%D}@TQ%Lb{_r3ql%+0jbPo1RHZ}uuA
zBqRl#0N1?<aIg>&5PtPSFYAMJ2aQ-nNJNKknWWuN64%_CZdahE4nP$_&k!Hi*&cI$
z{P6qX?JQc=^{XN7{+ol}KIY>p=B6x%DvCYBP+f^D$NAOO@k)F4)vw`%<o81Q^Dvdp
zo<WN=HshycN3U6*w2qQkTkzU+c-vH7FhkO|-qb9T`i&bW9~UsQ<*yccM3GPA8ayL#
ztNW7fJQVghgHbMegLk&lh%IGsa&nTw_irc2wctu()_N-?1*RY$|JvE1Df>0z(%$6S
zfqNRAN3C04+gtw6R;AXzq4-!=*Z=s+|2STXd>)7e{D#7g$lbN2yJ_)i#jXa&M@QUf
zA+uc!I^kO7I(>8Dx1E^&V@pe95faj+yUi%qO=mYbf+pq8q%*3oAHM%MX4-P!Ycs)j
zMyac$wJu=XLH#utE?+=UYsE7q8B-#QXsIKT=`o1vRin^6^)qgOh)?W2!l;Od?Ympt
zNCMiqFB%$kO-(vT<IBr!9><1?OZka>uU{win^hRK`#;{_02&80fcWN<i1qsxTW*2Z
zuO%NZQ1VVAbCo}6drNk+V@F5`lCLzo?XPuz;IW+>o1ga@6}nO$oHwfC5P_60EUbc9
zNYBhHAUw>qe*WreCE#h0t$hf4TkaTcbpw6iYL;m9j3Kn&OR3Xf=);E(0H*t{Ar#{U
z8VAK)18ksx(!-DU@(sXpT$Uze!_Gj!@L+AfA8bF^HzLJiX2FjF7;pU-qXzRRIaE9F
zr{uPsd$Xp2p@?X!&y<9Kh$u7bYrp^to>v!^z*kmU%HYnbi51uEycH>ELk^V$G^zk+
z{b_IDcoc0yC@wC({)?}$stU+eq4e4p7Z<K6ud?9a{v?|Ng=ei5O4AYh&|B}0TDB0M
z1@D%Y0=Y+1x}X-e;2y|b9ZY)KVjls;<Fgd%=y5Ud@b*p{EHZCF1258cK^;761>!_M
zf|lb==g`p5{r$b{HU<n#CtMkbDv+#f-@rS_<AvS$W|cFkYl3$nP1EKlX#G*AZQ$1)
zpu!Q8S5k@!3pSb40aNXofxI_oY%tLsAjJ{W|KW|t4-fPg+c{ZT8tihT!HQdSG_*cH
zxj0c2a9hxJVLPX&Q)754U_0-VFgBioEObp?Kf<Ud-D=ECPk;N_lc&)WAOB*8jW-<n
z^biU9RQbrTd744{(L7h6q6PhZdDrJ=5NiU@_0qC4;e#eD7&vA1?$3eM1191I>SRK(
zXJFOJPkO(Wa;XFlm6>;|PIVvekl<s2+xKD&krQ)sjbc&#XM*_Ut2Z0}mP;-PXkttC
z_1pvfy4+unn(gTlU+^e4cBekaf?y>W^TmpvG436yKHDP7de_HIFhT>y!TvmoP7P=a
zRmL~x#ixvBCgZ$TL0Ly&&|=&*445`yO?g}bhUMjC=rBN~dB59y#Ean}V~E@;%<w4!
z5jwXHw<S>UvX*4^1)C0tP{W}20*N^rD*)l1x7VF9J!Qmwj{2tR4Po4jRT?)3N44`(
zyrnOtA1=73O%Yg%Lg{KiK|+$ZFt{CDS~~C$&nS(F`tJi(yYh;P2|j(FAm;Ja#*~5o
z_N0@l`_Gccih)dK%#K&R-DE<pxeiw%oC`86h_X%W1fkag0&+d0opPc1RwthN_21%n
zp_@k2C!Cg%p`UYWm6ohn6s9hTREY%!;Q2Or$7|j;`JMKlci3VUt}65$>Q>k2TPEXu
z88Ae-ae~9o^-Q`&plY9+@wfh+Ga5r?r;~(!no-1O&}9miv~+jZgq&~c)j#LYR2<A<
zWgq|x8~1f=dT}wMv@~`D(jr@IP5ceJivqe4+-6E!XI=?etNBa=KE|E7!kl9e#}8jO
za2Kfza|*4Qr^vjL{r<jThcPw@di|nYnuclxy}mE9hiZfbJoe%mO<e;iUbaA!P@ut1
zAbofs$V<Kq5j+>+J48CTN8w#^*fYacoD3NdP$o$DOCNhTm}fJcn;>!|@Bb~)hyCVo
z6J;LZ>R|R{HWG3#?SC7#gT4G2X8cmx3cAf0tdy@)*Y3juU-EBpC}TXw6VXc!n?!<!
zK5Eo}69caKf_uj$jds0VOT|7f#!Uim40I*1Aqh<L%xKbxEGdKk<V7KJ>5aG<uyQYL
zshJzA(KdKThK8ceby|5p;`jf1t+>|bnKvdSFtEAy0eN|O1g!cmE0vL8|7{K7-&ZTY
zVn}4#H76$h{QV!#_a?c75&s34STH?WeM7_DTRF%UCJH5F5D*bd67-@MU`LDHX9^Y4
zi`9JCajn>rWRKhKjt&kWL(E`3a#R^`)in<H_N*No2*l><$rdLw@$o^S5fl&r^WYzX
zrZCJjhVjM4R)-bgNiHwX*@W!W(gZDDK|%Qt^?%AD(z8ezyeLV7*-sQA6$~iW$}ncC
zfHw#~-2=9`>CBh^I#A#_yvWEtYLh2a)Eoww8*oR<SE;HcxV9!LcxzyItVV65Q9Wbd
zU^}|ta_&tTBJCCmt(z+VwQcb@UUqIGefdV+O<DxXyV-u6C%jo_fS%RYauA6^;gblZ
zvEr$~n607fO20!JkY)dqVS`$SEEn93jEwj*F_sOFQr)(PQnd`d;2-|w-&0r!p_KY`
zE6~nZK%{ERJ9{9$pLSgT88KO;v>^`%&8eQ_-9TQH5YB$eT)820NA??#tmD0hC`<yJ
z6cF%KJ1U$$xb;(v9Tk;vbpu5cc{W=t2P>+lZ#Hj+17O3{w6xq`+W#bgKAupl@2M60
zW|nqK%@<(=hP!)vl+*8&II~9wIdfqH!{Gf@7@R&o|47>XaCdcviM&#*kMi9vy^sh4
z6I0}Dh?9WL(Cjz?jpJYSnhrJp7)?FN1qxc*bq^aIHgY$+x(29Mn}iejq|L)jnye}P
zJidDcDI?h;N>8~4l(Vp)e!Rcij1+spEU9vO(~6Z_SXfwDS=rDqTLVF<c4=WwE2j=s
z*3i(Tb*68>TRO%-LyHSdlBHFc{0c1ynitQMHU4~(_m<$?6&m$9sP3KE`@X?@Z=^6O
z9WA|a&FvxcxO~-iMe%e(0i=pEL1(=9BWR9zO}P_Gw?Y^$YMRe50FeFte*5Eop|y9G
z)VN1hC3U)DY3ZM45H~{C561xk78c>AXZ3c}IUpH!Ftvn=eYE2G!;1kwUUFSnS9ejH
z{cr#@AL$}1(KrZWGw?x72xB*@N@znpH)41mACI51E?aG1yatE%uS>2qu^gK93_x?_
zo~y71v#%AXT_S>YpvUw~LTtoO3wP`I@#q*ZO{UN|=3=`AI=Ps730sh9J4*f8ONpa;
z+HR*Sk5<}OoHEQ_?KRtX45?#-Rd;DxY-qdq2BrcK3U93ViDw#e;eNBZPO^E<4h4uy
zjbB{DK&O+U@B{LYEw`N0xv}6VkOhJ4at#y{rJCQ;rE{#D3OL(%jWJ~LmA+fdyr>Oy
zW=bG7+?<_HyTVYD&7Ej$RHBB?1hMnPa@b$Lb^}(yuU~Jg*&{w=3?y+OJ%_=^Z{)LG
z;6@Xly+}?@9u0Ur`;1O8<{m!a9g0OGQ>2vrxXsh<^>FJ3gnuRn!f<mP-0rTgWKckW
zTrzraP>z+`(sBp*8tgV6GQN)LRP>bFQov10fY(V6ft$gnw|T8q(nQ$*Dk;z{0n`e^
z0{p?~>2`Mi&!6Ci9m;a9Q{lw^3|^=8#U>XT%d8!hgwi)+j9>+(d)$_Qoe>Ibh^!qq
z509&h3wWAf)nCtgs;vCj<E2|~|C9yXH3ay8;bHtx(?<&iWybh*j^S~#d5<Z_L`qSX
z_j|yU^tGf*kRc}d61cg!Xplc~fSpy|A3r^^9Vfq1ck%`muDr$=P`h|YWZLn3?arsC
z>rX<XWhEsqP(>@u7g7}z6(7$;p3VS*F0M&SsKV-pdMk7_wD_f&@2cmhKM77OEC_IN
zickLWstuG66U+JAP4W15<?(Q(m<RvD=S>VHbT*;UFGnu(N&3xBQ!TRqvgTw|<RUhZ
zNfWEq_I<qB0i0r&)h)1t2%&*mn)HW8fDC@xFQk$W0P+C|FjamVSZvkW(ca_AYip`^
zl!@<wYG7}F^mupdK}t^?vwjYz4JN<Ffz!s2wByx&Y14k$@eETLlSpAwe-^zMJ)bo&
zGS~O2W##brc*lK+w;Sxe_Uk#PjjTRkyp&AO&CSisTyCd3C<1g~4F6%d1Tz$*HM^_x
z^QoyRWkr0&S0KS?A{xw^6Xi;ZN7mV-)w}GBw6zI$vs(@MRoV0l)wVqxIy|i+io{7Z
zz(GSKgzbmg(J?tV1Lp;70I9Mh<#jC8ZC3r*Z+-&)o5b5x!Opm=mz9Fy$8dM@lCy42
zK?DyePk5^n6Uh<<YmB2*rT1)^_`Ob^m~Bf`VRjE}C_}WZ3XCa(4nHnts^9fm@qXFy
znqttA-Z+ri?t{%AWXn_xIJ7ak1Gd~7wLEj=)uKwaMQmMRK~2L;GZ_Ki!;qEA(di5P
zRXc`UdS-%3YY2*4`CB^}2;}dX@q&AfvLk6Pd-T!K(Wvh>XMt+OFxEo-9^AY31Ya3$
zd?3<i`yBBpOg4W0P+sa*8D%jjt%BRlzWW!PO#G;P1$`u$UU??*z6O@T8oTszn(C?!
zSuy#gPTz$|YKWcLjEWwr&R%hl+nZ;SFsP^y@f_toi&~(C&sG?0pvp@#zL;taGN7E~
zVi}Bl3kr80uD2F$fjZMTj09_(Vaiq4ht3M3sQ9=UQeVaz8d_W08+pq4c(aXoeM#?j
zTv#)cglswZP3<&jA)qW4i)+>gTp8pL`Yg|2JFNL(6OZtK#6CxGo&W>NFxN5DlcajV
z{dVTWZ~Pox*rJ=g*f?FDM3=$1Ze1H&hVV58b?0eQ_iwmz{qvU*FTQD2&Gq++Clf4a
zp4!7gAdW6^R}%h<ySuw7?e|**hMqwWbk0W%_L2d9^O%{LnaAx<!Ui{H-rC9Lgb2(_
z&Dv2kLN$IggI265=^1!=ilEhl$Q;@WkkJa<(2kA{5P^Mt(%k8p+1UVuWhyp&|Ngz9
zf#>yWp}!r^775c7=)Ls0g+|=*rRwIG^IObJG}3I5EJUk16w2_7wA3xGf7?_FJzj56
z_?^GF@pFz+aoVWTcrOq99pHikZ<vwLEUnOP;ryDPUlhVnpt={svwRJN(W?|gZ);D_
zFKYaa;uv9neFxpoxygF1fvXK%0)QN#?%eV64{#XFUddp*lq#PyPhNS2JfF*qdEi7%
zZRRKHbG#4@v=u%S-_(-QW^gJ%05vu7G0mI={Ay;Eit2B<nGJZDWed0&jF*;R)zvq`
z)6{S?HC^9IF?t;FXgf>HzBjYCk5#j@ZVbQQ7&!i@KyGg>!ok5IB=m5*UpeRyxmjLO
zVZT4~4ILdFnCj%8id0K(Z@qu(f#u4~9JZ+aZmF9B%!qVuyJo=rzy%CgMX~{CU`ILM
zoNfWIG->C26s+}tK_Pq(R;u6WHjtf@$o2a<9SLL21tmRc9GMnSm?kh&9S%H4Mn{c+
z_rBf}1%wZ3YU;$q#3p@3mCv@^cff!EL=)&WnyDAJ{->UYR$OU{Mc|DT0rw|L0k@NY
zkB5m-0<)njdC;7=Eym&HbJRsr5^h^y%CX@`G2h7JN#0DPw1M3yEd|*U$e{%V=3s>Z
zzpP=Q%fG0T6yl8xW+9%Z%mlt604=SKYh8E8?E!le1zJXabwKNNZd#?$Xu9<AgOB=T
z2~1=I1A~AIt$^wI`ToKRTk>@hq)s@VHC4ZpC?j8>84qmL*pfm1&_sse>&9-xbxZ3N
zPVNB@?p<#zG-5trQUHI*)(|hMXMh{CM&*}{*Jh`6nmc$O&x-F^-K?R{*)WgP+qce5
z8El^-2o5A9k1a4#E6=ua7@S!|xriTXMeb^W^sS53c}e{o6&T&b3-xz*cgHQq!h<yo
z$)pELPPWS)Jj5}o>H_4SKx6}jj#SXI>c@`<P&`jOGwz;Fnn@%d`paDmt^mOCeYlui
z@!tRTbd&v*3JjO*Y)iRF&MY%pQ<BKXLF8;xlN0+N(U1!CuRMcE{6Li-6}~$F39(PW
z!hrx_k6{jW_P?tkn2HJtDrgKHt)?+!Zkf9DsEjdkiuL(4$gwWt1#)@aeJsGcni`nD
z(pCS$VsD$q6fnP;ubh3=5Svq0pf8q6pY3}(Z<$>%slk*aKPgcm?kPgU3r|5JKY6gf
zPhFQw@wB>kS+Sp>3z`nFam6&IrD<}ZZ6%*=2Jl$SVCU-%pz<H6aQTQj-xv^OAv7fe
z(=5X1ry9h-E*nkaB%FC+)b)JF9huV5|Hj;3AlzgT<rD=KbusyVS4xE6|K78px53Kw
z7ng$3CRjK%7IHu4V%+$nftj&fT^YSoH^uEQY@+%jyeXgZCmwT!2*axl(P`$`ae3<9
z+0jB=H5av20txY<+3GWJS+}==x)C3QV_W2zC8hgDi+J7?NEr}nZ>p3#=K{)kVqd2}
z&5EiTtSNE@*kyQIUs=-#jx<(n;Jaa8&AQDtETPl?Ow3OR)J^V58x%oSW=6tqv_|Wm
z13H<*)1^c0XdU)hDyv8~SD(^nxsQHMPE6M2zIc&_{dzUoTg>k9gGSOOj0I5*YYVNZ
z84x-LnTlOiVitPKzxQ0rECh;Y1}h6i?dP0h%gc(#VM6xbGceF0j=s^0K9Vv8s^EBl
zK;dsg94*pb5l>2r-#A(v3_FC3gvKqYdc}`x%|Up6B*4e}EU2Ny)_;<q%AZP#IqMM<
zj3s+hUFGU{{nw-#D~Z0KTZ|H{$7I|?4PZqT6%|R*Pr6cCQRZRMWEEZ(GF1D~zuKI?
zrxP%vcdzENqa-?I6Hyj;sOV>t=_OO5{8byzEzdb;>t^p8Etr{b=3yNLSbO18ul+&~
zlCuBB6Bg{=@|a``=q5p=@U3cZf11(%u@1UhBbZ{?_^!92))Sv3b>EUm<*691&?HK+
z%B{l-znWn(iuK+}oV(FP*pp-=?-jT|uoSr)6UQ8%H(dK`2hc>6Uvjfzk2j{!`4~^z
z2|C}_!%Sxif$j}2BSr&xzNjTcrqEhbL&G|4W@<_u5H`@d!;}OhPauwieFtRA{PB4V
zYVLyBz<4u#M0{&96Ho3MDaP{Gva+(GqMegoiXDq@2gtdHXwY=^*;ygw3e2nCVa5Mw
zu}SaJs;Qbk3iZaS9FlK@JKY8h915?^co0sYN2qt>#Fal&wg6cB(h<ee+0Y&i!$!w7
z(CR}%Ow8}HJ#=%n0~GSUy?5`_D$uDoPTf%6<$c;XikHsM$uR-tKl^s7D3(HGd2w;5
ziwR%vE#MxGIEFc;r2sCffnPSc?AUiQvTd656N|EvSR)E0$QHO7RDSz*cyJ)-e}4`5
z2?n{K^tODC@)%bP@xfnHqiXFbE|z#{s26Z~>1-^=O3Ckay7_^^pO>B85wsu8&(He`
zXOHeg^{mg$5yJNXp_C~pvUfurOEGM?ME(6>G7A8nAhm!3vltZ~V!s=Qcd0}s`1cb!
z?oSRh>g>^MU=#0-=k0&#{SFB?QP<J}wfZ$TH%P6Zlf#w&(94iN^JsV13RKcRe{PeE
zZt#{3?Kj0(zt}C1qF!y)-O7_I9(?xWIf@k5Ov<2CnLn(YxS&o<E@O<3ga`S%NYi((
zxk7-CZ+>bD*LJV3&L8(_y)aXlVmO7IQoz-g1D=9B=?)xukj9sRKHS#kbJSE+U#}^B
zm~}!4*BI)7a>~|PT6*Fsh##fGJ)_D|Y4$30bjM&;fd(5&Qh@J$0fp)ST64XXR}{`2
z`(oSF*OZr=>z8DEvD<8DWYi7>W?+#XFE*WlHmiO!Rr{s>SP~ela)FT%stsVNPtVK%
z^B%!AW7wj^ohM~5X>behjz1+uS*jXtuCC|6(-ko=c64-fcTe`C(&^z+*dTt1A|gc<
z55^)*Q*S#zv9#m|y238c&q3!%&^vMA@y#Hiw(1f<nuH%&DOaYsz5$f|rV6xr&?T-t
zZUJ$BrwF>#TwH?Jt0BUEIY$^kW1iZIv@Hg{GI*?F5wjmZ`7vv6yPrLyFfUAJGY;jG
zoMAPfU#NX#1*}{V62UV|49@~pfB5lJT~*7`C32ySTjDq!6+q;jC+O_n=_D^|YRCGD
zw!#3fs=hv0s#V!HvrxqGI>SJak4}=Df~~)wnC3W!BL6*M<oqDZr;;3WjfKDYp4mmn
z;3JBnhD8KoKQ~TbDE|t6dY@l1M4LTollJz^*pnoSlL;Rm-S3DzrAT=iwSY{WiTDcM
ztR;Hi*tZ!0d=|qQnQxah^ka`H>=H4qB=BDJIe7T^81Y{X`rYC3Y;!mTFnHr-L5?S1
z-L#)RXSau=o~`Rs>jDDs5~HJV(2f@XK`7Fn5~5VN6b8*+!Onkj)*i4#*ASL;$MkzL
z;9?{NtT)1eSFyAA7X_}WEa)gq=W)Pb*K5?v!s@C&wB>F&IM9G9g&Oz}e>1>=V3Se#
zY)mPmGEKFCD2I=aG)naOV!xv0NLS{BvnK)MmcL^tP@UqNJj>`AXv~A-PV^Cp*8(SP
zHGK#TsyX8=RtE;FRck{!2Fq++uK;c9W`+uvrN$?A-R!|6++)O453kWSCJN;GSitGW
zLU7(UsjfmIT*bS+W%bPR04BCx)fxqeyiXg5C8dHXK@^+*ZBfmkq}_ll)Y~b^%XiR1
zpO|G)O*kH747)ze`+)M=52_&sZ^~q4;$?_pbV8Y{a9;s8^ImXANc;`!6bb+f{0s#B
zSPFOsnyXeM8XBPTY5vnRgKU|r$@_np2AdDME!lEMLA6R_vd>YvyW`qvNmdy<ULflJ
zqCoj`h_T9B4WN+S9ypLrOX0XW!a;Ro*e#RzU8uON=*X9|;}vf5mvDT3UT4!JNRRY;
z%FW!v^O92S-A;hcu^`%l=5o?ar!YXeqm)T1mjDekuvyeRnmbO1ydS_EW<;w#n!O@=
zseOu$gdZq})D^PO(<e>=r-{4;FIo}s%ldg0R18<_&waPx9vDU|5Wd)rsUQU%29ur{
zM|>0kR(C={Ocp5ZK=5+JfR36^y#vD2{Yrt;I7wOY<IWUIni13pC}$B&IS*IT(qQ!X
zjEc|`<Av!OVyX@LTun{I7UzWKok*W=K%X0GofahwI%6wM#933I-5otKi3%L+PzBzT
z1{>Mw-Oqv9<xi&@)-(5j*A&Erk8rNypVBy@2rnxy`l)m#P?o)a|6Uei##faIPmKzl
zxr%|ok7B`yuy7qS%lZ04ujPyVS@SZKaH!j)EK@Yuc4Fikg0nt<0ASm_k&z|=h?J^r
zWwbKYs>TL1zCfr9mNjg#wWuOd31$*HpjsBHep$ZH-%~0$T5IRy>B$Q+lx%@)5L9KK
z$!IxhmYd{4QMXQ`OF^%Jm2}tSBF_BsrO)hDWNu@H%|d-H1L3!S?o3*GdQ%MALsD6u
zxom-|a5e=wIk!Thpaf+M#y=~hYWrZmmL5A|>~J8%&8RuVT!*dgIu|QfnW3?wrRydf
zssR0|0*M+ZhEI2`1%`gkKQn3fz=xpf+<+!wsS9+#palH}Etth$GMGp-xjqD&?GGd|
z<Nm@{J*3>m19B=-L<k~g%~da_vsqcBJj;7oPC-H6+jDCV*k!0yrtKm)D&V{+%|(2n
zkfzNPTVeehs5VpZeH0R7WME$ifyD#7?B4vjsRSX>YGpxSPXl_<hZ=Q?03G4)_2!Cy
zEm!$!z%)7A?<e|9E01)tLGh%mg1b;p);rFHz75@sDq&*{J6qd>!^4=~jeH}(cjipf
zva;NPdVnU|6)Xpp_0=n@ii$x0OGFZFFc4Khl^9?Sar|FLrMaTTa+G}ZOp`aFO_>1=
z9bLt9+09_65^6eR$rYFW0jv|Pd-ZpR6&LY+IZ!Mu)vb{hz-fI`JXdc=h=7MTK|O`f
z7nlwDlLp{SO=vLxg#sYk3+^5s4Le@y6RozG;hdHueOtVJuF%I~S8L19USwsF&$`KY
zTW$W#9cxEGKqyY6V0j_-PtATlFAI2-*hlB4^3wN#a#lLYrKO;M4IpG&=KqYW-dF|s
zyk<;aLtzq#!VU}WCF<)(Twvwic;e$X`E>p;_53vpTAb<ebF~H$_MisdbkKl}{N&<y
zYaAi$xbio_<~lQ}oR+Qzm>=Dt_FP%C-GV-5Bj`Lex6E_CDw{P5FhCORW_+m!0<<fz
zu0$IGT2fh=wbkLimHz4IfLZFnhRSKs4WJEsh4v1Br<#?9&&Kibl4|W^dI-=J!q)^1
z2x47@g>+s+v#NyQCJXiZ%?|Ak_1dh`|4ukvb46mN+uzkrSAG^aP9W;$1zi+cX9@f1
zz8r?eiB+E{!@r)m5Ee+qZ_vsPSn#|pJ|DD)xeEuPNhPUr2^e*`TpygrT2~nGJ~G6?
zWI$WBi#={FfYn>=IHj^eRl=Y?my|G;rXc+1gEi>@Pqx|057gVe>IA5?_<~^_Y72Iq
zq42%VsjGXPB>U~YNvqNjPn!Xn%iA((L+6^^Y``wOd5^~<QHWOF*(rJ>3Uz<b&IX)F
zN6$cCD<Ir&#xi%lC1?QjwcX6>{4ed9>8TV37h30w-d!DIV!do~R-V0RSoW6F(1^YP
zWdN&QM4D%F`$&$++_k%=9P|o~?wFWB9o>CSL+x$qrTHH|S2cz-D_QC3cYsO$OPQgt
zpK^Aj0C5gxq0?ECEtnYfzvRq#3#PtLZ3r!*Beq|M8#!jcKAHZrz`oYNCR?Wg?vJ#b
zWfoOKRAJBp`aGe*D7X~0X4pT-A1?N>zh8#S7FzSNjQeL2_nQH<>3sZpFOhZy56ua%
z3P;$eho5?!^L7|}4ZznDz!M8pk)gg+N7@Fe2+P8xfjR^-L5TVve-0IYL76!~vqU}E
z7&@J2+$D`PaTd50`Wtb37*N}+Ga<=p9)t6=_EjpHA~gsmx5O$irz9kN4iS-0i3s3t
zXsoK0$R$BXcDr-uz?SpB5+oLkxK@P*-x!*-R_fdo9h(Q;xQ;WyBZr>&@?XDx1s*nq
z;afUT?t+(qZ<T;AbNu()C17s<_w5pZ#zJy#MUA$LD)vQJkTte0(ZWqW51K>E;&Za1
zRScR&N{XwSJT%pFDFo<BMG;GNUJN<Qna{d~40FJ&Vh7hHu$0yUS-|iyz1mnCXx&rT
zP^*at)yCP`dCNz;-U}a^4c_-n58`H|rKRc4)UQheZiF`iJvx7%4_-+-q7Bk(@3|6}
zg@RekD6|G^A)9-t;?few{BJJkN3Uy~;2L%!wcl&l{dGDeCaJ<Mjkm~e+;gk=0#cuV
zD~a5v{`cmSv<(cXymP`|8=V{#9a$L)nranO3yF;5|DA4YL#N;TE9fI-RGp?#@*2~U
zMb%Jc*v882WXTwo$|sUqCw9a5l(SLtjpuqS4x5IC7eq3!V;p22d=&U{Y^bPB=4ha$
zF%63Us+jZFOti99h}u6-NP!8XK_FIqyi9_s8vAM7i4-(K(bLDzLk|Z{pOq?ZSY{_^
zbfA>rA}&Cuibq;dGtDVO6Ou#X5ENWoSurZH(&h(;tm^hXEs26FP|c3H6>7C1s{Z07
z>JwZsDHvWlW9(?%?4-RnP`e3qT_s5MbKIGSTtQ2Pg7`M}5}n5HT1!mpm_q9$ST}Rn
z!5YZm1lOUI$nAI(TbuOo{jSluK7cErjiI{MY~LE_cYCgBRQp*wd(9({WJ%k7ppN&1
zVu4b*uIKQh2ZJu`SCuyuW+mmU;(9qQUNlx#j@H}N*Uss2DJ0srRLF_4Mm9ou*WJpK
z@LkfDGZ8&L7>w>sh_KBr;2hYfK`xOd5n+xk+Qox8>X1_^)UYnl=_%bh7atl1^+zr;
zMZF|HnJTrP%e7A}EDVY=7*gdw_wWYig{m%6f~vF>n0ERt?lIid;{TdL{5ntFqAC9w
zq}0t7lL#5#0fquL7@nF&(q|jcv<`aVlFj2IRcKHx3Bg#HQ1Q)m`xS@<NAL1PZu9b_
zK22=oi#Auds7F!cld>Aj8qEH1TnjcKEG<2aq#R*~u8!2~1z;|ten&3A;-K0MH<_zf
zNG*un&`y>_Ake`5U4O`{2t*|N0yE$KaKOGGRsXX#k?y1Mf3L>h-CJ!wGXZEn+sU>6
zG&&od5=y3@F`1<G<r_1oK$!^aotJ-k5$KgJ9u#Hsvv%LPNZ?{N;4q4h!Rbu_vzUQN
zCFG!x)0^Ad*YDgpbB}%8@5d*sT-ST-zjgbzdEOllY2Z3fz9LXk&i39Jqb9r(I8p!{
ztX+~h3%J0@No@V!i4#+AZ%d8*Sn&rqC4PH*{``m)?;V#}13fk2fgf<W-`jrMZ#Qhe
z-*J8>YF)K!-DWx97A;^>15TQ*-@AA2w#2iCX0j~Y#cIJ?{;q%Os!1<O%FF-1d;f3U
zV+-K8=bRZc1h_Tdr(^+3#I0Mm+Wva6I3+G}nrouY?QP;~=dvZd4Vdt|{P>}>w{mam
ziFE^OxNpGO)4h|`{rh@)fXjDQteWMu6u93(zUsxocDbq-z@f%j%YaF*c%fn_sPH<x
zEq9&dk}s{R!`IKVF3$sQx~Qp%;Q%&5?_RpJ30NfqSG}Cx6cYNBORiD~(!L0&FIRNg
z850&db@D0=7uEC8M<2)l17~|z>ruCBixM@Za{IH=fda2{5-;-ZJT_srLh*FF`5}r`
zprmK}R_A)@$qm50U6;Ntc40qt-f3|lNUg)pn7C7?7r%_#qV{6*+JFD20|)gJazSM`
z|2v__yY$ZbKmB2KGx(q<kIXjE>KFzF^M?8Eh!PdHmkuOF>y3N@I&*-#_vp1#5P3Hu
gc{>Gnu>Po@>eumY+ow6NfRz%1r>mdKI;Vst0A>56Hvj+t

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/F-exif-late.png b/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/F-exif-late.png
new file mode 100644
index 0000000000000000000000000000000000000000..38f6defc58e9ddd8f00562455db70f764aa0a2fe
GIT binary patch
literal 15343
zcmch;by!r<*ES3&(jiik(lwNH4N}r6L$@Fx-65d}C?G8$EuE4A(j_@`Bi#+s4euU*
z&+|Utzu$LV&v&j17|zU`v-jF-ueI*`UMECNMHUB>3=;_n2}fQ|S_26QISTQEjsni$
z&1EEme}b*0q}1f4q@FoCJG`;BwLn7hO!18tlWSKa3{riSLra7z@>$S4AJ<Gq^S64D
zS|DbImeqLcYL2*MY%qOChq@!X;6<g5o1@djcq<J5q5q2%ic~_w?BCZhl3}ErqVru|
z=M?kxc=&G_a&_%qzt5d{!}^$nXPSunB$Ue=zlH0i#ha&<F<%26eCJ*<jT?Tkyga|v
zHGDf@_TmM7nrX20lhP-uc7Gmi_%5Tf^|Brc9e$Q4q4!&@TRtS;2!Nvue)+aFM&T5w
z1Nm7t(pGHs_IK=Wb=WA2akpo&^Zasg9BZ+Y>Rp?oim}nM@DF7AviCA__!-{=aK4(*
zy{uOW4I)hK^1Zn&F{VwBEWzP&?#sf)sn|ig|F}?Db@XJ#NJ9|!XS3iy*E9S-sN1lv
zOQ?Iw6$ZY~qmq-{W`hU0;_{{ZRhy588gUE^1o$lQe$66ZrD0EhHDr-f?B4ir&U2Lu
z8G481TH@_uld^JxEH_#lBhb=H!=?FsmoMGJ<LAKMLR#mIA5w&lbH(5G_7<=(7>;tf
zE=WjNPY^%INJ%NA;3S%>ys`}1DmFd}D)JnKE(tjG)Kx~uRm#E6&cfamNy^#6)YZcL
znTNHj)iYUnWi{;&xZp$2kmRK$G(G?9rCQq>Y`C4L*AGBv<?RUjI|yXdv8sk(4D~Sr
zAM8i6t9GibKhl;zsIiLjQ`9E?Fia~K%AX$ECO;?RnB0PcNzXkbSg@v9ZCanppj&P(
z|5!eeRyk2b=z4bV*3l>pS|??sf#JoXd%u8Y_QrE#AXUWW-etgRAk#CA2?=S@{Y3{0
z64Hw@Fzf(Sr1vJsNJtN{!0>dCkkE<$ci(6Q&i>!`z=t6H&&~f|zw!4_qKgF`r^|^@
zMjckA$tpt|ZB|Yi{xS%kv-#$zySsa6XlM<dP&r+^;T0YpK2vQs)8KWSCic#KcPeA2
zZbh(Uhb(x>D=m{bZNn=qudoom&CL)7qwG?L!PE)8X_Q9;@vH52>g;vn@!Pnt7fctQ
zAlFcaZg>e|Wk_Js26nGGhe(@QS#7TN#Bw(LZL2?M5`jYZy^QDySmG4u<%g|!2|~su
zC#gl;cX`q;l^h%#c*&|DVdeuB5ExAUn@)$pWDZGYmxaM(m7Tsip%w>N028Nf+#}Ia
zP1fjTgIeb`hr4wLznc|mJRF?p*_(yDOy;CquQb_Z4G3`%zOu6N+}xZh^wL~W5kB!l
z-{$Sx<wHSzrD{9!U<u-Qh-JKmb<#^t<@;07NdC@GD9?1B$(6||$U*K-RPRrAjPHfh
z{gp?%<6J1Z&J7kmhDc`?740m2qJ{zk8G6jYw6(Pj4f};<(&&UjTxV(orc)mRcOm}N
zt`xCyv&tlX*+$aD#mh?=*@YE^;*VKZGE=QwvvT-rMKDK09^I5QIM=$vEE>Y8L18#)
zV`KB~-MfRv^LfL1_q{(=HY=Us(1p<o$lx)rG96R2+Y{gw=o)Owqf^{Bvm4O!JqQ1K
z1CB}@2HEd{__@|2{%(eoyy50H(Sxe$Rx8`v+rHOll)|o?Lm5(NcvQuOg%x)7nyd^2
z80jjlZ7BGVGVC?yX<p??@U?Nb#vecIJUyqJD5k&AKBkeN;nskSyBRhq3iwnLybBA>
zWDc!xTIrPfgi8tax%j)(j)qIYOo&Oi?QA&dL~(>~YKe?atn+B5nk8btjw1y32SyC5
z`uEfui5My^j_PdD!C2py@mz+J@*g*ie@cz=);KK8&&*u+sQMjU9Igyo5n|u~!`Zhn
ztdi5K#vPu*KCKp1SG!-I?TL8oXE*=&@dG$#teEut2-<yu{ZRC1vz+;5$qk{_l){B>
z)8whV%NjD|N-vI6+e@<oYga$?bkDNjbyLC0Qv3HB#*MC?QUa6JKh^B%8@*^fn<ae)
zA51>L+Rv3OJRE))C%iVbjeZ*ZII;`)2fy8)vGMULo5>PN5qDQtSKIjpU?ds~TXksQ
zfmyX(GKZw$<XV`5yWy5zPCkY4)GF?Rrf^3lZAHHM#cJe@ab5ipRx<9ldGu7wKXzsO
zLJ{pVnr|&y4&f0unX;0^+(A%ljE<V{6~VYjsj?PU8)D<}rjw#7{whKlnviVr-8Yyt
z*zNg+g$j(Zc;YvXva(%GzSqFt)Qyc*Cx776CilOjeVjfU75na0<_qT+h5a_UK3sAB
z^1_#GxDydF;UYqw+SaD*YmC}SLJ=$75-<2&R?k(0>_aolBFfM?-o<YUdfj@cTdWSX
zDtwVZC%y=ZYD6lm#%S%P75VHJzBZV28b+-N8|PJ4&|nzZas>mpyS=Wlo2h<xzJGRh
zHZh?kyxzOu(-ds|so3?XIZ%`4#3ih0*QF;ne(-BnI$BIeoQOBH);xSsK%XOF?V;gi
z$WfB~T9}sbWCiN>OxhO%zcP)C{V9tl=vq^z5aFc)P1Xc>(8*IpcM3!D6v<X?6u53q
za4%6<k9kE#Mn-LIZAM0`Q_AJ#r8KQ+(i_&ex3;#n_V)I6c6RpmB?X9s8~fwl<9R$?
z-r_i@M8OyH!?TKy)nip;_@81>Rs2G7XgwOZmc5J^W1mt}r+@qQEj^t?a%gU6vUG4@
zKse$F*x18XHa0u)?D~58`a3&2uL?Bj2@XX|bs*by`^Tx%0mm#&yW_o<Uj}??4bF63
zJl@b_1ytb%<S;9|dNq1+;b|4HR<G4FLi1_B(&cbXua>&bg!u_<-iUv6(+QJ*G)_tT
zYp!*)96dpZ?Nk{JSvX^Ck2Ed#zp$tXI9*JSxr<AsbrKjyVPRn%;t-Bg7|tO#QJAVu
zg|Dq|Y*@Z|v%bEL86?S{ob!M!0q)}B^5ox<sPx9$yY8rHpiW-MX4;lNw#U43+N^xj
zE6qYTM+4aQa^j^9x37c2q+5kKk&HZJEDQ!4w)zQfK^ER=#?30O1{>$XHk_Q9nW?dz
zmK<&m4i1*1Uw&dx`1$X+`drVFJNm@c@3Kt?ef^p4ZuC=iboO8dcsxXS9_6U>h|Za#
zBh%3{&4*bRnQbkS9nu89q=2B&M}%hnHsk*DZS~`t#{4&ao!(j_%~Cd1TpN6S0jPMi
z5!;0*gy?JbdE1hg?t#*1acOCu+e|pQfc<<!ZDV62Sah(gB_%2l^S`?BRrxuOT2V~9
zwY0S-hlZjkxb)}*y#hE1F6#;#zF8zheOxw=E^p{nO~{cYemu=;`h?|~$;Ok<y_8qp
z>YAYtOGOB)s`Hq9(+=F@xN%3ucRPnZB)zRE`#=uGk3fglZbpSMmax4L+_ALO!P<Ij
zcXzh@wXD9rKDb{n4*74&SvvFpB7zE=R~!lc_viliA`6!T6$Lu8mciNKO{1<`TEVYb
zE0x$dYq=&FTDQr%PhREic!TxL8wCqM95y~Vxl^ZN%r2w8eCP?>7Oa4*tgNM_<?Gk4
zMXB=aRvo_Y>Jf)^_&~*>P?Z5bp$;A%9<aJ#k%z6oUW|x{0J-zs{oQT3j;-(D1G0;t
z?daj&@777+V&yu;YRnIdh^iKNuvdm<sVSd6^}61xIldIFw+_vW8ee$=^_o+Na10A-
zpvN3ql&bCjf+gc*SYyDE0AEW?Ow2J*S02S~XC@Admiz5Qp-}mK<7!*JCpu4!k%jDs
z-qo%y3<gXgA|m2{EZ~3K^5Fr9$p)q|><@RUYsv(t8*_3PrqVVH9(wO@h~HnPrKPpD
zwmxA}NrC!a^(FGu8bqW%!!5p`2v;Ea!o%8XcYb@=L3>Hky`iVk^i4+&^NBz_a`*M>
zx1<}QWe3XS<A@dP{~S0tdowi$gZDRs9=lWJX*5LmC~MA%4*Kz@o#YN`<jpzHW|C$0
zRPR<*FSd@4j}ID-2gGmM#YNAiUh7xeW-Rn5T#oXF7jxCMMm+eX+|OqGv*h`Qu&^gS
z>#FnwOF=RNlc#&(B*H$NZ<BHh3vUehl#khrFEQDDi?Kdi1!DfVK&P>tvA4DcF~j)n
zcu4q-G_5)_q4&FY3!W=D6_K7*%*p+CCwbz&YjN5GDMBvWV+E2KQSh|@9`#F+{!`&a
z{!ml)x^HTi&k9s?`1&o*nn1|?PU)RCIX8D3?%=c1ibicfy%cN`6k>q+?*8_?`KXr-
znH*kz_UF$ZU_<lgJ*aG7H>LH7F@tIr{H|{<kMmSgw+{}eDJgRp@hLJEIoY85GjjuG
zn_0yMC`SDBtgIS6tGmQbE4|jV(adoQyG#VCqKCi5?^eXy7;Xfm4pBla;^Av%<rm|n
zetZ{MreYc}K7x=N;L!qAfg8TP<6Q9;>Srq#7Z(Mu^3uH46Wc%GF~!QK!&{6E3~p))
zG*Q2qG!Zb62}%Y@#|_5K$r~5HpOdPMQ3A!xqsw4QN=iqJ1N7t2<Oocffi$st|NFZf
zKO!OOUM}q3PM@o-ymY@S>pu_t@AH@Y&VyVim=fUq0|RfKCn_dz_+Bi1O5iZ8^E_N$
zTwI)*()l|=|I6@1aR6>O#`d*YPg70#RLqv`^6h(R877SKD4xE=_9hw2UxC#6zl5G+
z^@E(fU%Qdk)6>%%$a2Nz5ggKC2FjF+()%kA$JgQQ^vw<|Ss|y<8n(H4d7pxVON<(Y
zg@wIOx5v-t-yM9!gMKgUT>SEPaaDC;1h$6yr0jTc(vY_UV)72R3PQelxaSzeox1oS
zzYjylYdJZkOmDhX9h&2#Vt%Uob1Un>M2m{<nD5J%mszV%rL)xek7;zM{Z}8xZ*6TY
zT!b$Ox@~{`#eMrn8^7JS7ld-KLny?&zcvX+%b7FOaur)RHxnw1EGe{<mzRU_lr}f}
zo0xnDzrDS^eSA_rQiiQpXd9`p;Zbp3DH^fxw)XF8FTV&OPqt(~4bg;_S3I<2NyQxE
zH0~6gkv7=wW*o^3VQeMf^p{^{eA>!-dF+N3(zTLuE1Rwf0y!xAC)Y3~A+P7;ax{RI
zJWt29FKzm9SbMgzY=RZu8cwDrC3$b8dPGo(DHP<*s=Qy9<2+?;P-9OvX;4sJaAP$U
z@w*We`_^Or^5x6mPoFrAn|#i8bqSth9&7u}DUYuHrcRGyFSLPHD(?5bK$90gJwpjg
zl7uc5eSJ5v9H*lSb&J*KD+}h(OQO?f*!>2l&iPdy+Rdb-X|y6jux-wsprjQqeCZcu
zul4)E-A+-~_n(jai2D!SC^ovI>2}=4UzD|Bne<$8eoZa298B{R9iU1q^`-Q+{`E0+
zMQ~#<ePdhK9*cxR;@q&$l|gOR5VyXU#E3QS4+!j*mK*JO;(gab9{Us>Z6yY^&!Nx(
zctY9+5oVAQBagUvy5W0KT`!769V?V25vueZdSgGr^R+SE^kq$>7H1nZ-9o`*{SxZ0
z;-3`+LjBoS=`x=2u61qIsfdwodY_3NY>yYYvR>e5oaR6Znkbl!Yp^T)h1$CHM-Gs?
zI7m)=*}|sS4Ciu`gf6ibXL!8)%~v&agH{Ch_V&PbefV%E0{v^Rdw3=@052et)p{P9
zy?;7rT%l2LG9Yp=bRO&-7iHJMZWHg^x|x){Be7pplm9@2HO^|IiE@9s5|~5G*Vnh{
z^=n0GV#=9nCPv1i%bVSQ$L#Fv3F2@Cr4TuJrCst>OWz>k*l@0Ou2p)IYoQBbtd{5+
z7L1s11lKz>D*mUOTIMiwGl@pHrzlm3bhZ5)EAft1uM8_FUs6>j#}NkuLC6pNnh}@L
zEmt=;HyDhls=lCMV9Uyy_i+a%6BAQcXD73oATO^bYuwQ#D4}u%<iwabj2d(x!~hwg
zRn~T=e9d{zW{At8mP}UI@R*45gHJ~O`?jO^R%8b}aS9gCpYG=$uEwfTL47>uIB0*D
zO$`6(eN*Xw@yY+<=6Dc38M*tXyND-kqr<G+2g)gMvr3d=A_AX$q&ho=U8=FWT2ay4
zxd(lvKKtwCz=0%juY${<hufiZp54r)j~^%|-QD@q2O}dQVuYk9b3s)$y2V>F9n(+C
zuWznDt{t~*qu!6!f<mL3LPSKVoZ#K;bMupppLMN=E>5+_{Q1X^9}~b1aNQaK8w>5x
zqs}hGVZEE|0E<9_gtYh+$=LP9@lGx2wY~S$1y#j|2WWT8oOhXxjlPZE&Jty9oi$N6
zKOB5_@a`7zRu#B4FzuQ9stR1WPtMN|7Mjz~JNske--;PbBb7RPewd}V89t)i=i|87
z-jCy`Cu-6aY*K&B21#0bQ87#5J8Tkvki*8Ay_o9}Mm3UY_<+Q%>RYmNU(nYS7R4_s
zf|I4joC)yJ(NSujzpWtFf+LPi`=zWbn1WI?pR+@4Iv?8H*67l%dlI8ZrCV0hOX06p
zh1P!%^|79w-@&=xL9{H@G$0Fvji8Pg?UjX_Nzt$JT@4TR_xZ6uPPQ@Y25T4Vc25Og
zwc_~=&COAUNXr#&)?r@M9$#jNnie}#Ola`k{%ky8U31@RG9`A#tSV)&&SBZW>VyX?
z<&acb35>~v7bu`v>WZg&z_Gk4l<UTRNA*4xl6?DUP+Z*h^%Y?#3B%Mk7_6$cRu_GE
ze!j`$z({2-J64E~FRsVD#JJh-?&cD}IKTl!*Byo|-_+aki}3Nu+?`@(9ffA9ebVuk
zY3Cvckrt&|sB_y{YX2l)J2f;t?KLQNt_GhrF5?!56wk~o0$)f@P0b<Q%d~#@{CvUx
z9?sd^N3gDVfU>xP(|bPobnuutu*XZa)v)i=r%#|v_gQ+BPxRj8L(~PR4U{oEgo&QL
z0JR*ir72~<GaxWLIGS(Z&AU6s6!>iH#9^SuTkd3mu?<ooxC1{Le%q-ROE6p&G+P7K
zxJPJc@{>M>%*fz+RY5UAMTLdT?i^b9QFYF1p`tca2uc7}1~BVydqc<lFQ%kYQc}yE
zLb+vSfUXK;(m6dnbxnAlhJvykZvhydr3M5{N9)FExZbZ{LwgXgSy%|@9xb_?O5~gy
zKzFsU>gz~;1`tokQmm!J#n8jsI|-g=QI8F7q~n4GKW+fzM9(8_$II5fzP_8A8-;aT
zB&1f9BH&dZSlPZnbx<M-y7WmaX4TXJ_d*|M$d1w8)?}y=*6F2vBB`XR8Wt2_I;9Jy
z+BN}sYr#@us@F^LMAD$qn@AWH@GrJg3JUZD#m4ZGD;#X>ZePVH2~2QW)OKb)Bd-<K
zKjy!l6$vFEQdU6NgzpYXGwupDF+Tp|cSjbiBRcx=1gBsy;_4rznG%&kgQn@>_Jdij
zfJOW8_t|x~n_+}0D(^GP)|gLP$Y9_!<(t2I7k637YUtugB_9B*6(4qeFXUAZ=qs{l
z*BEO**dQmy1E+5!nL|gWrhZ9=^&E>57cX9}{4<wg9N@&}s;l{Xd-V9f@7LKg#y%EM
z`PH8I5FdgcV<HqGb<DE0ukm2*Y1-><ev$!tFb=MVVT`W;w@_wsd6Iv`Vs1JtX!Rj&
z9}HTOzk(UhCa5-xSH!5em=XsGurzNs>-Gh4J>-or8lcRPA!vxXwYbfJgqJp_U?5t%
z`xGk(aqc}C&#w{yxTo#)Cd`gl2p?j-D0@K~HDQ&+&&^%#JQr>0L*q*b&goFUFT|vA
zHKZmd&zga+2NV|e-bS;?;bHyzLfNL0ib~A8?nsD5bh!!5`+sZFO546Y=doZYpBld5
zRc$vKlWC#L8;jzCfegHCl^{lpPeeqqW3W{*Fx%?T)1dlClptc!=)0jwDJcdSS5`^!
zDtSSgGU%oFU;v&k<2SsfZR20-z`cWJ(+D*X_t3Puz*#dL?oL5^ni(b9|4`qwT^zyo
zxtaXv**K;*Vsko->7gG)dw?)gfQ+TPyB6eRRloY7aH<MCgM*m_7&hwr(D>|ZN?~Ed
z3Zz~k-<s?PK^rw<A^6Qz*N(kn(iXE>d*7L~W<q&}Ada8DuMp1C8fD~KvyD-D#ryt!
z!G&aE`ho9pu^c_^0#0>zXb0^8Ik@cU1-2#(Jz610i&Uh>P9(X%_k)*G5gNGeqn{AD
zfDYx?@j(xa8lI%c1BWt2C!YJ<wZb-;>Rby^B!BzQM4xu*f=$%~pydHv@tovTUON94
zY=dC_E7I_poE2i3aXD!C5|?g*-#-&x<5t6cNF=TwA2f=NaDA+>UMFTkiy8NpGkTqB
zyZVwHLEOt2!El5n2p}=6(`?vsXzU5_fApdlmE20y1hCvQTROI1<=88N1ATp8EOZ+L
zKNI)-yRDS=*NGRV1xU!5_WoH}StJ|=&q~$Mk^e0X>EGuIo#Ev2%~~U)zJ7jpCtIVu
zP_%yzCK<qlU0qXi{ZbLKhKET5fde37Nsg2E7_4Z%`$VpCa{jA#T!dDfaS8`b*ZaG>
zkUlnGj|>fFLQUA-)|Rz{1Bv8RHRbGRDlsugG@>FRU>?GKh!BRC#5_DZ+u*PO9p&}%
zoQz3NER4|>6cttasQHgsM1K$}PZTC&I2lPTUc!uNt%hW-0dNEK{sy4MRcE1WzV{*z
zQN;&#uxdRKq-H;;xdC>xe4eOLKxk{KPP7Du$6?$=5!NyE1G%LQCF917In-_@*Sf9*
zK-+qcgL&s#if1o0-Q>g(xSO-_B<963Gh(muDMF-kp@$)=L-}Lx!`J#QN`3ciK$QJY
zg#FOaXF20;Y-}u?iaT$#pXj#Um#A&zg?jrh{vIJiNM$w08vu944m?#y$=L(#?YQIe
z?~u_v)fFWaL`?M@ZU^+DG&KD_b>WiI9mBU*rb_SzqC5)fB!B<=%0Xx{eC@X+7Zw)F
z;tHk~#$>u=27Xva_hi-tH>eF0laew!b^cKR-2#F5KNCxK%q{Ka>P~}5j5fEnXvSZw
z@}v*Kc`}jT2ci0@Gdq2K_?e>p_WJx74`U(U0Q09^a_&=HJUsE^J{}TIBlCk8Z0>*A
zYdp~6^B1~NUXak5E;=|F2{78ZG+`iLt&)ypQ`GgdYH=j=2>5K}Bn+gBtKMfC(o7<Q
z{PFgBHB|C3n~eI=WdnX@Zf<UAX=zQ(WCaAX+@+o^shBQM4F=O<aAs=0o;$$B#*PY%
zQ(#aY{f<ZoTBi@xVB3*O-qJjqVuSB?%ezLley#}K7%Pv;eUV$a;P;Tfn?G+lr@lX=
z22{nds54RYJ|af&(QHI8E|3OGm}N8fg3A78r}=It*V;QxcGx4WlrCANuyDH$_>I`b
z?Sa4ln>WE`$JKUp86X(8u+|4kezxM>7Q{szF1X08syeMqzug6#k6fOWL==Rj4(K4J
zq!BA+1q^|nE8zlncL(=rXAQQG`M{?A>yl|rrig7l0jfDF&qZXzNj_ydmyiHm#5O&a
zmK^ZaCR{tX+dlwElQl4kE#Gd2Q8Bz)+7?9GmO?+SLb9-qrmOMN{e|WQrxf$&TXps=
zeVPQo>MpgjHBF~Kz*InmA{Zfc=$V9(yHjVO8*h=ZK@I#8*2&uscsf~XUqBDp@+&%>
zn1~JnS`g4K7l1KQt@tBXIK{!E{A8WzS2$&Ksm~glAXW{dxhn7tH)rRgwjiu{3nzLT
z^{~EUQGzVV3@$!CHy{;scD^j<3i*`M8^??O5Q&)hmyqoYKep85X?%SAp#R<RR~+gg
z_uyXdKzw@nJk|8Ob%AED+bcIf{Ifcc23zP7wzqw!L=*%V1%tc0#rT=^_16HeA+Hl*
z5bJ7;eHn9`^S?~+_d4t#aWjm3nblAx_mtpYCI!4DD7Av{0e&#Pzna|H-VUhQpeg1(
zg2wiw2s$m#*1FJJrfsOl6uyvT0TvkVaGL{iMj((O(l*>YJkC!~QRxFTIv;eDS^08B
z%QakW7x`b;_`d_g!)<(JfE@tRj0s<c(LuaLhZ*-sLSCBpTY!`dwB-sgAg0;UgqfMx
zknJdd&Ps0%?(aAc;-70ed4mjBTwwyBT{I*#>0r8YBl7+tQf#oOpx`l<M2W>rqOyw0
z-Ld%nF{q&PE0SW$@Ou#23S$KWabfD~@+rDV(UF-M5gs0?(QU8F_ew#M8GqZU@BS{_
z?JeXB5TCw#5l(}cP2iVj183RfJ?2M=mT91}=3!CcB{P&yk}TKpxx3r|m|~N|?S0GB
zM>TYE6pb){dE%r_^ny>I<O397qS88$*vfUjcn_;BEoofS#J&ZrfxZ3y-SvS71ru5L
z@(GF#nEVp=lP2c44X@@io945Y2Y70DPnAavCUNp{vN_&|X8N4hFYFy0Y`FIcwu80T
z;hS<=N$Uo}OTqZm)YQbp*?O{r3aAcDP(RHV;01!PW_NyaGB!4*rb4Xp90V9GG{Z@Y
zr<pQRp;b0X)h-(YO-;~tE~`G@GMgT;%BI^rhx<h|@hI6E6oiX><ZOJke?SHHz)21#
zs8reGvRdY<R?8Z9>h6L5CjBx|v^DDdS*d970m`+K%%ofG2a?-_d!ogWk$CBxC6+<j
z!W+(1;w~poyrwzYAiG;m%sz$&WtIfEL*wa0`Rgt#!EYO0W6Zj8E4%XR-N@N+&Qulu
zJsaa|Aj`dYm1Tjkm{-a<OP~i8)iOFWmlqM-`?yd#IDSgJXvdt%#70tT4Z(CPerbmU
zf&4u-nQ_lhbEN3v`m(>jKj^d0lcN#Rk3Unrh4Q*N#z&r?7?AYo@Aie1M}K|&R9xs*
z8ukV*r%u?;wfPt9OyaO?Wdn5iE+tl}?izM@g<WzneR)}nf~3-1tIy0R9mLLjLR}wA
zcPsyc+lvP>NLW}9sSLI5H<f@3pDZz4!BUcAc|6we!H{N@mmMDZ5+v>{LT_!t98K0?
zBx#N)qlELePpu_S!=j@mD12Bd=oxGoE|qAeqs>>M4P?BV36afBW6~8-S9OvQiGU_w
zGOEr1U}X?Pn9@80?C_`iO+AABW4j%}egX(6#X{FyUxxNE|I3L(-{BJ+=$m$~e3N7)
zay@2~s%0Glc~U-Hy4IuG_CF}a1}D!#9{<oTo9gM3iYJ-TI<iNGKpb77&ZYfkH#avE
zns3%fj66TwGCJ=w+spX-PUEGfrXDokLk%y@y>;R(NFTAy)#-%Mi&gm2!>u?Hl2eGX
zR0Ki4fCZu#Af*AQp)D;fzyrIx<@l3R)6+o_ma0<o^XJc+8Ua2&vA-=3W=WHjnY;}6
z#RlAoWviyxvg^%FVM(^=ZzRfEl#7UrwKd;d{IMw&ySrGS_C0xg>FXS(?zB<{d#eQW
z9iV~(ZJ34BJSo?1=Hx<HSOUVFqp=k(Fn<Av(enf&Z);D_Z?A-ZN#O?l^?|#e@KbhK
z163QS1fX(2sB;JNjbJmFKbOaSCR;pZ5x?*pV>*)!Z`X;A&fHhx-NDQkz^w>j`Xm+<
z)`49C9H_Qdh;`!7zq5`*Hms-qa?<~HlGFbZ9xW%$p=V%Bqy=*`Gh1FuFuoh`XgZEf
zzcIJBk9cKi{VVuprT5^oGL^lxI5#)9nAq*rPAS|WbhWso#C~Vu2M!Jn5Y?$7^E3*s
zuDt)~19PRO_P?q8X{nb0#E4{myE=gUzySnU70O<OV~06k9<705Y1GbnKS28yml}El
zEY;(5^`498sq4=ZMsk*lQyM0UC`xU>Fpc0PI_!E53=SFt?R~i;3=ki5bab(?v9$&&
z>R)a7uYmvofF|H;v=UFR{Ej^Ltay`D^1vOb{cjFc{jWv=9uJbF0b)a2Jluk;Dcs@N
zL#$Z}a(-JN%5f5hv0W+=$y|;kG=bG9ECkUK(4jdw7Qn&)UskX)W}jBchzW)Uu#-*G
zqypU#6fF&oOKsN&&Hh^>Ioig)Re<Ytu3e;u)t<fcMGcFz1R}Dbp`rh&w*UC_bWd)H
zE!8qPdMk>+l7{bLn6VGwjC<EAY$+kz^r1n-dJ!v8?Q;6Lqgz0Od)*a*@R(0{)IcAy
zH6jY@=;g<&Q17(yT5YvXatHSlSnxTnnlyTM+%F*e@}+Za3TI>p$*#1_!5iGf(&M!Z
zW@mN@Ub5Rt@#{)Jee0pOp3yzT0zx<0O!f8k^+Ejs6kfp`PqC}&WIOL6Ko+i{DMA$q
zJR2}{6r!GGjg7Y;c^-PET;Ctok;~ln6uTIng969r_H=T=d*{dfW%_+05M0vJEfqs~
z(##pm$V2bo80luFhxUzMASF281>kYQfR!JFUhjf{*e&wLfdteZ{oGt!e-}UEsVFO}
zV>7ojn1v6yrRp(Zv4ktCRA<v;M7Rv+C}y>HvjgpFtaticPxBkQy=@Y!|MY6MTKaiS
zL`G4Lfn*|6y3f(HWqQsij5SVaRJugUQ=DE9m6}{>ba!Wmt}2uIesSxpWG6-sG#wBS
zO2WqF=ra**C0}iNiP+7Nr>hMS^dHD@*=V{yn9&p<^aZ`+>`<H|7#Wbu2IF{0CmtKO
zJ=}1|pfU2hwD1!NHl4*h!o<RwjlbEH6&Loq@yzL}v2yL?RW@D)hI_?M<;#{&7`@*+
zF_ft%uYcsGvi^-z!eBr!Au@a9E>ny&xZDVbeu|4wpxT`a`=hJYtd9D7Qes53`U+Im
z^>x5*M1Oc<o9CG(tM@{iY}yP^84x;e+JtN89GYn|AE)g)6%80if?^Iq5z*RrjwF(O
z*rE+;JM!~Mx5=709H!r~*)i|+;yaSy;uvad=)}LQvD>ErPv&rc=1@6UMR1(RA)e0L
zt@>5*v#*mAt97vtQK(Ument8kn|n0eSk9CsC#+^^rXeu}!ssAhvZ+DF&Sd%bhIgKw
zMCI6UVJ5HnglA}eUgaQ2%>HKzE)K-e=gaIn8TlLyuswjI2sfb(=IJa*#l=Oh?9al3
z_8<d+QF9tz(ZkwP5P`-R)aZ9JudpMkBc*Ax$Kt||J0wLTC|{J9xjJ6_H7&=FW6Eil
zqyhFAjk>J>sHmi*B<{<-o~(A5MbH<@60bM%v^!rqo1A|pld$2mFJ^OL#yX`xrOEM7
zH%O<{kEg->`)W9|IOBw~ovV8=XJW)zfMXEU+B0YR&8Pa1gq?4m$YAy6hh*wOHwhZG
zPg!&G{e(f|vLh*42x~Z}(8XHVa_qf~-b-@XEOny=`dC>G#bs3J^9fet2=9&9sY|U#
zTQV$ET_QKTmg3h#Qh3ADMoWL~Ks6EO8(*i=;f*JDG9=J+h$FOiJJFgzqIW6Cf?GqC
zEnx|f&$ZTq!K{-e#>O-OU<0i?tZ{(y1mrkacL265?jD9?WzLxQ4%ab-L^s5<3S=%(
z;Ld+9Dk{p$+c@l^-gxt47b9~I8xgL)Ix8ofgLzduEcoru*6N>G)s_o~VO?4kL$Zwt
z$D4qFL+!O14crOz2z9L-x(cT%<N#@3E+l_E9nr&K^viJxwEB>fkqNu3_gx-u0EWDK
z>-FnbB{;O)M{by}vm#gaqvf(QGE71GPrn+=i=Y;tpPlV%V<pyq39yIb6Qhj6LQpQg
z0&mv3Y}mK5aITv6kV$ZmTce4^DCD>rmj3v$x4SFqcXI*o2`-hW+`3YR+7NFz+3sI6
z<8qxbUiN4?gcfji=4_(KK_l#SwEBtKPmqht5wssoPfz<m(+4-gI+mxVNKrcgQOX(@
z+O?vIuM*T>p!pUa&khPt5L!TjnGFm6Xulanbf!uv`Zp4X@HaO$UHV`;kcl^kvv$69
z{e%RYYHDkPT+PSN4?-*G<Zu<<^D+`n-QV1_0-1Ds`zp@(l4#z@epQm=o81fr*7;i1
zl@gW8?pI%d{ZJ{bxD*=o>AljCQ@YsrB9`b-R1m-Ow0ySeN<@T&rpLwzZMV9s{0Q%t
zb5o(z{RvbwBCfXFsMJ((*I>(oFg_3X;ijf{`?Y!1)mn0UX@@i@zXCllk2o6&3lBX-
ziNn<SCp5TA&7UU@ZWvA~(-R;-3edez5v4jPt$AN6sX#M_zS-7x*JfpA`o`IwZq^wY
z8#e=j8AzlDv$e;d&8o*-!+x$Of*c9ISY%*;b_Gc4;}a7=ynkey(*LHwT_6D-2VVoY
zW4j<PO#|lU>Ush+U2#JbM@L6@_jq4g-40&m6|!fT;<B{SU@UU<)wa_kb926+E9~s#
z1ayvkcr67TUi~1}R9*l;6ZDRQW?`K72dJ`Nlz~<c#@MC1H9+of<RMJW%PV@Z_z~)x
zv5yNl=CQR<+kBuagUhPqvH1#99dL9t``WWW1(90op3vMY8kGb1h1E@&!@(OO9WXJ+
z{NTMtqpvXSdATBEEHC!3<rAm<9Eg(h2&3I=-S}B8od_R^1|*<WRaXbdHmLce=88LB
zq!@|{G0IR;bN2L*(I13UXTK#4orbeV7G&VSX8vY-rsrXRuc$~E<&jAKUO7af`70Xv
zHoKsYA$`y$>E*GBCwUqVD={&S?><#Rp4vE84y7h5**U6t{g)jRpSnljySUC6LYo|c
zpF7Nu=g0_Ufc9d*Eg&SsLi`-=drc^?&h6yS>`jygIT(F@*?jbn%N~Vpva0)48z6w^
zSRA1rHoQO)geeyp6Q<6q3^#v{JRRw*(`$(XgUYz$`Q97yvQPlj8{#0S(%RKYO{k#&
zItr5o9B{exf9a>;w^i@i^4IU~!VpX$j2Pl)4lodMJeH7+8BJKKnGPW3h>6h$pME{v
zDXHJrlRxC?hyk(X?+_+}r}&}7K6nfo^HBI>--$<SgPpdR+=q?eoQY=3-v_)Z*MYRa
zi)>xb0c>k$LlBpRCWm(ITmj_#Lu9nKeAp`^If~uvVE5xca^5j5FGD9?B)Yod@J#an
zBDQ|n5;gF=$Q87LLeYc|)T@3?VReBN?EoxP+o>ukwJ;#AnD(ZebU54udAVQk7L(5x
z!662$%BQ6grAXkmB9JSzJBOcbE1>0L^d-j_CMXt!nMr!^m5B_s7Olu(Fp&AQ{&AWg
zY}v}GdK%3FEZ}Z)w)|lTuF{0^Yna~Vuuf8(Rmz4J@VdX42>krfMExZUFl1M|4iw|E
zPh1^Q5WF$+nrZYVg4|Yd6w27}3O4;qIy^nCyK4GDpW<i2<<#xNf<m3mR#2VeLv%zf
z6y<7<kN|Z@BOg~R4H{^W)93`WHk|eZKY=++NR)jxfBy8D&Jhke@q0z|wvRI%-BQ#j
zS{Q4n5+(kf)(^`NWVlLC=Ia^v_dyII!L#jn%Cd-Iu<Dz0M~9K%x5wm!r-9TC2roxm
z#HfWdTOb1M&y{&h;?z_=Z;Y`g86$*%Vs_DllVDYC7>mbOtVbQ;UU;q_&2&JYtC^YP
z?3CEF6UD<7#B~F$lfs~&Gq%)JiX#Eh-O&*qtIWNOVBkIJ2{4>q|L&cfk33qjp11+H
zCMP_2fM=2Th~5zsI<GeCtKJ$zQ}p)jTLp-@P+2M}9TsBd>V}4m`Jy2~!Mf&_)75)k
z^QSwL7DbrB2(?K~K5w+?(AekWljZ4MP`2F|8*7mOPbphh!!FV&`&EN2^d3QjrS-pA
zn^l)C1v3fk)hG(oJS*N2?kE%;th9UQ=_v>zltPZe2L#JLky5{3r#Q-sscD_Wn1EA(
zEaR@lOP2cWTetc1(9B;YHZ#?k%%ng5sWVB*$+h9ww{b;T7795U&~$1lDt_fyQE8fR
z+<#I?+4}BuB@;o&&|Ytfn{nMo3ti5pi%k4XHRfL>^=+5I2nJ}o3<PSx7~Wqu<QVxn
z|4wDt0$)O~bG=%mg)WEzgB0`!v|#3cOJOC~;{6n0zSA4WM%YQ9u}8B`1n5-skdJ71
z73W<%&gMm-O6+eHctk~gu1>5ykmnInnU0I-posIT9530aa*_^fM2Ynuz}k$Vc2i3a
zQG#_L1riU?vb(aU#$v=I%GE@HJPqJQH&)ouBg6>*EZ3F%Yq`pP1w@nMot~#(8I;fu
zSE%oG)Cp&*DZ7Swan=!wQ3f@E+1c9e?(Kzltz;VmyfbB%l$PcW*aK{Zwg5#0t*=>H
zmX`<mUqa#-0syH3vP3W2N5}tCRO(9VEeELvkF^9tn$(!Fad6Z<=iLnZN)e(%nqq$8
zHb9-&?Tdd}ta!<8iUDJ3scDTq19t0+{Hba?(nmx@BXncLLhsW-e^M`snJGQqKUV-?
zd&b?vqh`ZPbELr*FPO)2pnFZQ+ZAzHf^r?D$<wqns!2C_Z>!bcnM2Kw9zDvBrDlID
z`H#(hIIRG1l;mgU+Ty~u?-i|d;|mKx{~D-}ZQ1@avT74`jFXBX1DNtCAcY-f+zT|9
z_j!TkUU(7{*S>3QH1q771TD@?#F^UgM_UL1Z~Q~Ajne4sPwOXQ1X0B=0xWbV5_v3L
z4e>s^BjmZFFLpBqc)vjBsfA^h^Lf#vvA-d@L_5nfec+&N@2d)QAfP3cgH1;h<wxOm
zOAFFm2LXakLo5J8&~xn9pm?fSsQGFV9WC>!c}V{e!a~GapaDU$EjO3Zt8Y?+G}v^e
zdZ*5z`L<ezL+;-WXRIrUO?CUb*y<|Gj=}>--K-C%xz=e=U%hAj2tTpvmSFzZ6ZerF
zQt}71vI7)6ZA&bK=wWVq0@0$CQ9lESx>&Ir#bc>02xuQEQeZNmt=h$&uo9HjYt2sz
z6~xM*AU_uruoNad`p*|Dl0iM$WUJI$ZTGwtRHgZ+%*zN_u<aOAh%ck6iZ4##$4#wv
zsS%M5Ga{BZr7{Fg)w$V#Re151NI*IlySTMg;!*;k{$L;XI#CQBgT7V(xL*vVZv2RW
zf$D3$j>Gw1*fZBx&ke}6&X%}7KfuF(R_m-bd0I2?tq6mCxddqdzgk>QV0C?8@u`Jt
zdqpwm6&&0!HAN`8J3K}@>vVI|jqlDYjOZ8Al9R6ilKdAk1Cb*$He>;C4q#{0om0pe
z8T32jNqGsTzC&k(NTLI_-}`@YPk?nY`zL{YuRxBsP6F5;eLl@Rtm0{jVLj;cL^z}9
zT-cIP4_r7{@^ep*Jg+Sx=cSqSOvLWgfzqb+?)!~&(m5(3CLk;C6JYH{b~tBkuyh%M
z#}dF5b2Kmzx>QTj3YIwg%&4Iz1TsR3^&fo>i+Dzj&0niPGr$Bfod^5{zv!dh5SAFM
zL~Y?BWV6<oIIC$~o}<d=iP$Q1z?s})%fOuC(22Rl#Uo=MfzQxem8(+8fR5~D=hoge
z=YJ_kG5~F<3>)=VVBAunbM2RiEX2aK9E<KdbVL_-c6Pqss|_NybfDP;HvvzTfQLE$
z`{@!exBq#%1XN=mGp;0z*YiqtBo;7WYiHQOreEO}h_v{SGH(%={ud4P`DGTi#)<4B
zgr&mBWLr=BoE0r5-9GknBP|jHRK>6tRsveU=q|b3L<ex)V+07PNdU{n+1YvRoldnE
zF(Mkg?H-2{rX(dL=}lBG%K>aeG=SJTe;>ln<s7l$OgdYxWJQ5s78A-10ooWAUK)f9
zWa0l63wm&>evR<<J5ktg)ogYijY-O=bIB3S3Y&CXsXT^M#}LY3bZh>-jFhuM0-1LT
z`u&%aqlzO3b53ogN@DI)ljwiD+uF$KkMIJ{KoM=LS(p-RTqds^!3^72nIF!XAk)4J
zrPGaAF*)M-CG)~_IpPT?4CV!qdEYV&A`dYpYB2$V)TVSa)P{|N<i9BC{5=)BXc6-2
zpC+Wtid!QRAvIhiO<PWIKkP&S8ljk&qNfp?gTC8JgD@zy6*M}~Nb{2A;Lt{+&%83r
zD8d#~MCTS2on2TkF0j%O2Aizx>MaAgvMXTC4)~QTbs!pkQU#hLyx|GBUb;hE*zH^t
zU6%;C33Oe>$o6nwTYNl6qzYxJb%HrY*q=&EJnQgW>o{aL3uJf&1U|yMCo6t69LCus
z*MGBVd}08~70|{|UTMB#4fwk)*Cg7Vw2iI0fji2$^=^>II|A`Rs$AB0Xzajc4C*ZN
zMwD4`8H<Eoj<ct~N=pZ;?W!xM^m&zI?dwYvB{)KVA#m6A!aejlZq4~A6EPT!-sMNA
z%_hJc1Xv$jLQO-09P4%R;Tf8cBU-GWHqhxQ*Dw_w7=+MAPE#ekWFpN}n@<#*$7W{W
z63j-l*$+Lu!G58w3YDfUECiyRLA`r8Kb_RSrV!uOBeyR!{{&LHx{}dHDL+9C1!ORy
zSFpIRHlS%8^uonkM2D)=V_A}dv9MwhTj=#DlZg&qXNg~BWywa4tYk~nmAGhzQD;+d
z7)}~aHaac^n35J29);2ja3QQCJ9!F_%b@SR3y?TyH-k;5s+ALSB35+bWgd~h2>(>?
z390}R$v(&2rzaSoFGyK1VOWRp?YQw=<2!*w6L9}WJwNW4Lq15FxF+=R#;~58JwODM
zXn@W=PBzsQEJ-x<L@#}t26RC)8=z5?xZo9PNe_UlXtoka?#|Sd*48FAh#Ot6bPLOr
z$~FI)nGvv`l_Ljzp195kSGG~CHDG*F0GI+m)@EBLfd(T<;?mpbXp5O@3*AG{8z70#
z)HtN;<R3`nihxN)EvkTazr9GYvnjFjS*dj*5%0Q^N-FS(7H~BnnwB;;rdFHww<SKz
zs6!P*_1KS$D~#E6_3*ggKe#Jd5d^$v%C~R$SS$zTZ$U(?s;UyZ+RQRH(v6ofh0Iiw
z{78LdvZoex?a|fN|Hp2IgE$OixHF)hHpVikMtu1K+IR8`lN55m^A6PBn;D;|yf*>W
zn3M}#&n1Hfh6rBm)pjLMvrmGGv`f=OJnX?k7d}1)=%5Il8yTqpDH(LVz$-LiYnW7C
z1plco)cieYq-zbdU~#d9%+d^l`W=fDz&JIbK^-qAGEG^?>>}S<f)hKoro%Y3ol(ip
zToRz^nl#=B*Av@=OuF@yfoHo$PP3%ZdIu%5)DfS3QEOn-3(wjz`pLLi`Qz?B0g(D8
zc8J)Gw@<KA$I-94b|F0ds#PAFq8ia1gM=jTK3(>IBI<uXONV&tfBQi`d`Jp-dhh?Q
zCk6kXPb2<+ds6Th>V<!t%ICA{qm*rsl=Lig<liVOBe8<l=t!u@1V|6SD`ccc;1?MZ
zuq=3ugrtB>{(oO<AT$5hXTZEsp8VHq#Hapq$bmnI|Ni}TwOw;SoR*hSkuH%m3HU$z
C7^rgq

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/F-rotated.png b/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/F-rotated.png
new file mode 100644
index 0000000000000000000000000000000000000000..f515edd823253f7b3d61cae8f7f82cba4d7ab4f1
GIT binary patch
literal 15355
zcmch8WmMHc`|SY%X%Uf<7U2K~1f*NKyBnlKQc5}nq)WQ%(A_QFB_gSSNO#vA-n-tr
z?w9-Ve_0FH@&q%#nP>L1pZ)9!Rg{;&LMKLtKp<FBlA_8G2txGZFDfE<<=IkpD)>*Z
zrHF{4l!yq0y`!C(rHv^B;+EzW!!OyRh!>=wl27##nfD8qNfEZOnCf?>62(CDY;}v-
zuJwFD;kaPx-d-hpMy|^m%}@3YKW4ksaFBe2(n!+r^zy#n#0rNKzU5o)cfTN6Zh3}d
z^`=0}_JeQ1f*JjDf_L*TSx&>4J#adi#ZAqKYGUI9?Yx#$XlM1lnqOVqY3W&w84C$f
zXBY)rzNmPiVEYSY)9Vi^!w~%u_t6(A0&4H|=08WTHvNYY$G?8tnjvur)P&VmPIZ@B
zSbdNCuB0|iXE5Ma>bU%;G=aX<LE*mJUfw|e4^J5ab)~PEBu;jgKUTcqYw;HOupqqj
zey`iRas#R);c_fy$B|r2tm>Vo4*@GRb;mE(^p&}=Ydg5c`YCXJA#bboUkSLRU8CW6
zqLiN&bm%@Q5R|ImsQdSPq76$|my_M}S>qzYbq3~qydIsT%)qAK#k=bQ*u-ZH=W-7x
z>$J5~1j*^rSkBHaN@mrpUG_{@*V?hYm5jbyZ%Cx3WA$NAPbb(IG<!)cCkO=N#p5pm
zBqfayy!g~vN>1$QIwlSx;+t}P1_TI%0wN{)Ue)c_Ub?lt>ZW`D3V%|YR7p!CVKfdd
z1=3H7kDmy473T`_U1GPmWT$_9RH3ykOy3GIE3hn7@%gtYU%1Cc&T9LM=(A&Szf>H@
zi$8fTB#3Azn5Y>3fp7eRsB!+)Uko>$_QZJ|JGxx#c0G?BJAUw*C{;Jtn3_MiA3xzc
za6<c8&j^8ZK7(>0Lm;U55QtDE1cC#DKzt3s43RJ(kS-8v|ATK(Xo9u*?->4I68|0i
zfBKEbXZ!CMj}Hy`@8JK#Z~UKyeH{G13;Q_u|MVOGUD*Hb>LvO#+ZBRfJuJKfof19B
ze~pM}p?)jq$}@vZGg0k)AVH|J-qv#)G6Si%eTs<i<E@$+1F5(N9+WDO8B=7Mtsg^g
z*`#UWkmZTuD<s5@T0u#Rfn9Wzfa+@`L_cLB<CiLUL8D9_m>3w4N(=P_+lBlgV=eq-
zc^jvgyEhfC*D<DA^|mGOA#wF=MP|8oB-lM~kRUMDJT5<>PD-61;rDZ&94`joLz^ci
zw%oT89xud{2F8qU7?OsAgee;XA--Y(fqiUptns2O6k<#nMueMV=`GG%QxUH?#U&)3
zqM%gI+t4RS=PS?KB(9wbe<?37r_FHt(@S9Bxm{csh*PWzFE7W&$A=hB8VW{!rRibD
z4gKEzpP!44hdc7y)u$pNA~iKNaJY72!k|g_?@G%QFs&agLKH&Jnbg$g%5+?Je^!lq
z?K|=F^UvG3<Z}muMfOx+O>TAB`?b2d+S%FJ<g{6?+r;|rod|wnfn~7Kgb^G*MDsG)
zEDw^c2u&Kk6UIaI8~3?C@wuDxS(=@#o4QwN3|uwx%i$pTfZsd7CSgnRoP;vaGKJ(-
zPTi=3wLB{H?&U3GTgO_`aSROq^y8@xiO#2-#tR99jiiaFWv`2+uCA^ZwDM`ZuKRyS
zQ@5N`uvdFD%L3zTdws|R$2J@%E!fiKr{~D;4?}J)4t%aQk|;GHusBYocwF2_S(+E2
zqCfX5ZFQz=r^wMPY0I5gBI3Vz!{PLI18j1*0%A&%HS6|`MuhdYJI(s)2PO_CXL+wN
zf`kP!$2U(JJ}zBvDfnFP+4<be6ssi52A>FT5pau+z7ETYPBUdCqWu2z=g*yrj&_GN
z@i6oEl@Lv<>iN?09h<+=)PuN*<C~1b=pj8Zl7SJgISM3GHA6*%0%^2wZ}~_q2~qOd
z>B72;pPUMmdYr0+NyYH9v#_vmab4cu97IJ#=(V`)?Ju>&#l>M@V3=Ga(BwLeT}yOU
zm+CV03w)r!AtWShbU&ei!61nU+*Jehd!7Oc=XeLFI*DS>Fnb8e$vf<ScdxIn4-5><
z%-~&V<-Mh50il*IPm3EWN)<D_Av^t5JU1dDLQYN&tRW%hkGZ*qx;l1tcK-99A8c)H
zt>?;Z?d;}0@u$nLw0-7Gmi0dDdivtUi`?AY>FH?`&V1!!6ISkb@8V=>REkw;;s!TQ
zuva3^?|%kQeM;}%q%I~Otv5c2Gmx)l2LZ*wfzpL&=#HpqGKYsAWWh#^9t3TCfr&C$
zq=aYc;&Kj_*RK8Q@72ksgt&O@pb1a9nM{}*rP89-n%z9oTJJaut1^##g5x)_$ct=q
z-R(=R+^~B>_nN4?_g71;B0ki2R;<-F3uI(u!G;KxBm~U`8;;xy^|_N!cb_i9XyXwu
z?fxk8hke(M&qsfHMXBDOCzaC0Gp$Ao&ZlMf<Mrg&6Ot;Jh2Lr)vv5yQ&z+(b3k27F
zb;33w{oP2|+l|>%2@6kuUthn!b4wWfez~N;a$P%EINO93?eV!LKBfOyUtH96a;h;R
ze7KByxIC-yxdQ=v<i>}CiWKmExLVQxI<?NM$tD*UAX>_5lYRK1I#n}@gxB?!rWD(m
z@G37z*e_xDc^p0asie+E*+|r)h2L`AM#3qnKXNB)XFjc;(CX>d^uu+<!}ap#gQa$_
zRJ}?e3JO}PL9^!sxN$_v9IB#2-BO#8hd6?U>}Wy40Q|f$Qk87xtJaT7*yM6?1w$N<
zZg}HQz3U2Wl7GY1N&srZu)#6z{%d2`gsUl!KwC%r>eWrxGw;K`S9WRKPBaP94qI=@
z*DBdbj8#1}wX~ewmA!TF`>QMHmv-ZN)Q%BaD`+=GCZr6xF+zIgZGPx=OIG@KQH0XW
z3fs+BBZH|^30bP_Y96uvU}KDt{BF#`D&?#P&Q`MQ-^C`UinjA#J`Wc@{c8?-bArd`
z57Ir8wNYazO<@2}a8ONZw4}=%Ia>zKM>bF5xvUmkxJdLHK9V9~_=*Ybt8Pku``T-K
za&iJ<cwKgMbo6d?<#trZuI<y#k1|hzw@HPKc7s=l@_&uV)v<+-ItIm6-i+qRJ^82u
z-|>LrdF)p8t1oUwY74Jg-*m@Fj7e<^e|g3EvGx9XXXW-U=gQ{;ereRzPDL&fY$QYz
zj~QQkr^-zFr*hNlcxBDa&8qYpM`e;T|87fl8uqtmOKjS@yAcha?_zjFk8jc;y+9AL
zS;$CECL$rZ1pyIN;eA%(Seyli*T&Y&+l)5$9XIF}^xO$c#qVry<B2&u^fyIh!r}8a
z=ZC+0805+*G&@(U)%GREHdq4!0({Oid_Eno56aSf&{FsE@?uS<o(?FgIuRPgKi)T?
z#vL?a1xtn>es+4wceNfj&Ub=2*bwe+y5Pc;^kI7U!u#N2Vw%)fOogF`xhR*02r*gK
z%+PRk*x>&7XszGe%uMnd^d`pYbe(#{khutMh1D1sKiJD?tf~gEV5!kz?RQT|rrV#;
zyPJ!CV;0KqAlPTSg{EL?Y8XM?;NdS0Ru2B@A#@?G=JtPdV>D$=HetPLJMcQle7MR4
z`KwVRJO_&BmbfDi!lRBKhyA%TtzM)kRVt_5a*g@;`QF0C?tG2iO1nMRNRxJ0&ezDu
z4F1nQHXcmpVm<pvd0i%WJKrF!3atJy+5R~^>Vpx47*vAj*9qWxT0`G`V<h>Vqger;
zZj>j9b~%Xr`q@BLs@I!FJR?}%0)&`DH4j56w6~fr+6UGK;Zd7-@9u}^wE)onwr^}}
zYs<}Do5&U!=f7A4gPM>hi-yUQCMQ<3Ut95{|7{;MWn{nBtJSz{8uuz!gxX7x0;-dd
z<wzu^RMg>?t(ax62E}8QJDJLtc{mY#II(*;w*yEC0@BIJDPcL}72`nn_aoTHLt*%L
z(&vp9!Ph+TdYihAyG4I<?M&CoRTDIyOQ)V3wXkz?Hq_Sc{;IRy`&Fl>rw4#DmBZG`
z#-_BQ!tUe80`BLh3xn?qrh7+ep)7m1S0_2t!UvTzjc+x<ht175htg7>bRjYj?+c4<
z(AA<&Z#mP%HF;hguRPqXbe#Rr$s=a6>P1OfR8_!BC9hQeSwEU;5tbuL^;~c66*2LT
zGM%}_#ZpV+poZcLcV<G6AI{Fs)_L;5-{B#R>W>?wZYnx*OG_Dy)}v`~QB-5c4_8ub
zt*VNdp(Vk#PO104yPhr4aCLRHTWqY#&woQ4!NJBh;Qp$bNbCnbzgZn%Kk>DcVGGaa
z%Jo|8fBP3D7K|UP%+1YBPEtw}7YSEFiV(LjUeT>@$toy340qfPgV3zdZ<FRVu63qE
z9_-zqY>J7Z?2+cMPf1B})?2AI9sUr-U+;Rbe1Cu6-Yy^=NgMFx8B=<x*pCRA=r8(e
z>c}P-;VXf?ksSD!cb4ORjCA+KwhPoox`suT#0gY`qe~2yJa^mX8SVv5P08ArU<!?b
zh<=cRCuTMCfO+^_hWK!K-*O>4Tj0uaq$ZS{47H;@?bYlyDO8xQJwHERx!+sy{vAZX
z!@~on1b$4O$w=<aGBAG7x<S>O+ekXZXnOeiMC)sj6J77*Wk*&=hz>7vd`zcT<G;7r
za#Ib<9>W`Ue_ach22%=11w6TkBg#hx$8lh*Pr9h)Xh7EejbU*4Yp%Vo{t2BtN2)1z
z(fV0*TPNw6f0rRsQVooOI07F%XsN~3=P2BO&v6~~$`x-ShVk{qohY|K=z>y}O5bxf
zO1bK2bEiS&?hbiL_glw~kf{{gSla&YD)$7-J`Z=(g$m)Z$6M7Xh7>p!mX`C44!O~>
zj(|rk8W36=8~>@B)4v(gXm`B3K2wCMLh%|aAX1^Zzg4vcR4F4~zh%V@1xI%?KS`g*
z^O8BDcF2VF)2C017ekZj>E?7v(r^*iOO|5zZL3HI$#0j~LS<{oi~^N&KPX2h$Wmz{
z41t%EQQmCq>>H+qv8N6X_jhGwWz=0vWK00(Sw}`jblW|zWDKsS0Mi=FrD~*uBImhz
z2DBuLM;u+Mk&=>jT%~qg(fS<I-re2t>G`X?F}d-7Dqg8QXe-#;#wZe`x*~Bv$9eeS
zB05AjK0W>Qf>t%MM0GDE;}3)D05r<F9{@ZFm~^vT*8<&=2o0DC`JDeLs;IoMO9g<=
zK-|=zn*X!X<~`TP?&C_LrU2$=OCL-fidEK7#|{q<Gw<dzv9Pg~3)__6h3!&s+jX)e
z`Gtgr{ZS;kmWd?ezaC<!0K__=`i*Ax(7jr|dV<KLNmAJ^%kgQt@^I1VD5?1}OF)Q$
zj6`Dl%R7Q#qcr}{=iftL95*?#d<en;sSQxyygB9Ir>sj|Vd9Zx1KOS8>iaw0En7Bt
zT==Q4r)2kEJ)pbiA-cP-t*u>o-jAj80_56mXg@1kXs}Ze(u-7RDl~SCEV6N`GR=l>
z(+XY<Zf5#;-<<CO=!<OpwAXvjWY8{)oS=4R+Dv|WaS>-YsgD2yF=#R#)b_QSl2Rg1
z%lqm4OstM^tc#-l8?i4o3-Z*s0OP=jEBEIOQRIRGEG%7r(TZP2UE%e%%QKb4`@iMG
z3%Q;`qa^dWJyP)e^CI*9w6LY6g|u8<&N$_7=nLAS2H9CE>S`-;@PRt(Ipv~{rWqut
z_(l7%ha63%rjB7QTP4yJpRVb2Ox9cEWMy?*-5l)g4_~cZ_T3zGybb))YrH!h^JgGf
zfA(|x2V<;+LJ&lE8wU3qk4Z<xitBR=d#Sqcm!O~^r_C{UmWnT66oLE8wQe16IwXuz
zJT6$Ty0WE3a*dyKf{dhA_^I{}<l$;iY6)a2(8Trh^a$Sme)e$iaDOnAz`%ANB}t9D
zsP0Eh!fP_aj}P*@g+I$1k=okY*3&7O%!k`e%aV)}dZ__*Lz)Y!6b+3E{q%3&>_y2K
z=m?TEz-q@W`FyYR6@<b1)#PpSin8CdgjIJYr07L{fW}dz%SS~<dLMjVxfye9f5*lq
zTAXo9?<fLgqj^AZj1KZ%A5c%CtjiHJ1n1*z`{kd5+pz<_<AK-52-%7jrsDAgF{<=u
zW4s5Aw9`EM%1@t>+1S|R=_N^{k>J28|75Xx(NC-uaVK;;zON8j#q1d{0cG5~xe5bv
zGO~<s-@c`#Q3pv=<AT=!nx?0x=a)NH%Ma>YvIz)~V4sNc?YnJQ#H||RD@m+s!p=h;
zf$_HAr}aZWHa?wpm@4}oZfXhE-_6Yx&l5Rxy{h&WuHY`i!_}?;=P-4%NM0n2_>SqZ
z(NRVij5=;`etzDBwW+ew9#px>$;obf@;M^qRHkTOqoT$~Miv3Jt@}zUUe3ZqYS$Zg
z|Gh0ab0$p#wJSBi(VOGot_f*LrFbS=Bt+k1E8jfR%Vji${ZwZFEAKCT{1#JSR@Hdj
zH8%}zsGlDKcfbt)emkIpZJ#e3F^HQL26Cq;G#M}=p~IZ|5@Rt%(dpEiPt}^QlKyfg
z?U#nes!N+jZO(TjFwt<M_D+jzQQcpS`v@>IGYbfS>~`iUkSU%2=jihG_O`oQm_7ky
zv?I4$4b1ezl~qTXx9O)664e-M7W_<6>@;QT8~vdgF_L*@WqW|p8C-S~ka?X>R_D;X
z!mi6!KZc6)aGQ{0VPQF#MDM&IU1p;VCl0RidGH=OrZtal&ndhK!(OZ;sjL#R4mglW
zsP7}07f-l_4JG1Vd@OQ^%}Wa#EL$V#@ORlMZhOlsEgd6E^V-0q-gc$Qi8gcGpviG#
zeK5{^JcE>stljGd(7?5ia@`B}ldL&A%|?W2e!cT*>syMng4F|&B;3dI<K8YHvP?9O
zLiMVaNB`(IEXw*b`3??B)!Wn2i7r=1S7>fqTrN6|$N1M2%Mk2Ihnu{w^xlG7q=-}X
zdR1>NtHDL9|8PxJFfcy53P|FdS?{B0rMYV0!cBqJQulkAe2$)hD?-x*eY^qh><+>(
zA4?-5B^@=Z!444n2wA<1Qva36fz}44v5&#DOc8&9vQ@FSwdD?yt2d|+ItmLV@LXx>
z{`FN=zO;bBsM41D#xb$5xJy5C$jiL#PE1UEEfINWE953g?q|sOPIp(|rDwR;>C{-C
zdogngBj@xwtCM*yX+R_PQTXt~rzTPa2V4W_8K6)G^2X&QU~;HPh#+-sIXBz*yKUj8
z<}PiZe=Qx1YEp7!Blfz#+I-kQxG!&MN#&<#@2^zT={fo|_V%~T0P|O89<Q@)H3z%y
zva|u3D8w3=H7G%T+iR9r|5@h3fsw<|`cER^RZ)peYmzFlOR^Hzu_Ou5h}B212i*6d
z<KaH}ojH?UGaEPeppm8g*BmY})?^q~ZIzxn9it&K4VL3Cq(ak4y6X{hfs@D0I#_N4
zvEwKkCjWMidB|(miv65^f6p=(ZbcPCNJ_dfJYsr?r1uVFfI=JG`Q}1nI@BNNy^}$S
zcDkMhj)b}-c!w5735?YY3s{jIU>C@}FMk6yV`5^WH=JNRQ&5nD13#*NV@&#%e%ouz
z38^u{@Akr}!l=n%V~G52RGw4H2`EY$8gt}#ljMLnJAuk+T}cnme$cF@xqMoHpx;8>
zOnNeB^&kEFd`X}@Eh-1|ir62hw;Q`(n1R)C7Q~r~937G^4l-P-Vdh#Kn?vvk%Tr9_
zSwCcjGkuPH9lwt<brv(eNlQZmcFA#TD*x!{=wkUZV8S0gJa}Rxx%Q(Y?XEVec?Z2e
z(!|9yV6S_L8+@-MIhk&-Te&|Te*3VMc~4j9rTkQYc*`b*#(n5^%cN%h<<Cvm$qJo*
zw~VSPmixu6-N`5OrDk?Yb7y-C4JTM%TZ~Ib9EDMTv=!zOB6c{e^#SDzB#yqmKILLn
z*5tfSoTUQj9xom`I~!YVeSLjhU0rQ08ylOVi}AcG%~sRri~W%iS*n<U&6BhgW=>8{
zZf<w*yrNW;Ns3(Pbn61rj;5KdEebn{3$LQje!IO$>RcSsjYu>-J3nu~1=H@hb#!ui
z$NiS?kJvODYw>y?S1VoDRe2q8U+m|<6Xq$SW)%h<Okrw&95tom89saw&z)&ijQpgm
zH-nCMt&I;Ov(z|~;N#x_ase9;7g>~3!UHSMd(&LQV@1b#Qk)C3z~StwDSMP9$N4`W
zoMQL;s^=8xO(GjpbLAsc#I>A0RB2Mh;7lF1NcZ8jJ!xtvu=L*jK+fy9K0tokMegkE
ze2C9`1FJ?E+`?eG%d=9hY!sy5`UJ(x!4>A2^~9Qf+5O|i>^sfG*~P_H(_wrEI|3Dn
zHAd7Q$`l0G!zEwV{>8r|#SU3Jx=d<6%|GzIXaP_VGxu^+XHMMWheJR@$bQUEhuh^C
z^x;^I>sFH2aVkPmg;QI#mMMAapdyL%@|_wF|B4KsybABQ4EMP%^vQt}D`BQN6(MuU
znsKK|<0oPqqhdBqOg$A)Ec1@8CJ=JXsE!~az{l73xjTEf9e?oLOm}rVn}TO;p|IP(
zPuioCNA^7}>)CdgnVz^ytSjAJ9iRI04Tmaj@LPdYuUB*VFeA~Bu;o6G$}-1O3#69t
ziq500Ft0w8{bs@-m#bVSA_>dE#KvwWQ3!Fs*D)|4N3y=6bdU9No3A1!B6`Faplz+V
zZ>Gy6F&)Xr<)$jz>P}!^lugMZS+PnnWy56G&4wg+#G7lLzW>#)g=#W2)wFR(mvl~Z
zTAydlr<D9E5u+IUxs}?v)n@bxkcC?<NWAa?H9Vcf$}&R^zi1t3&1th8k|!o1@m!1G
zyua{yNOFYrws9k<j*dsQasJc18q0e9Figq6sQZ%z$q#ve(uEC;J9U&to9>HoGRr3Z
z1Va3P_SQjON8kv{^#{qVb?>3(@)NJ3`gd~&7bgj+Lkd7D<Sun?UCXGlUEo0daV%2L
zvXspIo+)*-{iyGi!QHmT3Q%l41;|m6Bx8%x!i=Ggya*j72_lsw^)LI+iWWnVWFm)Z
zjNTLuJ2@eTL6mhv^-C<Z*@*KI_Nz2Y%gPvuBTx|iz+o%bs-YpoY(E}iNGMpFeEL2N
z9~0%Jm{y(D%ibDE5pHMXI>)QhB_RIAuBM^D&HZH>sgT0U44OAH0ie!m7=V9a5n(xM
z61+5trh}u5B^+TVxiSN;Yl_hLQL`pk%%(w%pNNyVRA{4jV{tJZC{;N)fCL&MOxaG^
z(9i%XSO;)s7l1CjzfUu{Dg8Vn-dyWPQpc@nl2(SZUDg{3a#3@0TCwW&1o0y`3ze<S
z;dxC!XPll{*jHePDFGb~Na~xp*M}*0yWDR=4h8|&dH~eU3FHa%d@xRInQ*qyf`5LQ
z_g%TVsT`w~aRZ<jk&%(t*Vp!3t!ASsKYsi;+nKXls4r`4<HrvN>HsgRa3hg#G_K3Q
zQtlz6={_o*5mnN#7}fLpwv~tbizNbOHe%Dvs_bkdP-5o?Mb~~9&<PR3tJ%K%9{KgF
z8|F8pfUfIn51$BZ_>rElHuw69UbFMoUc*Ye(<XMZ{NhC{56OgtJk~48fgxhLgp8)Q
zGKIUdYnOE6MoF0_;ZaL$`<DH-+0qq%?YU%~L_T|XfZo8_Zq2xhv-5Z3s^(^%1A>y*
zTZ2cfX(+v)tAX+zSBNL(ezVuGp}nYldGIWx2h?^muo;KMpFV-|gBeKa{5*`0%htrT
zVO3_saWnF6{Bi`Rc=lQB4-Q+uX`bYilxCoF4->tGaA!xhXvOL)RtAe0o@VUcI$4q#
zpgXFz#QME{E6Cjx`dXA)y!zT6GgVq)z;9zGfk`VwTZyv;FoVKO?`E*6g@uJ39fJ7b
zlL}HXT4n1~-Mv`tj$dy<{*B*Qb!4{PQVuWa33(>+wKda7sgzQN8W*IkeMH*4U!@rt
z885k_?v3zZ+K|P|!Rpejt*xde?)gpglEC;cxIP1%>nI|8q8jHo+@gEN$w_sJHlb4i
zq%;X1DpJT)c0&_loTu4FCCJ?KT3SGUSON!kvDMuPq|fG0J6xurI#EDykfautdSaSz
z`W{9*Tn#F+-Ewtjj{ns8@8nK?R(-(9jWRS}0$=m+Xx<L#PEzsl5v&UgG-T}fpg>GX
za5t5+A?l(p9C>XdA))9UJHo_0s$5RQq{H&MrN|U{%qX3Ey~n7+VNq`GY=3`0;OVpd
z<+jiLk)(hlM2Y9tHucd^ip2~JZgeEJqDXA!R>%Dy;LMPG_f(IAWxcG#g3aS__5Hxa
z9eSee0$>Z-!(-xGj8@=?+)G=Pn0Cdk?WYug{z0#CRZtMJ{&?EZz*T<jgP4+gc|(qA
z-;x`{Qr+TC2<e`+$*>Gr=*VAwT6=U#a87u6d2g<-Ic$H;tgLhZ1u!xaTT6lTmANh|
zO-TaGC$BX}*e6x&78UAS1Vu+nym_1RDijU}H44ZDb^O8B&lRd~(XgLA`^;HEOicXi
z*RR`8vDSRkdivDhGe8(4c&oqO$o`7JhGg(J<<;`WH!dnpnP?eJsP_RbFVxz7P+S6v
z_b9TJl<?ZGb^`T{)Am;_$orsfr~~=EwsvN2?xe+`;+1q{LIh0{-#6!p$qV(!{Xrii
z%Z0RFf2863W376BP&i?|X@1-FXB>1G!uNTFkNI;83q#W0Q%9ELL0QFiP9`PDy{@+k
z3kwQ9uCz0TjdK1>G)t9Hinm}(88j)<k&%#)(9zMcwzj6m&F1g-6tE){XCnsO?8wd2
z$cQpV(u9@Bqe1$&uMh<eCJIoE!Q&cNX|fSx1qsij@)1V>Dq{PyG8=^0$=^}%@RJrZ
zltQ&LO*L6i{3j|!>`B8%2OBm|lx&!^wa?@X^vup-=xL^KC^~zmvw`HPAgDjU`ah*j
zXAjQxF`1=?abs443Sz1ff@IANs?CsE%jp7en65!(0c3YJZgKtJiKa@`b*5S~s;kN7
z88bOkk`M^d?V}gqYN6w90n}Z`Y|op@<rY(`)Yyafn9Uo-qXMKOyYO|TB+f~9o?Bxb
zU~V^$*>&ejItDTOFfL%0lukEmD!tU_10$#ss|`-Ahv`nU0pVcjL6sttbKaGVh^Y9N
zf6Rx*8MQtG_8NBOKRZFf*@lFDa~=0*cHSqcpj{|gIPEAKaxwEdW*|38;2I#5z|C$A
z=&5zbUaIXAEy|{oYF^YyRI~H)z6upB;(t<vK1Yv*iAlm`Pmwg-G$NaDa<=SwG8*Nz
z`{5p)z^bmz(8N0VHdn!GTLmaiKsNz{5E2n3XJ&39Py(fQX=zD;@8~<Nz)|Rvr`Vlu
zwD6J?7ZnyvJ<zU(a|(Ean5b-s73AgB%SKoE$QJ6s<81NW3|JK(5hm`cDC)!llv=rr
zSoycTeO+g8Q&(JE?93zAv<j4dz^fN4jh;L+IMNVa8sa-~Ml4<}u)++_wb9+&CDcNq
zN5j`E0aTpq01FNe?)eQ`!&A#;IHjiTgS=DeMVbI{z>f}I1F}eV^oN16)}5#~M<t8&
zveUYnnupcf79uKS+fV9_-7>Zu?^XkzY5pturS*!#=I}#B#;?pjdx|9cqn#_UY9rPG
zh&`qT82dZxCs$wl*CJ^dt`6dfsW=JxlTUFkvR;UB@9z^Z9+=tutn}+Iz8*~TEE3SZ
zcit)xZ9>iY8774Ko(|)JeT1m-XZ@+~xrsZKzLv$2B7@1lnY(2|H+}ipoy4}|^K%z>
zd^RNOAn)dQnbAFVE;L_(RzqgV!TtDqeVIMeM6#w|F*0;*KQZ#7{D$8!^7@kX*Tp=M
zClE9x6{$@0sf)LbrXZj^*(Gr};3B%GGlq6FH&Equ@iAG4;wu2H-dJjpzExy1tThns
z--}OlwZ-=Z$-i##L9=Q>H~-nlWXE8Pg!a}(=M7eXNE0I?<D$s?#z{_G=BU|*iI?IT
z-^mxVCe!E^Lo~|m?d|UY#rDAJ(9x&<1!QeFnpWEAz^9l+VpKQ2aW&q^BZ*FSlXeUO
z;mXbcZOKI<keK~;(DiO5wk5>l+(fbDv~^NyY_-&>VpfTjlLEHng_cOX2u^(s{ht0S
ztF-&q+p$*0^pPicuNyvKiIpax%&tups0m1rj}Yk1BQ@yZUvS8kA#rAAn@w=}UF2)|
z2~i}=CZ<1A#2@Q9P9nnSLVSjvAx_yE5wSYd1#0=-aSvCNtHf2M%711Pv$Go#QLp@w
z$!2UbU9Kf78_%)`<kNY2`8(`s_|X%M2nS87;V2FP4_L1_DlPxM-tY(WLTq}qyD>XE
z+w?SVfaG<M$HkKCyj5rNsoQ5}%pR7Ev0eoYy!@u7`6LGv&!4OBDH=Fl3YQvmEPF9J
z=y>VP`P{CNPh+sG&kslVIigsu7L-ae-Dg>*@G;C8(1qZ@4h>21n;#B-R`qzP9WrD0
zFq@g1hXe;>_GB3~WWjq)QfMv?pU-mK<B0+3crg{}y(?rtx!g?a2ato{JnSS@Vf|}`
z3YkCHuwG>FUkB9Nj*pLH*m3WGg(1Nnmg@%{&w4c>7ZFfC@9nQB?a{v6Sa)oSqg6Qm
zCaHL)S_0=06jZ1S)JKwE4m{I9BSymDD^mO3@NuDju2gIK$B)00UC)Kn1iY?6%WMBb
zmv3}m5)1}&qci*C@x&?~6|}#STph{S2_wWog4beqN;hx>P|ToFPVsMl19a@>=d}*R
z<M{BF41_8>pS0A6Mc{tYdxipXF<B{bT+V_wGoft0vf#tjxC3_ELLT5B%RQUfieK&|
zzE?tU*m{)k7MP)7)j-c_vi9EMH~6Tg4#f)&4yKQoM5$&GGl#`U4hS?3GrnKcaRW}I
zRRVd5Y{gY<xhTQ=%X-^|z<9l0{z@qAa@Df;aa?92Dv3RpuZoI_BV{eG^^Z~(IhDCj
zR)s;4xsY4s`p1w4?Y`j#=Ons$;V(8EJ5_g(tmT#EXV@V<j<b}w5(qf;w!^MBKoHdF
zIMc~#ta^iyDAM$AL6yGOsYFPPHTi45I+mYMR(rd?JWG%v!eKZ)&ioRW{VK%WeNm#-
zxwx`#!?CGEqv8*n2X(S+^FrBIQ!OCC91oD-2|hU--k=Oqn*e7Jh~UD~2GEzVtE<UL
zrL<1C8I1o+|Jw5A{g2t%L4>!U9e06L`EyLW&7-bW*urV4YQ#<WZZwtCftcUXz<+jT
z<~uLh{WT}0=IZ;UD;a_SQ>_y9GWbkd1skU4#lBveRFpYyf;9J-$s0sJA<)EMbQqB+
zD*_)!Xr@255XLP9OFSi9FZ8@Wbs!w4ajorCSxs%f@L!9GD=NMlGlBZ#T2?7TSe<nW
z&`eIQ_@aIl%qYS=3mjg?Z^@54y*H+bdoH~0$jx@nz^)y{_AH^*GU+528fHWYfEHS3
z1$r%9lo-QCvJU^|vLyyhV*PbXJ#b2^z1bo%E|jfA`c=~#&>y!G1DJ%i-%7`y<84-F
zJgWPz<ya@UX8f}k^Zk2k>Xv5HyoXu>QJbGA_ICeC5dWCf+Oco(jhmevbpPxI6%v=!
z0u7Z!Tz@lqlA$62?j^H=<d5tdmyto1!aagbahADu)6wb%yhEJrM_5+zBS$c{LHal8
z@+WC~+t&I@&{vNhBQ*;<yG{2X$J?Nmp{lT$szV?<-|m_V=9)8~mB12Bfyf&j`B}+H
zO)WJg#nUPuz+dbXX!A`?QH3Q0vwik&>z<Nw2fh}An_qJ#4U+~-$YgAb6Y0d{Cn!NJ
zhA}bVEnoV_Ha5t!*@^?OZoxlhtR%}+ygQ?uD<%egQT&^ULX{RKksoTc-~9C0a0M8w
z7z6abfsztM=*0E!Y<<TEqTy<R+e4A#r<MXiN$gjLS<tWoOVF}_!(*>E9l2dw=x{?d
z6UCmYAQBvd&f@^!!p}%~sNdoyA@@k>IAd~t?zD{04%B%oq3lif6eorYUFan!6<kmM
zDMePdyd@k<Aei!`r;g-74e2q7P;WyxoFPG4LMW0K$ed%d1vSl|W$5SpHMwb3yf+Eb
zN^+smF1QH8FJ@6Z1{HI?ua578D4t<Jl6YHj{EvNGow>5b+(0Ov8wXZ2W5BQ?MHLBP
z!#P}8o+XbDM<zGTnk>skyy3_(M)AqW(^D6(P(!GU#9y8hqUF4Z{6$6fPV=4bI2nu`
z4hLOV(9?xOPpdn{#l?S$d`E-T36aWu29m*ox}-Iv)3y%OftoNHTC66FM9UNa0IgVW
z71LFOxk%2Tnx2HO;2^!w3%~IL{-7C#`QZ^~y*az(Rw;??=8q{f;y;syqIGX~bKW0E
zF~iAx>7!p+5Q^*Qq~cJej;ecwnriXkq7Z2^xgs9iuS&R40u22cjb=zFZf#xCuO~Ro
zW|>3ZYn`RV<ft;+k?SNWP)Dv~{Jyf26*aMZr%9KI1Urs*ErW|b>^+0%q8`%lO()Zk
zb<5l207JhJyoLIj`BFF>>|<miE0f}aU?#_)F7f=a{uAJ{88ALuOAa*j+tAVm@Owmd
zy0^QFCjj%*ss0RM-#&6{HPr$g`Qt0mKTycaNjAo0Stc0Fe(pn3ulR5=;7Amvwa0Y0
z%ebPV4oNOXMqP!R5SwQK`TBanMnHfJ(&ln^Kzk{cO@hi5z~uiXi3zNp?E<ic?IX3n
z({LC@l!++c0bY$o@p8BfXmP11@QdA57P;fM3KOZRVfAE@V$T0^RBA9`rIXn4ijPL_
zLLBb=`SY9Z@LwjOy}i8|DJ_bxYV#js#X8`S$-%sga>U+oNF$7Kn(eJ_BSqL<*`h``
z91aeJCt+*1w7D8y?!kU!M(gxYOD)*2z~L0o>}M4$|D|sR%70Hxq+z{Kz6>h(T6WSU
zLkpHaa^h`@N<2_IJaj+R0eNm^W&Fi<o3pFiH$CAf;FL<5Fei8>U{iVOFBX8y=iv^B
za}gixX<X(oI{rAxG45)M(`F=8y!ti)h6twqx7$sY^jEcMxF;sne!h4S4i#~Phpfvp
zBt)2IqG?l-IM~yk_U50W$52gBs@<pOHn2^-4MYtRJ~ouNNTS9?n|~7mVtbO@^HCsp
zsSL%_Jq~so54S<^v9)Bxa@Gc2^&*X^8z#y-XBU^mUDhcsa`zz6&YF>xm#<b0HO>hL
z?<5ND`t4#8(R|}^VH$sR92^ow1gm-w#`^V1uK`wK^<D~;Q^j}4qx1>z8+JbTwU<nk
zkdHFq;;V-Z`@Bbh%co%uz7YET@}8a((<cP)@VWmRGjDHwywArmr;Voo>Ffx4RZ&iR
zv~^!&_#+E_DpClLFb}lyXnG!T$kBgDsmc(gyzi<6f-~Pm3XrIK^~T7(F!9_)9~7Rt
zFVfW3Bvxn$MNrM!8~Kk}whI8xHZC<`1yJ;;@*=EvU9Q`}825}$RZ`OFRI;W>ws7hQ
z7;Z=s3b)QHYorelP7`W`^u}nDNT&EZU7h$TG!2V22wcCOK>5?IeX~Bl!TQsvKO47Z
zU+(3~N~vimRRxoo`y}z<MUrXHV7~A+^4IBqI26-t{6DxSu>v-6ulG&<)I62h!v%?x
zn-7mbCEQ#f+)9l0*&dc}dvgdPDfxS*q&Nj$klTy?bpX4TJTcrOBr`Mf?U}3ROn~QL
zv;?R6ONuKFUls#M<MRk{cSNz-{8(9<jVhi2J1BcnAPyW3YUWsE?X!68#NH)h&%*o1
z9RnUXeQGrgf-^^7+YRHYYD4#?rxTG+wKOkg^Y8!%73Z2@`0TFV=QD(l&w);gABU4u
zUOpC{B-am2V1g)>j}Oj*`I-<@xd3sLX#GupA7Tr4AatKLrC>|>)1|#}3JsAQ*iGPO
z``QifS9#-3fs+;0Bk}N7z`HUp8Z!9t3moovO(j_HbjAq#T|4|&#^T4B@R(t_7kb*X
zpwBM^4Z{uZy{u|AGvWW!Uwb9?+r-5sI&6bWsoqv1SLrt+h3NuEKKlf-EwJl0R(aof
zNE1^%M8fE_%J9S}UjqAE6yNce#s*vbKl`RJ)5P%D;f=-)LSVq=1k#46Ub#hArQuN`
zU!gH48=K8?Yw{kVACbXJSg8=j#LUckZ$~aj6|&U0-p;jPAB%y$G~eV@h||rC>9P;y
zRo&;#g$_jmAJpzo$^*=y^jlw;2ta3jxRd4)(6t7;0liukx3fEV?C!U>w@>kQ?4H^#
zHJ<_9NT=arf(&X5m$p=Zan-keRGxGzV!1CLu^_5idLY;&B1z_f!_zX3FE@Hk1sI|#
zDh^aKuT^3Auh(SCc>)cAwUdCM=_h;Xb&3War6?cSMXn)b83L^Cgevf7rBM$<MeEeU
z!p$%13an?(7{b6gcGfGbebmf=J^2Vs05Ckzv}~LH+jhXQMt*vg_Yo^bk~&?!<@0F#
zXR#<in9>!<#ZVrfo6;5_$}mC4WiPPwJenPOK5fqo41BRn0ZNVn|Je*^e<d3{oEZ=Z
zo3JKJQv1I<e~!s?@dWTTP({r!0xJ0O_otkl>&aY+C^G&b!JH8aeLlsKo9dd@Bm`&}
zD?h*7YnwaMa;jkDM7$nm*l;y0{4aNn{E={uaGWkv()ebK<A$EEs6%)3A^uv+r=7&c
z1}HjUJ#PqfC(*OQ>Vax&nFG=kA*LgQObLGD_++aUD6k&|_aaTT*hr^bd)F%~JC!S#
zdYHMiROdcbV+&{F<ktYo!A<}5-QSJ)sX0UDe=NjeFBohV&X*z(@bNX35&e7%EE7$u
z%m!1B!g4Cp-zdIw6Z8kRGCq#O*WmkTi5=aV;2h;m_|hFeb+;r6eox=`-1XRcLbk8P
zaFFHw+eM8|3?@o9NuyjT4kXEMZfQx4nQW4vv@#-`v^c#!+i|9~=l&K^{3s7RLj)Fm
zx7EKd=NQ%0+>gJr%jtA@xAoUwgDledXIPyk?#P%;sVE!<Tlv%h=*Q}ZMmAcqC<1h3
z)~v-n*e@y@YwKK69kAAhmPu7Pi*29hjO-JFbS4zlxW#9mKoYSdr2uEQOrhb#bIJzB
zEIf3&FyRGK0XX!L%wXttc&A%EDY*_1{?gYco>~9T4~$`F9=%%{8j5B$w$?lRA2(^@
zn-K{jYA`2HOm`<ZJTf9eNsZ=Ht9?TyFj@@|<uNBl{kjCM>qC|_ROtYFJ{J=#P?(%P
zZkAza78~+5`}P}Fu{Nm<T&S}(1Og-V6Y}NJaT`?4q9N+Gn`8j<uQSwF>c?0nKaFJ{
z%I70gdj`=|?#g*OgFYGVqhY0a1?@!u{J10ieQYW)UOUyawFGwCZ3Kcj-7;$07;$G5
zH~tMr+xI3p2DM)nKHCnc3s1{F8(3C%G`F;1^{hhhrNQkPnLyhGV7pEoRepO5fA2b6
z{iDL50#v>1#9$*dsk(?kBiw`)FT&9kjZVY*QBq|s1*PiD7j0xjzu&)&$k<icX<lNY
z0KxrdlBgiqrC9VI6B9T-I(5vIKv8dN11@3UK9~F$91_yDBd?*M0mZ|;Ps;(xrE|sK
zRO<&gLTUB;Iig`XHuKd%{1PicRbYV2SJP|&J)~OU9`0c|rFt!i!+BmankXRAG1`Ov
z$JUmm-W(t<M@3AmCWL)JtJa+KoO1<$?b`uRp}^9k_S^Q(4$zn8ZSyKxdm4|sp!Sg4
z(cN7erli-!f0zanWPz5=Ve^wBY?48m{7h*aMH3ABO*q?rtq%)WQJ;#;E-Ljft5@jD
zHH!x)m}&_O+4u$_`$j3LeR6h=C;J>K`{;_SufOlsro*lTZ$UI;kxQY#&s`n5z6@<D
zD;v$WkR(9{+e_|wi14hm0xkfg&nwSmX3Vk9V~uGgfY+CV!__o2G@4#T8r8!`fIxK_
zD%O|5hJ_nYAf32Pfxro%Y9%6qM%tc{1HBbeinm>;SNhJMIX-=oQg8(=dklgo;8dxC
zfg2lW#be_2-`1l6_XF<C9GBd6wAfC{f7lRBbllKD5T{2kN_8ED@$=uFo}DROQHJ9E
z#YKc9Mgka~6b)6Lj470f&aq6XHyb6U+{3-L4p*f3hwWPdxSJzKDx(@SmRf?*Sx=9Y
z-;g|d57zO0$;b$tz`p+e4Y*LGCU;&~hK+?qbnbE5T4WQrIg)Q^W)?h!H^5@zZhRMu
z%zz(0=)fd6<^zoIs~<itHH$H2+wc^_wK=$6g3AzR9~e(GWMCll1!ywIRZ<W)mBBG}
zP0iM}n4*IZ8!4@=d7VB`feA%ra|ay1J7pA<Qeqr?es=Q!sxpWV2EN4nM&nDb1X3Y^
z$BRCi?d-ZUbj!zU+9V;hv)zK><F6nO#wli&B<TsmF$4Q8Y)W7(b}{+{dbvVJLX}dB
zNed7@5KRtX7HYy$f76v?r>16WX?b+>5UwW-@swpvUhg;6p;pOtr3@_J0XeP`Txc5Z
z8yWdpz7t7}qE)D>mj86#roOQ7>El74hvK2<ul+6d!#qpO&O{050{L`d;c>2&HWPSi
z4hPs2oN>>4hhFj6%)-?k0j^r9zQtia9vGpm43n4@Uu~H{_|oiO5jj2~70j6>MGpe^
zhin&g-B2I@Mw;qSn=u0n2Q@1Z2U1BjBfY;s8-@VO(6D$3KntQi;-QXLU3PrcYP*n9
zP*vP3c-(;Tl@P41e&@@fCmTdTVL6IEN<L@X0YS)}J&4vSSa^IQl@PZtyKncSgTMz3
zH{c1m`36|ueH2rk2w^GzqLxupBbVz3fBg{Wx5bjiE1f`lz#vW6*I_-(ZsKf!QB+pz
z3eUr<VZ-%%&OBJ)!WryU<dxp>CECaIk$&Kv1p`2a#Q_3L;dNKH#coLrS1T9eJ$}(9
zu*axL;mIb;z%<%C15j}v7vz|6)tJF#KF?9|rRyc=dOf}trpPqUnP*O7E4dN+^6>@b
z+#MeN=v)mFYga-8P(}UkmDJGKM6De@jGL+a4Qz-1c@2<4y2AJJwyvU!O-1$~cK@^6
zfXbr>A@;-lyRvYEr`hDDVZ-o}lGhC}-x)}-|1;mdu7IbOs#bt?6a)GkY@|qjq02-I
zu4nbIjsAkt20n)Kk5a7~z`Q7t@?m+(Kp_V<g24f*p0E*+)yj##-C_c`>puk=vWrWs
zZEs|@sg{XJazQbiewOdz{QTo`E75-@gH6J9*p2acJc)v{q3B}8VE>?Ie2UENfci`W
zpCWL919bE?6;Yc7Gy>ei(LgmyG0RrO>GdGBnloQ;VJ6%?I9O?MwWG#;4BTSw|6p3y
z&NXm^J{m6{FEx-85h<yuP1gd#P(KT(TZYg5)rbB_04-%G_Xglpw1*h070RbyKYD9{
zwI6i7(I`DUJTg3w2UqTvR_-qQ1?3SgiN9q5Q#a%i1t@_3-!2q_H2r^FD6|K6cER5M
l=T;wBm;d)2$I6^bpKFP$573`6|G>u}QeyI=<-&&k{|itYC9D7d

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/F-upright.png b/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/F-upright.png
new file mode 100644
index 0000000000000000000000000000000000000000..c44e72d0f4f7f62f0379e0f625b6a5a4a84d8a21
GIT binary patch
literal 15204
zcmch8byQW+*DYYsAySgkbt&n(NJ*z$x&;C04hcm-0cing>6Daiki2vw-3`(WZ(o1k
zH@^4pdt<zJ#(*(6mwV3MYp=c5nscrltg0-7jX{cmgoK1GCo83ngoGT4_(4MfcW~#@
zlfWNAR+5sca*~qI9h~gnTG^N*A$cVGM2X6_s}cmNyw0W}d?fruz$_2PR9fS=TA^wH
zM!Kfuc<XAmm_$qvT}OwS1Dn7_g|@4M<HUF?4DX@e%VhEt0)wpI*U=K8Bpf31U7qLU
z^YyrR@91-MY~OsynR(0dgqVApkn1Fb(+jVK^OgDAXBE-k0_=U}UNepxe6_edztu5#
zH(>hmC0(jXkk!+Yrz*C89&h+8qp|j~910$Okt3$_U9DR_B-`+ZqYQrizBNYf7@!UL
zRXWmEWcluQ%x^W=D6>(wN0HO~a#1Wxk)z68n}f2E;j++AWV+H1(z1BzKm4)38PmS1
zR}KjzNa^yqxh*!LiI*tG=5*@I#KJD$LB0R9P*HjGbj46z0Owb;z(Ch?yg!e&VO^I{
zx8y5yJnzTFCppdf4|2rhO86=_pA0o(>+AFLn&Z~YB44FqO@A|BmR0E9_;}8Jl>-@i
zkLgnE<!qh2a)K;7S`^LS(n`&#@ne@a&E5Uiz}`Y?=Z!B?xVBUI-}d$vurTNjvO3O4
zNSIF%KgdXl$t2(=s*9YGH0mlA9?AoJ+>2%vB&6p^a#G?N9)I>ytZei*T+h?$2cWZZ
zwgmkh_|j^al|wN4`e^=-b|YDpJ5^SnXv!W`TSodSXpwvzrjZTdOABd}o0E1(YQe^!
z;~EmkU(={Esn4O;DKnFMB9}m;lprj4J-c`7V3-Q6lQdLE_hi<&UqCf|>#;GABJ6zc
zJm5Ky;gQOSgtX}PvV$23>18Pxr2iwN55~wyNDnc=@U)ST(1`xue$Wd1_`lzQ2SNIu
zm;WDs@b^%>ix~~O%aK4@4OXeaB25!zT1FD~DiDvO`R1s*yL)J8Xbm1;F<rFb85R~c
zQ)N5T;CY-X`rd7KDt)JJMWA?xG-$~)HG?U2!!tFvpa8GU)c^*g=u(5h)Cjz&l|}>b
zs%&@a>~!Mr+BmTmOctLaS5t&+cnV;qi(}9PbgwxDOPN|)Zm#yka5VgFt3PNGhC=r}
z4e9WiW98}OhAnyUgU2Q(sf68jxzjEc?d|P(NGl<sW&`CA7)<WFc8C6CHgQImx&CCO
zt)3czCOcRFW5;fsBaspfmZ)X@TBkMpyLEftn-wZtZ0xAnn}ysAro<f2RGDRU2vH!O
zl9JNg+?)#Z(o8`CKJin}`rW(bLjgU-DqFH3aiTbgMVz@+;wuiN`%{q!zRu4m&$XY+
zmdeV@Lhepf?oW1%?uF9)lt#N_oyoh-^%p(`OJx)m?ks(#f&v2>xX;0~w6qKi`h}!Z
zX$6B_W~%w8Qyv0$A^O~|7`}3|$|!c(M%={7!$T0!g&BzAhf!BNQ>9eBa#*t>kgYC<
zW<nB_W7T0A1>sO9H<+}xwtoNq{XygTyg|L&-k(bAmCi8e!e}{U@R&!5mNClpDeww3
zbylU(DXyE@4e0rvy<fdPdj&SV%#Q%P9IFvOSA$8OFf;3@K@~O2mF?|qpX)OUA(zde
zbV*cP%A$gTa@%?h7J7X2H09Pd6g)^N)|%5akJ2Rg+PG`u&!4s)9#f9w(_d+xP>WM@
zsl&!y4Vo1Ay{quwhlXS@g_Jw4bV`24p@4c{{9S5C#UW=Rz#!OmGMIEEKf*JyKt?0d
zemqmf9KK)29*px7J(@-BN6L+OG^HkcRhGzLjL)k$PJ>CgPn$-+Bu9Cw?HA@}X0Cfw
ze2*>;SB5PK(6NEx?Aqv8$>>yK4^LsASM#f?+^)~|gx&YEnt%TM37j)VRBC<%^*-Ki
zC~CA>*6gzQhCp*l{z9i|@>I@w4H<H!8_S{PsZox(s~2**XOaJ=DSu_D{YN#!MpsV>
zzVYgxDz>zZUeun=;y(S4#vftr=St@8_CJl{-<a4$Jqvmg(FOd2&-TyQ_;{uDWHE)X
zn~RH!&3pqe61BOF8Z_X*w8}P#UBX~;EmYpkU`sbUkKAZ#6=y+1s3U`>JkRW6HR8so
zuKox!3FrGfS_;M=+fqKk@b(#vcjhgJ@bH@q83`h;K&TaZM|IeWKx~9$X$y-rk<ob5
zNns^lC4n?`a2DC_TMTNf_Pl}ud4?EVu^R^&nXV?EYv6BcMn)==Kk;ai`d`sJNt=y~
zdH*`&rPIrTe(M}>&R9P=q02U$iE!yKVL=ZqD-*Ug2CYQF@Re@ymwe8v=gNY1AsMCN
zrD*K$<2D66Z{5|*SBF~Vzlx&~T?9rpA{A7jw|3JAfAI}l8%#V6rP6?n^C-!y(~oSq
zfC1dyURT@BRJ}jnKRY{{n9vkj?_Kb23bOiK<Z{#;ph11&9NM(&+>;YG_$@OHHM%2K
z*b7=~7PiQ*#~#1-(BLxoC{b=LR8wfO{L%JI>Q{Z=QuXxxDf6djno}kap{0BcmUwvJ
z$uk8vas#qtiB>HXxK4IZFJWkpS$TSTdTniOdU~s4^5x~F6pcyZTb9^&Ha0ePc6PS5
zwsv;K`G|`P>(kzod0ZWyqFAVS{#UcZv+_?>W0j<MpQ9fs`vzyzxHoVvdm1vtJfosY
z`~LlVS{kv$(A>^s$>6|%Q20}@v4<_Kt#{(s^mO&~c6N4N=WEd6ABvP{L$>Sok5i`o
zkC~fx$9pZl4tUq<pXoTezoo<Uuf*}sW|DvXdi3JL!_t4PUbAO}`tyK=^WmCqEmfT{
z(^J^IA>ZhxBL?4StfJPp9IGf<I{aXpsZwgvFou{ODH`y1L17_qy67G=XXgs5L@<tm
zf`U54B@`<^oK0pdKUI|iUt8bUuz34+eSIAxP=YTh`vGe_+}YXr>Ax#M@vWCv-BIB{
zot&Wcv<+WOk6FdEY1yV{s<}?KI<W2K#4BwsAA9{t*K#vLX*q@%7z{RS`3t;)G_2E<
zi$zQoHqMD<FgY_bQ*ARXG29*$6eLTx{8Yc-%inRext=9Aw27<VrJMG8dNbYKXs2pu
zY(ez!IEc_Z%2DSLtrL4khJ#0{H<J!B>skaGqzQgW4nd_056Sp#%Jt{_>ZdjJ`R{z%
zy|soKC9Enq)_8jSP_ZaO)(a5`;kT^wwk1!U1I5vzl9F84nJ_YbyZMIN#>Pgl=wMlk
zi<Kc}e|6$2^RgeeqL_4RYH3Xl4Mmc3>e32$`g7o4))h2-H;<3}v}_ht*3hdGpDjc5
zWSYg~Df4sVji+CFDXzTKG(sR23J?|*r!l#v9k}~(<Bqh?b~asbT3b`rfh>wIzBZ5T
zj50$EL3;ssV@Zj<mDSen?rhl`89hBc@V+2yvfmW5v}pc>_~q8G+2j50&;9O&7cK|N
z^R;I!g0jMzMqRcvgWj-ID6(?Ya!%5>Zj*MOyw2V60_&SQ3KoDUbbNAhr%u_3O<HaF
z&;z(FSOFOs84C-GH*emEQ0CgM+W*+qB?|5EhKfO<$^*QD9o*d9V0FPF4_ku07#<!D
za_9T|yW28t8=t`kq!)qPQNz7ItP;V)%Cw7AnI0ArRxWU3tqjXhQ9OI*dA(PCd?`|I
z6_OD-zVa06IVT_P5E|G(hcUD$S=;{=Q`*s>TAw{0zLt=Xkgcz#G>X;EL=+k&``eLR
zzT(Hm)wWzuRIVxmGwDy=t6d!!446V#SlI8F-|x8P;{y<r^-ZGL9`00CmkLZbW@pn+
zrEcgy^xEGLyT43LO>J#$eafhu4E4F{OW>~64^MfHQ*=QdCQtm8o2AwE{PwVe=90L3
zLsz}&yS6OGQ~o&Q?(5a>i8qAH_7q9S;VW4Gxv;VKW~vVc?{5a(cc;oysR{8=)|?XT
z_2N!D$?R3hnzNtJBuVe7+^woyY#kpTA2b{fh~2b{iJVQn(W|maU+9s)9OVfs;;d^8
ze^8^;&ua9m_{GQ2(5K$(Ds=cufzkt$r+Z<<Lf#zj5_1X)ZVY&pj#-T^G1z>HFuzy^
zVEnv5qqdo`v$6s)!|2_3aM+C$jT#ey*ZcPi9xK@85gwIHN&R;xxne$Rv04Mkg3jAx
z`4Z`o@HKyKwM*gtQ=vt^5EHh#@2Z#2^Hs8W`_0dqK*;?;;gvc$H+LIm@4eEBN~KS=
z6l5G2tdH^j{`S22sFxL)3|@Bj=g%KtL$en>k66ELO6d_{1XeHjUf*0E=PIXc9~@9o
zP-HXUk*6<mutN7|<_1hRGmG?54Eg9-Sk!w~cZnQVdaY=pm}2F38Szy_4u6Z?t%$YJ
z-v~$^qJ)^o!PiX7F2+lIc`q_eMAc!u_`x^8qxmZXHhg-=IpfUL&Q>liF7jXJrh2X?
zw138BjFC%&w;1W`-&E&oJo;|jgilW@AQ31PI~Y4BXH@iIPO>&y5fn3zFM}v3C>+oa
z(2hfr!ZD}^Qbp_i?(edF2?eQoIk9>>y|1=%(|oV2{ygxz&s*+04|FDHjEDCR47`1j
zpb*dQbFuU}p536%<8XO#adB!&`|k){jlqe+0Nh}V^;@&9hN{x3s157oyAM**jOb;N
z+<gh{P0|)M0aSW5f-f-pLC)T<-AL`}>FEt%zG8I`3hpokWy(d#{S}Dg>+p8EW_#w$
z;L|8|o1EO-&p|=OhK)i(LSCoa<LC454?f{Se-v~se*L?+s<JQwTYL1h^muX7fTsgu
z{2r$gLbiFh=Mc!1viKmc4_(`HIVrhRce+&#n(eJ@cB=DhEAzlulaltB_v_bJnXAvF
zGS&EwskN#6Rv*S~ZEY=Fge?fTZhx!cy8WYt*KX7cLOIwW<f2~RnuMZc&FE`6i_D#x
z3FJqX<Xg(h%D{L^nw$NMjemgOUS3|_-pQXRLf6Z+43$}NDLJkb44HXa`**dLUj~yU
zS+Jc3Ye37&A6hV{U<`2>b&AYL>2G&4jAR5ewBmF4$*nRxYh}4Sc0~>DT1mc@Nz(v<
z9F+Z&YZwxcH*>Pt>cC1Kr{h|e*8SKlJzJU9LGtemCQ}j<y*5(Z!zo4O^K)mFKdj4g
zoU$~ivLzWe$SW<lvX}__-Ux_(?=gGz>Q&I^&m2Zg-e<cy_%ASywS4E4Mpu7RrA4w8
zSVJom_IqEV%88wxp@b$%K$i-?y`NZ))mDMJ#^~{u2C?fV((2Lgeuq<K*OY~HGb(Br
zt_b6Ao3X_!YQ_m&`bOGm{(f+`Q<(YV*JEFz{zF&tjqWJg9oO-frEQqTJ(nEcQc5ib
zQ$0imC=*J2D15AHKBcS(Yz(GtZ0p!z5|fLc8}zx*tIitW)b|n_vc&!Yf!)Glqa9bQ
z?^@7(pS+{3SiklK6gmKpPu(EI2vlU?786S|_#mR=NuHo>iLxY2nYKe`<V$eAHl~xd
ztYO&VWUZ=GAaJZ#O!ZCdi#&gbAKNNz`g5MOuB|#{QIbusGm(Ss@j@4t3vBh%Y)F0+
zIg?Q}R=J;GTesfG0df~R@o6t>=oG8LT(+X%CFbG`x2K=ks=7|#ioo999@wrAAMS*s
zed~1#%U}ZF1w^u1k3-WB&jyXk)$>mVgb#+!gS=uRZ9CYk<D6PI6SH>2_Y14@9;ma#
zT5dE^>`zw!bBOx*_%ywFqaZ~@F;m6Jz;JYVv-|Iwot-^FTrQv#A|tD?O}c978$?_i
zPPI<8if?nwbwG^O6j{TB5fO~wc!fm9{gPG97-niFRuA(Kp$wL)vYTTe+Oh1FW&!0(
zit^+*;-be7{;5|z;yk+L;_B)OgArEN=Qj*&Sz7Tt>A+xQWbEqfWKtF2;n84;J-P%X
zR1UwaC?mUJgEoW+AS2X@+V13U*)LcPaF|t-NDCUC5K?^fPS5+$cJ#rL^ng27-u%V0
z{k+4~7!^vWx5pei&F|8Q;Xl1^EBr1#`(4}|55gxScK>u2a;I)|n3j1%Irwi@36qV5
z;ggS5W~Z=9)OT0Q%X>Tbps&?tYhDc;ND%ePI}f_M9y;aP&Rlx?f@0FmjW2C5B0M}=
zP?91CRAr-EJk`_D{WN@fW_sgVvCGzK{irP{)GEn@gcM5gUd`S&zgYQL)_Q1TReH=`
zeERe$9_#>@tr4)XP#-_;>_S{tyGi!2a8yWei+7>4ZC@<U)RJ!72M--kReXGadbiAR
zm(keh)9B?SUfR}K9eMN9-e(8*ZV`7?o=Y9Wj;XIQ--YYs{QO{{Iqkf&KRWK6sQxrk
ziId02Svu?CBZ_@q_Is`USoV6tCLMt$wI{5Q#I={@v*bR*#&HMPtQ=X3Iqsp9BN+w{
zh+QkcCpq;6eoJOn__`u6Sz^Qy4<8*JrSksU3Sup|Vp+9b$;f~yC`R!*+1IA=qRwrN
zF73J{GPqZ`W;VSN`es>R^#@TO>+1R*ockU`$xu!MvOvfX>VV!}QLvd9^*YbR;9!5B
z59`xp8<S3uR*_EkRM1r`uJ6#?97V8{Y{6z7#zpP%Wx9w-krVlZI`8eT#sii$x2+}<
zA}5T>5_+p_<_*kFc#vW?afK!Sm~>daJgS9`Sc*Fw)3aQuZtQnt?=wM(caI0f#BAPN
z5rh!aPko2MDr;+X(1z#do7@i!mFKcz1bKO5d(4WBntktXE&+@K96(gvVes-zy$zo*
zFR%37DMsc|NQUZXZ7=C|PW)gg5z2)+*PW&I&-^x1L(|iqgQDlE@M)t`E-^^a%*-P2
zg`|{}Y?8eUtA{Vn7yRzw9L;_B>k0=bi!0c@=abI{kC_5`JXKl^`aXaD49axxrN?=M
zAB;anUVz#_38O=Z@cBzn%kfy4Q1m+i0>hoX`3By+yJJL-$I3<&3TnLNPG%VEASHr3
z@TKOnnR>Yd!%;@H(PxQ$jEX8Z>21J-44zjR7%f;>P{8EIu89{}=d>0gVoiyl1Yo5A
zv;MX-aM=H9LLw<Cx!ft3Q(6k>ssKjq)6-Lz_!p@tDBE%7fZ<tcK)`g=ZtRBZ{rWZ3
z2mYG{1%U3+l+CU{&b|S3R||`tw!{|z@dPbITRNN#+`YUK;koAZSl~t4&Y1Ay20%{q
zJl1l!Z0+moyScfMU&ld0YDFmoUIl`c&C5sjiiCle-l;__8k*o;Xyf!*(OTOY^wmPz
zy);iH6jfA01N}{=bih>GCLr(3nX657d&!?l=r?*13Oxe+i_Mh0JRN?K5xn>c8w;!3
zM<G%i1Kbv|nORTIZH4uZ`K@P0K=BEc<PkREy+hK7y@E}QkN^DLkqPUFih44^ArORk
z`X?#I1jUfRX*#&wV5SRT(LVlte%<YA5N`5_=eb2|^k+?EFmUR!&ELI?yDX&Dv~eU7
z4}jH*4!eF7@TmFs6`HrJkF_6ckP+d6+cy$SAtO^$H4>pc$09^Ui<c|^%%u<uII+2^
zD!$$xUA`atb#@FfPxzH<+7lk)LGYrD1;ZtenYZ@UAFMq~ebdcHJU|D=!TB(h;WgkE
zN{ug1@{X9zOojz4Kc?=3K}+zJGvQhX)@Jeu8x|E&U?TyR=G|u9z5tH9oFRGxlqn(@
z6*0FK*Ex{zQs?CLMQV4SVFn`ZeIVtoDF%Rh+D>=E^oW_@A?C}{mn4xBmWg~^TxCvk
zQ5N3RJ_O*NHr0m$3~CnxDl)Rn8Th(?K|$|r6tgTY=D#nLZYnA(N5AimfS5;>8B>4w
zw<fJL?b~zi3kGs2VH=)RwxiJ*<~lqvD9-4}z{^(gqeXdzg%vsmTNMJbEDt^OtA0ib
zAQp|T8=9D$te<{mnHZ;>8>k_TR)Plx;PEPM!*kju?u|CwD{wZIKppW84a*DcHIw1)
zWTa;qks|#M^-S8u5Nw~T@z0)(V>&}t$HV9zx<S+j2s8OhTe!JtLQYoosvZiZD8tj)
znTUa5BYzBy&(0<n6ojup>gDsSNPptDQ6UzB&rD_Q*fTnHF^i@5y>V*>lzRx`@cG9I
z!7PnodX5$A7=>q?&)=7vNX8}~d7l)?($OqnS9OPU&<v1)$DUqbX~58;<g+zNgsW|Z
zllpr<dMXy8g6BT|1(EgdP<j&=_`tB?X|fz}C=)cIxi4KStdl8DwGaiecmGWEd8aPO
zM3o;}=Fb_&K}PAR{cpiG@aMlF4WG$cB9<A4otigc=_csIbD=dZRh)-}VtR3bqi6`%
z#|-UtWFj!1aceoF)2_0uFWwQrxr`PFLs$YI63sHriY1H677zbNFN#viu0&1%%RRTD
zWvwa0S`irN>-%c1(;)DLsOR5nCAGdyyfn#2Le8-B%goFqX4ijSqKbz6Z)r&WzF6oC
zBa>^^92xcT^}RdU8s&ka{&O%1e@3jT>gwxP3XnBi3~C4*01*o^?A#|{Mf2Pya+H$t
zUccugu;hr9KWMt%-`$1uu>yOft1}U3!1lJbtnBTHC8nw<W=B(qh(Mwd5f%pX5b8sO
zFx*6@;n~>+`vvGIkEh3EbXr0|w3dK~h~g)Wf6OA<gAh5wP-%n72r98+CJZZ8Br|n@
z8=&_$04=UM31;zr5PtYbY+who)&oIm_Jf)mU`LA=3F`R-HYRF>OJI2HMor|Q9Ya5n
zTiQ_4Z%mm&Y-e(;>WTrht#?0|cd8|S{!+tLRt$l=IT}x*UoJBt_A0LeL@Eb*7_2gs
zH})ZHt?#15XU`f$+5be?j}3hmGj2vkMnWk#^M?BguIqgXT85sFZvVyKBV-7PjK+8a
z;Lg~9r)n!Yxud=tcUb-%JesSrqKJZssUE}afL@e>rroD3TvE89`}9gz3fw@HMnRqA
z=XYN*2u*^o{g&Xw#AIGv!O%pXOp{2*3+?Eh%$(o?wP8YHVn(O-KMJ6mKLGDnLh+87
zh3#D3X&|xT=GGSV_!|}Ov_Uv`2J(l%N4{!Ij^7@BA#cCEK0n4qU&zzP_+^`v^9%<U
zSM0cto0!AU>>wJ8>tFU74>14om3EW|B($cB4h{x<^ma}S7|2(vBqLemb^R=w?D0MP
z-dox618HI^_ZbG%lgJ={yt`fvk$A!?t#)+TfR~YzlT%VsQe8b+4#6mMu4hdwq76`m
z!8GZe7@M!>4sfurA_HRO>6J!*AQFP+=>t{Rc7&pr6!)g+;QQUOu92-@D*`u0N~5x0
zWmhiv+~w}(&zsJv?hmN|RdFohL>RS?h!MQh8{rHKBthb)Sxmj4vcK7BzT3&M@=BE%
zc26y#O;Ro>*scS9BYJUr;OF=DZIJ14l`U;L2!<^z^#KxJEP1vCa2^fkU*uF)o>rvY
z?gGw7HrG--62e>ubPyAg@Ribh`T&oWF#fx{gZtF82Ae0mVAK9}&afg?z_OYE)f}bA
zBC^3GuM(|uu)hvsn;uI^4ESgftR39#9{{Au5)jFnXFJ275LP8+10ropfiGtPX=q2&
z)p*JNLi2)Sve}ERI=hxW4SZmA=i1rorqiEbDxg9U2$wwcNJP)ssWaD!Gf&^30)7eW
z<mm@IoeY%^poeVu6dX^CMFs&a2xylJz?i6%|B)@2V&_(Rx=vUVMiEuwy~ZklS<PUk
z0(`^O$?2#q5Hrr)k<MBzwC`91KT{%|lb6>ONClmpugW-sKPUIb@}NCLA|k30w3*?<
zlAJt^i;EldyF31dO*P~e)aw<1M<<u7l6JSw-|TsN<qC*@7JHH)a~*>AwjUITf&e{#
zaCf%|FQdNx8sIhLbwYF^9rdxVW3F?4m+^j{haJSO1`)3^8%kxL;s48|fVTvtRv;e0
z4@UP_lRMkn{?!}QMLb8)n4V+-$K}~tXF7}24YlZkmlDjt0^=R7b3o1r05U}ChO4{#
z`RVB+I)C-f2OXuBKAcgq4OiQRe%IB0@4@hJ8ei*U`GYiL%$sg_5NF<D$~6+7o9gur
zASHb**?e?}NtP5rMg|sSI})I?lADA3JC1|67aERUAj1`v8v|$;1qn$!n6B7}xW9-H
z9W2bxe}XAqY(A5qq^x{*EOvhkD(JlO#OPAI9)z~SP)<)&kn*N%iZ()IWM)Q~n_F^p
z+q2?>VxUC&-*&3IzYBMJ3wiuRr|(~eQ6pv(@b&q?Sr%E3*-?T;DyXcvnU#4+4dfCf
z%Cx=jE;j(C*kpJ8(DLkYHLWapBg{{ZD6tbQ|1&8000o$!xDF(?GVQNk!>UV5>etjU
z?*MCHXSaWMec(>cNE)_$f}#y3zr^*li79r&v-!-r`K;vut}5;`rBVG!>^$r&_75Q$
z-sklTdj|&_ZhZpnVC}VeryN&OyMgeMKRz`zH8F9vo@B2KssrOkpXc*&13*}_JwG`a
z8yizqCQ^O@0*ofA!KC@K3~9-bO6$Zb=Z%4;CTKgSWuH%}b&qI8)9s%9{UWMZq)asm
z!bLuDG``+Hpags1B%1?Ns%){DEpwHtrHwmv_dtJ>dX*s38hQS_L?q|{<yujC(zW&@
z@ooG);o`_hoK*G_^B_&Z4Mz%5m!k)6(;Q8p?JWmJAAN%ob3EL>@pPi>O_!y>_YKc6
zCLP(8UAgsc<SaNxin8CHwb3<@<zBwdG)G^|E#a8O*M*8`8lIWS2@C9fS|}MDKP6hU
zWy)Y=B`&doV7L~&vPFVG{vI38xTUK)kaux@-QV9I^j_!ARuAsSo2lADdD9&2EyqU$
zNcyz*`+`cNHQzoL6}Xm!zJ<%G5wvq|{slXeC^Sn+A5E@Hkwvn*nhjoVn^Z(sR@x#j
zp*Yv-Ju^xRu{E1e)5Fx+%KPa0@_{rGCMHBOUA6md1>nLbiw#yV6=j*9j5T~TpdRI6
zgNM8Vi93_PON$^|gJl>=iapXW{=DsTYw@$tsK^O&Z{~73dK>ynMe6A&vy~`)X|HAi
zWHXcKG=)d2+KGrnK%FNMS*H)MGKe9JsUH5ec+>qR?m>Pr-40+s0R)t6u4ASrP4k5B
z)x@FC@Ci2bZ98Y4agrjLE|YQPvNpaP2`>(9>rrj{ACw~fljp%terlCY^>j(b5zlBI
z*&#z94$hJ1QoggBo15{?H*3U(9v^QRoc5XQr2TxRaZ^%K4w~<w2A5`D+HvM2k6GvH
zv_t7c%YEqJmhACK$%L880!T>D%n`i+$qhgaZE0x%9@yP2%a@drmIjKj6y@q)zkXF$
z^YikG{%v_MOOmL>=&8>qI^aemQ#r+&Rc~ejOSD0ID_+{7R7hx~rSbOSk9CRY-Ng!(
z&&iWZAE!_?$CXmpJ4K-H02Lf)!^|XRi8;12Cl^9O;t-~6^{p`e`3pddp2r({S$TMT
ze=Srai4*wO8}4?(N6}>kRBfOVfXV@(&K=A*g3Vy|LJsG-Owp8i+`<d==?qrfT}N74
zGavEy2Qyy*w<3t)oseHp2X+N;pxRnNmWe~Z&N_CP(4P9sNx$1k4!=uyl&loHuD%hW
zCd}2;ba^e_=x)Hh={P3s#>~zx{I!KuP0-Cs@4*)(N;@ktE-o%n(c7z?61aWHYEf~q
z-Oj{MY;0^Gs#8Yfs^?!_dHvA?=1NKFe_Qd(LN^|W5lMWubpZK+3ka~v6uk(?4t2Ub
zS_8$>sIAk!zt$}d74!yJs>ku_11I-0mtQ9gWX$EK)Qsej6k32`8o^Dl-}M+695e#j
z`*KGpAU<emX=7qyYW0=XzS;0y0|5d6O~BV^CY)aR9(n9p@+2zff;Uq6-5jd;U5x@f
z9w<Q##D=ywxH)N4nEmsIn6u<$d^SLo;~)xUy;LNWz8r~f0;^F_0HP(JL$kBZfrSCS
zEN5fLI<1rz6$tTXBb}yB0lFb5S{fXd+O7|p{kBH3wTyf!0oUtPyGRGCJ$vu-C^W(X
zh{y&827aene&f^AJvqfTl*?pjttk9U>OO~|M&5uk?p-Ulp@3}Dg#;4mhOb1n%j)Hf
zZUGJMO;<R=V?N_j0e#5EkTA5Pmk+mGt<&0bwbd%o4ZM$k!TY#!((wIpKflbYS5CFb
z91+39yHe5zZ*dYzj@QzeoY=&9NN+2|t}6ibt&7%rM*9#G2;HPJRoB<o2lWR~csWxX
z`L2qi&AdB5X_&f(Fl7YrY{1Zwi+GeaHr|5ddFYXReScU-CVkse<ZN&b3LNj-)5!&|
zouBuYY4-_0a7jzEPzd2pHKR8r3%P@%r<s}@+BJTK6l4G3hsO#5R(=qAy$b?jxA0qg
zVo-bZb8&M1UHpWrtfZud#njSZ8aCvbqRWWM9HyXLl|_dh?mV2WklEhN2DGcO-sy8)
zjqhxBHi;~L)2mskY3J49>4n+)5($iH-bd3GY1yMNmRQA6sbWbFF*<=qRAh>yyE{9y
zl^Im`i(6;KJJGtJ=>VTV0yZv7mw{+2`DWcq$YzE-U1flv|3HSzLe=@ngeniA%kLd$
zgJK`SNP%277|TsE@x-X@;f5PJwW05&xvy}L$t=bZ1}5fg+|8zpn2_&{M|M}WrAsG|
zlF=$K+-o*UAJ#mAsQuoFp$uI)y(3rU_3s?w`U3*-5m_U58KNXXWro;vQ=A0+Rc@SE
zpIkI&wbee55Fw(~H=wevuLE`?>f=+JT#r;4-IrRV)24vRfY5r;#9upQQ%{q6J8su0
ztHapi6|(UQ3D<tGClc?&7Ofw(Bfpq*ovfb2X8awK75zast|JjHhOWwrMpR>k)jkDy
zGW+{8`-;Iz{Nn_6u{54;m2V1Pd>kEFtctt|LkxTL%G1_Z-J;+|vL?*gq18(>4GGB*
z279^UO?6T>MvK2UJo9YC%Etx^Gr7$t+(Yy8$_Ig>cE6HwuptiKUuWM-%Vn#B?ExG`
zs0np2S9?J+Ha2Qye-<9N2N?*6oKyFV8rGVE@Ha+3ih4iu8Y{diLW(A9EH>=8Lqa5+
z;$>N>i^IiVlQO(m#_V<pYG9Ai$lG#&ii(SiW53?(%4mg}2Y#g}_IxWxv-7pH$>~=T
zF)McaViqSxjAPm}>TGv4{WJ=_IBJZ)uZJ^=(oZ<rIlBk5Cq|t3*#|+bJ#(hle5wbD
z-}&x=3|4P`NV*<$lb}+0mo_)wPv|!;JCL9TvxIR7UaW;K$J|Tnz9N&!R5M(li;-bh
zSbhY3F~MRK?zIs!b*cGyOPZOoOZaBjLhO1-5_fpoaOtlts3t;v;_8$;yl_QNhWMKf
zu?5#|CtBl)buR^&ajGe^#4R9lIaZo5m{sD$*q8<YY@l_AB^FSgfE)+w4#1ZA-NP`<
zj2W}u;X20PsD?Ne{){DZocSMxg@w7f8;4y~8*hK^qG#-3A;Q%+C#CpvFs~~61>gPI
zTD>#N+A^U~%uCB6NR|=7coPtCs61DrfIER6p{|uf7oimSY#{B+2Iq~ZA$m9rYaEt9
zs}C6|sgUz}-{tWJV92|--n@BTj7`IJ<cjeoGh$^wN;WG!-2|lnw5ze)a4NC++1b7}
z79zb@0DCw*HB2uk0OjIq@L{d<hFvQ&$EryWsW>~C6{={oe71{0$<LpAySpO3Hx~e(
z;82Rlt}CXi4)KJM?*273D$^e0VT+PQXaQ$uPR0uC)Iy#|tDmWS1voh!K>N}3^t3lL
zZEz#BV|i+d<WUD8N?Bq<x>hvslmq+oHQvGF*g)Y4LJLSRv!Ows>^36_&r~Qx{zhOE
z{N}=<O&d%DGV$hc=Fa!7UyvXZ4J|E@t9kkOKxhS>94<n8o`ymx`<t7VAd_xyU&R_-
z63!ditxB+ex1Ax!JYTE4QlwPg{pQ2JA0nw4n@p`Xy;m}FN*fbb$Q%{&2*mGPP4BI`
zVqrnS>9H{ao2~9jUxNGPoD?Wke>^3%u!{}XBPz<+Yp~@(7@r6Ha8uL!{o35BDoxqF
z)I(~NngDl<BaViGf<q4xqEI!y33aX#vlj`28wQg~bodC60(9?FM5zu+Yo1q%%Fv9V
z?>4pFwV4?iKCw2Zn{|dpM$Ld=1`_GPZ0#{<v+6NZx0~w;Cqu$35*`?!Spkyz_{0Pd
z?;qPF_rJ||<Bx~O!q))q*v`*QRfoB{xSRk@SIofJ!NI}JEzXBVr-Mgnh4eXwm<&x6
z7>g`jmCf|X+?)^S3OhSF0i7cs-$+7-S3in2mE{A_1ifRYUKr>3399UurJ&V=A!g}r
z4UqdAxd>D9@Q7S2euDa>@8bZDd2B7jCJ*S!;IYcNtUf}N2kc$VK6cDd0i@Qtr_}cf
zhGhVLVRlnwv-1Q?`A^I-J@}yB=p#gPUZ%hh!-F+!@zilY8=~km!eIMGCvH|#JKS5m
z0SRbTRaO2n4XWNLIbseM$p#{V4APWT96ddxbO&KnS?@?frr~T6`RUlOnZH>cX}Rd&
zE6U=Axx^B`R}PV=|B6Js%gXPgPaCvOe06N>L6*wRLPUh^vrieHt2&OEO`*X;dj80)
z{_Bphcim&~T^uKL!A<snFCC`HbEE{)Kzq^W;ujQTCVBz)xhCLW=W_I8@*+%y9E`rW
zY(9F(X@^2PS=s%%4G_R{%ns0x8=jyD!jO%K4prk(f}6cSo{n(R?zO;%L8aYreeMl-
zn8^X^4Yn6hZtd!%B2bqH9fe8!_Bfn+HF~LdZB=_VeD%A#Fa%QwBZByv0Sts3hbd@n
zN*$VFstrgvA|kZGXWveDitG1v<qo+!qCsr=JA{GYDSj%l4IYEWJQTi|_hM06V5co6
z^<g16XTsUC5B{&qv>`3<LK~NJ0NdJG5yWMI@u6)yr#~6r5Gl<qFV@OPwn8@>*!_5q
zopwyhO3_Fb39qi$JyP9)h^<$;L<KxAVg)t7KqUSn)v9k(Xk7q#I{*t+wknE>E%b;d
zroJsB84fc>UhWsT#o+ZpaESh^a;YhV$>KPz2;>Uw&gNs?@^ASRb;&-40g447CgL7E
zB|-zuMN2Xm3}imdf1Kt=8`d()o<>uDbGYlA4PPjNt2Czg7OJ~BteqHZnY`f%yzVas
z0zZE;R(k~l4B6GLJ^8rIQx^vm1aFMIW)iiDAh(qr1k*P>gG~OC3{Ow%teSk(BmWhD
zId%Imzd(Dl6;$VV5N#221=-poBtYF!%f%K+fd(4nR9b$`4aYr!&tMJ{;-z2AUOaoQ
zeT0oh^g#iw?bA$0w<HycCi>bV@nXMDtB0isGF-VQ<IRlQhd_GapxJg@B^kspSoF-e
zqC$!B+M~0>QbB45gqH&jV$^~fEfD_p7fRg5v8u{nHpbWzjSxaW5t~T-Nsx*bjM@Dg
z=HreqPh6KzrrMy-)znmCc1m>Gk^JEb;<*7<iJ?%?8Czl^$sUjB?&t`MQQ}%gFz_C9
z_~?#re)mq!M;xtKP22!nlN}Z`z`aOxMCX73omZXpQEQE+E`0ayojk-$ur%cnEhb{-
zY6b?4c_P7qK{{p@(^Y$(^QSwL=7ktR2(?L7E_bx)(8&AK)8*-1P`2F|8EFy&Pbpnj
z#VS-Ut*OQm{D7drQv2Vo&8kV2fSCmJsuu=moE7Z|brgsUR@lDx@DKnIN<LfuBZ6h0
zNUq<nQyAsJ(6CBmh{rBRmUh$RAx-)Iz1!?XNJdSu^-NU;6Uoni>P%u%Qf(O4ZERtt
zxqP-dG>wXql20i{M2b2L=bsc(y1qMI!H6F`wAY*LYE<{hT!*9SA_Ff&m8qt<zU?vy
z!2oTSf<O%z!~5%oY(pQX-zoH4;7bU0u2++!z!@=Mkb?ez7R<cw$t+}=JfHo|c6wu3
z2|DrB_o&wi0iB8#{0SAe{Je|X$*eF$k?oy4w}^=M)rplm@;pK+({>ga6n0vb<sm&)
zO4McvFShyvSevm&-BeOT6kuIQfW!l|?5?b-v1n28GF1^EPXl<-jTw6M7%{>>%XP*7
zTCTEQ1JUGor{~!>dPTIu6{>q}HG-KcimqWE>~+LqltPVRwl+4qdwXGBD_KSW?@XB{
zrlz_9_5e%1&0hgQ>uZ#h=H`O_m*7}>e?Y2$EYZvQ$>F~gmAc}3i$Ti4V@-kJCRHXZ
zY-}};c~^tJ5`^fGs*qQ(4Nxam`{JJ#OCHjjBEVQ$Xjq}mfZh5sZ>q|c<S`-P2<;e=
z;D<EOpVW(DYC?zm&lLdJo^f+`uio&~7-_J<4dS*K=w1`(c0oKAzf4<k@-#J-a?(}K
z%X0O1#!&O)$B*-3sMwxJ{A05pPRj!vCGo|nwy5CU2L(%=xPk)EzXmE~8`l4ftjbso
z{iJ+IAEq=4NMZXKw|tG|eI8)BmmWk!weMRSO+7j%L5njZQHB=$@fJeB8~@mAtvEXS
z%j&5peq_;0e{-FQ1a1o#1Kcle2zjpXtL=<FZVl)>HMhugIxn0w@-sjaZ)bk42OPBR
zLuI};1hk~GvubOg{4CgRX+fInz(>$&hy|bze1Y`_6i?*~)!&SxqNHCp59vKdScpgy
zG$2T{<>WAU_D!mj1ewfK?bO*f-&Sd}%l_Np40XjZDXxDPTU~_MP`Cl9oB8oH$0`--
zqx-xc;U|{e;!OW~;y$rKivNICc7TGXZHNRBJ<M%SA(}MOYG(jZ7b$e3xG%K@0_`JN
z5=;iPRXf`eRDiO2t@&wzyl5#D<mdc+=7RXg|M_Bh5~wGeY!rK|Y+tm3sx<GEX&E64
zwjE;#@}^f-^2W;lys6bHF(lMxLd5c>6#9UvI#+A33NPOg@=N7l6}7gCUy38tAFShE
zNAkgA(ANq8_sgM_ji1plP<^e}u{-?>duDoSIsQ3TS>o5{2e^38Yn@alPpjv>6kxEg
zmmm$`Rf);+udeSaJTrG`FE0YUf`c0-CJ04$huctlopx@z@%?$ZA>Bf1Qqna*lK(<x
z0CGh7h717C{%j07bMo0EgT80n$*;iFcW4a}Np!&GM}H011Xw52e-hY_a^yIxM1cL#
z=2Oi=%byh+)Pp`xgfoiFg)SNPz=eV&zV!6S@z@}8UaE1=M9fYdC~aEre%weUo<Bmw
z1Z1Use9XOw4yViw<}L$pECD<*TOA#tOSL4fV2ZKLj2dV_AR{E0|Iz0#iDpz;{WSA6
z{EZRQdBB%nLl^m$pjdw;atj9`o3%#AT2A9|A62|az*43K&g2?X3g#4xM#Lp177_Cp
z{12UFnF^&e=*Vt%YVBQf`j>(v{85)mu^!a~#4Z&$)qV}nL@Zp(vB<uCM^sT~XXl5#
z+CU-;d+JT_5^$;n9On4%(<NYT|8u$oRAZmguf&bkbBlMx7tmpAXIMcd-{9tmwD^!B
zcM*rKhMMa9G80SvMCLKVQlX?Wt*3oX3g(lppZd9w7V-TnquB~704-p6msDn~4Y=+x
ze1z1*k7@1X<h1r)yULRY5e?pTkHZO)6B844C#sfZ0X8BWKy01A58>ys4p?wT?JXD5
z!T>Of38e;qEp&5Fbpm?Qu>Xn$J=m2sBRu_%<aS%to1I5v64Gj%vV^lj#vND6Pasv%
z1k&i;8h<Y%WUY}v=ADB6sBv^qc3@}9uB}i`$a!WQ^>24u89M$ETEHGCq-iw`RfLU8
z=awOuVQWjX!#QJQn)e~JI^iqEN8B~iFFlsSpK`!po)GB|EyE!45Mewj!bgzW6b=Sj
zuyK(57bTp2q+k^;LSFyVgp^ots)fTPhYO`>%JA=p9mzo>6eDBQG-7kmbz7<v1g5lt
zMh9vs9@1=VnkclH*QV)(SfUDOTp}W~3kyd1mfAvKla*e*qbE~x0j${ppHhW3MBP_1
zUt@$PEFQ;GXNVK4os+!l5+OH%uB&L79<FQiPv?kKp(MGEKgR(3Q(=K?6_#Tai|lHS
z3@?YkM|k#R#IA-zIhthqZ#Ioi^g+1-+8D|z%yz5*f4Ak5NVAi=u~j#4M-jW;4f1$L
z03Jw{%X;>W9XJeuouyugGAlNHk-*bo_Ozy?WU$J%s$xoyM=8dxzF0w=J){PKyRH}R
zq1Ul%PR|&Lz+iMQKS8ZG0p`HR{OBBF5*+AIubl@^*MJ<+U<S5<PEXl}si=TJgg$bb
zBJL?2VXD%6qR>1xGXocAGNj3R=<Wsf3r%H+6iq<^5bgBq-NN{2CI2;r__Q9mex?2=
zkkZx_k3LTR1!^cDgAu-l#eTB}P3xc+F3vnEM2!y9f&`3(1(V2Jw?~OoWbisu>?$);
zCSqhIOT4bwStFDxi=5qH(qOXDVaeZwq@ds^gnEDzVI7&tQ-E9sefFJ!#6hzeWHMEy
zl#m_1q8%swm>5Rzr)p0?8IVYJ*=F87K>&S0N`nYOJB)6}jpiEP^CuXC_do9WdB+s|
zQNq|IzK<uG<>c%EBA`S8bnbq#sU~khtgb6^>C-fz1De?YjiSg2FIP=`09-|*6<=a^
zrn;oIHlabx@Oq_NNV-I}`OnM@zul}X8R+xGaYDGVwL+~v!_$1g6aca|%PJ8x7)cP7
z+(t#2&s3S~9D3XUNqnZ-K21CCKs-knOe%6w8MOQDMTnkFiJs3&t`iD-)fHDzf+JeM
z)qrSP(%6_%Wzyf4@G!mZk-#JO{fO9t=uH=Q_xt^WyW$lAz<VZt|Bi>rd|>ttM8wL<
zO3|y$Ofy5BIB65eOcn9Zl*h(<s*%_3U2Xk;Y-iYsLP3T*1L|pG45Lc;*RP;`C$At;
zJ{z2Opz_*G|4iw%38==z9N>D+>C`Yp@M^EJEq<1D5?H8Jk}B+O2M%3$d+VctB6MzK
zq#UGV(Dec@*MO~IP<rD3r@m12bElT7)z^f@#uP9~(GTi%ERqA`REGq1yqd@`VJ5YW
zcxM4_?AVwLW7l>@COvnKho)&zdm&s;bPqD=+EWV7c8#27N}=`+N@S`b{`Y0AzF{vs
zbIb4-!)C?LyZd-R>Kof4VmIzS{z@HtzslN$(Ddt8IV|!jM0X4l690!Zng5BX|9zGY
z@zMY5gM4_9WN>=#|JO;u|NS)L|J_N!nnxFYvC3c0s*aMkK~h4JlU9~0mN54JU*DaV
AJpcdz

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-after-part.html b/tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-after-part.html
new file mode 100644
index 00000000000..0bd28fa5d52
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-after-part.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<title>::file-selector-button allows to customize the button in &lt;input type=file&gt;</title>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/5049">
+<link rel="help" href="https://drafts.csswg.org/css-pseudo/#file-selector-button-pseudo">
+<link rel="mismatch" href="file-selector-button-001-notref.html">
+<style>
+#host::part(file-input)::file-selector-button {
+  border: 1px solid green;
+}
+</style>
+<div id="host"></div>
+<script>
+  document.getElementById("host").attachShadow({ mode: "open" }).innerHTML = `
+    <input type=file part=file-input>
+  `;
+</script>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-border-box-001-ref.xht b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-001-ref.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-border-box-001-ref.xht
rename to tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-001-ref.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-border-box-001.xht b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-001.xht
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-border-box-001.xht
rename to tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-001.xht
index 3118bc40b54..c66cda94eba 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-border-box-001.xht
+++ b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-001.xht
@@ -3,7 +3,7 @@
  <head>
   <title>CSS Test: Box Sizing - Border-Box with specified width</title>
   <link rel="author" title="Scott Johnson" href="mailto:sjohnson@mozilla.com" />
-  <link rel="help" href="http://www.w3.org/TR/css3-ui/#box-sizing" />
+  <link rel="help" href="https://drafts.csswg.org/css-sizing-3/#box-sizing" />
   <link rel="match" href="box-sizing-border-box-001-ref.xht" />
   <meta name="assert" content="box-sizing: border-box should make the element's (percentage) width be the distance from the left border edge to the right border edge." />
   <style type="text/css"><![CDATA[
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-border-box-002-ref.xht b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-002-ref.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-border-box-002-ref.xht
rename to tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-002-ref.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-border-box-002.xht b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-002.xht
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-border-box-002.xht
rename to tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-002.xht
index c18147f7ca9..ea4c9e4f67d 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-border-box-002.xht
+++ b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-002.xht
@@ -3,7 +3,7 @@
  <head>
   <title>CSS Test: Box Sizing - Border-Box with specified width</title>
   <link rel="author" title="Scott Johnson" href="mailto:sjohnson@mozilla.com" />
-  <link rel="help" href="http://www.w3.org/TR/css3-ui/#box-sizing" />
+  <link rel="help" href="https://drafts.csswg.org/css-sizing-3/#box-sizing" />
   <link rel="match" href="box-sizing-border-box-002-ref.xht" />
   <meta name="assert" content="box-sizing: border-box should make the element's (percentage) width be the distance from the left border edge to the right border edge." />
   <style type="text/css"><![CDATA[
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-border-box-003-ref.xht b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-003-ref.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-border-box-003-ref.xht
rename to tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-003-ref.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-border-box-003.xht b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-003.xht
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-border-box-003.xht
rename to tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-003.xht
index b66b812e4dd..835abeb3c3c 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-border-box-003.xht
+++ b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-003.xht
@@ -3,7 +3,7 @@
  <head>
   <title>CSS Test: Box Sizing - Border-Box with specified width/height</title>
   <link rel="author" title="Scott Johnson" href="mailto:sjohnson@mozilla.com" />
-  <link rel="help" href="http://www.w3.org/TR/css3-ui/#box-sizing" />
+  <link rel="help" href="https://drafts.csswg.org/css-sizing-3/#box-sizing" />
   <link rel="match" href="box-sizing-border-box-003-ref.xht" />
   <meta name="assert" content="box-sizing: border-box should make the element's (percentage) width be the distance from the left border edge to the right border edge and the height be the distance from the top border edge to the bottom border edge." />
   <style type="text/css"><![CDATA[
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-border-box-004-ref.xht b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-004-ref.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-border-box-004-ref.xht
rename to tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-004-ref.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-border-box-004.xht b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-004.xht
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-border-box-004.xht
rename to tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-004.xht
index 62698821434..b9429eeecbd 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-border-box-004.xht
+++ b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-004.xht
@@ -3,7 +3,7 @@
  <head>
   <title>CSS Test: Box Sizing - Border-Box with min/max width/height</title>
   <link rel="author" title="Scott Johnson" href="mailto:sjohnson@mozilla.com" />
-  <link rel="help" href="http://www.w3.org/TR/css3-ui/#box-sizing" />
+  <link rel="help" href="https://drafts.csswg.org/css-sizing-3/#box-sizing" />
   <link rel="match" href="box-sizing-border-box-004-ref.xht" />
   <meta name="assert" content="box-sizing: border-box should make the element's (length) width be the distance from the left border edge to the right border edge and the height be the distance from the top border edge to the bottom border edge." />
   <style type="text/css"><![CDATA[
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-content-box-001-ref.xht b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-content-box-001-ref.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-content-box-001-ref.xht
rename to tests/wpt/web-platform-tests/css/css-sizing/box-sizing-content-box-001-ref.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-content-box-001.xht b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-content-box-001.xht
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-content-box-001.xht
rename to tests/wpt/web-platform-tests/css/css-sizing/box-sizing-content-box-001.xht
index 8a076923962..9835c25699b 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-content-box-001.xht
+++ b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-content-box-001.xht
@@ -3,7 +3,7 @@
  <head>
   <title>CSS Test: Box Sizing - Content-Box with specified width/height</title>
   <link rel="author" title="Scott Johnson" href="mailto:sjohnson@mozilla.com" />
-  <link rel="help" href="http://www.w3.org/TR/css3-ui/#box-sizing" />
+  <link rel="help" href="https://drafts.csswg.org/css-sizing-3/#box-sizing" />
   <link rel="match" href="box-sizing-content-box-001-ref.xht" />
   <meta name="assert" content="box-sizing: content-box should make the element's (percentage) width be the distance from the left content edge to the right content edge and the height be the distance from the top content edge to the bottom content edge."/>
   <style type="text/css"><![CDATA[
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-content-box-002-ref.xht b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-content-box-002-ref.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-content-box-002-ref.xht
rename to tests/wpt/web-platform-tests/css/css-sizing/box-sizing-content-box-002-ref.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-content-box-002.xht b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-content-box-002.xht
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-content-box-002.xht
rename to tests/wpt/web-platform-tests/css/css-sizing/box-sizing-content-box-002.xht
index 83853e6a71d..536cdbc7eff 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-content-box-002.xht
+++ b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-content-box-002.xht
@@ -3,7 +3,7 @@
  <head>
   <title>CSS Test: Box Sizing - Content-Box with specified width/height</title>
   <link rel="author" title="Scott Johnson" href="mailto:sjohnson@mozilla.com" />
-  <link rel="help" href="http://www.w3.org/TR/css3-ui/#box-sizing" />
+  <link rel="help" href="https://drafts.csswg.org/css-sizing-3/#box-sizing" />
   <link rel="match" href="box-sizing-content-box-002-ref.xht" />
   <meta name="assert" content="box-sizing: content-box should make the element's (calc) width be the distance from the left content edge to the right content edge and the height be the distance from the top content edge to the bottom content edge."/>
   <style type="text/css"><![CDATA[
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-content-box-003-ref.xht b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-content-box-003-ref.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-content-box-003-ref.xht
rename to tests/wpt/web-platform-tests/css/css-sizing/box-sizing-content-box-003-ref.xht
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-content-box-003.xht b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-content-box-003.xht
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-content-box-003.xht
rename to tests/wpt/web-platform-tests/css/css-sizing/box-sizing-content-box-003.xht
index a6cee3c4c79..411d001eb3b 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-content-box-003.xht
+++ b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-content-box-003.xht
@@ -3,7 +3,7 @@
  <head>
   <title>CSS Test: Box Sizing - Content-Box with min/max width/height</title>
   <link rel="author" title="Scott Johnson" href="mailto:sjohnson@mozilla.com" />
-  <link rel="help" href="http://www.w3.org/TR/css3-ui/#box-sizing" />
+  <link rel="help" href="https://drafts.csswg.org/css-sizing-3/#box-sizing" />
   <link rel="match" href="box-sizing-content-box-003-ref.xht" />
   <meta name="assert" content="box-sizing: content-box should make the element's (percentage) width be the distance from the left content edge to the right content edge and the height be the distance from the top content edge to the bottom content edge."/>
   <style type="text/css"><![CDATA[
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-replaced-001-ref.xht b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-replaced-001-ref.xht
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-replaced-001-ref.xht
rename to tests/wpt/web-platform-tests/css/css-sizing/box-sizing-replaced-001-ref.xht
index 815813c51e7..c7ccf666f7d 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-replaced-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-replaced-001-ref.xht
@@ -6,7 +6,7 @@
     <link href="mailto:sjohnson@mozilla.com" title="Scott Johnson" rel="author"></link>
     <meta content="image" name="flags"></meta>
     <!--
-      <link rel="help" href="http://www.w3.org/TR/2012/WD-css3-ui-20120117/#box-sizing">
+      <link rel="help" href="https://drafts.csswg.org/css-sizing-3/#box-sizing">
     -->
     <style type="text/css">
       p {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-replaced-001.xht b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-replaced-001.xht
similarity index 98%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-replaced-001.xht
rename to tests/wpt/web-platform-tests/css/css-sizing/box-sizing-replaced-001.xht
index 003556b36e3..a56829e70b3 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-replaced-001.xht
+++ b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-replaced-001.xht
@@ -4,7 +4,7 @@
     <title>CSS Test: Min/Max Height and Width Constraints on Replaced Elements with Box-Sizing</title>
     <link href="http://fantasai.inkedblade.net/contact" title="Elika J. Etemad" rel="author"></link>
     <link href="mailto:sjohnson@mozilla.com" title="Scott Johnson" rel="author"></link>
-    <link rel="help" href="http://www.w3.org/TR/css3-ui/#box-sizing" />
+    <link rel="help" href="https://drafts.csswg.org/css-sizing-3/#box-sizing" />
     <link rel="match" href="box-sizing-replaced-001-ref.xht" />
     <meta content="image" name="flags"></meta>
     <meta name="assert" content="All images should be sized at 75px x 75px, with 5px of padding around each." />
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-replaced-002-ref.xht b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-replaced-002-ref.xht
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-replaced-002-ref.xht
rename to tests/wpt/web-platform-tests/css/css-sizing/box-sizing-replaced-002-ref.xht
index 64204a68a76..d0f4b08ccc2 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-replaced-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-replaced-002-ref.xht
@@ -6,7 +6,7 @@
     <link href="mailto:sjohnson@mozilla.com" title="Scott Johnson" rel="author"></link>
     <meta content="image" name="flags"></meta>
     <!--
-      <link rel="help" href="http://www.w3.org/TR/2012/WD-css3-ui-20120117/#box-sizing">
+      <link rel="help" href="https://drafts.csswg.org/css-sizing-3/#box-sizing">
     -->
     <style type="text/css">
       p {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-replaced-002.xht b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-replaced-002.xht
similarity index 98%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-replaced-002.xht
rename to tests/wpt/web-platform-tests/css/css-sizing/box-sizing-replaced-002.xht
index fc062f4eb62..60490e48082 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-replaced-002.xht
+++ b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-replaced-002.xht
@@ -4,7 +4,7 @@
     <title>CSS Test: Min/Max Height and Width Constraints on Replaced Elements with Box-Sizing</title>
     <link href="http://fantasai.inkedblade.net/contact" title="Elika J. Etemad" rel="author"></link>
     <link href="mailto:sjohnson@mozilla.com" title="Scott Johnson" rel="author"></link>
-    <link rel="help" href="http://www.w3.org/TR/css3-ui/#box-sizing" />
+    <link rel="help" href="https://drafts.csswg.org/css-sizing-3/#box-sizing" />
     <link rel="match" href="box-sizing-replaced-002-ref.xht" />
     <meta content="image" name="flags"></meta>
     <meta name="assert" content="All images should be sized at 75px x 75px, with 5px of padding and 5px of blue border around each." />
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-replaced-003-ref.xht b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-replaced-003-ref.xht
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-replaced-003-ref.xht
rename to tests/wpt/web-platform-tests/css/css-sizing/box-sizing-replaced-003-ref.xht
index 85524daf4a9..a54b2df1a34 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-replaced-003-ref.xht
+++ b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-replaced-003-ref.xht
@@ -6,7 +6,7 @@
     <link href="mailto:sjohnson@mozilla.com" title="Scott Johnson" rel="author"></link>
     <meta content="image" name="flags"></meta>
     <!--
-      <link rel="help" href="http://www.w3.org/TR/2012/WD-css3-ui-20120117/#box-sizing">
+      <link rel="help" href="https://drafts.csswg.org/css-sizing-3/#box-sizing">
     -->
     <style type="text/css">
       p {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-replaced-003.xht b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-replaced-003.xht
similarity index 98%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-replaced-003.xht
rename to tests/wpt/web-platform-tests/css/css-sizing/box-sizing-replaced-003.xht
index ed75c02d73c..39ce63ea9e2 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-replaced-003.xht
+++ b/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-replaced-003.xht
@@ -4,7 +4,7 @@
     <title>CSS Test: Min/Max Height and Width Constraints on Replaced Elements with Box-Sizing</title>
     <link href="http://fantasai.inkedblade.net/contact" title="Elika J. Etemad" rel="author"></link>
     <link href="mailto:sjohnson@mozilla.com" title="Scott Johnson" rel="author"></link>
-    <link rel="help" href="http://www.w3.org/TR/css3-ui/#box-sizing" />
+    <link rel="help" href="https://drafts.csswg.org/css-sizing-3/#box-sizing" />
     <link rel="match" href="box-sizing-replaced-003-ref.xht" />
     <meta content="image" name="flags"></meta>
     <meta name="assert" content="All images should be sized at 75px x 75px." />
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-1.png b/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-1.png
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-1.png
rename to tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-1.png
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-10.png b/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-10.png
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-10.png
rename to tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-10.png
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-11.png b/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-11.png
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-11.png
rename to tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-11.png
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-12.png b/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-12.png
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-12.png
rename to tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-12.png
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-13.png b/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-13.png
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-13.png
rename to tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-13.png
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-14.png b/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-14.png
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-14.png
rename to tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-14.png
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-15.png b/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-15.png
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-15.png
rename to tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-15.png
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-16.png b/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-16.png
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-16.png
rename to tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-16.png
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-17.png b/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-17.png
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-17.png
rename to tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-17.png
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-18.png b/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-18.png
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-18.png
rename to tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-18.png
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-19.png b/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-19.png
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-19.png
rename to tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-19.png
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-2.png b/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-2.png
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-2.png
rename to tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-2.png
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-3.png b/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-3.png
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-3.png
rename to tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-3.png
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-4.png b/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-4.png
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-4.png
rename to tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-4.png
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-5.png b/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-5.png
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-5.png
rename to tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-5.png
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-6.png b/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-6.png
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-6.png
rename to tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-6.png
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-7.png b/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-7.png
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-7.png
rename to tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-7.png
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-8.png b/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-8.png
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-8.png
rename to tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-8.png
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-9.png b/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-9.png
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-9.png
rename to tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-9.png
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max.png b/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max.png
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max.png
rename to tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max.png
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-001.html b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-001.html
new file mode 100644
index 00000000000..733da5334bd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-001.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text Test: white-space: break-spaces</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com" />
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="flags" content="ahem">
+<meta name="assert" content="A breaking opportunity exists only after a ideographic space character.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 25px/1 Ahem;
+}
+.fail {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+span { color: green; }
+.test {
+  color: green;
+  width: 4ch;
+
+  white-space: break-spaces;
+}
+
+</style>
+<body>
+  <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+  <div class="fail">X<span>XXX<br></span>XX<span>X</span>X<br><span>XXXX<br></span><span>XXXX<br></span></div>
+  <div class="test">X&#x3000;XX&#x3000;X</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-002.html b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-002.html
new file mode 100644
index 00000000000..faa69b6b01d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-002.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text Test: white-space: break-spaces</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com" />
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="help" title="5.5. Overflow Wrapping: the overflow-wrap/word-wrap property " href="https://drafts.csswg.org/css-text-3/#overflow-wrap-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-overflow-wrap-break-word">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="flags" content="ahem">
+<meta name="assert" content="A breaking opportunity exists before the first character of a sequence of ideographic spaces to avoid the line overflow, honoring the overflow-wrap property, except when there are previous breaking opportunities.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 25px/1 Ahem;
+}
+.fail {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+span { color: green; }
+.test {
+  color: green;
+  width: 4ch;
+
+  white-space: break-spaces;
+  overflow-wrap: break-word;
+}
+
+</style>
+<body>
+  <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+  <div class="fail">X<span>XXX<br></span>XX<span>X</span>X<br><span>XXXX<br></span><span>XXXX<br></span></div>
+  <div class="test">X&#x3000;XX&#x3000;X</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-003.html b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-003.html
new file mode 100644
index 00000000000..71bb366668b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-003.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text Test: white-space: break-spaces</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com" />
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="help" title="5.5. Overflow Wrapping: the overflow-wrap/word-wrap property " href="https://drafts.csswg.org/css-text-3/#overflow-wrap-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-overflow-wrap-anywhere">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="flags" content="ahem">
+<meta name="assert" content="A breaking opportunity exists before the first character of a sequence of ideographic spaces to avoid the line overflow, honoring the overflow-wrap property, except when there are previous breaking opportunities.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 25px/1 Ahem;
+}
+.fail {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+span { color: green; }
+.test {
+  color: green;
+  width: 4ch;
+
+  white-space: break-spaces;
+  overflow-wrap: anywhere;
+}
+
+</style>
+<body>
+  <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+  <div class="fail">X<span>XXX<br></span>XX<span>X</span>X<br><span>XXXX<br></span><span>XXXX<br></span></div>
+  <div class="test">X&#x3000;XX&#x3000;X</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-004.html b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-004.html
new file mode 100644
index 00000000000..9d8829b70ef
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-004.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text Test: white-space: break-spaces</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com" />
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="help" title="5.2. Breaking Rules for Letters: the word-break property " href="https://drafts.csswg.org/css-text-3/#word-break-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-word-break-break-all">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="flags" content="ahem">
+<meta name="assert" content="A breaking opportunity exists only after a ideographic space character, but it's possible to avoid the overflow honoring the 'word-break' property.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 25px/1 Ahem;
+}
+.fail {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+span { color: green; }
+.test {
+  color: green;
+  width: 4ch;
+
+  white-space: break-spaces;
+  word-break: break-all;
+}
+
+</style>
+<body>
+  <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+  <div class="fail">X<span>X</span>X<span>X<br></span>X<span>X</span>X<span>X<br></span><span>XXXX<br></span><span>XXXX<br></span></div>
+  <div class="test">X&#x3000;XX&#x3000;X</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-005.html b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-005.html
new file mode 100644
index 00000000000..0bb0673fd86
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-005.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text Test: white-space: break-spaces</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com" />
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="help" title="5.2. Breaking Rules for Letters: the word-break property " href="https://drafts.csswg.org/css-text-3/#word-break-property">
+<link rel="help" title="5.5. Overflow Wrapping: the overflow-wrap/word-wrap property " href="https://drafts.csswg.org/css-text-3/#overflow-wrap-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-word-break-break-all">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-overflow-wrap-break-word">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="flags" content="ahem">
+<meta name="assert" content="A breaking opportunity exists only after a ideographic space character, but it's possible to avoid the overflow honoring the 'word-break' property, hence the overflow-wrap property is not applied.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 25px/1 Ahem;
+}
+.fail {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+span { color: green; }
+.test {
+  color: green;
+  width: 4ch;
+
+  white-space: break-spaces;
+  overflow-wrap: break-word;
+  word-break: break-all;
+}
+
+</style>
+<body>
+  <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+  <div class="fail">X<span>X</span>X<span>X<br></span>X<span>X</span>X<span>X<br></span><span>XXXX<br></span><span>XXXX<br></span></div>
+  <div class="test">X&#x3000;XX&#x3000;X</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-006.html b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-006.html
new file mode 100644
index 00000000000..acd6fa20c6c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-006.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text Test: white-space: break-spaces</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com" />
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="help" title="5.2. Breaking Rules for Letters: the word-break property " href="https://drafts.csswg.org/css-text-3/#word-break-property">
+<link rel="help" title="5.5. Overflow Wrapping: the overflow-wrap/word-wrap property " href="https://drafts.csswg.org/css-text-3/#overflow-wrap-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-word-break-break-all">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-overflow-wrap-anywhere">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="flags" content="ahem">
+<meta name="assert" content="A breaking opportunity exists only after a ideographic space character, but it's possible to avoid the overflow honoring the 'word-break' property, hence the overflow-wrap property is not applied.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 25px/1 Ahem;
+}
+.fail {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+span { color: green; }
+.test {
+  color: green;
+  width: 4ch;
+
+  white-space: break-spaces;
+  overflow-wrap: anywhere;
+  word-break: break-all;
+}
+
+</style>
+<body>
+  <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+  <div class="fail">X<span>X</span>X<span>X<br></span>X<span>X</span>X<span>X<br></span><span>XXXX<br></span><span>XXXX<br></span></div>
+  <div class="test">X&#x3000;XX&#x3000;X</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-007.html b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-007.html
new file mode 100644
index 00000000000..c8c53b57377
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-007.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text Test: white-space: break-spaces</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com" />
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="help" title="5.3. Line Breaking Strictness: the line-break property" href="https://drafts.csswg.org/css-text-3/#propdef-line-break">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-line-break-anywhere">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="flags" content="ahem">
+<meta name="assert" content="A breaking opportunity exists before the first character of a sequence of ideographic spaces to avoid the line overflow, honoring the 'line-break' property.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 25px/1 Ahem;
+}
+.fail {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+span { color: green; }
+.test {
+  color: green;
+  width: 4ch;
+
+  white-space: break-spaces;
+  line-break: anywhere;
+}
+
+</style>
+<body>
+  <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+  <div class="fail">X<span>X</span>XX<br><span>X</span>X<span>XX<br></span><span>XXXX<br></span><span>XXXX<br></span></div>
+  <div class="test">X&#x3000;XX&#x3000;X</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-008.html b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-008.html
new file mode 100644
index 00000000000..f3ffdf28d97
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-008.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text Test: white-space: break-spaces</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com" />
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="help" title="5.3. Line Breaking Strictness: the line-break property" href="https://drafts.csswg.org/css-text-3/#propdef-line-break">
+<link rel="help" title="5.5. Overflow Wrapping: the overflow-wrap/word-wrap property " href="https://drafts.csswg.org/css-text-3/#overflow-wrap-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-line-break-anywhere">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-overflow-wrap-break-word">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="flags" content="ahem">
+<meta name="assert" content="A breaking opportunity exists before the first character of a sequence of ideographic spaces to avoid the line overflow, honoring the 'line-break' property, ignoring previous breaking opportunities.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 25px/1 Ahem;
+}
+.fail {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+span { color: green; }
+.test {
+  color: green;
+  width: 4ch;
+
+  white-space: break-spaces;
+  line-break: anywhere;
+  overflow-wrap: break-word;
+}
+
+</style>
+<body>
+  <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+  <div class="fail">X<span>X</span>XX<br><span>X</span>X<span>XX<br></span><span>XXXX<br></span><span>XXXX<br></span></div>
+  <div class="test">X&#x3000;XX&#x3000;X</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-009.html b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-009.html
new file mode 100644
index 00000000000..39118f4b4f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-009.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text Test: white-space: break-spaces</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com" />
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="help" title="5.3. Line Breaking Strictness: the line-break property" href="https://drafts.csswg.org/css-text-3/#propdef-line-break">
+<link rel="help" title="5.5. Overflow Wrapping: the overflow-wrap/word-wrap property " href="https://drafts.csswg.org/css-text-3/#overflow-wrap-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-line-break-anywhere">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-overflow-wrap-anywhere">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="flags" content="ahem">
+<meta name="assert" content="A breaking opportunity exists before the first character of a sequence of ideographic spaces to avoid the line overflow, honoring the 'line-break' property, ignoring previous breaking opportunities.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 25px/1 Ahem;
+}
+.fail {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+span { color: green; }
+.test {
+  color: green;
+  width: 4ch;
+
+  white-space: break-spaces;
+  line-break: anywhere;
+  overflow-wrap: anywhere;
+}
+
+</style>
+<body>
+  <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+  <div class="fail">X<span>X</span>XX<br><span>X</span>X<span>XX<br></span><span>XXXX<br></span><span>XXXX<br></span></div>
+  <div class="test">X&#x3000;XX&#x3000;X</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-010.html b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-010.html
new file mode 100644
index 00000000000..0fb4dccd7fc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-010.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text Test: white-space: break-spaces</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com" />
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="help" title="5.2. Breaking Rules for Letters: the word-break property " href="https://drafts.csswg.org/css-text-3/#word-break-property">
+<link rel="help" title="5.3. Line Breaking Strictness: the line-break property" href="https://drafts.csswg.org/css-text-3/#propdef-line-break">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-line-break-anywhere">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-word-break-break-all">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="flags" content="ahem">
+<meta name="assert" content="A breaking opportunity exists before the first character of a sequence of ideographic spaces to avoid the line overflow, honoring the 'line-break' property, ignoring previous breaking opportunities.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 25px/1 Ahem;
+}
+.fail {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+span { color: green; }
+.test {
+  color: green;
+  width: 4ch;
+
+  white-space: break-spaces;
+  line-break: anywhere;
+  word-break: break-all;
+}
+
+</style>
+<body>
+  <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+  <div class="fail">X<span>X</span>XX<br><span>X</span>X<span>XX<br></span><span>XXXX<br></span><span>XXXX<br></span></div>
+  <div class="test">X&#x3000;XX&#x3000;X</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-011.html b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-011.html
new file mode 100644
index 00000000000..6aae96fd7be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-011.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text Test: ideographic space - break-spaces</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com" />
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="help" title="5.2. Breaking Rules for Letters: the word-break property " href="https://drafts.csswg.org/css-text-3/#word-break-property">
+<link rel="help" title="5.3. Line Breaking Strictness: the line-break property" href="https://drafts.csswg.org/css-text-3/#propdef-line-break">
+<link rel="help" title="5.5. Overflow Wrapping: the overflow-wrap/word-wrap property " href="https://drafts.csswg.org/css-text-3/#overflow-wrap-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-line-break-anywhere">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-word-break-break-all">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-overflow-wrap-break-word">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="flags" content="ahem">
+<meta name="assert" content="A breaking opportunity exists before the first character of a sequence of ideographic spaces to avoid the line overflow, honoring the 'line-break' property, ignoring previous breaking opportunities.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 25px/1 Ahem;
+}
+.fail {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+span { color: green; }
+.test {
+  color: green;
+  width: 4ch;
+
+  white-space: break-spaces;
+  line-break: anywhere;
+  word-break: break-all;
+  overflow-wrap: break-word;
+}
+
+</style>
+<body>
+  <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+  <div class="fail">X<span>X</span>XX<br><span>X</span>X<span>XX<br></span><span>XXXX<br></span><span>XXXX<br></span></div>
+  <div class="test">X&#x3000;XX&#x3000;X</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-012.html b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-012.html
new file mode 100644
index 00000000000..bcc68e03854
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-012.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text Test: white-space: break-spaces</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com" />
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="help" title="5.5. Overflow Wrapping: the overflow-wrap/word-wrap property " href="https://drafts.csswg.org/css-text-3/#overflow-wrap-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-overflow-wrap-break-word">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="flags" content="ahem">
+<meta name="assert" content="A breaking opportunity exists before the first character of a sequence of ideographic spaces to avoid the line overflow, honoring the overflow-wrap property.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 25px/1 Ahem;
+}
+.fail {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+span { color: green; }
+.test {
+  color: green;
+  width: 4ch;
+
+  white-space: break-spaces;
+  overflow-wrap: break-word;
+}
+
+</style>
+<body>
+  <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+  <div class="fail">XXXX<br><span>X</span>XX<span>X<br></span><span>XXXX<br></span><span>XXXX<br></span></div>
+  <div class="test">XXXX&#x3000;XX</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-013.html b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-013.html
new file mode 100644
index 00000000000..d888f6c9e40
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-013.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text Test: white-space: break-spaces</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com" />
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="help" title="5.5. Overflow Wrapping: the overflow-wrap/word-wrap property " href="https://drafts.csswg.org/css-text-3/#overflow-wrap-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-overflow-wrap-anywhere">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="flags" content="ahem">
+<meta name="assert" content="A breaking opportunity exists before the first character of a sequence of ideographic spaces to avoid the line overflow, honoring the overflow-wrap property.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 25px/1 Ahem;
+}
+.fail {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+span { color: green; }
+.test {
+  color: green;
+  width: 4ch;
+
+  white-space: break-spaces;
+  overflow-wrap: anywhere;
+}
+
+</style>
+<body>
+  <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+  <div class="fail">XXXX<br><span>X</span>XX<span>X<br></span><span>XXXX<br></span><span>XXXX<br></span></div>
+  <div class="test">XXXX&#x3000;XX</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-014.html b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-014.html
new file mode 100644
index 00000000000..71bb366668b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-014.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text Test: white-space: break-spaces</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com" />
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="help" title="5.5. Overflow Wrapping: the overflow-wrap/word-wrap property " href="https://drafts.csswg.org/css-text-3/#overflow-wrap-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-overflow-wrap-anywhere">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="flags" content="ahem">
+<meta name="assert" content="A breaking opportunity exists before the first character of a sequence of ideographic spaces to avoid the line overflow, honoring the overflow-wrap property, except when there are previous breaking opportunities.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 25px/1 Ahem;
+}
+.fail {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+span { color: green; }
+.test {
+  color: green;
+  width: 4ch;
+
+  white-space: break-spaces;
+  overflow-wrap: anywhere;
+}
+
+</style>
+<body>
+  <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+  <div class="fail">X<span>XXX<br></span>XX<span>X</span>X<br><span>XXXX<br></span><span>XXXX<br></span></div>
+  <div class="test">X&#x3000;XX&#x3000;X</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-015.html b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-015.html
new file mode 100644
index 00000000000..02ca9c2d1b5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-015.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text Test: white-space: break-spaces</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com" />
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="help" title="5.2. Breaking Rules for Letters: the word-break property " href="https://drafts.csswg.org/css-text-3/#word-break-property">
+<link rel="help" title="5.5. Overflow Wrapping: the overflow-wrap/word-wrap property " href="https://drafts.csswg.org/css-text-3/#overflow-wrap-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-word-break-break-all">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-overflow-wrap-anywhere">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="flags" content="ahem">
+<meta name="assert" content="A breaking opportunity exists only after a ideographic space character, but it's possible to avoid the overflow honoring the 'word-break' property, hence the 'overflow-wrap' property is not applied.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 25px/1 Ahem;
+}
+.fail {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+span { color: green; }
+.test {
+  color: green;
+  width: 4ch;
+
+  white-space: break-spaces;
+  overflow-wrap: anywhere;
+  word-break: break-all;
+}
+
+</style>
+<body>
+  <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+  <div class="fail">X<span>X</span>X<span>X<br></span>X<span>X</span>X<span>X<br></span><span>XXXX<br></span><span>XXXX<br></span></div>
+  <div class="test">X&#x3000;XX&#x3000;X</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-016.html b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-016.html
new file mode 100644
index 00000000000..39118f4b4f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-016.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text Test: white-space: break-spaces</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com" />
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="help" title="5.3. Line Breaking Strictness: the line-break property" href="https://drafts.csswg.org/css-text-3/#propdef-line-break">
+<link rel="help" title="5.5. Overflow Wrapping: the overflow-wrap/word-wrap property " href="https://drafts.csswg.org/css-text-3/#overflow-wrap-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-line-break-anywhere">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-overflow-wrap-anywhere">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="flags" content="ahem">
+<meta name="assert" content="A breaking opportunity exists before the first character of a sequence of ideographic spaces to avoid the line overflow, honoring the 'line-break' property, ignoring previous breaking opportunities.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 25px/1 Ahem;
+}
+.fail {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+span { color: green; }
+.test {
+  color: green;
+  width: 4ch;
+
+  white-space: break-spaces;
+  line-break: anywhere;
+  overflow-wrap: anywhere;
+}
+
+</style>
+<body>
+  <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+  <div class="fail">X<span>X</span>XX<br><span>X</span>X<span>XX<br></span><span>XXXX<br></span><span>XXXX<br></span></div>
+  <div class="test">X&#x3000;XX&#x3000;X</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-017.html b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-017.html
new file mode 100644
index 00000000000..df8a8d58c78
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-017.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text Test: white-space: break-spaces</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com" />
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="help" title="5.2. Breaking Rules for Letters: the word-break property " href="https://drafts.csswg.org/css-text-3/#word-break-property">
+<link rel="help" title="5.3. Line Breaking Strictness: the line-break property" href="https://drafts.csswg.org/css-text-3/#propdef-line-break">
+<link rel="help" title="5.5. Overflow Wrapping: the overflow-wrap/word-wrap property " href="https://drafts.csswg.org/css-text-3/#overflow-wrap-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-line-break-anywhere">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-word-break-break-all">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-overflow-wrap-anywhere">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="flags" content="ahem">
+<meta name="assert" content="A breaking opportunity exists before the first character of a sequence of ideographic spaces to avoid the line overflow, honoring the 'line-break' property, ignoring previous breaking opportunities.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 25px/1 Ahem;
+}
+.fail {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+span { color: green; }
+.test {
+  color: green;
+  width: 4ch;
+
+  white-space: break-spaces;
+  line-break: anywhere;
+  word-break: break-all;
+  overflow-wrap: anywhere;
+}
+
+</style>
+<body>
+  <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+  <div class="fail">X<span>X</span>XX<br><span>X</span>X<span>XX<br></span><span>XXXX<br></span><span>XXXX<br></span></div>
+  <div class="test">X&#x3000;XX&#x3000;X</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-018.html b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-018.html
new file mode 100644
index 00000000000..d888f6c9e40
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-018.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text Test: white-space: break-spaces</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com" />
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="help" title="5.5. Overflow Wrapping: the overflow-wrap/word-wrap property " href="https://drafts.csswg.org/css-text-3/#overflow-wrap-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-overflow-wrap-anywhere">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="flags" content="ahem">
+<meta name="assert" content="A breaking opportunity exists before the first character of a sequence of ideographic spaces to avoid the line overflow, honoring the overflow-wrap property.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 25px/1 Ahem;
+}
+.fail {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+span { color: green; }
+.test {
+  color: green;
+  width: 4ch;
+
+  white-space: break-spaces;
+  overflow-wrap: anywhere;
+}
+
+</style>
+<body>
+  <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+  <div class="fail">XXXX<br><span>X</span>XX<span>X<br></span><span>XXXX<br></span><span>XXXX<br></span></div>
+  <div class="test">XXXX&#x3000;XX</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-001.html b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-001.html
new file mode 100644
index 00000000000..60e0dcae302
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-001.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: ideographic space at the end of line and white-space is break-spaces</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="match" href="reference/pre-wrap-001-ref.html">
+<meta name="assert" content="ideographic space at the end of the line is wrapped when the white-space property is set to break-spaces.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font-size: 20px;
+  font-family: Ahem;
+  line-height: 1em;
+  white-space: break-spaces;
+  color: green;
+
+  background: linear-gradient(red, red) 1ch 0/2ch 2ch no-repeat;
+
+  width: 4ch;
+  margin-left: -1ch;
+}
+</style>
+<body>
+  <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+  <div>&#x3000;XX&#x3000;&#x3000;XX</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-002.html b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-002.html
new file mode 100644
index 00000000000..9d060e09044
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-002.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text Test: white-space: break-spaces</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="help" title="5.2. Breaking Rules for Letters: the word-break property" href="https://drafts.csswg.org/css-text-3/#word-break-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-word-break-break-word">
+<meta name="flags" content="ahem">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="assert" content="break-word + break-spaces do not allow a break
+between the last character of a word and the first space of a sequence of ideographic spaces
+if there are other wrapping opportunities earlier in the line.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+   font: 25px/1 Ahem;
+}
+.fail {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+span { color: green; }
+.test {
+  color: green;
+  width: 4ch;
+
+  white-space: break-spaces;
+  word-break: break-word;
+}
+</style>
+<body>
+  <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+  <div class="fail">XX<span>XX</span><br>X<span>X</span>X<span>X<br>XXXX<br>XXXX</span></div>
+  <div class="test">XX&#x3000;X&#x3000;X</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-003.html b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-003.html
new file mode 100644
index 00000000000..9d060e09044
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-003.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text Test: white-space: break-spaces</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="help" title="5.2. Breaking Rules for Letters: the word-break property" href="https://drafts.csswg.org/css-text-3/#word-break-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-word-break-break-word">
+<meta name="flags" content="ahem">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="assert" content="break-word + break-spaces do not allow a break
+between the last character of a word and the first space of a sequence of ideographic spaces
+if there are other wrapping opportunities earlier in the line.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+   font: 25px/1 Ahem;
+}
+.fail {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+span { color: green; }
+.test {
+  color: green;
+  width: 4ch;
+
+  white-space: break-spaces;
+  word-break: break-word;
+}
+</style>
+<body>
+  <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+  <div class="fail">XX<span>XX</span><br>X<span>X</span>X<span>X<br>XXXX<br>XXXX</span></div>
+  <div class="test">XX&#x3000;X&#x3000;X</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-004.html b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-004.html
new file mode 100644
index 00000000000..c61fcced0dd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-004.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text Test: white-space: break-spaces</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="help" title="5.2. Breaking Rules for Letters: the word-break property" href="https://drafts.csswg.org/css-text-3/#word-break-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-word-break-break-word">
+<meta name="flags" content="ahem">
+<link rel="match" href="reference/pre-wrap-001-ref.html">
+<meta name="assert" content="The word is not broken if there are previous breaking opportunities, honoring the 'white-space: break-spaces' value.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 20px/1 Ahem;
+}
+.fail {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+span { color: green; }
+.test {
+  color: green;
+  width: 2ch;
+
+  white-space: break-spaces;
+  word-break: break-word;
+}
+</style>
+<body>
+  <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+  <div class="fail"><span>XX</span><br>XX</div>
+  <div class="test">&#x3000;XX</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-005.html b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-005.html
new file mode 100644
index 00000000000..7df2f06eec7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-005.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text Test: white-space: break-spaces</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com" />
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="flags" content="ahem">
+<meta name="assert" content="If 'white-space' is set to 'break-spaces', collapsing preserved white-spaces' advance width is not allowed, so that they can be wrapped honoring the 'white-space' propery.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 10px/1 Ahem;
+}
+.fail {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+span { color: green; }
+.test {
+  color: green;
+  width: 100px;
+
+  white-space: break-spaces;
+}
+
+</style>
+<body>
+  <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+  <div class="fail">XXXX<span>XXXXXX</span><br><span>XXXXXXXXXX</span><br><span>XXXXXXXXXX</span><br><span>XXXXXXXXXX</span><br><span>XXXXXXXXXX</span><br><span>XXXXXXXXXX</span><br><span>XXXXXXXXXX</span><br><span>XXXXXXXXXX</span><br><span>XXXXXXXXXX</span><br><span>XX</span>XXXX<span>XXXX</span></div>
+  <div class="test">XXXX&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;XXXX</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-006.html b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-006.html
new file mode 100644
index 00000000000..a04970f9848
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-006.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text Test: white-space: break-spaces</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com" />
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://www.w3.org/TR/css-text-3/#white-space-property">
+<link rel="help" title="5.2. Breaking Rules for Letters: the word-break property" href="https://drafts.csswg.org/css-text-3/#word-break-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-word-break-break-all">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="flags" content="ahem">
+<meta name="assert" content="Ideographic spaces can be wrapped, honoring the 'white-space: break-spaces', but the words are broken, honring the 'word-beak: break-all' even though there are previous breaking opportunities in the white-spaces.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 25px/1 Ahem;
+}
+.fail {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+span { color: green; }
+.test {
+  color: green;
+  width: 4ch;
+
+  white-space: break-spaces;
+  word-break: break-all;
+}
+</style>
+<body>
+  <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+  <div class="fail"><span>X</span>XXX<br>X<span>X</span>XX<br>X<span>XXX</span><br><span>XXXX</span></div>
+  <div class="test">&#x3000;XXXX&#x3000;XXX</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-007.html b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-007.html
new file mode 100644
index 00000000000..44fb3d2fc65
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-007.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text Test: white-space: break-spaces</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com" />
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://www.w3.org/TR/css-text-3/#white-space-property">
+<link rel="help" title="5.2. Breaking Rules for Letters: the word-break property" href="https://drafts.csswg.org/css-text-3/#word-break-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-word-break-break-all">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="flags" content="ahem">
+<meta name="assert" content="A single leading ideographic space should be used as breaking opportunity, honoring white-space: break-spaces, to avoid overflow; however, a single ideographic space at the end of the line cannot be wrapped, hence it overflows when breaking after it to move the rest of the text to the next line.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 25px/1 Ahem;
+}
+.fail {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+span { color: green; }
+.test {
+  color: green;
+  width: 4ch;
+
+  white-space: break-spaces;
+}
+</style>
+<body>
+  <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+  <div class="fail"><span>XXXX</span><br>XXXX<br>XXX<span>X</span><br><span>XXXX</span></div>
+  <div class="test">&#x3000;XXXX&#x3000;XXX</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-008.html b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-008.html
new file mode 100644
index 00000000000..7102439d469
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-008.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text Test: white-space: break-spaces</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com" />
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://www.w3.org/TR/css-text-3/#white-space-property">
+<link rel="help" title="5.2. Breaking Rules for Letters: the word-break property" href="https://drafts.csswg.org/css-text-3/#word-break-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-word-break-break-all">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="flags" content="ahem">
+<meta name="assert" content="Ideographic spaces can be wrapped, honoring the 'white-space: break-spaces', which may lead to overfow. However, we can break before the las letter in the word honoring the 'break-all' value.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 25px/1 Ahem;
+}
+.fail {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+span { color: green; }
+.test {
+  color: green;
+  width: 4ch;
+
+  white-space: break-spaces;
+  word-break: break-all;
+}
+</style>
+<body>
+  <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+  <div class="fail">XXX<span>X</span><br>X<span>X</span>XX<br><span>XXXX</span><br><span>XXXX</span></div>
+  <div class="test">XXXX&#x3000;XX</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-009.html b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-009.html
new file mode 100644
index 00000000000..52bd181af6b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-009.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text Test: word-break:break-word + white-space:break-spaces</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com" />
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="help" title="5.2. Breaking Rules for Letters: the word-break property" href="https://drafts.csswg.org/css-text-3/#word-break-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-word-break-break-word">
+<meta name="flags" content="ahem">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="assert" content="break-word + break-spaces do allow a break
+between the last character of a word and the first space of a sequence of ideographic spaces
+if there are no other wrapping opportunities earlier in the line">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 25px/1 Ahem;
+}
+.expected {
+  position: absolute;
+  color: green;
+  width: 100px;
+  height: 100px;
+  white-space: pre;
+}
+.test {
+  background: green;
+  color: red;
+  width: 4ch;
+
+  white-space: break-spaces;
+  word-break: break-word;
+</style>
+
+<p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+<div class="expected">XXXX<br> <br>XXXX<br></div>
+<div class="test">XXXX&#x3000;XXXX&#x3000;</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-010.html b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-010.html
new file mode 100644
index 00000000000..d59afcf56d9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-010.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text Test: white-space: break-spaces</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com" />
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<meta name="flags" content="ahem">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="assert" content="break-spaces only allows breaking after an ideographic space, hence, it may overflow.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 25px/1 Ahem;
+}
+.fail {
+  position: absolute;
+  color: red;
+  z-index: -1;
+}
+span { color: green; }
+.test {
+  color: green;
+  width: 4ch;
+
+  white-space: break-spaces;
+}
+</style>
+
+<p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+<div class="fail">XXXX<br><span>X</span>XX<span>X<br>XXXX<br>XXXX</span></div>
+<div class="test">XXXX&#x3000;&#x3000;XX</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/eol-spaces-bidi-003.html b/tests/wpt/web-platform-tests/css/css-text/white-space/eol-spaces-bidi-003.html
index 14f31ec0d85..4161c955140 100644
--- a/tests/wpt/web-platform-tests/css/css-text/white-space/eol-spaces-bidi-003.html
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/eol-spaces-bidi-003.html
@@ -18,10 +18,11 @@
       background: green;
 
       width: 4ch;
+      white-space: pre-wrap;
+  }
+  span {
+      background: blue;
   }
-  .blue { color: blue; }
-  .bgblue { background-color: blue; }
-  .space { color: transparent; }
 </style>
 <p>Test passes if a blue box (the white space) is visible at the left start in first line.</p>
-<div>ب<span class="bgblue"><span class="blue">X</span>OP</span><span class="space">X<br>XXX</span>D</div>
+<div>ب <span>OP</span><span> </span>D</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/eol-spaces-bidi-003-ref.html b/tests/wpt/web-platform-tests/css/css-text/white-space/reference/eol-spaces-bidi-003-ref.html
index 0fe8f48c25a..57e23bdc105 100644
--- a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/eol-spaces-bidi-003-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/reference/eol-spaces-bidi-003-ref.html
@@ -16,6 +16,7 @@
   }
   .blue { color: blue; }
   .space { color: transparent; }
+  .text { background: blue; }
 </style>
 <p>Test passes if a blue box (the white space) is visible at the left start in first line.</p>
-<div>ب<span class="blue">X</span>OP<span class="space">X<br>XXX</span>D</div>
+<div>ب<span class="blue">X</span><span class="text">OP</span><span class="space">X<br>XXX</span>D</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/eol-spaces-bidi-alt-003-ref.html b/tests/wpt/web-platform-tests/css/css-text/white-space/reference/eol-spaces-bidi-alt-003-ref.html
index 6f610aa935f..6861ec61de6 100644
--- a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/eol-spaces-bidi-alt-003-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/reference/eol-spaces-bidi-alt-003-ref.html
@@ -17,6 +17,7 @@
   }
   .blue { color: blue; }
   .space { color: transparent; }
+  .text { background: blue; }
 </style>
 <p>Test passes if a blue box (the white space) is visible at the left start in first line.</p>
-<div>ب<span class="blue">X</span>OP<span class="space">X<br>XXX</span>D</div>
+<div>ب<span class="blue">X</span><span class="text">OP</span><span class="space">X<br>XXX</span>D</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-ideographic-space-break-spaces-001-ref.html b/tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-ideographic-space-break-spaces-001-ref.html
new file mode 100644
index 00000000000..ad629e94eec
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-ideographic-space-break-spaces-001-ref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS test reference</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com"/>
+<style>
+    div { white-space: pre; }
+</style>
+
+<p>Test passes if the characters below are arranged in pairs with a empty line in between.</p>
+<div>ああ<br><br>ああ</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-001.html b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-001.html
new file mode 100644
index 00000000000..2ab5edffc0c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-001.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: Breaking sequences of trailing ideograohic spaces </title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com"/>
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="match" href="reference/trailing-ideographic-space-break-spaces-001-ref.html">
+<meta name="assert" content="If white-space is set to 'break-spaces', the overflowing idegraphic spaces must wrap to the next line.">
+<style>
+div {
+    width: 3em;
+    white-space: break-spaces;
+}
+</style>
+
+<p>Test passes if the characters below are arranged in pairs with a empty line in between.</p>
+<div>ああ&#x3000;&#x3000;&#x3000;&#x3000;ああ</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-002.html b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-002.html
new file mode 100644
index 00000000000..423dd8e1dbd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-002.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: Breaking sequences of trailing ideograohic spaces </title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com"/>
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="match" href="reference/trailing-ideographic-space-break-spaces-001-ref.html">
+<meta name="assert" content="If white-space is set to 'break-spaces', the overflowing idegraphic spaces must wrap to the next line.">
+<style>
+div {
+    width: 3em;
+    white-space: break-spaces;
+}
+</style>
+
+<p>Test passes if the characters below are arranged in pairs with a empty line in between.</p>
+<div>ああ<span>&#x3000;&#x3000;&#x3000;&#x3000;</span>ああ</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-003.html b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-003.html
new file mode 100644
index 00000000000..fe09ba7eb3a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-003.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: Breaking sequences of trailing ideograohic spaces </title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com"/>
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="match" href="reference/trailing-ideographic-space-break-spaces-001-ref.html">
+<meta name="assert" content="If white-space is set to 'break-spaces', the overflowing idegraphic spaces must wrap to the next line.">
+<style>
+div {
+    width: 3em;
+    white-space: break-spaces;
+}
+</style>
+
+<p>Test passes if the characters below are arranged in pairs with a empty line in between.</p>
+<div contenteditable="true">ああ&#x3000;&#x3000;&#x3000;&#x3000;ああ</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-004.html b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-004.html
new file mode 100644
index 00000000000..bdc042e815c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-004.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: Breaking sequences of trailing ideograohic spaces </title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com"/>
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="match" href="reference/trailing-ideographic-space-break-spaces-001-ref.html">
+<meta name="assert" content="If white-space is set to 'break-spaces', the overflowing idegraphic spaces must wrap to the next line.">
+<style>
+div {
+    width: 3em;
+    white-space: break-spaces;
+}
+</style>
+
+<p>Test passes if the characters below are arranged in pairs with a empty line in between.</p>
+<div contenteditable="true">ああ<span>&#x3000;&#x3000;&#x3000;&#x3000;<span>ああ</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-005.html b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-005.html
new file mode 100644
index 00000000000..2d31870cc27
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-005.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: Breaking sequences of trailing ideograohic spaces </title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com"/>
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="match" href="reference/trailing-ideographic-space-break-spaces-001-ref.html">
+<meta name="assert" content="If white-space is set to 'break-spaces', the overflowing idegraphic spaces must wrap to the next line.">
+<style>
+div {
+    width: 3em;
+    white-space: break-spaces;
+}
+</style>
+
+<p>Test passes if the characters below are arranged in pairs with a empty line in between.</p>
+<div>ああ&#x3000;<span>&#x3000;&#x3000;&#x3000;</span>ああ</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-006.html b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-006.html
new file mode 100644
index 00000000000..5ac80ad1b34
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-006.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: Breaking sequences of trailing ideograohic spaces </title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com"/>
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="match" href="reference/trailing-ideographic-space-break-spaces-001-ref.html">
+<meta name="assert" content="If white-space is set to 'break-spaces', the overflowing idegraphic spaces must wrap to the next line.">
+<style>
+div {
+    width: 3em;
+    white-space: break-spaces;
+}
+</style>
+
+<p>Test passes if the characters below are arranged in pairs with a empty line in between.</p>
+<div contenteditable="true">ああ&#x3000;<span>&#x3000;&#x3000;&#x3000;</span>ああ</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-007.html b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-007.html
new file mode 100644
index 00000000000..79c23acba98
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-007.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: Breaking sequences of trailing ideograohic spaces </title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com"/>
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="assert" content="Setting white-space to 'break-spaces', hanging or collapsing the advance width of the spaces is not allowed.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div { font: 25px/1 Ahem; }
+.test {
+    z-index: -1;
+    color: green;
+
+    width: 4ch;
+    white-space: break-spaces;
+}
+.test > span { background: red; }
+.ref {
+    color: transparent;
+    background: green;
+    position: absolute;
+}
+.ref > span { color: transparent; }
+</style>
+
+<p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+<div class="ref">XX<span>XX<br>XXXX<br>XXXX</br>XX</span>XX</div>
+<div class="test">XX<span>&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;&#x3000;</span>XX</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-008.html b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-008.html
new file mode 100644
index 00000000000..386083f1007
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-008.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: Breaking sequences of trailing ideograohic spaces </title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com"/>
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-break-spaces">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="assert" content="Setting white-space to 'break-spaces' doesn't prevent overflow if the first ideographic space of the sequence doesn't fit, which must hang.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+    font: 25px/1 Ahem;
+    color: transparent;
+    height: 100px;
+}
+.test {
+    width: 3ch;
+    white-space: break-spaces;
+}
+.test > span { background: green; }
+.ref {
+    width: 100px;
+    background: green;
+    position: absolute;
+    z-index: -1;
+}
+.ref > span { color: red; }
+</style>
+
+<p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+<div class="ref">XXX<span>X</span></div>
+<div class="test">XXX<span>&#x3000;</span>X</div>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/reftest.list b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/reftest.list
index 3bf278e1989..c3ec6c1263d 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/reftest.list
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/reftest.list
@@ -58,9 +58,6 @@ include text3/reftest.list
 # Text Decoration Level 3
 include text-decor-3/reftest.list
 
-# User Interface Level 3
-include ui3/reftest.list
-
 # Values and Units Level 3
 include values3/reftest.list
 
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/reftest.list b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/reftest.list
deleted file mode 100644
index c63b1f5a978..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/reftest.list
+++ /dev/null
@@ -1,10 +0,0 @@
-== box-sizing-border-box-001.xht box-sizing-border-box-001-ref.xht
-== box-sizing-border-box-002.xht box-sizing-border-box-002-ref.xht
-== box-sizing-border-box-003.xht box-sizing-border-box-003-ref.xht
-== box-sizing-border-box-004.xht box-sizing-border-box-004-ref.xht
-== box-sizing-content-box-001.xht box-sizing-content-box-001-ref.xht
-== box-sizing-content-box-002.xht box-sizing-content-box-002-ref.xht
-== box-sizing-content-box-003.xht box-sizing-content-box-003-ref.xht
-== box-sizing-replaced-001.xht box-sizing-replaced-001-ref.xht
-== box-sizing-replaced-002.xht box-sizing-replaced-002-ref.xht
-== box-sizing-replaced-003.xht box-sizing-replaced-003-ref.xht
diff --git a/tests/wpt/web-platform-tests/custom-elements/pseudo-class-defined-print-ref.html b/tests/wpt/web-platform-tests/custom-elements/pseudo-class-defined-print-ref.html
new file mode 100644
index 00000000000..1ed6da59582
--- /dev/null
+++ b/tests/wpt/web-platform-tests/custom-elements/pseudo-class-defined-print-ref.html
@@ -0,0 +1,9 @@
+<!doctype html>
+<style>
+  div {
+    width: 100px;
+    height: 100px;
+    background: green;
+  }
+</style>
+<div></div>
diff --git a/tests/wpt/web-platform-tests/custom-elements/pseudo-class-defined-print.html b/tests/wpt/web-platform-tests/custom-elements/pseudo-class-defined-print.html
new file mode 100644
index 00000000000..24e1bb7b03f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/custom-elements/pseudo-class-defined-print.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<link rel="match" href="pseudo-class-defined-print-ref.html">
+<style>
+  custom-element {
+    display: block;
+    width: 100px;
+    height: 100px;
+    background: green;
+  }
+  custom-element:not(:defined) {
+    background: red;
+  }
+</style>
+<custom-element></custom-element>
+<script>
+  customElements.define("custom-element", class extends HTMLElement { });
+</script>
diff --git a/tests/wpt/web-platform-tests/docs/commands.json b/tests/wpt/web-platform-tests/docs/commands.json
index 55408d83dbc..f3494b8cd93 100644
--- a/tests/wpt/web-platform-tests/docs/commands.json
+++ b/tests/wpt/web-platform-tests/docs/commands.json
@@ -3,6 +3,7 @@
     "path": "frontend.py",
     "script": "build",
     "help": "Build documentation",
+    "py3only": true,
     "virtualenv": true,
     "requirements": [
       "./requirements.txt"
diff --git a/tests/wpt/web-platform-tests/docs/conf.py b/tests/wpt/web-platform-tests/docs/conf.py
index 96e8290455e..022a4bdb6b7 100644
--- a/tests/wpt/web-platform-tests/docs/conf.py
+++ b/tests/wpt/web-platform-tests/docs/conf.py
@@ -92,9 +92,10 @@ language = None
 # directories to ignore when looking for source files.
 # This pattern also affects html_static_path and html_extra_path.
 exclude_patterns = [
+    '**/.tox',
+    '**/.DS_Store',
+    '**/Thumbs.db',
     '_build',
-    'Thumbs.db',
-    '.DS_Store'
 ]
 
 from docs.wpt_lint_rules import WPTLintRules
diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-window-open-srcdoc.html b/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-window-open-srcdoc.html
new file mode 100644
index 00000000000..6fbff6df82f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-window-open-srcdoc.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>window.open("about:srcdoc") from a sandboxed iframe</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+// Check what happens when executing window.open("about:srcdoc") from a
+// sandboxed iframe. Srcdoc can't be loaded in the main frame. It should
+// result in an error page. The error page should be cross-origin with the
+// opener.
+//
+// This test covers an interesting edge case. A main frame should inherit
+// sandbox flags. However the document loaded is an internal error page. This
+// might trigger some assertions, especially if the implementation wrongly
+// applies the sandbox flags of the opener to the internal error page document.
+//
+// This test is mainly a coverage test. It passes if it doesn't crash.
+async_test(test => {
+  let iframe = document.createElement("iframe");
+  iframe.sandbox = "allow-scripts allow-popups allow-same-origin";
+  iframe.srcdoc = `
+    <script>
+      let w = window.open();
+      onunload = () => w.close();
+
+      let notify = () => {
+        try {
+          w.origin; // Will fail after navigating to about:srcdoc.
+          parent.postMessage("pending", "*");
+        } catch (e) {
+          parent.postMessage("done", "*");
+        };
+      };
+
+      addEventListener("message", notify);
+      notify();
+
+      w.location = "about:srcdoc"; // Error page.
+    </scr`+`ipt>
+  `;
+
+  let closed = false;
+  addEventListener("message", event => {
+    closed = (event.data === "done");
+    iframe.contentWindow.postMessage("ping","*");
+  });
+
+  document.body.appendChild(iframe);
+  test.step_wait_func_done(()=>closed);
+}, "window.open('about:srcdoc') from sandboxed srcdoc doesn't crash.");
+</script>
diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/contenteditable-overflow-height-ref.html b/tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/contenteditable-overflow-height-ref.html
new file mode 100644
index 00000000000..e88e904f96d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/contenteditable-overflow-height-ref.html
@@ -0,0 +1,9 @@
+<!doctype html>
+<title>CSS test reference</title>
+<style>
+  [contenteditable] {
+    outline: 1px solid black;
+    outline-offset: -1px;
+  }
+</style>
+<div contenteditable></div>
diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/contenteditable-overflow-height.html b/tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/contenteditable-overflow-height.html
new file mode 100644
index 00000000000..8470b02c2b9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/contenteditable-overflow-height.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<title>Overflow still allows contenteditable elements to have height</title>
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<link rel="author" title="Mozilla" href="https://mozilla.org">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1681375">
+<link rel="match" href="contenteditable-overflow-height-ref.html">
+<style>
+  [contenteditable] {
+    outline: 1px solid black;
+    outline-offset: -1px;
+    overflow: hidden;
+  }
+</style>
+<div contenteditable></div>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/selection-start-end.html b/tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/selection-start-end.html
index 919d1a4d658..768bce41298 100644
--- a/tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/selection-start-end.html
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/selection-start-end.html
@@ -41,6 +41,12 @@
     return el;
   }
 
+  function createClonedTextareaWithNoDirtyValueFlag(text) {
+    const textarea = document.createElement("textarea");
+    textarea.textContent = text;
+    return textarea.cloneNode(true);
+  }
+
   function createTestElements(value) {
     return [ createInputElement(value, true),
              createInputElement(value, false),
@@ -50,6 +56,7 @@
              createTextareaElement(value, false),
              createPrefocusedTextareaElement(value, true),
              createPrefocusedTextareaElement(value, false),
+             createClonedTextareaWithNoDirtyValueFlag(value)
            ];
   }
 
@@ -61,9 +68,11 @@
 
   for (let prop of ["selectionStart", "selectionEnd"]) {
     for (let el of createTestElements(testValue)) {
-      test(function() {
-        assert_equals(el[prop], testValue.length);
-      }, `Initial .value set on ${el.id} should set ${prop} to end of value`);
+      if (el.defaultValue !== el.value) {
+        test(function() {
+          assert_equals(el[prop], testValue.length);
+        }, `Initial .value set on ${el.id} should set ${prop} to end of value`);
+      }
     }
   }
 
diff --git a/tests/wpt/web-platform-tests/lint.ignore b/tests/wpt/web-platform-tests/lint.ignore
index b11dd752192..b571175fbdf 100644
--- a/tests/wpt/web-platform-tests/lint.ignore
+++ b/tests/wpt/web-platform-tests/lint.ignore
@@ -603,7 +603,7 @@ CSS-COLLIDING-REF-NAME: css/vendor-imports/mozilla/mozilla-central-reftests/cont
 CSS-COLLIDING-SUPPORT-NAME: css/compositing/mix-blend-mode/support/red.png
 CSS-COLLIDING-SUPPORT-NAME: css/compositing/background-blending/support/red.png
 CSS-COLLIDING-SUPPORT-NAME: css/CSS2/normal-flow/support/replaced-min-max-3.png
-CSS-COLLIDING-SUPPORT-NAME: css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-3.png
+CSS-COLLIDING-SUPPORT-NAME: css/css-sizing/support/replaced-min-max-3.png
 CSS-COLLIDING-SUPPORT-NAME: css/css-backgrounds/background-size/support/50x50-green.png
 CSS-COLLIDING-SUPPORT-NAME: css/css-backgrounds/support/50x50-green.png
 CSS-COLLIDING-SUPPORT-NAME: css/css-grid/grid-items/support/50x50-green.png
@@ -613,7 +613,7 @@ CSS-COLLIDING-SUPPORT-NAME: css/CSS2/backgrounds/support/animated.gif
 CSS-COLLIDING-SUPPORT-NAME: css/css-shapes/shape-outside/shape-image/support/animated.gif
 CSS-COLLIDING-SUPPORT-NAME: css/css-display/support/util.js
 CSS-COLLIDING-SUPPORT-NAME: css/CSS2/normal-flow/support/replaced-min-max-1.png
-CSS-COLLIDING-SUPPORT-NAME: css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-1.png
+CSS-COLLIDING-SUPPORT-NAME: css/css-sizing/support/replaced-min-max-1.png
 CSS-COLLIDING-REF-NAME: css/css-multicol/baseline-001-ref.html
 CSS-COLLIDING-REF-NAME: css/css-grid/subgrid/baseline-001-ref.html
 CSS-COLLIDING-REF-NAME: css/css-backgrounds/simple-bg-color-ref.html
diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-javascript-url-frame-policy.https.html b/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-javascript-url-frame-policy.https.html
new file mode 100644
index 00000000000..48385485802
--- /dev/null
+++ b/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-javascript-url-frame-policy.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+
+<head>
+  <script src=/resources/testharness.js></script>
+  <script src=/resources/testharnessreport.js></script>
+</head>
+
+<body>
+  <script>
+  'use strict';
+
+  const script = 'script';
+  const testPage = `
+  <${script}>
+    parent.postMessage(document.fullscreenEnabled, '*');
+  </${script}>
+  `;
+
+  function runTest(allow, expectation) {
+    return new Promise((resolve, reject) => {
+      window.onmessage = event => resolve(event.data);
+
+      const iframe = document.createElement("iframe");
+      iframe.allow = allow;
+      iframe.src = `javascript: \`${testPage}\``;
+      document.body.appendChild(iframe);
+
+    }).then(enabled => {
+      assert_equals(enabled, expectation);
+    });
+  }
+
+  promise_test(() => runTest('fullscreen *', true),
+      'allow attribute(container policy) can enable feature on javascript generated document');
+
+  promise_test(() => runTest("fullscreen 'none'", false),
+      'allow attribute(container policy) can disable feature on javascript generated document');
+
+  </script>
+</body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html b/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html
index c4dffd3ed70..356eedd4f48 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html
@@ -9,19 +9,38 @@
     <script src="resources/make-html-script.js"></script>
     <meta name="referrer" content="origin">
   </head>
-  <body onload="runTest()">
+  <body>
     <h1>Referrer Policy: iframes srcdoc correctly inherit the ancestor's referrer policy</h1>
     <script>
-      var test = async_test("iframes srcdoc correctly inherit the ancestor's referrer policy");
-      window.addEventListener("message", test.step_func_done(msg => {
-        assert_equals(msg.data.referrer, self.origin + "/");
-      }));
+      let reportedReferrer = () => {
+        return new Promise(resolve => {
+          window.addEventListener("message", msg => resolve(msg.data.referrer));
+        });
+      };
 
-      function runTest() {
-        var iframe = document.createElement("iframe");
-        iframe.srcdoc = createScriptString(get_host_info().REMOTE_ORIGIN);
+      const iframe = document.createElement("iframe");
+
+      promise_test(async t => {
+        let referrer = reportedReferrer();
+        iframe.srcdoc = createScriptString(get_host_info().REMOTE_ORIGIN,
+                                           location.origin + "/custom");
         document.body.appendChild(iframe);
-      }
+        assert_equals(await referrer, self.origin + "/");
+      }, "Srcdoc iframe inherits referrer policy from parent on creation.");
+
+      promise_test(async t => {
+        let referrer = reportedReferrer();
+
+        // We navigate the iframe to a page that will set referrer
+        // policy to 'unsafe-url' and then navigate to about:srcdoc.
+        iframe.contentWindow.location = 'resources/referrer-policy-unsafe-url-navigate-to-srcdoc.html';
+
+        // Despite the navigation was initiated by a document with
+        // referrer policy 'unsafe-url', the srcdoc iframe should
+        // still inherit the referrer policy from its parent, and
+        // not the navigation's initiator.
+        assert_equals(await referrer, self.origin + "/");
+      }, "Even after a navigation from another initiator, srcdoc iframe still inherits referrer policy from the parent.");
     </script>
     <div id="log"></div>
   </body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/resources/referrer-policy-unsafe-url-navigate-to-srcdoc.html b/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/resources/referrer-policy-unsafe-url-navigate-to-srcdoc.html
new file mode 100644
index 00000000000..dfdfae1f0d8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/resources/referrer-policy-unsafe-url-navigate-to-srcdoc.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta name="referrer" content="unsafe-url">
+  </head>
+  <body>
+    <script>
+      window.location = "about:srcdoc";
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/selection/textcontrols/selectionchange.tentative.html b/tests/wpt/web-platform-tests/selection/textcontrols/selectionchange.tentative.html
index 061d21f2046..2216a4b514f 100644
--- a/tests/wpt/web-platform-tests/selection/textcontrols/selectionchange.tentative.html
+++ b/tests/wpt/web-platform-tests/selection/textcontrols/selectionchange.tentative.html
@@ -16,7 +16,11 @@
 
 <script>
   class SelectionChangeCollector {
+    /**
+     * @param {HTMLElement} target
+     */
     constructor(target) {
+      this.target = target;
       this.events = [];
       target.addEventListener("selectionchange", ev => {
         this.events.push(ev);
@@ -28,165 +32,139 @@
   }
 
   const data = {
-    input: new SelectionChangeCollector(input),
-    textarea: new SelectionChangeCollector(textarea),
+    collectors: [
+      new SelectionChangeCollector(input),
+      new SelectionChangeCollector(input.cloneNode()),
+      new SelectionChangeCollector(textarea),
+      new SelectionChangeCollector(textarea.cloneNode(true)),
+    ],
     async initialize() {
-      input.blur();
-      textarea.blur();
-      input.selectionStart = input.selectionEnd = 0;
-      textarea.selectionStart = textarea.selectionEnd = 0;
+      for (const collector of this.collectors) {
+        collector.target.blur();
+        collector.target.setSelectionRange(0, 0);
+      }
       await this.spin();
-      this.input.clear();
-      this.textarea.clear();
+      for (const collector of this.collectors) {
+        collector.clear();
+      }
     },
     spin() {
       return new Promise(setTimeout);
     },
     async assert_empty_spin() {
       // firing selectionchange must be asynchronous
-      assert_equals(this.input.events.length, 0);
-      assert_equals(this.textarea.events.length, 0);
+      for (const collector of this.collectors) {
+        assert_equals(collector.events.length, 0);
+      }
       await this.spin();
     }
   };
 
-  promise_test(async () => {
-    await data.initialize();
+  for (const collector of data.collectors) {
+    const target = collector.target;
+    const name = `the ${!target.parentNode ? "disconnected " : ""}${target.localName} element`;
 
-    textarea.selectionStart = 1;
+    promise_test(async () => {
+      await data.initialize();
 
-    await data.assert_empty_spin();
-    assert_equals(data.textarea.events.length, 1);
-  }, "Modifying selectionStart value of the textarea element");
+      target.selectionStart = 1;
 
-  promise_test(async () => {
-    await data.initialize();
+      await data.assert_empty_spin();
+      assert_equals(collector.events.length, 1);
+    }, `Modifying selectionStart value of ${name}`);
 
-    textarea.selectionEnd = 1;
+    promise_test(async () => {
+      await data.initialize();
 
-    await data.assert_empty_spin();
-    assert_equals(data.textarea.events.length, 1);
-  }, "Modifying selectionEnd value of the textarea element");
+      target.selectionEnd = 1;
 
-  promise_test(async () => {
-    await data.initialize();
+      await data.assert_empty_spin();
+      assert_equals(collector.events.length, 1);
+    }, `Modifying selectionEnd value of ${name}`);
 
-    textarea.setSelectionRange(0, 4);
+    promise_test(async () => {
+      await data.initialize();
 
-    await data.assert_empty_spin();
-    assert_equals(data.textarea.events.length, 1);
-  }, "Calling setSelectionRange() on the textarea element");
+      target.setSelectionRange(0, 4);
 
-  promise_test(async () => {
-    await data.initialize();
+      await data.assert_empty_spin();
+      assert_equals(collector.events.length, 1);
+    }, `Calling setSelectionRange() on ${name}`);
 
-    input.select();
+    promise_test(async () => {
+      await data.initialize();
 
-    await data.assert_empty_spin();
-    assert_equals(data.input.events.length, 1);
-  }, "Calling select() on the input element");
+      target.select();
 
-  promise_test(async () => {
-    await data.initialize();
+      await data.assert_empty_spin();
+      assert_equals(collector.events.length, 1);
+    }, `Calling select() on ${name}`);
 
-    textarea.select();
+    promise_test(async () => {
+      await data.initialize();
 
-    await data.assert_empty_spin();
-    assert_equals(data.textarea.events.length, 1);
-  }, "Calling select() on the textarea element");
+      target.selectionStart = 0;
 
-  promise_test(async () => {
-    await data.initialize();
+      await data.assert_empty_spin();
+      assert_equals(collector.events.length, 0);
+    }, `Setting initial zero selectionStart value on ${name}`);
 
-    input.selectionStart = 0;
+    promise_test(async () => {
+      await data.initialize();
 
-    await data.assert_empty_spin();
-    assert_equals(data.input.events.length, 0);
-  }, "Setting initial zero selectionStart value on the input element");
+      target.selectionStart = 2;
+      target.selectionStart = 2;
 
-  promise_test(async () => {
-    await data.initialize();
+      await data.assert_empty_spin();
+      assert_equals(collector.events.length, 1);
+    }, `Setting the same selectionStart value twice on ${name}`);
 
-    input.selectionEnd = 0;
+    promise_test(async () => {
+      await data.initialize();
 
-    await data.assert_empty_spin();
-    assert_equals(data.input.events.length, 0);
-  }, "Setting initial zero selectionEnd value on the input element");
+      target.selectionEnd = 0;
 
-  promise_test(async () => {
-    await data.initialize();
+      await data.assert_empty_spin();
+      assert_equals(collector.events.length, 0);
+    }, `Setting initial zero selectionEnd value on ${name}`);
 
-    textarea.selectionStart = 0;
+    promise_test(async () => {
+      await data.initialize();
 
-    await data.assert_empty_spin();
-    assert_equals(data.textarea.events.length, 0);
-  }, "Setting initial zero selectionStart value on the textarea element");
+      target.selectionEnd = 2;
+      target.selectionEnd = 2;
 
-  promise_test(async () => {
-    await data.initialize();
+      await data.assert_empty_spin();
+      assert_equals(collector.events.length, 1);
+    }, `Setting the same selectionEnd value twice on ${name}`);
 
-    textarea.selectionStart = 2;
-    textarea.selectionStart = 2;
+    promise_test(async () => {
+      await data.initialize();
 
-    await data.assert_empty_spin();
-    assert_equals(data.textarea.events.length, 1);
-  }, "Setting the same selectionStart value twice on the textarea element");
+      target.setSelectionRange(0, 0);
 
-  promise_test(async () => {
-    await data.initialize();
+      await data.assert_empty_spin();
+      assert_equals(collector.events.length, 0);
+    }, `Setting initial zero selection range on ${name}`);
 
-    textarea.selectionEnd = 0;
+    promise_test(async () => {
+      await data.initialize();
 
-    await data.assert_empty_spin();
-    assert_equals(data.textarea.events.length, 0);
-  }, "Setting initial zero selectionEnd value on the textarea element");
+      target.setSelectionRange(3, 3);
+      target.setSelectionRange(3, 3);
 
-  promise_test(async () => {
-    await data.initialize();
+      await data.assert_empty_spin();
+      assert_equals(collector.events.length, 1);
+    }, `Setting the same selection range twice on ${name}`);
 
-    textarea.selectionEnd = 2;
-    textarea.selectionEnd = 2;
+    promise_test(async () => {
+      await data.initialize();
 
-    await data.assert_empty_spin();
-    assert_equals(data.textarea.events.length, 1);
-  }, "Setting the same selectionEnd value twice on the textarea element");
+      target.select();
+      target.select();
 
-  promise_test(async () => {
-    await data.initialize();
-
-    textarea.setSelectionRange(0, 0);
-
-    await data.assert_empty_spin();
-    assert_equals(data.textarea.events.length, 0);
-  }, "Setting initial zero selection range on the textarea element");
-
-  promise_test(async () => {
-    await data.initialize();
-
-    textarea.setSelectionRange(3, 3);
-    textarea.setSelectionRange(3, 3);
-
-    await data.assert_empty_spin();
-    assert_equals(data.textarea.events.length, 1);
-  }, "Setting the same selection range twice on the textarea element");
-
-  promise_test(async () => {
-    await data.initialize();
-
-    input.select();
-    input.select();
-
-    await data.assert_empty_spin();
-    assert_equals(data.input.events.length, 1);
-  }, "Calling select() twice on the input element");
-
-  promise_test(async () => {
-    await data.initialize();
-
-    textarea.select();
-    textarea.select();
-
-    await data.assert_empty_spin();
-    assert_equals(data.textarea.events.length, 1);
-  }, "Calling select() twice on the textarea element");
+      await data.assert_empty_spin();
+      assert_equals(collector.events.length, 1);
+    }, `Calling select() twice on ${name}`);
+  }
 </script>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/slots-imperative-api-slotchange.tentative.html b/tests/wpt/web-platform-tests/shadow-dom/slots-imperative-api-slotchange.tentative.html
index 1f4ef1531a2..43627a246cc 100644
--- a/tests/wpt/web-platform-tests/shadow-dom/slots-imperative-api-slotchange.tentative.html
+++ b/tests/wpt/web-platform-tests/shadow-dom/slots-imperative-api-slotchange.tentative.html
@@ -220,21 +220,6 @@ async_test((test) => {
   }));
 }, "Fire slotchange event when order of assigned nodes changes.");
 
-promise_test((test) => {
-  const data = getDataCollection();
-  let tTree = setupShadowDOM(test_slotchange, test, data);
-  let [s1Promise] = monitorSlots(data);
-
-  assert_array_equals(tTree.s1.assignedNodes({ flatten: true }), [tTree.fb]);
-  let div = document.createElement("div");
-  tTree.s1.appendChild(div);
-
-  return s1Promise.then(test.step_func(() => {
-    assert_equals(data.s1EventCount, 1);
-    assert_array_equals(tTree.s1.assignedNodes({ flatten: true }), [tTree.fb, div]);
-  }));
-}, "Fire slotchange event when slot's fallback content changes.");
-
 promise_test((test) => {
   const data = getDataCollection();
   let tTree = setupShadowDOM(test_slotchange, test, data);
diff --git a/tests/wpt/web-platform-tests/shape-detection/detection-HTMLCanvasElement.https.html b/tests/wpt/web-platform-tests/shape-detection/detection-HTMLCanvasElement.https.html
index e66b70241a6..4773bc8a661 100644
--- a/tests/wpt/web-platform-tests/shape-detection/detection-HTMLCanvasElement.https.html
+++ b/tests/wpt/web-platform-tests/shape-detection/detection-HTMLCanvasElement.https.html
@@ -11,13 +11,23 @@ const canvasElementTests =
       {
         createDetector: () => { return new FaceDetector(); },
         createCanvas: () => { return document.createElement("canvas"); },
+        pixelFormat: "uint8",
         mockTestName: "FaceDetectionTest",
         detectionResultTest: FaceDetectorDetectionResultTest,
         name: "Face - detect(HTMLCanvasElement)"
       },
+      {
+        createDetector: () => { return new FaceDetector(); },
+        createCanvas: () => { return document.createElement("canvas"); },
+        pixelFormat: "float16",
+        mockTestName: "FaceDetectionTest",
+        detectionResultTest: FaceDetectorDetectionResultTest,
+        name: "Face - detect(HTMLCanvasElementF16Format)"
+      },
       {
         createDetector: () => { return new FaceDetector(); },
         createCanvas: () => { return new OffscreenCanvas(300, 150); },
+        pixelFormat: "uint8",
         mockTestName: "FaceDetectionTest",
         detectionResultTest: FaceDetectorDetectionResultTest,
         name: "Face - detect(OffscreenCanvas)"
@@ -25,13 +35,23 @@ const canvasElementTests =
       {
         createDetector: () => { return new BarcodeDetector(); },
         createCanvas: () => { return document.createElement("canvas"); },
+        pixelFormat: "uint8",
         mockTestName: "BarcodeDetectionTest",
         detectionResultTest: BarcodeDetectorDetectionResultTest,
         name: "Barcode - detect(HTMLCanvasElement)"
       },
+      {
+        createDetector: () => { return new BarcodeDetector(); },
+        createCanvas: () => { return document.createElement("canvas"); },
+        pixelFormat: "float16",
+        mockTestName: "BarcodeDetectionTest",
+        detectionResultTest: BarcodeDetectorDetectionResultTest,
+        name: "Barcode - detect(HTMLCanvasElementF16Format)"
+      },
       {
         createDetector: () => { return new BarcodeDetector(); },
         createCanvas: () => { return new OffscreenCanvas(300, 150); },
+        pixelFormat: "uint8",
         mockTestName: "BarcodeDetectionTest",
         detectionResultTest: BarcodeDetectorDetectionResultTest,
         name: "Barcode - detect(OffscreenCanvas)"
@@ -39,13 +59,23 @@ const canvasElementTests =
       {
         createDetector: () => { return new TextDetector(); },
         createCanvas: () => { return document.createElement("canvas"); },
+        pixelFormat: "uint8",
         mockTestName: "TextDetectionTest",
         detectionResultTest: TextDetectorDetectionResultTest,
         name: "Text - detect(HTMLCanvasElement)"
       },
+      {
+        createDetector: () => { return new TextDetector(); },
+        createCanvas: () => { return document.createElement("canvas"); },
+        pixelFormat: "float16",
+        mockTestName: "TextDetectionTest",
+        detectionResultTest: TextDetectorDetectionResultTest,
+        name: "Text - detect(HTMLCanvasElementF16Format)"
+      },
       {
         createDetector: () => { return new TextDetector(); },
         createCanvas: () => { return new OffscreenCanvas(300, 150); },
+        pixelFormat: "uint8",
         mockTestName: "TextDetectionTest",
         detectionResultTest: TextDetectorDetectionResultTest,
         name: "Text - detect(OffscreenCanvas)"
@@ -59,7 +89,9 @@ for (let canvasElementTest of canvasElementTests) {
     img.src = "/images/green-16x16.png";
     await imgWatcher.wait_for("load");
     const canvas = canvasElementTest.createCanvas();
-    canvas.getContext("2d").drawImage(img, 0, 0);
+    canvas.getContext(
+      "2d", { pixelFormat: canvasElementTest.pixelFormat }).drawImage(
+        img, 0, 0);
 
     const detector = canvasElementTest.createDetector();
     const detectionResult = await detector.detect(canvas);
diff --git a/tests/wpt/web-platform-tests/shape-detection/detection-HTMLImageElement-empty-src.https.html b/tests/wpt/web-platform-tests/shape-detection/detection-HTMLImageElement-empty-src.https.html
new file mode 100644
index 00000000000..40eee244946
--- /dev/null
+++ b/tests/wpt/web-platform-tests/shape-detection/detection-HTMLImageElement-empty-src.https.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+// This test verifies *Detector.detect() rejects the promise when fed with
+// an HTMLImageElement with an empty 'src'.
+const emptyInputTests = [
+  {
+    createDetector: () => { return new FaceDetector(); },
+    name: "Face - detect(empty src)"
+  },
+  {
+    createDetector: () => { return new BarcodeDetector(); },
+    name: "Barcode - detect(empty src)"
+  },
+  {
+    createDetector: () => { return new TextDetector(); },
+    name: "Text - detect(empty src)"
+  }
+];
+
+for (let emptyInputTest of emptyInputTests) {
+  promise_test(async t => {
+    const img = new Image();
+    const imgWatcher = new EventWatcher(t, img, ["load", "error"]);
+    img.src = "";
+    await imgWatcher.wait_for("error");
+
+    const detector = emptyInputTest.createDetector();
+    promise_rejects_dom(t, "InvalidStateError", detector.detect(img));
+  }, emptyInputTest.name);
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/shape-detection/detection-HTMLImageElement-zero-dimension-image.https.html b/tests/wpt/web-platform-tests/shape-detection/detection-HTMLImageElement-zero-dimension-image.https.html
new file mode 100644
index 00000000000..621dd4e23fc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/shape-detection/detection-HTMLImageElement-zero-dimension-image.https.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+// This test verifies *Detector.detect() returns an empty list when fed with
+// an HTMLImageElement with an image with 0x0 dimensions.
+const zeroDimensionsTests = [
+  {
+    createDetector: () => { return new FaceDetector(); },
+    name: "Face - detect(0x0)"
+  },
+  {
+    createDetector: () => { return new BarcodeDetector(); },
+    name: "Barcode - detect(0x0)"
+  },
+  {
+    createDetector: () => { return new TextDetector(); },
+    name: "Text - detect(0x0)"
+  }
+];
+
+for (let zeroDimensionsTest of zeroDimensionsTests) {
+  promise_test(async t => {
+    const img = new Image();
+    const imgWatcher = new EventWatcher(t, img, ["load", "error"]);
+    img.src = "/images/red-zerosize.svg";
+    await imgWatcher.wait_for("load");
+
+    const detector = zeroDimensionsTest.createDetector();
+    const detectionResult = await detector.detect(img);
+    assert_equals(detectionResult.length, 0);
+  }, zeroDimensionsTest.name);
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/shape-detection/shapedetection-empty-input.https.html b/tests/wpt/web-platform-tests/shape-detection/shapedetection-empty-input.https.html
deleted file mode 100644
index a0d4490d825..00000000000
--- a/tests/wpt/web-platform-tests/shape-detection/shapedetection-empty-input.https.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script>
-
-// This test verifies *Detector.detect() returns an empty list when fed with
-// an empty HTMLImageElement.
-const emptyInputTests =
-    [
-      {
-        createDetector: () => { return new FaceDetector(); },
-        name: "Face - detect(empty)"
-      },
-      {
-        createDetector: () => { return new BarcodeDetector(); },
-        name: "Barcode - detect(empty)"
-      },
-      {
-        createDetector: () => { return new TextDetector(); },
-        name: "Text - detect(empty)"
-      }
-    ];
-
-for (let emptyInputTest of emptyInputTests) {
-  promise_test(async t =>{
-    const img = new Image();
-    const imgWatcher = new EventWatcher(t, img, ["load", "error"]);
-    img.src = "";
-    await imgWatcher.wait_for("error");
-
-    const detector = emptyInputTest.createDetector();
-    const detectionResult = await detector.detect(img);
-    assert_equals(detectionResult.length, 0);
-  }, emptyInputTest.name);
-}
-
-</script>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/tools/ci/pr_preview.py b/tests/wpt/web-platform-tests/tools/ci/pr_preview.py
index c7107334d4f..c6932dab255 100755
--- a/tests/wpt/web-platform-tests/tools/ci/pr_preview.py
+++ b/tests/wpt/web-platform-tests/tools/ci/pr_preview.py
@@ -62,6 +62,12 @@ def gh_request(method_name, url, body=None, media_type=None):
 
     logger.info('Response status code: %s', resp.status_code)
 
+    # If GitHub thinks the fields are invalid, it will send a 422 back and
+    # include debugging information in the body. See
+    # https://developer.github.com/v3/#client-errors
+    if resp.status_code == 422:
+        logger.error(resp.json())
+
     resp.raise_for_status()
 
     if resp.status_code == 204:
diff --git a/tests/wpt/web-platform-tests/tools/localpaths.py b/tests/wpt/web-platform-tests/tools/localpaths.py
index 51aecea7712..87eafccf4d2 100644
--- a/tests/wpt/web-platform-tests/tools/localpaths.py
+++ b/tests/wpt/web-platform-tests/tools/localpaths.py
@@ -11,7 +11,9 @@ sys.path.insert(0, os.path.join(here, "third_party", "attrs", "src"))
 sys.path.insert(0, os.path.join(here, "third_party", "funcsigs"))
 sys.path.insert(0, os.path.join(here, "third_party", "html5lib"))
 sys.path.insert(0, os.path.join(here, "third_party", "more-itertools"))
-sys.path.insert(0, os.path.join(here, "third_party", "pluggy"))
+sys.path.insert(0, os.path.join(here, "third_party", "packaging"))
+sys.path.insert(0, os.path.join(here, "third_party", "pathlib2"))
+sys.path.insert(0, os.path.join(here, "third_party", "pluggy", "src"))
 sys.path.insert(0, os.path.join(here, "third_party", "py"))
 sys.path.insert(0, os.path.join(here, "third_party", "pytest"))
 sys.path.insert(0, os.path.join(here, "third_party", "pytest", "src"))
@@ -22,6 +24,8 @@ sys.path.insert(0, os.path.join(here, "third_party", "hpack"))
 sys.path.insert(0, os.path.join(here, "third_party", "hyperframe"))
 sys.path.insert(0, os.path.join(here, "third_party", "certifi"))
 sys.path.insert(0, os.path.join(here, "third_party", "hyper"))
+if sys.version_info < (3, 8):
+    sys.path.insert(0, os.path.join(here, "third_party", "importlib_metadata"))
 sys.path.insert(0, os.path.join(here, "webdriver"))
 sys.path.insert(0, os.path.join(here, "wptrunner"))
 
diff --git a/tests/wpt/web-platform-tests/tools/serve/test_functional.py b/tests/wpt/web-platform-tests/tools/serve/test_functional.py
index 5a918c2ee47..894479d111c 100644
--- a/tests/wpt/web-platform-tests/tools/serve/test_functional.py
+++ b/tests/wpt/web-platform-tests/tools/serve/test_functional.py
@@ -9,7 +9,6 @@ try:
     import Queue as queue  # noqa: N813
 except ImportError:
     import queue
-import sys
 import tempfile
 import threading
 
@@ -46,8 +45,6 @@ def tempfile_name():
     os.remove(name)
 
 
-@pytest.mark.skipif(sys.version_info >= (3, 8) and sys.platform == 'darwin',
-                    reason="multiprocessing test hangs in Python 3.8 on macOS (#24880)")
 def test_subprocess_exit(server_subprocesses, tempfile_name):
     timeout = 30
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/.gitignore b/tests/wpt/web-platform-tests/tools/third_party/funcsigs/.gitignore
new file mode 100644
index 00000000000..c8d2af85d3c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/funcsigs/.gitignore
@@ -0,0 +1,19 @@
+*~
+*.egg
+*.egg-info
+*.pyc
+*.pyo
+*.swp
+.DS_Store
+.coverage
+.tox/
+MANIFEST
+build/
+docs/.build/
+dist/
+env*/
+htmlcov/
+tmp/
+coverage.xml
+junit.xml
+.eggs/
diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/.travis.yml b/tests/wpt/web-platform-tests/tools/third_party/funcsigs/.travis.yml
index d2a7ab3051a..c1e7abe0b44 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/.travis.yml
+++ b/tests/wpt/web-platform-tests/tools/third_party/funcsigs/.travis.yml
@@ -2,16 +2,17 @@ language: python
 python:
   - 2.6
   - 2.7
-  - 3.2
   - 3.3
+  - 3.4
+  - 3.5
+  - nightly
   - pypy
+#  - pypy3
 install:
-  - pip install -r requirements/development.txt -r requirements/production.txt
-  - python setup.py install
+  - pip install -U pip setuptools wheel
+  - pip install -r requirements/development.txt .
 script:
   - coverage run setup.py test
   - coverage report --show-missing
 after_success:
   - coveralls
-notifications:
-    email: aaron.iles+travis-ci@gmail.com
diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/CHANGELOG b/tests/wpt/web-platform-tests/tools/third_party/funcsigs/CHANGELOG
index 602eec5e7c2..e1366d2668d 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/CHANGELOG
+++ b/tests/wpt/web-platform-tests/tools/third_party/funcsigs/CHANGELOG
@@ -1,6 +1,11 @@
 Changelog
 ---------
 
+0.5
+```
+
+* Fix binding with self as a kwarg. (Robert Collins #14)
+
 0.4 (2013-12-20)
 ````````````````
 * Fix unbound methods getting their first parameter curried
diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/README.rst b/tests/wpt/web-platform-tests/tools/third_party/funcsigs/README.rst
index f04b7b422cf..5fbca27e6e6 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/README.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/funcsigs/README.rst
@@ -1,74 +1,342 @@
-funcsigs
-========
+.. funcsigs documentation master file, created by
+   sphinx-quickstart on Fri Apr 20 20:27:52 2012.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Introducing funcsigs
+====================
+
+The Funcsigs Package
+--------------------
 
 ``funcsigs`` is a backport of the `PEP 362`_ function signature features from
 Python 3.3's `inspect`_ module. The backport is compatible with Python 2.6, 2.7
-as well as 3.2 and up.
+as well as 3.3 and up. 3.2 was supported by version 0.4, but with setuptools and
+pip no longer supporting 3.2, we cannot make any statement about 3.2
+compatibility.
 
-|pypi_version|
-
-Documentation
--------------
-
-The reference documentation is standard library documentation for the
-`inspect`_ module in Python3. This documentation has been included in the
-``funcsigs`` package documentation hosted on `Read The Docs`_.
-
-Example
--------
-
-To obtain a signature object, pass the target function to the
-``funcsigs.signature`` function. ::
-
-    >>> from funcsigs import signature
-    >>> def foo(a, b=None, *args, **kwargs):
-    ...     pass
-
-    >>> sig = signature(foo)
-
-For the details of the signature object, refer to the either the package of
-standard library documentation.
-
-Compatability
--------------
+Compatibility
+`````````````
 
 The ``funcsigs`` backport has been tested against:
 
 * CPython 2.6
 * CPython 2.7
-* CPython 3.2
-* PyPy 1.9
+* CPython 3.3
+* CPython 3.4
+* CPython 3.5
+* CPython nightlies
+* PyPy and PyPy3(currently failing CI)
 
 Continuous integration testing is provided by `Travis CI`_.
 
-Under Python 2.x there is a compatability issue when a function is assigned to
+Under Python 2.x there is a compatibility issue when a function is assigned to
 the ``__wrapped__`` property of a class after it has been constructed.
 Similiarily there under PyPy directly passing the ``__call__`` method of a
-builtin is also a compatability issues.  Otherwise the functionality is
+builtin is also a compatibility issues.  Otherwise the functionality is
 believed to be uniform between both Python2 and Python3.
 
 Issues
-------
+``````
 
 Source code for ``funcsigs`` is hosted on `GitHub`_. Any bug reports or feature
 requests can be made using GitHub's `issues system`_. |build_status| |coverage|
 
+Example
+-------
+
+To obtain a `Signature` object, pass the target function to the
+``funcsigs.signature`` function.
+
+.. code-block:: python
+
+    >>> from funcsigs import signature
+    >>> def foo(a, b=None, *args, **kwargs):
+    ...     pass
+    ...
+    >>> sig = signature(foo)
+    >>> sig
+    <funcsigs.Signature object at 0x...>
+    >>> sig.parameters
+    OrderedDict([('a', <Parameter at 0x... 'a'>), ('b', <Parameter at 0x... 'b'>), ('args', <Parameter at 0x... 'args'>), ('kwargs', <Parameter at 0x... 'kwargs'>)])
+    >>> sig.return_annotation
+    <class 'funcsigs._empty'>
+
+Introspecting callables with the Signature object
+-------------------------------------------------
+
+.. note::
+
+   This section of documentation is a direct reproduction of the Python
+   standard library documentation for the inspect module.
+
+The Signature object represents the call signature of a callable object and its
+return annotation.  To retrieve a Signature object, use the :func:`signature`
+function.
+
+.. function:: signature(callable)
+
+   Return a :class:`Signature` object for the given ``callable``::
+
+      >>> from funcsigs import signature
+      >>> def foo(a, *, b:int, **kwargs):
+      ...     pass
+
+      >>> sig = signature(foo)
+
+      >>> str(sig)
+      '(a, *, b:int, **kwargs)'
+
+      >>> str(sig.parameters['b'])
+      'b:int'
+
+      >>> sig.parameters['b'].annotation
+      <class 'int'>
+
+   Accepts a wide range of python callables, from plain functions and classes to
+   :func:`functools.partial` objects.
+
+   .. note::
+
+      Some callables may not be introspectable in certain implementations of
+      Python.  For example, in CPython, built-in functions defined in C provide
+      no metadata about their arguments.
+
+
+.. class:: Signature
+
+   A Signature object represents the call signature of a function and its return
+   annotation.  For each parameter accepted by the function it stores a
+   :class:`Parameter` object in its :attr:`parameters` collection.
+
+   Signature objects are *immutable*.  Use :meth:`Signature.replace` to make a
+   modified copy.
+
+   .. attribute:: Signature.empty
+
+      A special class-level marker to specify absence of a return annotation.
+
+   .. attribute:: Signature.parameters
+
+      An ordered mapping of parameters' names to the corresponding
+      :class:`Parameter` objects.
+
+   .. attribute:: Signature.return_annotation
+
+      The "return" annotation for the callable.  If the callable has no "return"
+      annotation, this attribute is set to :attr:`Signature.empty`.
+
+   .. method:: Signature.bind(*args, **kwargs)
+
+      Create a mapping from positional and keyword arguments to parameters.
+      Returns :class:`BoundArguments` if ``*args`` and ``**kwargs`` match the
+      signature, or raises a :exc:`TypeError`.
+
+   .. method:: Signature.bind_partial(*args, **kwargs)
+
+      Works the same way as :meth:`Signature.bind`, but allows the omission of
+      some required arguments (mimics :func:`functools.partial` behavior.)
+      Returns :class:`BoundArguments`, or raises a :exc:`TypeError` if the
+      passed arguments do not match the signature.
+
+   .. method:: Signature.replace(*[, parameters][, return_annotation])
+
+      Create a new Signature instance based on the instance replace was invoked
+      on.  It is possible to pass different ``parameters`` and/or
+      ``return_annotation`` to override the corresponding properties of the base
+      signature.  To remove return_annotation from the copied Signature, pass in
+      :attr:`Signature.empty`.
+
+      ::
+
+         >>> def test(a, b):
+         ...     pass
+         >>> sig = signature(test)
+         >>> new_sig = sig.replace(return_annotation="new return anno")
+         >>> str(new_sig)
+         "(a, b) -> 'new return anno'"
+
+
+.. class:: Parameter
+
+   Parameter objects are *immutable*.  Instead of modifying a Parameter object,
+   you can use :meth:`Parameter.replace` to create a modified copy.
+
+   .. attribute:: Parameter.empty
+
+      A special class-level marker to specify absence of default values and
+      annotations.
+
+   .. attribute:: Parameter.name
+
+      The name of the parameter as a string.  Must be a valid python identifier
+      name (with the exception of ``POSITIONAL_ONLY`` parameters, which can have
+      it set to ``None``).
+
+   .. attribute:: Parameter.default
+
+      The default value for the parameter.  If the parameter has no default
+      value, this attribute is set to :attr:`Parameter.empty`.
+
+   .. attribute:: Parameter.annotation
+
+      The annotation for the parameter.  If the parameter has no annotation,
+      this attribute is set to :attr:`Parameter.empty`.
+
+   .. attribute:: Parameter.kind
+
+      Describes how argument values are bound to the parameter.  Possible values
+      (accessible via :class:`Parameter`, like ``Parameter.KEYWORD_ONLY``):
+
+      +------------------------+----------------------------------------------+
+      |    Name                | Meaning                                      |
+      +========================+==============================================+
+      | *POSITIONAL_ONLY*      | Value must be supplied as a positional       |
+      |                        | argument.                                    |
+      |                        |                                              |
+      |                        | Python has no explicit syntax for defining   |
+      |                        | positional-only parameters, but many built-in|
+      |                        | and extension module functions (especially   |
+      |                        | those that accept only one or two parameters)|
+      |                        | accept them.                                 |
+      +------------------------+----------------------------------------------+
+      | *POSITIONAL_OR_KEYWORD*| Value may be supplied as either a keyword or |
+      |                        | positional argument (this is the standard    |
+      |                        | binding behaviour for functions implemented  |
+      |                        | in Python.)                                  |
+      +------------------------+----------------------------------------------+
+      | *VAR_POSITIONAL*       | A tuple of positional arguments that aren't  |
+      |                        | bound to any other parameter. This           |
+      |                        | corresponds to a ``*args`` parameter in a    |
+      |                        | Python function definition.                  |
+      +------------------------+----------------------------------------------+
+      | *KEYWORD_ONLY*         | Value must be supplied as a keyword argument.|
+      |                        | Keyword only parameters are those which      |
+      |                        | appear after a ``*`` or ``*args`` entry in a |
+      |                        | Python function definition.                  |
+      +------------------------+----------------------------------------------+
+      | *VAR_KEYWORD*          | A dict of keyword arguments that aren't bound|
+      |                        | to any other parameter. This corresponds to a|
+      |                        | ``**kwargs`` parameter in a Python function  |
+      |                        | definition.                                  |
+      +------------------------+----------------------------------------------+
+
+      Example: print all keyword-only arguments without default values::
+
+         >>> def foo(a, b, *, c, d=10):
+         ...     pass
+
+         >>> sig = signature(foo)
+         >>> for param in sig.parameters.values():
+         ...     if (param.kind == param.KEYWORD_ONLY and
+         ...                        param.default is param.empty):
+         ...         print('Parameter:', param)
+         Parameter: c
+
+   .. method:: Parameter.replace(*[, name][, kind][, default][, annotation])
+
+      Create a new Parameter instance based on the instance replaced was invoked
+      on.  To override a :class:`Parameter` attribute, pass the corresponding
+      argument.  To remove a default value or/and an annotation from a
+      Parameter, pass :attr:`Parameter.empty`.
+
+      ::
+
+         >>> from funcsigs import Parameter
+         >>> param = Parameter('foo', Parameter.KEYWORD_ONLY, default=42)
+         >>> str(param)
+         'foo=42'
+
+         >>> str(param.replace()) # Will create a shallow copy of 'param'
+         'foo=42'
+
+         >>> str(param.replace(default=Parameter.empty, annotation='spam'))
+         "foo:'spam'"
+
+
+.. class:: BoundArguments
+
+   Result of a :meth:`Signature.bind` or :meth:`Signature.bind_partial` call.
+   Holds the mapping of arguments to the function's parameters.
+
+   .. attribute:: BoundArguments.arguments
+
+      An ordered, mutable mapping (:class:`collections.OrderedDict`) of
+      parameters' names to arguments' values.  Contains only explicitly bound
+      arguments.  Changes in :attr:`arguments` will reflect in :attr:`args` and
+      :attr:`kwargs`.
+
+      Should be used in conjunction with :attr:`Signature.parameters` for any
+      argument processing purposes.
+
+      .. note::
+
+         Arguments for which :meth:`Signature.bind` or
+         :meth:`Signature.bind_partial` relied on a default value are skipped.
+         However, if needed, it is easy to include them.
+
+      ::
+
+        >>> def foo(a, b=10):
+        ...     pass
+
+        >>> sig = signature(foo)
+        >>> ba = sig.bind(5)
+
+        >>> ba.args, ba.kwargs
+        ((5,), {})
+
+        >>> for param in sig.parameters.values():
+        ...     if param.name not in ba.arguments:
+        ...         ba.arguments[param.name] = param.default
+
+        >>> ba.args, ba.kwargs
+        ((5, 10), {})
+
+
+   .. attribute:: BoundArguments.args
+
+      A tuple of positional arguments values.  Dynamically computed from the
+      :attr:`arguments` attribute.
+
+   .. attribute:: BoundArguments.kwargs
+
+      A dict of keyword arguments values.  Dynamically computed from the
+      :attr:`arguments` attribute.
+
+   The :attr:`args` and :attr:`kwargs` properties can be used to invoke
+   functions::
+
+      def test(a, *, b):
+         ...
+
+      sig = signature(test)
+      ba = sig.bind(10, b=20)
+      test(*ba.args, **ba.kwargs)
+
+
+.. seealso::
+
+   :pep:`362` - Function Signature Object.
+      The detailed specification, implementation details and examples.
+
 Copyright
 ---------
 
-This is a derived work of CPython under the terms of the `PSF License
+*funcsigs* is a derived work of CPython under the terms of the `PSF License
 Agreement`_. The original CPython inspect module, its unit tests and
 documentation are the copyright of the Python Software Foundation. The derived
 work is distributed under the `Apache License Version 2.0`_.
 
+.. _PSF License Agreement: http://docs.python.org/3/license.html#terms-and-conditions-for-accessing-or-otherwise-using-python
 .. _Apache License Version 2.0: http://opensource.org/licenses/Apache-2.0
-.. _GitHub: https://github.com/aliles/funcsigs
+.. _GitHub: https://github.com/testing-cabal/funcsigs
 .. _PSF License Agreement: http://docs.python.org/3/license.html#terms-and-conditions-for-accessing-or-otherwise-using-python
 .. _Travis CI: http://travis-ci.org/
 .. _Read The Docs: http://funcsigs.readthedocs.org/
 .. _PEP 362: http://www.python.org/dev/peps/pep-0362/
 .. _inspect: http://docs.python.org/3/library/inspect.html#introspecting-callables-with-the-signature-object
-.. _issues system: https://github.com/alies/funcsigs/issues
+.. _issues system: https://github.com/testing-cabal/funcsigs/issues
 
 .. |build_status| image:: https://secure.travis-ci.org/aliles/funcsigs.png?branch=master
    :target: http://travis-ci.org/#!/aliles/funcsigs
@@ -81,3 +349,5 @@ work is distributed under the `Apache License Version 2.0`_.
 .. |pypi_version| image:: https://pypip.in/v/funcsigs/badge.png
    :target: https://crate.io/packages/funcsigs/
    :alt: Latest PyPI version
+
+
diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/docs/index.rst b/tests/wpt/web-platform-tests/tools/third_party/funcsigs/docs/index.rst
index 5d0f42f9368..5fbca27e6e6 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/docs/index.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/funcsigs/docs/index.rst
@@ -9,48 +9,65 @@ Introducing funcsigs
 The Funcsigs Package
 --------------------
 
-*funcsigs* is a backport of the `PEP 362`_ function signature features from
+``funcsigs`` is a backport of the `PEP 362`_ function signature features from
 Python 3.3's `inspect`_ module. The backport is compatible with Python 2.6, 2.7
-as well as 3.2 and up.
+as well as 3.3 and up. 3.2 was supported by version 0.4, but with setuptools and
+pip no longer supporting 3.2, we cannot make any statement about 3.2
+compatibility.
 
-.. _PEP 362: http://www.python.org/dev/peps/pep-0362/
-.. _inspect: http://docs.python.org/3/library/inspect.html#introspecting-callables-with-the-signature-object
-
-Compatability
+Compatibility
 `````````````
 
-The *funcsigs* backport has been tested against:
+The ``funcsigs`` backport has been tested against:
 
 * CPython 2.6
 * CPython 2.7
-* CPython 3.2
-* PyPy 1.9
+* CPython 3.3
+* CPython 3.4
+* CPython 3.5
+* CPython nightlies
+* PyPy and PyPy3(currently failing CI)
 
 Continuous integration testing is provided by `Travis CI`_.
 
-Under Python 2.x there is a compatability issue when a function is assigned to
+Under Python 2.x there is a compatibility issue when a function is assigned to
 the ``__wrapped__`` property of a class after it has been constructed.
 Similiarily there under PyPy directly passing the ``__call__`` method of a
-builtin is also a compatability issues.  Otherwise the functionality is
+builtin is also a compatibility issues.  Otherwise the functionality is
 believed to be uniform between both Python2 and Python3.
 
-.. _Travis CI: http://travis-ci.org/
-
 Issues
 ``````
 
-Source code for *funcsigs* is hosted on `GitHub`_. Any bug reports or feature
-requests can be made using GitHub's `issues system`_.
+Source code for ``funcsigs`` is hosted on `GitHub`_. Any bug reports or feature
+requests can be made using GitHub's `issues system`_. |build_status| |coverage|
 
-.. _GitHub: https://github.com/aliles/funcsigs
-.. _issues system: https://github.com/alies/funcsigs/issues
+Example
+-------
+
+To obtain a `Signature` object, pass the target function to the
+``funcsigs.signature`` function.
+
+.. code-block:: python
+
+    >>> from funcsigs import signature
+    >>> def foo(a, b=None, *args, **kwargs):
+    ...     pass
+    ...
+    >>> sig = signature(foo)
+    >>> sig
+    <funcsigs.Signature object at 0x...>
+    >>> sig.parameters
+    OrderedDict([('a', <Parameter at 0x... 'a'>), ('b', <Parameter at 0x... 'b'>), ('args', <Parameter at 0x... 'args'>), ('kwargs', <Parameter at 0x... 'kwargs'>)])
+    >>> sig.return_annotation
+    <class 'funcsigs._empty'>
 
 Introspecting callables with the Signature object
 -------------------------------------------------
 
 .. note::
 
-   This section of documentation is a direct repoduction of the Python
+   This section of documentation is a direct reproduction of the Python
    standard library documentation for the inspect module.
 
 The Signature object represents the call signature of a callable object and its
@@ -61,7 +78,7 @@ function.
 
    Return a :class:`Signature` object for the given ``callable``::
 
-      >>> from inspect import signature
+      >>> from funcsigs import signature
       >>> def foo(a, *, b:int, **kwargs):
       ...     pass
 
@@ -225,7 +242,7 @@ function.
 
       ::
 
-         >>> from inspect import Parameter
+         >>> from funcsigs import Parameter
          >>> param = Parameter('foo', Parameter.KEYWORD_ONLY, default=42)
          >>> str(param)
          'foo=42'
@@ -313,3 +330,24 @@ work is distributed under the `Apache License Version 2.0`_.
 
 .. _PSF License Agreement: http://docs.python.org/3/license.html#terms-and-conditions-for-accessing-or-otherwise-using-python
 .. _Apache License Version 2.0: http://opensource.org/licenses/Apache-2.0
+.. _GitHub: https://github.com/testing-cabal/funcsigs
+.. _PSF License Agreement: http://docs.python.org/3/license.html#terms-and-conditions-for-accessing-or-otherwise-using-python
+.. _Travis CI: http://travis-ci.org/
+.. _Read The Docs: http://funcsigs.readthedocs.org/
+.. _PEP 362: http://www.python.org/dev/peps/pep-0362/
+.. _inspect: http://docs.python.org/3/library/inspect.html#introspecting-callables-with-the-signature-object
+.. _issues system: https://github.com/testing-cabal/funcsigs/issues
+
+.. |build_status| image:: https://secure.travis-ci.org/aliles/funcsigs.png?branch=master
+   :target: http://travis-ci.org/#!/aliles/funcsigs
+   :alt: Current build status
+
+.. |coverage| image:: https://coveralls.io/repos/aliles/funcsigs/badge.png?branch=master
+   :target: https://coveralls.io/r/aliles/funcsigs?branch=master
+   :alt: Coverage status
+
+.. |pypi_version| image:: https://pypip.in/v/funcsigs/badge.png
+   :target: https://crate.io/packages/funcsigs/
+   :alt: Latest PyPI version
+
+
diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/funcsigs/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/funcsigs/funcsigs/__init__.py
index fd2f47b1d4d..5f5378b42a6 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/funcsigs/__init__.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/funcsigs/funcsigs/__init__.py
@@ -2,7 +2,7 @@
 """Function signature objects for callables
 
 Back port of Python 3.3's function signature tools from the inspect module,
-modified to be compatible with Python 2.6, 2.7 and 3.2+.
+modified to be compatible with Python 2.6, 2.7 and 3.3+.
 """
 from __future__ import absolute_import, division, print_function
 import itertools
@@ -13,7 +13,7 @@ import types
 try:
     from collections import OrderedDict
 except ImportError:
-    from funcsigs.odict import OrderedDict
+    from ordereddict import OrderedDict
 
 from funcsigs.version import __version__
 
@@ -61,18 +61,29 @@ def signature(obj):
     if isinstance(obj, types.MethodType):
         sig = signature(obj.__func__)
         if obj.__self__ is None:
-            # Unbound method: the first parameter becomes positional-only
-            if sig.parameters:
-                first = sig.parameters.values()[0].replace(
-                    kind=_POSITIONAL_ONLY)
-                return sig.replace(
-                    parameters=(first,) + tuple(sig.parameters.values())[1:])
-            else:
-                return sig
+            # Unbound method - preserve as-is.
+            return sig
         else:
-            # In this case we skip the first parameter of the underlying
-            # function (usually `self` or `cls`).
-            return sig.replace(parameters=tuple(sig.parameters.values())[1:])
+            # Bound method. Eat self - if we can.
+            params = tuple(sig.parameters.values())
+
+            if not params or params[0].kind in (_VAR_KEYWORD, _KEYWORD_ONLY):
+                raise ValueError('invalid method signature')
+
+            kind = params[0].kind
+            if kind in (_POSITIONAL_OR_KEYWORD, _POSITIONAL_ONLY):
+                # Drop first parameter:
+                # '(p1, p2[, ...])' -> '(p2[, ...])'
+                params = params[1:]
+            else:
+                if kind is not _VAR_POSITIONAL:
+                    # Unless we add a new parameter type we never
+                    # get here
+                    raise ValueError('invalid argument type')
+                # It's a var-positional parameter.
+                # Do nothing. '(*args[, ...])' -> '(*args[, ...])'
+
+            return sig.replace(parameters=params)
 
     try:
         sig = obj.__signature__
@@ -769,16 +780,16 @@ class Signature(object):
                 # Process our '**kwargs'-like parameter
                 arguments[kwargs_param.name] = kwargs
             else:
-                raise TypeError('too many keyword arguments')
+                raise TypeError('too many keyword arguments %r' % kwargs)
 
         return self._bound_arguments_cls(self, arguments)
 
-    def bind(self, *args, **kwargs):
+    def bind(*args, **kwargs):
         '''Get a BoundArguments object, that maps the passed `args`
         and `kwargs` to the function's signature.  Raises `TypeError`
         if the passed arguments can not be bound.
         '''
-        return self._bind(args, kwargs)
+        return args[0]._bind(args[1:], kwargs)
 
     def bind_partial(self, *args, **kwargs):
         '''Get a BoundArguments object, that partially maps the
diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/funcsigs/odict.py b/tests/wpt/web-platform-tests/tools/third_party/funcsigs/funcsigs/odict.py
deleted file mode 100644
index 6221e971b37..00000000000
--- a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/funcsigs/odict.py
+++ /dev/null
@@ -1,261 +0,0 @@
-# Backport of OrderedDict() class that runs on Python 2.4, 2.5, 2.6, 2.7 and pypy.
-# Passes Python2.7's test suite and incorporates all the latest updates.
-# Copyright 2009 Raymond Hettinger
-# http://code.activestate.com/recipes/576693/
-"Ordered dictionary"
-
-try:
-    from thread import get_ident as _get_ident
-except ImportError:
-    from dummy_thread import get_ident as _get_ident
-
-try:
-    from _abcoll import KeysView, ValuesView, ItemsView
-except ImportError:
-    pass
-
-
-class OrderedDict(dict):
-    'Dictionary that remembers insertion order'
-    # An inherited dict maps keys to values.
-    # The inherited dict provides __getitem__, __len__, __contains__, and get.
-    # The remaining methods are order-aware.
-    # Big-O running times for all methods are the same as for regular dictionaries.
-
-    # The internal self.__map dictionary maps keys to links in a doubly linked list.
-    # The circular doubly linked list starts and ends with a sentinel element.
-    # The sentinel element never gets deleted (this simplifies the algorithm).
-    # Each link is stored as a list of length three:  [PREV, NEXT, KEY].
-
-    def __init__(self, *args, **kwds):
-        '''Initialize an ordered dictionary.  Signature is the same as for
-        regular dictionaries, but keyword arguments are not recommended
-        because their insertion order is arbitrary.
-
-        '''
-        if len(args) > 1:
-            raise TypeError('expected at most 1 arguments, got %d' % len(args))
-        try:
-            self.__root
-        except AttributeError:
-            self.__root = root = []                     # sentinel node
-            root[:] = [root, root, None]
-            self.__map = {}
-        self.__update(*args, **kwds)
-
-    def __setitem__(self, key, value, dict_setitem=dict.__setitem__):
-        'od.__setitem__(i, y) <==> od[i]=y'
-        # Setting a new item creates a new link which goes at the end of the linked
-        # list, and the inherited dictionary is updated with the new key/value pair.
-        if key not in self:
-            root = self.__root
-            last = root[0]
-            last[1] = root[0] = self.__map[key] = [last, root, key]
-        dict_setitem(self, key, value)
-
-    def __delitem__(self, key, dict_delitem=dict.__delitem__):
-        'od.__delitem__(y) <==> del od[y]'
-        # Deleting an existing item uses self.__map to find the link which is
-        # then removed by updating the links in the predecessor and successor nodes.
-        dict_delitem(self, key)
-        link_prev, link_next, key = self.__map.pop(key)
-        link_prev[1] = link_next
-        link_next[0] = link_prev
-
-    def __iter__(self):
-        'od.__iter__() <==> iter(od)'
-        root = self.__root
-        curr = root[1]
-        while curr is not root:
-            yield curr[2]
-            curr = curr[1]
-
-    def __reversed__(self):
-        'od.__reversed__() <==> reversed(od)'
-        root = self.__root
-        curr = root[0]
-        while curr is not root:
-            yield curr[2]
-            curr = curr[0]
-
-    def clear(self):
-        'od.clear() -> None.  Remove all items from od.'
-        try:
-            for node in self.__map.itervalues():
-                del node[:]
-            root = self.__root
-            root[:] = [root, root, None]
-            self.__map.clear()
-        except AttributeError:
-            pass
-        dict.clear(self)
-
-    def popitem(self, last=True):
-        '''od.popitem() -> (k, v), return and remove a (key, value) pair.
-        Pairs are returned in LIFO order if last is true or FIFO order if false.
-
-        '''
-        if not self:
-            raise KeyError('dictionary is empty')
-        root = self.__root
-        if last:
-            link = root[0]
-            link_prev = link[0]
-            link_prev[1] = root
-            root[0] = link_prev
-        else:
-            link = root[1]
-            link_next = link[1]
-            root[1] = link_next
-            link_next[0] = root
-        key = link[2]
-        del self.__map[key]
-        value = dict.pop(self, key)
-        return key, value
-
-    # -- the following methods do not depend on the internal structure --
-
-    def keys(self):
-        'od.keys() -> list of keys in od'
-        return list(self)
-
-    def values(self):
-        'od.values() -> list of values in od'
-        return [self[key] for key in self]
-
-    def items(self):
-        'od.items() -> list of (key, value) pairs in od'
-        return [(key, self[key]) for key in self]
-
-    def iterkeys(self):
-        'od.iterkeys() -> an iterator over the keys in od'
-        return iter(self)
-
-    def itervalues(self):
-        'od.itervalues -> an iterator over the values in od'
-        for k in self:
-            yield self[k]
-
-    def iteritems(self):
-        'od.iteritems -> an iterator over the (key, value) items in od'
-        for k in self:
-            yield (k, self[k])
-
-    def update(*args, **kwds):
-        '''od.update(E, **F) -> None.  Update od from dict/iterable E and F.
-
-        If E is a dict instance, does:           for k in E: od[k] = E[k]
-        If E has a .keys() method, does:         for k in E.keys(): od[k] = E[k]
-        Or if E is an iterable of items, does:   for k, v in E: od[k] = v
-        In either case, this is followed by:     for k, v in F.items(): od[k] = v
-
-        '''
-        if len(args) > 2:
-            raise TypeError('update() takes at most 2 positional '
-                            'arguments (%d given)' % (len(args),))
-        elif not args:
-            raise TypeError('update() takes at least 1 argument (0 given)')
-        self = args[0]
-        # Make progressively weaker assumptions about "other"
-        other = ()
-        if len(args) == 2:
-            other = args[1]
-        if isinstance(other, dict):
-            for key in other:
-                self[key] = other[key]
-        elif hasattr(other, 'keys'):
-            for key in other.keys():
-                self[key] = other[key]
-        else:
-            for key, value in other:
-                self[key] = value
-        for key, value in kwds.items():
-            self[key] = value
-
-    __update = update  # let subclasses override update without breaking __init__
-
-    __marker = object()
-
-    def pop(self, key, default=__marker):
-        '''od.pop(k[,d]) -> v, remove specified key and return the corresponding value.
-        If key is not found, d is returned if given, otherwise KeyError is raised.
-
-        '''
-        if key in self:
-            result = self[key]
-            del self[key]
-            return result
-        if default is self.__marker:
-            raise KeyError(key)
-        return default
-
-    def setdefault(self, key, default=None):
-        'od.setdefault(k[,d]) -> od.get(k,d), also set od[k]=d if k not in od'
-        if key in self:
-            return self[key]
-        self[key] = default
-        return default
-
-    def __repr__(self, _repr_running={}):
-        'od.__repr__() <==> repr(od)'
-        call_key = id(self), _get_ident()
-        if call_key in _repr_running:
-            return '...'
-        _repr_running[call_key] = 1
-        try:
-            if not self:
-                return '%s()' % (self.__class__.__name__,)
-            return '%s(%r)' % (self.__class__.__name__, self.items())
-        finally:
-            del _repr_running[call_key]
-
-    def __reduce__(self):
-        'Return state information for pickling'
-        items = [[k, self[k]] for k in self]
-        inst_dict = vars(self).copy()
-        for k in vars(OrderedDict()):
-            inst_dict.pop(k, None)
-        if inst_dict:
-            return (self.__class__, (items,), inst_dict)
-        return self.__class__, (items,)
-
-    def copy(self):
-        'od.copy() -> a shallow copy of od'
-        return self.__class__(self)
-
-    @classmethod
-    def fromkeys(cls, iterable, value=None):
-        '''OD.fromkeys(S[, v]) -> New ordered dictionary with keys from S
-        and values equal to v (which defaults to None).
-
-        '''
-        d = cls()
-        for key in iterable:
-            d[key] = value
-        return d
-
-    def __eq__(self, other):
-        '''od.__eq__(y) <==> od==y.  Comparison to another OD is order-sensitive
-        while comparison to a regular mapping is order-insensitive.
-
-        '''
-        if isinstance(other, OrderedDict):
-            return len(self)==len(other) and self.items() == other.items()
-        return dict.__eq__(self, other)
-
-    def __ne__(self, other):
-        return not self == other
-
-    # -- the following methods are only used in Python 2.7 --
-
-    def viewkeys(self):
-        "od.viewkeys() -> a set-like object providing a view on od's keys"
-        return KeysView(self)
-
-    def viewvalues(self):
-        "od.viewvalues() -> an object providing a view on od's values"
-        return ValuesView(self)
-
-    def viewitems(self):
-        "od.viewitems() -> a set-like object providing a view on od's items"
-        return ItemsView(self)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/funcsigs/version.py b/tests/wpt/web-platform-tests/tools/third_party/funcsigs/funcsigs/version.py
index 896a370cad1..7863915fa5f 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/funcsigs/version.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/funcsigs/funcsigs/version.py
@@ -1 +1 @@
-__version__ = "0.4"
+__version__ = "1.0.2"
diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/requirements/development.txt b/tests/wpt/web-platform-tests/tools/third_party/funcsigs/requirements/development.txt
index ecafb0a527d..40dedd92bf0 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/requirements/development.txt
+++ b/tests/wpt/web-platform-tests/tools/third_party/funcsigs/requirements/development.txt
@@ -1,6 +1,5 @@
 coverage
 coveralls
-pip
 flake8
 sphinx
-wheel
+unittest2
diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/setup.py b/tests/wpt/web-platform-tests/tools/third_party/funcsigs/setup.py
index 98b09126045..f3696888f9e 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/setup.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/funcsigs/setup.py
@@ -14,26 +14,22 @@ def load_version(filename='funcsigs/version.py'):
         version = match.group(1)
         return version
 
-def load_rst(filename='docs/source/guide_content.rst'):
-    "Purge refs directives from restructured text"
-    with open(filename) as source:
-        text = source.read()
-        doc = re.sub(r':\w+:`~?([a-zA-Z._()]+)`', r'*\1*', text)
-        return doc
 
 setup(
     name="funcsigs",
     version=load_version(),
     packages=['funcsigs'],
     zip_safe=False,
-    author="Aaron Iles",
-    author_email="aaron.iles@gmail.com",
+    author="Testing Cabal",
+    author_email="testing-in-python@lists.idyll.org",
     url="http://funcsigs.readthedocs.org",
     description="Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+",
     long_description=open('README.rst').read(),
-    # long_description=load_rst(),
     license="ASL",
-    install_requires = [],
+    extras_require = {
+        ':python_version<"2.7"': ['ordereddict'],
+    },
+    setup_requires = ["setuptools>=17.1"],
     classifiers = [
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
@@ -44,12 +40,13 @@ setup(
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Software Development :: Libraries :: Python Modules'
     ],
-    tests_require = [] if sys.version_info[0] > 2 else ['unittest2'],
-    test_suite = "tests" if sys.version_info[0] > 2 else 'unittest2.collector'
+    tests_require = ['unittest2'],
+    test_suite = 'unittest2.collector',
 )
diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/tests/test_formatannotation.py b/tests/wpt/web-platform-tests/tools/third_party/funcsigs/tests/test_formatannotation.py
index fd7a8873f85..4b98e6037d8 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/tests/test_formatannotation.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/funcsigs/tests/test_formatannotation.py
@@ -1,12 +1,6 @@
-try:
-    # python 2.x
-    import unittest2 as unittest
-except ImportError:
-    # python 3.x
-    import unittest
-
 import funcsigs
 
+import unittest2 as unittest
 
 class TestFormatAnnotation(unittest.TestCase):
     def test_string (self):
@@ -21,7 +15,3 @@ class TestFormatAnnotation(unittest.TestCase):
         class dummy (object): pass
         self.assertEqual(funcsigs.formatannotation(dummy),
                          "tests.test_formatannotation.dummy")
-
-
-if __name__ == "__main__":
-    unittest.begin()
diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/tests/test_funcsigs.py b/tests/wpt/web-platform-tests/tools/third_party/funcsigs/tests/test_funcsigs.py
index eecc0a8a709..a7b9cca7679 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/tests/test_funcsigs.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/funcsigs/tests/test_funcsigs.py
@@ -1,9 +1,4 @@
-try:
-    # python 2.x
-    import unittest2 as unittest
-except ImportError:
-    # python 3.x
-    import unittest
+import unittest2 as unittest
 
 import doctest
 import sys
@@ -69,25 +64,28 @@ class TestFunctionSignatures(unittest.TestCase):
         self.assertTrue(inspect.__version__)
 
     def test_readme(self):
+        # XXX: This fails but doesn't fail the build.
+	# (and the syntax isn't valid on all pythons so that seems a little
+	# hard to get right.
         doctest.testfile('../README.rst')
 
     def test_unbound_method(self):
-        if sys.version_info < (3,):
-            self_kind = "positional_only"
-        else:
-            self_kind = "positional_or_keyword"
+        self_kind = "positional_or_keyword"
         class Test(object):
             def method(self):
                 pass
             def method_with_args(self, a):
                 pass
-        self.assertEqual(self.signature(Test.method),
-                (((('self', Ellipsis, Ellipsis, self_kind)),), Ellipsis))
-        self.assertEqual(self.signature(Test.method_with_args), ((
-                ('self', Ellipsis, Ellipsis, self_kind),
-                ('a', Ellipsis, Ellipsis, "positional_or_keyword"),
+            def method_with_varargs(*args):
+                pass
+        self.assertEqual(
+            self.signature(Test.method),
+            (((('self', Ellipsis, Ellipsis, self_kind)),), Ellipsis))
+        self.assertEqual(
+            self.signature(Test.method_with_args),
+            ((('self', Ellipsis, Ellipsis, self_kind),
+              ('a', Ellipsis, Ellipsis, "positional_or_keyword"),
                 ), Ellipsis))
-
-
-if __name__ == "__main__":
-    unittest.begin()
+        self.assertEqual(
+            self.signature(Test.method_with_varargs),
+            ((('args', Ellipsis, Ellipsis, "var_positional"),), Ellipsis))
diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/tests/test_inspect.py b/tests/wpt/web-platform-tests/tools/third_party/funcsigs/tests/test_inspect.py
index 323c323eafd..98d6592fcc7 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/tests/test_inspect.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/funcsigs/tests/test_inspect.py
@@ -1,12 +1,10 @@
 # Copyright 2001-2013 Python Software Foundation; All Rights Reserved
 from __future__ import absolute_import, division, print_function
 import collections
+import functools
 import sys
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest2 as unittest
 
 import funcsigs as inspect
 
@@ -24,11 +22,6 @@ class TestSignatureObject(unittest.TestCase):
                 (Ellipsis if sig.return_annotation is sig.empty
                                             else sig.return_annotation))
 
-    def __init__(self, *args, **kwargs):
-        unittest.TestCase.__init__(self, *args, **kwargs)
-        if not hasattr(self, 'assertRaisesRegex'):
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     if sys.version_info[0] > 2:
         exec("""
 def test_signature_object(self):
@@ -656,11 +649,6 @@ def test_signature_replace_anno(self):
 
 class TestParameterObject(unittest.TestCase):
 
-    def __init__(self, *args, **kwargs):
-        unittest.TestCase.__init__(self, *args, **kwargs)
-        if not hasattr(self, 'assertRaisesRegex'):
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def test_signature_parameter_kinds(self):
         P = inspect.Parameter
         self.assertTrue(P.POSITIONAL_ONLY < P.POSITIONAL_OR_KEYWORD < \
@@ -780,11 +768,6 @@ class TestSignatureBind(unittest.TestCase):
         ba = sig.bind(*args, **kwargs)
         return func(*ba.args, **ba.kwargs)
 
-    def __init__(self, *args, **kwargs):
-        unittest.TestCase.__init__(self, *args, **kwargs)
-        if not hasattr(self, 'assertRaisesRegex'):
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def test_signature_bind_empty(self):
         def test():
             return 42
@@ -982,14 +965,18 @@ def test_signature_bind_positional_only(self):
         self.call(test, a_po=1, b_po=2)
 """)
 
+    def test_bind_self(self):
+        class F:
+            def f(a, self):
+                return a, self
+        an_f = F()
+        partial_f = functools.partial(F.f, an_f)
+        ba = inspect.signature(partial_f).bind(self=10)
+        self.assertEqual((an_f, 10), partial_f(*ba.args, **ba.kwargs))
+
 
 class TestBoundArguments(unittest.TestCase):
 
-    def __init__(self, *args, **kwargs):
-        unittest.TestCase.__init__(self, *args, **kwargs)
-        if not hasattr(self, 'assertRaisesRegex'):
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def test_signature_bound_arguments_unhashable(self):
         def foo(a): pass
         ba = inspect.signature(foo).bind(1)
@@ -1013,7 +1000,3 @@ class TestBoundArguments(unittest.TestCase):
         def bar(b): pass
         ba4 = inspect.signature(bar).bind(1)
         self.assertNotEqual(ba, ba4)
-
-
-if __name__ == "__main__":
-    unittest.begin()
diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/tox.ini b/tests/wpt/web-platform-tests/tools/third_party/funcsigs/tox.ini
new file mode 100644
index 00000000000..1873c744a00
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/funcsigs/tox.ini
@@ -0,0 +1,8 @@
+[tox]
+envlist = py26, py27, py33, py34, py35, py36, pypy, pypy3
+
+[testenv]
+deps = -rrequirements/development.txt
+commands = 
+    coverage run setup.py test
+    coverage report --show-missing
diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/.github/workflows/main.yml b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/.github/workflows/main.yml
new file mode 100644
index 00000000000..b56320fd000
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/.github/workflows/main.yml
@@ -0,0 +1,126 @@
+name: Automated Tests
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        python: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9]
+        platform: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python }}
+      - name: Install tox
+        run: |
+          python -m pip install tox
+      - name: Run tests
+        run: tox
+        env:
+          TOXENV: python
+
+  qa:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+      - name: Install tox
+        run: |
+          python -m pip install tox
+      - name: Run checks
+        run: tox
+        env:
+          TOXENV: qa
+
+  coverage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+      - name: Install tox
+        run: |
+          python -m pip install tox
+      - name: Evaluate coverage
+        run: tox
+        env:
+          TOXENV: cov
+
+  benchmark:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+      - name: Install tox
+        run: |
+          python -m pip install tox
+      - name: Run benchmarks
+        run: tox
+        env:
+          TOXENV: perf
+
+  diffcov:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+      - name: Install tox
+        run: |
+          python -m pip install tox
+      - name: Evaluate coverage
+        run: tox
+        env:
+          TOXENV: diffcov
+
+  docs:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+      - name: Install tox
+        run: |
+          python -m pip install tox
+      - name: Build docs
+        run: tox
+        env:
+          TOXENV: docs
+
+  release:
+    needs: test
+    if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+      - name: Install tox
+        run: |
+          python -m pip install tox
+      - name: Release
+        run: tox -e release
+        env:
+          TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/.gitignore b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/.gitignore
new file mode 100644
index 00000000000..ae864d61259
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/.gitignore
@@ -0,0 +1,13 @@
+build
+/coverage.xml
+/diffcov.html
+htmlcov
+importlib_metadata.egg-info
+.mypy_cache
+/.coverage
+/.DS_Store
+artifacts
+.eggs
+.doctrees
+dist
+pip-wheel-metadata
diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/.readthedocs.yml b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/.readthedocs.yml
new file mode 100644
index 00000000000..8ae4468428b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/.readthedocs.yml
@@ -0,0 +1,5 @@
+python:
+  version: 3
+  extra_requirements:
+    - docs
+  pip_install: true
diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/LICENSE b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/LICENSE
new file mode 100644
index 00000000000..be7e092b0b0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/LICENSE
@@ -0,0 +1,13 @@
+Copyright 2017-2019 Jason R. Coombs, Barry Warsaw
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/MANIFEST.in b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/MANIFEST.in
new file mode 100644
index 00000000000..3fcf6d633ad
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/MANIFEST.in
@@ -0,0 +1,5 @@
+include *.py MANIFEST.in LICENSE README.rst
+global-include *.txt *.rst *.ini *.cfg *.toml *.whl *.egg
+exclude .gitignore
+prune build
+prune .tox
diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/README.rst b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/README.rst
new file mode 100644
index 00000000000..5655d9ab987
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/README.rst
@@ -0,0 +1,42 @@
+=========================
+ ``importlib_metadata``
+=========================
+
+``importlib_metadata`` is a library to access the metadata for a
+Python package.
+
+As of Python 3.8, this functionality has been added to the
+`Python standard library
+<https://docs.python.org/3/library/importlib.metadata.html>`_.
+This package supplies backports of that functionality including
+improvements added to subsequent Python versions.
+
+
+Usage
+=====
+
+See the `online documentation <https://importlib_metadata.readthedocs.io/>`_
+for usage details.
+
+`Finder authors
+<https://docs.python.org/3/reference/import.html#finders-and-loaders>`_ can
+also add support for custom package installers.  See the above documentation
+for details.
+
+
+Caveats
+=======
+
+This project primarily supports third-party packages installed by PyPA
+tools (or other conforming packages). It does not support:
+
+- Packages in the stdlib.
+- Packages installed without metadata.
+
+Project details
+===============
+
+ * Project home: https://github.com/python/importlib_metadata
+ * Report bugs at: https://github.com/python/importlib_metadata/issues
+ * Code hosting: https://github.com/python/importlib_metadata
+ * Documentation: https://importlib_metadata.readthedocs.io/
diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/codecov.yml b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/codecov.yml
new file mode 100644
index 00000000000..66c7f4bd190
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/codecov.yml
@@ -0,0 +1,2 @@
+codecov:
+  token: 5eb1bc45-1b7f-43e6-8bc1-f2b02833dba9
diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/coverage.ini b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/coverage.ini
new file mode 100644
index 00000000000..b4d3102f425
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/coverage.ini
@@ -0,0 +1,24 @@
+[run]
+branch = true
+parallel = true
+omit =
+     setup*
+    .tox/*/lib/python*
+    */tests/*.py
+    */testing/*.py
+    /usr/local/*
+    */mod.py
+plugins =
+     coverplug
+
+[report]
+exclude_lines =
+    pragma: nocover
+    raise NotImplementedError
+    raise AssertionError
+    assert\s
+    nocoverpy${PYV}
+
+[paths]
+source =
+    importlib_metadata
diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/coverplug.py b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/coverplug.py
new file mode 100644
index 00000000000..0b0c7cb5490
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/coverplug.py
@@ -0,0 +1,21 @@
+"""Coverage plugin to add exclude lines based on the Python version."""
+
+import sys
+
+from coverage import CoveragePlugin
+
+
+class MyConfigPlugin(CoveragePlugin):
+    def configure(self, config):
+        opt_name = 'report:exclude_lines'
+        exclude_lines = config.get_option(opt_name)
+        # Python >= 3.6 has os.PathLike.
+        if sys.version_info >= (3, 6):
+            exclude_lines.append('pragma: >=36')
+        else:
+            exclude_lines.append('pragma: <=35')
+        config.set_option(opt_name, exclude_lines)
+
+
+def coverage_init(reg, options):
+    reg.add_configurer(MyConfigPlugin())
diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/requirements/production.txt b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/docs/__init__.py
similarity index 100%
rename from tests/wpt/web-platform-tests/tools/third_party/funcsigs/requirements/production.txt
rename to tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/docs/__init__.py
diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/docs/changelog.rst b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/docs/changelog.rst
new file mode 100644
index 00000000000..396535744a5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/docs/changelog.rst
@@ -0,0 +1,314 @@
+=========================
+ importlib_metadata NEWS
+=========================
+
+v2.1.0
+======
+
+* #253: When querying for package metadata, the lookup
+  now honors
+  `package normalization rules <https://packaging.python.org/specifications/recording-installed-packages/>`_.
+
+v2.0.0
+======
+
+* ``importlib_metadata`` no longer presents a
+  ``__version__`` attribute. Consumers wishing to
+  resolve the version of the package should query it
+  directly with
+  ``importlib_metadata.version('importlib-metadata')``.
+  Closes #71.
+
+v1.7.0
+======
+
+* ``PathNotFoundError`` now has a custom ``__str__``
+  mentioning "package metadata" being missing to help
+  guide users to the cause when the package is installed
+  but no metadata is present. Closes #124.
+
+v1.6.1
+======
+
+* Added ``Distribution._local()`` as a provisional
+  demonstration of how to load metadata for a local
+  package. Implicitly requires that
+  `pep517 <https://pypi.org/project/pep517>`_ is
+  installed. Ref #42.
+* Ensure inputs to FastPath are Unicode. Closes #121.
+* Tests now rely on ``importlib.resources.files`` (and
+  backport) instead of the older ``path`` function.
+* Support any iterable from ``find_distributions``.
+  Closes #122.
+
+v1.6.0
+======
+
+* Added ``module`` and ``attr`` attributes to ``EntryPoint``
+
+v1.5.2
+======
+
+* Fix redundant entries from ``FastPath.zip_children``.
+  Closes #117.
+
+v1.5.1
+======
+
+* Improve reliability and consistency of compatibility
+  imports for contextlib and pathlib when running tests.
+  Closes #116.
+
+v1.5.0
+======
+
+* Additional performance optimizations in FastPath now
+  saves an additional 20% on a typical call.
+* Correct for issue where PyOxidizer finder has no
+  ``__module__`` attribute. Closes #110.
+
+v1.4.0
+======
+
+* Through careful optimization, ``distribution()`` is
+  3-4x faster. Thanks to Antony Lee for the
+  contribution. Closes #95.
+
+* When searching through ``sys.path``, if any error
+  occurs attempting to list a path entry, that entry
+  is skipped, making the system much more lenient
+  to errors. Closes #94.
+
+v1.3.0
+======
+
+* Improve custom finders documentation. Closes #105.
+
+v1.2.0
+======
+
+* Once again, drop support for Python 3.4. Ref #104.
+
+v1.1.3
+======
+
+* Restored support for Python 3.4 due to improper version
+  compatibility declarations in the v1.1.0 and v1.1.1
+  releases. Closes #104.
+
+v1.1.2
+======
+
+* Repaired project metadata to correctly declare the
+  ``python_requires`` directive. Closes #103.
+
+v1.1.1
+======
+
+* Fixed ``repr(EntryPoint)`` on PyPy 3 also. Closes #102.
+
+v1.1.0
+======
+
+* Dropped support for Python 3.4.
+* EntryPoints are now pickleable. Closes #96.
+* Fixed ``repr(EntryPoint)`` on PyPy 2. Closes #97.
+
+v1.0.0
+======
+
+* Project adopts semver for versioning.
+
+* Removed compatibility shim introduced in 0.23.
+
+* For better compatibility with the stdlib implementation and to
+  avoid the same distributions being discovered by the stdlib and
+  backport implementations, the backport now disables the
+  stdlib DistributionFinder during initialization (import time).
+  Closes #91 and closes #100.
+
+0.23
+====
+* Added a compatibility shim to prevent failures on beta releases
+  of Python before the signature changed to accept the
+  "context" parameter on find_distributions. This workaround
+  will have a limited lifespan, not to extend beyond release of
+  Python 3.8 final.
+
+0.22
+====
+* Renamed ``package`` parameter to ``distribution_name``
+  as `recommended <https://bugs.python.org/issue34632#msg349423>`_
+  in the following functions: ``distribution``, ``metadata``,
+  ``version``, ``files``, and ``requires``. This
+  backward-incompatible change is expected to have little impact
+  as these functions are assumed to be primarily used with
+  positional parameters.
+
+0.21
+====
+* ``importlib.metadata`` now exposes the ``DistributionFinder``
+  metaclass and references it in the docs for extending the
+  search algorithm.
+* Add ``Distribution.at`` for constructing a Distribution object
+  from a known metadata directory on the file system. Closes #80.
+* Distribution finders now receive a context object that
+  supplies ``.path`` and ``.name`` properties. This change
+  introduces a fundamental backward incompatibility for
+  any projects implementing a ``find_distributions`` method
+  on a ``MetaPathFinder``. This new layer of abstraction
+  allows this context to be supplied directly or constructed
+  on demand and opens the opportunity for a
+  ``find_distributions`` method to solicit additional
+  context from the caller. Closes #85.
+
+0.20
+====
+* Clarify in the docs that calls to ``.files`` could return
+  ``None`` when the metadata is not present. Closes #69.
+* Return all requirements and not just the first for dist-info
+  packages. Closes #67.
+
+0.19
+====
+* Restrain over-eager egg metadata resolution.
+* Add support for entry points with colons in the name. Closes #75.
+
+0.18
+====
+* Parse entry points case sensitively.  Closes #68
+* Add a version constraint on the backport configparser package.  Closes #66
+
+0.17
+====
+* Fix a permission problem in the tests on Windows.
+
+0.16
+====
+* Don't crash if there exists an EGG-INFO directory on sys.path.
+
+0.15
+====
+* Fix documentation.
+
+0.14
+====
+* Removed ``local_distribution`` function from the API.
+  **This backward-incompatible change removes this
+  behavior summarily**. Projects should remove their
+  reliance on this behavior. A replacement behavior is
+  under review in the `pep517 project
+  <https://github.com/pypa/pep517>`_. Closes #42.
+
+0.13
+====
+* Update docstrings to match PEP 8. Closes #63.
+* Merged modules into one module. Closes #62.
+
+0.12
+====
+* Add support for eggs.  !65; Closes #19.
+
+0.11
+====
+* Support generic zip files (not just wheels).  Closes #59
+* Support zip files with multiple distributions in them.  Closes #60
+* Fully expose the public API in ``importlib_metadata.__all__``.
+
+0.10
+====
+* The ``Distribution`` ABC is now officially part of the public API.
+  Closes #37.
+* Fixed support for older single file egg-info formats.  Closes #43.
+* Fixed a testing bug when ``$CWD`` has spaces in the path.  Closes #50.
+* Add Python 3.8 to the ``tox`` testing matrix.
+
+0.9
+===
+* Fixed issue where entry points without an attribute would raise an
+  Exception.  Closes #40.
+* Removed unused ``name`` parameter from ``entry_points()``. Closes #44.
+* ``DistributionFinder`` classes must now be instantiated before
+  being placed on ``sys.meta_path``.
+
+0.8
+===
+* This library can now discover/enumerate all installed packages. **This
+  backward-incompatible change alters the protocol finders must
+  implement to support distribution package discovery.** Closes #24.
+* The signature of ``find_distributions()`` on custom installer finders
+  should now accept two parameters, ``name`` and ``path`` and
+  these parameters must supply defaults.
+* The ``entry_points()`` method no longer accepts a package name
+  but instead returns all entry points in a dictionary keyed by the
+  ``EntryPoint.group``. The ``resolve`` method has been removed. Instead,
+  call ``EntryPoint.load()``, which has the same semantics as
+  ``pkg_resources`` and ``entrypoints``.  **This is a backward incompatible
+  change.**
+* Metadata is now always returned as Unicode text regardless of
+  Python version. Closes #29.
+* This library can now discover metadata for a 'local' package (found
+  in the current-working directory). Closes #27.
+* Added ``files()`` function for resolving files from a distribution.
+* Added a new ``requires()`` function, which returns the requirements
+  for a package suitable for parsing by
+  ``packaging.requirements.Requirement``. Closes #18.
+* The top-level ``read_text()`` function has been removed.  Use
+  ``PackagePath.read_text()`` on instances returned by the ``files()``
+  function.  **This is a backward incompatible change.**
+* Release dates are now automatically injected into the changelog
+  based on SCM tags.
+
+0.7
+===
+* Fixed issue where packages with dashes in their names would
+  not be discovered. Closes #21.
+* Distribution lookup is now case-insensitive. Closes #20.
+* Wheel distributions can no longer be discovered by their module
+  name. Like Path distributions, they must be indicated by their
+  distribution package name.
+
+0.6
+===
+* Removed ``importlib_metadata.distribution`` function. Now
+  the public interface is primarily the utility functions exposed
+  in ``importlib_metadata.__all__``. Closes #14.
+* Added two new utility functions ``read_text`` and
+  ``metadata``.
+
+0.5
+===
+* Updated README and removed details about Distribution
+  class, now considered private. Closes #15.
+* Added test suite support for Python 3.4+.
+* Fixed SyntaxErrors on Python 3.4 and 3.5. !12
+* Fixed errors on Windows joining Path elements. !15
+
+0.4
+===
+* Housekeeping.
+
+0.3
+===
+* Added usage documentation.  Closes #8
+* Add support for getting metadata from wheels on ``sys.path``.  Closes #9
+
+0.2
+===
+* Added ``importlib_metadata.entry_points()``.  Closes #1
+* Added ``importlib_metadata.resolve()``.  Closes #12
+* Add support for Python 2.7.  Closes #4
+
+0.1
+===
+* Initial release.
+
+
+..
+   Local Variables:
+   mode: change-log-mode
+   indent-tabs-mode: nil
+   sentence-end-double-space: t
+   fill-column: 78
+   coding: utf-8
+   End:
diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/docs/conf.py b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/docs/conf.py
new file mode 100644
index 00000000000..129a7a4eaed
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/docs/conf.py
@@ -0,0 +1,185 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# importlib_metadata documentation build configuration file, created by
+# sphinx-quickstart on Thu Nov 30 10:21:00 2017.
+#
+# This file is execfile()d with the current directory set to its
+# containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#
+# import os
+# import sys
+# sys.path.insert(0, os.path.abspath('.'))
+
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#
+# needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+    'rst.linker',
+    'sphinx.ext.autodoc',
+    'sphinx.ext.coverage',
+    'sphinx.ext.doctest',
+    'sphinx.ext.intersphinx',
+    'sphinx.ext.viewcode',
+    ]
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+#
+# source_suffix = ['.rst', '.md']
+source_suffix = '.rst'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = 'importlib_metadata'
+copyright = '2017-2019, Jason R. Coombs, Barry Warsaw'
+author = 'Jason R. Coombs, Barry Warsaw'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '0.1'
+# The full version, including alpha/beta/rc tags.
+release = '0.1'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = None
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This patterns also effect to html_static_path and html_extra_path
+exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# If true, `todo` and `todoList` produce output, else they produce nothing.
+todo_include_todos = False
+
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#
+html_theme = 'default'
+
+# Custom sidebar templates, must be a dictionary that maps document names
+# to template names.
+#
+# This is required for the alabaster theme
+# refs: http://alabaster.readthedocs.io/en/latest/installation.html#sidebars
+html_sidebars = {
+    '**': [
+        'relations.html',  # needs 'show_related': True theme option to display
+        'searchbox.html',
+        ]
+    }
+
+
+# -- Options for HTMLHelp output ------------------------------------------
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'importlib_metadatadoc'
+
+
+# -- Options for LaTeX output ---------------------------------------------
+
+latex_elements = {
+    # The paper size ('letterpaper' or 'a4paper').
+    #
+    # 'papersize': 'letterpaper',
+
+    # The font size ('10pt', '11pt' or '12pt').
+    #
+    # 'pointsize': '10pt',
+
+    # Additional stuff for the LaTeX preamble.
+    #
+    # 'preamble': '',
+
+    # Latex figure (float) alignment
+    #
+    # 'figure_align': 'htbp',
+    }
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+#  author, documentclass [howto, manual, or own class]).
+latex_documents = [
+    (master_doc, 'importlib_metadata.tex',
+     'importlib\\_metadata Documentation',
+     'Brett Cannon, Barry Warsaw', 'manual'),
+    ]
+
+
+# -- Options for manual page output ---------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    (master_doc, 'importlib_metadata', 'importlib_metadata Documentation',
+     [author], 1)
+    ]
+
+
+# -- Options for Texinfo output -------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+    (master_doc, 'importlib_metadata', 'importlib_metadata Documentation',
+     author, 'importlib_metadata', 'One line description of project.',
+     'Miscellaneous'),
+    ]
+
+
+# Example configuration for intersphinx: refer to the Python standard library.
+intersphinx_mapping = {
+    'python': ('https://docs.python.org/3', None),
+    'importlib_resources': (
+        'https://importlib-resources.readthedocs.io/en/latest/', None
+        ),
+    }
+
+
+# For rst.linker, inject release dates into changelog.rst
+link_files = {
+    'changelog.rst': dict(
+        replace=[
+            dict(
+                pattern=r'^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n',
+                with_scm='{text}\n{rev[timestamp]:%Y-%m-%d}\n\n',
+                ),
+            ],
+        ),
+    }
diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/docs/index.rst b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/docs/index.rst
new file mode 100644
index 00000000000..57332f5e8d1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/docs/index.rst
@@ -0,0 +1,52 @@
+===============================
+ Welcome to importlib_metadata
+===============================
+
+``importlib_metadata`` is a library which provides an API for accessing an
+installed package's metadata (see :pep:`566`), such as its entry points or its top-level
+name.  This functionality intends to replace most uses of ``pkg_resources``
+`entry point API`_ and `metadata API`_.  Along with :mod:`importlib.resources` in
+Python 3.7 and newer (backported as :doc:`importlib_resources <importlib_resources:index>` for older
+versions of Python), this can eliminate the need to use the older and less
+efficient ``pkg_resources`` package.
+
+``importlib_metadata`` supplies a backport of
+:doc:`importlib.metadata <library/importlib.metadata>` as found in
+Python 3.8 and later for earlier Python releases.  Users of
+Python 3.8 and beyond are encouraged to use the standard library module
+when possible and fall back to ``importlib_metadata`` when necessary.
+When imported on Python 3.8 and later, ``importlib_metadata`` replaces the
+DistributionFinder behavior from the stdlib, but leaves the API in tact.
+Developers looking for detailed API descriptions should refer to the Python
+3.8 standard library documentation.
+
+The documentation here includes a general :ref:`usage <using>` guide.
+
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Contents:
+
+   using.rst
+   changelog (links).rst
+
+
+Project details
+===============
+
+ * Project home: https://github.com/python/importlib_metadata
+ * Report bugs at: https://github.com/python/importlib_metadata/issues
+ * Code hosting: https://github.com/python/importlib_metadata
+ * Documentation: https://importlib_metadata.readthedocs.io/
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+
+
+.. _`entry point API`: https://setuptools.readthedocs.io/en/latest/pkg_resources.html#entry-points
+.. _`metadata API`: https://setuptools.readthedocs.io/en/latest/pkg_resources.html#metadata-api
diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/docs/using.rst b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/docs/using.rst
new file mode 100644
index 00000000000..11965147f45
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/docs/using.rst
@@ -0,0 +1,260 @@
+.. _using:
+
+=================================
+ Using :mod:`!importlib_metadata`
+=================================
+
+``importlib_metadata`` is a library that provides for access to installed
+package metadata.  Built in part on Python's import system, this library
+intends to replace similar functionality in the `entry point
+API`_ and `metadata API`_ of ``pkg_resources``.  Along with
+:mod:`importlib.resources` in Python 3.7
+and newer (backported as :doc:`importlib_resources <importlib_resources:index>` for older versions of
+Python), this can eliminate the need to use the older and less efficient
+``pkg_resources`` package.
+
+By "installed package" we generally mean a third-party package installed into
+Python's ``site-packages`` directory via tools such as `pip
+<https://pypi.org/project/pip/>`_.  Specifically,
+it means a package with either a discoverable ``dist-info`` or ``egg-info``
+directory, and metadata defined by :pep:`566` or its older specifications.
+By default, package metadata can live on the file system or in zip archives on
+:data:`sys.path`.  Through an extension mechanism, the metadata can live almost
+anywhere.
+
+
+Overview
+========
+
+Let's say you wanted to get the version string for a package you've installed
+using ``pip``.  We start by creating a virtual environment and installing
+something into it::
+
+    $ python3 -m venv example
+    $ source example/bin/activate
+    (example) $ pip install importlib_metadata
+    (example) $ pip install wheel
+
+You can get the version string for ``wheel`` by running the following::
+
+    (example) $ python
+    >>> from importlib_metadata import version
+    >>> version('wheel')
+    '0.32.3'
+
+You can also get the set of entry points keyed by group, such as
+``console_scripts``, ``distutils.commands`` and others.  Each group contains a
+sequence of :ref:`EntryPoint <entry-points>` objects.
+
+You can get the :ref:`metadata for a distribution <metadata>`::
+
+    >>> list(metadata('wheel'))
+    ['Metadata-Version', 'Name', 'Version', 'Summary', 'Home-page', 'Author', 'Author-email', 'Maintainer', 'Maintainer-email', 'License', 'Project-URL', 'Project-URL', 'Project-URL', 'Keywords', 'Platform', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Requires-Python', 'Provides-Extra', 'Requires-Dist', 'Requires-Dist']
+
+You can also get a :ref:`distribution's version number <version>`, list its
+:ref:`constituent files <files>`, and get a list of the distribution's
+:ref:`requirements`.
+
+
+Functional API
+==============
+
+This package provides the following functionality via its public API.
+
+
+.. _entry-points:
+
+Entry points
+------------
+
+The ``entry_points()`` function returns a dictionary of all entry points,
+keyed by group.  Entry points are represented by ``EntryPoint`` instances;
+each ``EntryPoint`` has a ``.name``, ``.group``, and ``.value`` attributes and
+a ``.load()`` method to resolve the value.  There are also ``.module``,
+``.attr``, and ``.extras`` attributes for getting the components of the
+``.value`` attribute::
+
+    >>> eps = entry_points()
+    >>> list(eps)
+    ['console_scripts', 'distutils.commands', 'distutils.setup_keywords', 'egg_info.writers', 'setuptools.installation']
+    >>> scripts = eps['console_scripts']
+    >>> wheel = [ep for ep in scripts if ep.name == 'wheel'][0]
+    >>> wheel
+    EntryPoint(name='wheel', value='wheel.cli:main', group='console_scripts')
+    >>> wheel.module
+    'wheel.cli'
+    >>> wheel.attr
+    'main'
+    >>> wheel.extras
+    []
+    >>> main = wheel.load()
+    >>> main
+    <function main at 0x103528488>
+
+The ``group`` and ``name`` are arbitrary values defined by the package author
+and usually a client will wish to resolve all entry points for a particular
+group.  Read `the setuptools docs
+<https://setuptools.readthedocs.io/en/latest/setuptools.html#dynamic-discovery-of-services-and-plugins>`_
+for more information on entry points, their definition, and usage.
+
+
+.. _metadata:
+
+Distribution metadata
+---------------------
+
+Every distribution includes some metadata, which you can extract using the
+``metadata()`` function::
+
+    >>> wheel_metadata = metadata('wheel')
+
+The keys of the returned data structure [#f1]_ name the metadata keywords, and
+their values are returned unparsed from the distribution metadata::
+
+    >>> wheel_metadata['Requires-Python']
+    '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*'
+
+
+.. _version:
+
+Distribution versions
+---------------------
+
+The ``version()`` function is the quickest way to get a distribution's version
+number, as a string::
+
+    >>> version('wheel')
+    '0.32.3'
+
+
+.. _files:
+
+Distribution files
+------------------
+
+You can also get the full set of files contained within a distribution.  The
+``files()`` function takes a distribution package name and returns all of the
+files installed by this distribution.  Each file object returned is a
+``PackagePath``, a :class:`pathlib.Path` derived object with additional ``dist``,
+``size``, and ``hash`` properties as indicated by the metadata.  For example::
+
+    >>> util = [p for p in files('wheel') if 'util.py' in str(p)][0]
+    >>> util
+    PackagePath('wheel/util.py')
+    >>> util.size
+    859
+    >>> util.dist
+    <importlib_metadata._hooks.PathDistribution object at 0x101e0cef0>
+    >>> util.hash
+    <FileHash mode: sha256 value: bYkw5oMccfazVCoYQwKkkemoVyMAFoR34mmKBx8R1NI>
+
+Once you have the file, you can also read its contents::
+
+    >>> print(util.read_text())
+    import base64
+    import sys
+    ...
+    def as_bytes(s):
+        if isinstance(s, text_type):
+            return s.encode('utf-8')
+        return s
+
+In the case where the metadata file listing files
+(RECORD or SOURCES.txt) is missing, ``files()`` will
+return ``None``. The caller may wish to wrap calls to
+``files()`` in `always_iterable
+<https://more-itertools.readthedocs.io/en/stable/api.html#more_itertools.always_iterable>`_
+or otherwise guard against this condition if the target
+distribution is not known to have the metadata present.
+
+.. _requirements:
+
+Distribution requirements
+-------------------------
+
+To get the full set of requirements for a distribution, use the ``requires()``
+function::
+
+    >>> requires('wheel')
+    ["pytest (>=3.0.0) ; extra == 'test'", "pytest-cov ; extra == 'test'"]
+
+
+Distributions
+=============
+
+While the above API is the most common and convenient usage, you can get all
+of that information from the ``Distribution`` class.  A ``Distribution`` is an
+abstract object that represents the metadata for a Python package.  You can
+get the ``Distribution`` instance::
+
+    >>> from importlib_metadata import distribution
+    >>> dist = distribution('wheel')
+
+Thus, an alternative way to get the version number is through the
+``Distribution`` instance::
+
+    >>> dist.version
+    '0.32.3'
+
+There are all kinds of additional metadata available on the ``Distribution``
+instance::
+
+    >>> d.metadata['Requires-Python']
+    '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*'
+    >>> d.metadata['License']
+    'MIT'
+
+The full set of available metadata is not described here.  See :pep:`566`
+for additional details.
+
+
+Extending the search algorithm
+==============================
+
+Because package metadata is not available through :data:`sys.path` searches, or
+package loaders directly, the metadata for a package is found through import
+system `finders`_.  To find a distribution package's metadata,
+``importlib.metadata`` queries the list of :term:`meta path finders <meta path finder>` on
+:data:`sys.meta_path`.
+
+By default ``importlib_metadata`` installs a finder for distribution packages
+found on the file system.  This finder doesn't actually find any *packages*,
+but it can find the packages' metadata.
+
+The abstract class :py:class:`importlib.abc.MetaPathFinder` defines the
+interface expected of finders by Python's import system.
+``importlib_metadata`` extends this protocol by looking for an optional
+``find_distributions`` callable on the finders from
+:data:`sys.meta_path` and presents this extended interface as the
+``DistributionFinder`` abstract base class, which defines this abstract
+method::
+
+    @abc.abstractmethod
+    def find_distributions(context=DistributionFinder.Context()):
+        """Return an iterable of all Distribution instances capable of
+        loading the metadata for packages for the indicated ``context``.
+        """
+
+The ``DistributionFinder.Context`` object provides ``.path`` and ``.name``
+properties indicating the path to search and name to match and may
+supply other relevant context.
+
+What this means in practice is that to support finding distribution package
+metadata in locations other than the file system, subclass
+``Distribution`` and implement the abstract methods. Then from
+a custom finder, return instances of this derived ``Distribution`` in the
+``find_distributions()`` method.
+
+
+.. _`entry point API`: https://setuptools.readthedocs.io/en/latest/pkg_resources.html#entry-points
+.. _`metadata API`: https://setuptools.readthedocs.io/en/latest/pkg_resources.html#metadata-api
+.. _`finders`: https://docs.python.org/3/reference/import.html#finders-and-loaders
+
+
+.. rubric:: Footnotes
+
+.. [#f1] Technically, the returned distribution metadata object is an
+         :class:`email.message.EmailMessage`
+         instance, but this is an implementation detail, and not part of the
+         stable API.  You should only use dictionary-like methods and syntax
+         to access the metadata contents.
diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/importlib_metadata/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/importlib_metadata/__init__.py
new file mode 100644
index 00000000000..d5cbc2d03c4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/importlib_metadata/__init__.py
@@ -0,0 +1,627 @@
+from __future__ import unicode_literals, absolute_import
+
+import io
+import os
+import re
+import abc
+import csv
+import sys
+import zipp
+import operator
+import functools
+import itertools
+import posixpath
+import collections
+
+from ._compat import (
+    install,
+    NullFinder,
+    ConfigParser,
+    suppress,
+    map,
+    FileNotFoundError,
+    IsADirectoryError,
+    NotADirectoryError,
+    PermissionError,
+    pathlib,
+    ModuleNotFoundError,
+    MetaPathFinder,
+    email_message_from_string,
+    PyPy_repr,
+    unique_ordered,
+    str,
+    )
+from importlib import import_module
+from itertools import starmap
+
+
+__metaclass__ = type
+
+
+__all__ = [
+    'Distribution',
+    'DistributionFinder',
+    'PackageNotFoundError',
+    'distribution',
+    'distributions',
+    'entry_points',
+    'files',
+    'metadata',
+    'requires',
+    'version',
+    ]
+
+
+class PackageNotFoundError(ModuleNotFoundError):
+    """The package was not found."""
+
+    def __str__(self):
+        tmpl = "No package metadata was found for {self.name}"
+        return tmpl.format(**locals())
+
+    @property
+    def name(self):
+        name, = self.args
+        return name
+
+
+class EntryPoint(
+        PyPy_repr,
+        collections.namedtuple('EntryPointBase', 'name value group')):
+    """An entry point as defined by Python packaging conventions.
+
+    See `the packaging docs on entry points
+    <https://packaging.python.org/specifications/entry-points/>`_
+    for more information.
+    """
+
+    pattern = re.compile(
+        r'(?P<module>[\w.]+)\s*'
+        r'(:\s*(?P<attr>[\w.]+))?\s*'
+        r'(?P<extras>\[.*\])?\s*$'
+        )
+    """
+    A regular expression describing the syntax for an entry point,
+    which might look like:
+
+        - module
+        - package.module
+        - package.module:attribute
+        - package.module:object.attribute
+        - package.module:attr [extra1, extra2]
+
+    Other combinations are possible as well.
+
+    The expression is lenient about whitespace around the ':',
+    following the attr, and following any extras.
+    """
+
+    def load(self):
+        """Load the entry point from its definition. If only a module
+        is indicated by the value, return that module. Otherwise,
+        return the named object.
+        """
+        match = self.pattern.match(self.value)
+        module = import_module(match.group('module'))
+        attrs = filter(None, (match.group('attr') or '').split('.'))
+        return functools.reduce(getattr, attrs, module)
+
+    @property
+    def module(self):
+        match = self.pattern.match(self.value)
+        return match.group('module')
+
+    @property
+    def attr(self):
+        match = self.pattern.match(self.value)
+        return match.group('attr')
+
+    @property
+    def extras(self):
+        match = self.pattern.match(self.value)
+        return list(re.finditer(r'\w+', match.group('extras') or ''))
+
+    @classmethod
+    def _from_config(cls, config):
+        return [
+            cls(name, value, group)
+            for group in config.sections()
+            for name, value in config.items(group)
+            ]
+
+    @classmethod
+    def _from_text(cls, text):
+        config = ConfigParser(delimiters='=')
+        # case sensitive: https://stackoverflow.com/q/1611799/812183
+        config.optionxform = str
+        try:
+            config.read_string(text)
+        except AttributeError:  # pragma: nocover
+            # Python 2 has no read_string
+            config.readfp(io.StringIO(text))
+        return EntryPoint._from_config(config)
+
+    def __iter__(self):
+        """
+        Supply iter so one may construct dicts of EntryPoints easily.
+        """
+        return iter((self.name, self))
+
+    def __reduce__(self):
+        return (
+            self.__class__,
+            (self.name, self.value, self.group),
+            )
+
+
+class PackagePath(pathlib.PurePosixPath):
+    """A reference to a path in a package"""
+
+    def read_text(self, encoding='utf-8'):
+        with self.locate().open(encoding=encoding) as stream:
+            return stream.read()
+
+    def read_binary(self):
+        with self.locate().open('rb') as stream:
+            return stream.read()
+
+    def locate(self):
+        """Return a path-like object for this path"""
+        return self.dist.locate_file(self)
+
+
+class FileHash:
+    def __init__(self, spec):
+        self.mode, _, self.value = spec.partition('=')
+
+    def __repr__(self):
+        return '<FileHash mode: {} value: {}>'.format(self.mode, self.value)
+
+
+class Distribution:
+    """A Python distribution package."""
+
+    @abc.abstractmethod
+    def read_text(self, filename):
+        """Attempt to load metadata file given by the name.
+
+        :param filename: The name of the file in the distribution info.
+        :return: The text if found, otherwise None.
+        """
+
+    @abc.abstractmethod
+    def locate_file(self, path):
+        """
+        Given a path to a file in this distribution, return a path
+        to it.
+        """
+
+    @classmethod
+    def from_name(cls, name):
+        """Return the Distribution for the given package name.
+
+        :param name: The name of the distribution package to search for.
+        :return: The Distribution instance (or subclass thereof) for the named
+            package, if found.
+        :raises PackageNotFoundError: When the named package's distribution
+            metadata cannot be found.
+        """
+        for resolver in cls._discover_resolvers():
+            dists = resolver(DistributionFinder.Context(name=name))
+            dist = next(iter(dists), None)
+            if dist is not None:
+                return dist
+        else:
+            raise PackageNotFoundError(name)
+
+    @classmethod
+    def discover(cls, **kwargs):
+        """Return an iterable of Distribution objects for all packages.
+
+        Pass a ``context`` or pass keyword arguments for constructing
+        a context.
+
+        :context: A ``DistributionFinder.Context`` object.
+        :return: Iterable of Distribution objects for all packages.
+        """
+        context = kwargs.pop('context', None)
+        if context and kwargs:
+            raise ValueError("cannot accept context and kwargs")
+        context = context or DistributionFinder.Context(**kwargs)
+        return itertools.chain.from_iterable(
+            resolver(context)
+            for resolver in cls._discover_resolvers()
+            )
+
+    @staticmethod
+    def at(path):
+        """Return a Distribution for the indicated metadata path
+
+        :param path: a string or path-like object
+        :return: a concrete Distribution instance for the path
+        """
+        return PathDistribution(pathlib.Path(path))
+
+    @staticmethod
+    def _discover_resolvers():
+        """Search the meta_path for resolvers."""
+        declared = (
+            getattr(finder, 'find_distributions', None)
+            for finder in sys.meta_path
+            )
+        return filter(None, declared)
+
+    @classmethod
+    def _local(cls, root='.'):
+        from pep517 import build, meta
+        system = build.compat_system(root)
+        builder = functools.partial(
+            meta.build,
+            source_dir=root,
+            system=system,
+            )
+        return PathDistribution(zipp.Path(meta.build_as_zip(builder)))
+
+    @property
+    def metadata(self):
+        """Return the parsed metadata for this Distribution.
+
+        The returned object will have keys that name the various bits of
+        metadata.  See PEP 566 for details.
+        """
+        text = (
+            self.read_text('METADATA')
+            or self.read_text('PKG-INFO')
+            # This last clause is here to support old egg-info files.  Its
+            # effect is to just end up using the PathDistribution's self._path
+            # (which points to the egg-info file) attribute unchanged.
+            or self.read_text('')
+            )
+        return email_message_from_string(text)
+
+    @property
+    def version(self):
+        """Return the 'Version' metadata for the distribution package."""
+        return self.metadata['Version']
+
+    @property
+    def entry_points(self):
+        return EntryPoint._from_text(self.read_text('entry_points.txt'))
+
+    @property
+    def files(self):
+        """Files in this distribution.
+
+        :return: List of PackagePath for this distribution or None
+
+        Result is `None` if the metadata file that enumerates files
+        (i.e. RECORD for dist-info or SOURCES.txt for egg-info) is
+        missing.
+        Result may be empty if the metadata exists but is empty.
+        """
+        file_lines = self._read_files_distinfo() or self._read_files_egginfo()
+
+        def make_file(name, hash=None, size_str=None):
+            result = PackagePath(name)
+            result.hash = FileHash(hash) if hash else None
+            result.size = int(size_str) if size_str else None
+            result.dist = self
+            return result
+
+        return file_lines and list(starmap(make_file, csv.reader(file_lines)))
+
+    def _read_files_distinfo(self):
+        """
+        Read the lines of RECORD
+        """
+        text = self.read_text('RECORD')
+        return text and text.splitlines()
+
+    def _read_files_egginfo(self):
+        """
+        SOURCES.txt might contain literal commas, so wrap each line
+        in quotes.
+        """
+        text = self.read_text('SOURCES.txt')
+        return text and map('"{}"'.format, text.splitlines())
+
+    @property
+    def requires(self):
+        """Generated requirements specified for this Distribution"""
+        reqs = self._read_dist_info_reqs() or self._read_egg_info_reqs()
+        return reqs and list(reqs)
+
+    def _read_dist_info_reqs(self):
+        return self.metadata.get_all('Requires-Dist')
+
+    def _read_egg_info_reqs(self):
+        source = self.read_text('requires.txt')
+        return source and self._deps_from_requires_text(source)
+
+    @classmethod
+    def _deps_from_requires_text(cls, source):
+        section_pairs = cls._read_sections(source.splitlines())
+        sections = {
+            section: list(map(operator.itemgetter('line'), results))
+            for section, results in
+            itertools.groupby(section_pairs, operator.itemgetter('section'))
+            }
+        return cls._convert_egg_info_reqs_to_simple_reqs(sections)
+
+    @staticmethod
+    def _read_sections(lines):
+        section = None
+        for line in filter(None, lines):
+            section_match = re.match(r'\[(.*)\]$', line)
+            if section_match:
+                section = section_match.group(1)
+                continue
+            yield locals()
+
+    @staticmethod
+    def _convert_egg_info_reqs_to_simple_reqs(sections):
+        """
+        Historically, setuptools would solicit and store 'extra'
+        requirements, including those with environment markers,
+        in separate sections. More modern tools expect each
+        dependency to be defined separately, with any relevant
+        extras and environment markers attached directly to that
+        requirement. This method converts the former to the
+        latter. See _test_deps_from_requires_text for an example.
+        """
+        def make_condition(name):
+            return name and 'extra == "{name}"'.format(name=name)
+
+        def parse_condition(section):
+            section = section or ''
+            extra, sep, markers = section.partition(':')
+            if extra and markers:
+                markers = '({markers})'.format(markers=markers)
+            conditions = list(filter(None, [markers, make_condition(extra)]))
+            return '; ' + ' and '.join(conditions) if conditions else ''
+
+        for section, deps in sections.items():
+            for dep in deps:
+                yield dep + parse_condition(section)
+
+
+class DistributionFinder(MetaPathFinder):
+    """
+    A MetaPathFinder capable of discovering installed distributions.
+    """
+
+    class Context:
+        """
+        Keyword arguments presented by the caller to
+        ``distributions()`` or ``Distribution.discover()``
+        to narrow the scope of a search for distributions
+        in all DistributionFinders.
+
+        Each DistributionFinder may expect any parameters
+        and should attempt to honor the canonical
+        parameters defined below when appropriate.
+        """
+
+        name = None
+        """
+        Specific name for which a distribution finder should match.
+        A name of ``None`` matches all distributions.
+        """
+
+        def __init__(self, **kwargs):
+            vars(self).update(kwargs)
+
+        @property
+        def path(self):
+            """
+            The path that a distribution finder should search.
+
+            Typically refers to Python package paths and defaults
+            to ``sys.path``.
+            """
+            return vars(self).get('path', sys.path)
+
+    @abc.abstractmethod
+    def find_distributions(self, context=Context()):
+        """
+        Find distributions.
+
+        Return an iterable of all Distribution instances capable of
+        loading the metadata for packages matching the ``context``,
+        a DistributionFinder.Context instance.
+        """
+
+
+class FastPath:
+    """
+    Micro-optimized class for searching a path for
+    children.
+    """
+
+    def __init__(self, root):
+        self.root = str(root)
+        self.base = os.path.basename(self.root).lower()
+
+    def joinpath(self, child):
+        return pathlib.Path(self.root, child)
+
+    def children(self):
+        with suppress(Exception):
+            return os.listdir(self.root or '')
+        with suppress(Exception):
+            return self.zip_children()
+        return []
+
+    def zip_children(self):
+        zip_path = zipp.Path(self.root)
+        names = zip_path.root.namelist()
+        self.joinpath = zip_path.joinpath
+
+        return unique_ordered(
+            child.split(posixpath.sep, 1)[0]
+            for child in names
+            )
+
+    def is_egg(self, search):
+        base = self.base
+        return (
+            base == search.versionless_egg_name
+            or base.startswith(search.prefix)
+            and base.endswith('.egg'))
+
+    def search(self, name):
+        for child in self.children():
+            n_low = child.lower()
+            if (n_low in name.exact_matches
+                    or n_low.replace('.', '_').startswith(name.prefix)
+                    and n_low.endswith(name.suffixes)
+                    # legacy case:
+                    or self.is_egg(name) and n_low == 'egg-info'):
+                yield self.joinpath(child)
+
+
+class Prepared:
+    """
+    A prepared search for metadata on a possibly-named package.
+    """
+    normalized = ''
+    prefix = ''
+    suffixes = '.dist-info', '.egg-info'
+    exact_matches = [''][:0]
+    versionless_egg_name = ''
+
+    def __init__(self, name):
+        self.name = name
+        if name is None:
+            return
+        self.normalized = self.normalize(name)
+        self.prefix = self.normalized + '-'
+        self.exact_matches = [
+            self.normalized + suffix for suffix in self.suffixes]
+        self.versionless_egg_name = self.normalized + '.egg'
+
+    @staticmethod
+    def normalize(name):
+        """
+        PEP 503 normalization plus dashes as underscores.
+        """
+        return re.sub(r"[-_.]+", "-", name).lower().replace('-', '_')
+
+
+@install
+class MetadataPathFinder(NullFinder, DistributionFinder):
+    """A degenerate finder for distribution packages on the file system.
+
+    This finder supplies only a find_distributions() method for versions
+    of Python that do not have a PathFinder find_distributions().
+    """
+
+    def find_distributions(self, context=DistributionFinder.Context()):
+        """
+        Find distributions.
+
+        Return an iterable of all Distribution instances capable of
+        loading the metadata for packages matching ``context.name``
+        (or all names if ``None`` indicated) along the paths in the list
+        of directories ``context.path``.
+        """
+        found = self._search_paths(context.name, context.path)
+        return map(PathDistribution, found)
+
+    @classmethod
+    def _search_paths(cls, name, paths):
+        """Find metadata directories in paths heuristically."""
+        return itertools.chain.from_iterable(
+            path.search(Prepared(name))
+            for path in map(FastPath, paths)
+            )
+
+
+class PathDistribution(Distribution):
+    def __init__(self, path):
+        """Construct a distribution from a path to the metadata directory.
+
+        :param path: A pathlib.Path or similar object supporting
+                     .joinpath(), __div__, .parent, and .read_text().
+        """
+        self._path = path
+
+    def read_text(self, filename):
+        with suppress(FileNotFoundError, IsADirectoryError, KeyError,
+                      NotADirectoryError, PermissionError):
+            return self._path.joinpath(filename).read_text(encoding='utf-8')
+    read_text.__doc__ = Distribution.read_text.__doc__
+
+    def locate_file(self, path):
+        return self._path.parent / path
+
+
+def distribution(distribution_name):
+    """Get the ``Distribution`` instance for the named package.
+
+    :param distribution_name: The name of the distribution package as a string.
+    :return: A ``Distribution`` instance (or subclass thereof).
+    """
+    return Distribution.from_name(distribution_name)
+
+
+def distributions(**kwargs):
+    """Get all ``Distribution`` instances in the current environment.
+
+    :return: An iterable of ``Distribution`` instances.
+    """
+    return Distribution.discover(**kwargs)
+
+
+def metadata(distribution_name):
+    """Get the metadata for the named package.
+
+    :param distribution_name: The name of the distribution package to query.
+    :return: An email.Message containing the parsed metadata.
+    """
+    return Distribution.from_name(distribution_name).metadata
+
+
+def version(distribution_name):
+    """Get the version string for the named package.
+
+    :param distribution_name: The name of the distribution package to query.
+    :return: The version string for the package as defined in the package's
+        "Version" metadata key.
+    """
+    return distribution(distribution_name).version
+
+
+def entry_points():
+    """Return EntryPoint objects for all installed packages.
+
+    :return: EntryPoint objects for all installed packages.
+    """
+    eps = itertools.chain.from_iterable(
+        dist.entry_points for dist in distributions())
+    by_group = operator.attrgetter('group')
+    ordered = sorted(eps, key=by_group)
+    grouped = itertools.groupby(ordered, by_group)
+    return {
+        group: tuple(eps)
+        for group, eps in grouped
+        }
+
+
+def files(distribution_name):
+    """Return a list of files for the named package.
+
+    :param distribution_name: The name of the distribution package to query.
+    :return: List of files composing the distribution.
+    """
+    return distribution(distribution_name).files
+
+
+def requires(distribution_name):
+    """
+    Return a list of requirements for the named package.
+
+    :return: An iterator of requirements, suitable for
+    packaging.requirement.Requirement.
+    """
+    return distribution(distribution_name).requires
diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/importlib_metadata/_compat.py b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/importlib_metadata/_compat.py
new file mode 100644
index 00000000000..303d4a22e85
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/importlib_metadata/_compat.py
@@ -0,0 +1,152 @@
+from __future__ import absolute_import, unicode_literals
+
+import io
+import abc
+import sys
+import email
+
+
+if sys.version_info > (3,):  # pragma: nocover
+    import builtins
+    from configparser import ConfigParser
+    import contextlib
+    FileNotFoundError = builtins.FileNotFoundError
+    IsADirectoryError = builtins.IsADirectoryError
+    NotADirectoryError = builtins.NotADirectoryError
+    PermissionError = builtins.PermissionError
+    map = builtins.map
+    from itertools import filterfalse
+else:  # pragma: nocover
+    from backports.configparser import ConfigParser
+    from itertools import imap as map  # type: ignore
+    from itertools import ifilterfalse as filterfalse
+    import contextlib2 as contextlib
+    FileNotFoundError = IOError, OSError
+    IsADirectoryError = IOError, OSError
+    NotADirectoryError = IOError, OSError
+    PermissionError = IOError, OSError
+
+str = type('')
+
+suppress = contextlib.suppress
+
+if sys.version_info > (3, 5):  # pragma: nocover
+    import pathlib
+else:  # pragma: nocover
+    import pathlib2 as pathlib
+
+try:
+    ModuleNotFoundError = builtins.FileNotFoundError
+except (NameError, AttributeError):  # pragma: nocover
+    ModuleNotFoundError = ImportError  # type: ignore
+
+
+if sys.version_info >= (3,):  # pragma: nocover
+    from importlib.abc import MetaPathFinder
+else:  # pragma: nocover
+    class MetaPathFinder(object):
+        __metaclass__ = abc.ABCMeta
+
+
+__metaclass__ = type
+__all__ = [
+    'install', 'NullFinder', 'MetaPathFinder', 'ModuleNotFoundError',
+    'pathlib', 'ConfigParser', 'map', 'suppress', 'FileNotFoundError',
+    'NotADirectoryError', 'email_message_from_string',
+    ]
+
+
+def install(cls):
+    """
+    Class decorator for installation on sys.meta_path.
+
+    Adds the backport DistributionFinder to sys.meta_path and
+    attempts to disable the finder functionality of the stdlib
+    DistributionFinder.
+    """
+    sys.meta_path.append(cls())
+    disable_stdlib_finder()
+    return cls
+
+
+def disable_stdlib_finder():
+    """
+    Give the backport primacy for discovering path-based distributions
+    by monkey-patching the stdlib O_O.
+
+    See #91 for more background for rationale on this sketchy
+    behavior.
+    """
+    def matches(finder):
+        return (
+            getattr(finder, '__module__', None) == '_frozen_importlib_external'
+            and hasattr(finder, 'find_distributions')
+            )
+    for finder in filter(matches, sys.meta_path):  # pragma: nocover
+        del finder.find_distributions
+
+
+class NullFinder:
+    """
+    A "Finder" (aka "MetaClassFinder") that never finds any modules,
+    but may find distributions.
+    """
+    @staticmethod
+    def find_spec(*args, **kwargs):
+        return None
+
+    # In Python 2, the import system requires finders
+    # to have a find_module() method, but this usage
+    # is deprecated in Python 3 in favor of find_spec().
+    # For the purposes of this finder (i.e. being present
+    # on sys.meta_path but having no other import
+    # system functionality), the two methods are identical.
+    find_module = find_spec
+
+
+def py2_message_from_string(text):  # nocoverpy3
+    # Work around https://bugs.python.org/issue25545 where
+    # email.message_from_string cannot handle Unicode on Python 2.
+    io_buffer = io.StringIO(text)
+    return email.message_from_file(io_buffer)
+
+
+email_message_from_string = (
+    py2_message_from_string
+    if sys.version_info < (3,) else
+    email.message_from_string
+    )
+
+
+class PyPy_repr:
+    """
+    Override repr for EntryPoint objects on PyPy to avoid __iter__ access.
+    Ref #97, #102.
+    """
+    affected = hasattr(sys, 'pypy_version_info')
+
+    def __compat_repr__(self):  # pragma: nocover
+        def make_param(name):
+            value = getattr(self, name)
+            return '{name}={value!r}'.format(**locals())
+        params = ', '.join(map(make_param, self._fields))
+        return 'EntryPoint({params})'.format(**locals())
+
+    if affected:  # pragma: nocover
+        __repr__ = __compat_repr__
+    del affected
+
+
+# from itertools recipes
+def unique_everseen(iterable):  # pragma: nocover
+    "List unique elements, preserving order. Remember all elements ever seen."
+    seen = set()
+    seen_add = seen.add
+
+    for element in filterfalse(seen.__contains__, iterable):
+        seen_add(element)
+        yield element
+
+
+unique_ordered = (
+    unique_everseen if sys.version_info < (3, 7) else dict.fromkeys)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/prepare/example/example/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/prepare/example/example/__init__.py
new file mode 100644
index 00000000000..ba73b743394
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/prepare/example/example/__init__.py
@@ -0,0 +1,2 @@
+def main():
+    return 'example'
diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/prepare/example/setup.py b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/prepare/example/setup.py
new file mode 100644
index 00000000000..8663ad389a2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/prepare/example/setup.py
@@ -0,0 +1,10 @@
+from setuptools import setup
+setup(
+    name='example',
+    version='21.12',
+    license='Apache Software License',
+    packages=['example'],
+    entry_points={
+        'console_scripts': ['example = example:main', 'Example=example:main'],
+        },
+    )
diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/pyproject.toml b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/pyproject.toml
new file mode 100644
index 00000000000..e5c3a6a4552
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/pyproject.toml
@@ -0,0 +1,2 @@
+[build-system]
+requires = ["setuptools>=30.3", "wheel", "setuptools_scm"]
diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/setup.cfg b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/setup.cfg
new file mode 100644
index 00000000000..fa10c8d358c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/setup.cfg
@@ -0,0 +1,47 @@
+[metadata]
+name = importlib_metadata
+author = Jason R. Coombs
+author_email = jaraco@jaraco.com
+url = http://importlib-metadata.readthedocs.io/
+description = Read metadata from Python packages
+long_description = file: README.rst
+license = Apache Software License
+classifiers =
+    Development Status :: 3 - Alpha
+    Intended Audience :: Developers
+    License :: OSI Approved :: Apache Software License
+    Topic :: Software Development :: Libraries
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 2
+
+[options]
+python_requires = >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*
+setup_requires = setuptools-scm
+install_requires =
+    zipp>=0.5
+    pathlib2; python_version < '3'
+    contextlib2; python_version < '3'
+    configparser>=3.5; python_version < '3'
+packages = importlib_metadata
+
+[mypy]
+ignore_missing_imports = True
+# XXX We really should use the default `True` value here, but it causes too
+# many warnings, so for now just disable it.  E.g. a package's __spec__ is
+# defined as Optional[ModuleSpec] so we can't just blindly pull attributes off
+# of that attribute.  The real fix is to add conditionals or asserts proving
+# that package.__spec__ is not None.
+strict_optional = False
+
+[wheel]
+universal=1
+
+[options.extras_require]
+testing =
+    importlib_resources>=1.3; python_version < "3.9"
+    packaging
+    pep517
+    unittest2; python_version < "3"
+docs =
+    sphinx
+    rst.linker
diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/setup.py b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/setup.py
new file mode 100644
index 00000000000..d5d43d7c93a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/setup.py
@@ -0,0 +1,3 @@
+from setuptools import setup
+
+setup(use_scm_version=True)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/data/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/data/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/data/example-21.12-py3-none-any.whl b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/data/example-21.12-py3-none-any.whl
new file mode 100644
index 0000000000000000000000000000000000000000..641ab07f7aadd5c3ffe199b1e397b84504444994
GIT binary patch
literal 1455
zcmWIWW@Zs#U|`^2sH#5hC#89?LJ`OVVPPOntw_u*$Vt_YkI&4@EQycTE2#AL^bJ1Y
zd*;mL3tJuqF*Gf@GU?JH8`iH^x{lmwniEp0#}EKFaSqT#mVX%$)j*SW1F-_aL|r38
zJwqeCl+5B1-ORkSe0^Wn5Jwls5Xac=ja-KeL|ngr7ya2Na>+2-+_Beb<+<s<vY0D<
zJ%X?7zwXGh<8C$I^AoJ*A}_d~Up;<w)i%Q?3OS<oikb$YsZy7N_IE1mUn6zr-rRM4
zWq}ducXlqy(=I;qKYsIpb}#<AC#io^Vh>qte)Tv+?!=mXP3IU>yCSok_B-aII-Kw3
zQMDMLgF#ppkHf<~TwQ&*&wKcuy~yjWt99<o`OQHFSBxJN`JeUH_0l=1zbVMW>!gle
zr#}12zzYT!jLohYUwp!K>b(BNuR7OwHFUksp7hxiq@k(h`;^PmXM2#w3X^MRPoMX`
z>U(DOlSfQw;W@=u^`JJ;IgUWAfyY^?c_l@a@df#rc_qbqB^4#ze&^0>pF8i_tM8|G
zN=HMp?`hFmk2AU_JVQ5xdbDm>QzUHsc}LJj?qWtX3-6|I25|u`;s9b*JQkMZ7sThJ
zmZj!^Z1aYg{S@8xHoufE=rJ-dTm)h{Jcb3iI{OE?l%CmH)a1axaN%A)<C6)>u3Q2l
zE(Z%%TzIplh-=e{bsROdT|LH`74jc0G1}d-ie(BgQ)O((bmtPEAigxe^3+zD^2ZPA
z=Kj_@llnHb%pqs>={~b{JFA<IF7rt`x?90ZK<wpxm(MbXKl%hEIZgL%o5rpjP-+@r
z|Mpwa^GR$R7dSfAA~&q6pJV#F$*<mNi$>WU-FsQLpa0z(9XLnn{J!+d2H)mi39tFM
zWw~J?v;DQj2W5<}*`3O4x;giZz4dI<U(*Fr7E1-j|9LahY>BjE_o=poHl8P!xz%}R
z^2PdUhwx4OykW7N0@LpsPXda2KAh-#t~vYAon3*GEN%;5X|j5I`Pcv4f`xLoSdG>m
z=t|fwwtn6&&3ktpt-?;-J{BOG-L!7y`!yP=+rIT|ef?5o>krldZ$>5&X54uh7~Ej6
zq!C16$=S#TV9UA??F<Y{8iNo9;LOPArlIF2glXKs!~k^;hH2p3g>Dpj9zYni2#-<d
zIRf2O^n{KuRhS9415uJax{>I~9cJVf#soY@LK1&~H!B-RJsS|72YTxiGl&NO07LVy

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/data/example-21.12-py3.6.egg b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/data/example-21.12-py3.6.egg
new file mode 100644
index 0000000000000000000000000000000000000000..cdb298a19b09d360d18f72a91e9dd70d7d7f54ec
GIT binary patch
literal 1497
zcmWIWW@Zs#U|`^2c;|fF@3nF0krp8DC=d$*v8%hguBV@yzkYx>gb~~8$aTm-!1cSO
ztKNj9U1!!ka0&=sxZ<^<U#`OCmXxllYS$|br~k|K?{{zGHdrD2?9t<#C3#_om=;c~
zVE1A?>c4f@#kCS*N+<Z0`^&O_Zx)^Hu|g<j<D$HWn$P~Pop7MttNh->n7GL42YfZ!
zEk5xYo$43J*3tWY<o);jQjP=3XF^U22cS6l>Gog!X+Wp$0%DLy;7$(q4-Im54c05E
zC@DSV$kpt?<MwcGd7+I<peCzs*K38Z>s$Pc9T!_{7cXah`>i&=P4|_F+Kpf9t5RHa
za$M}sCdvd)D?c%>-)L{RYwfgc?`B2cv%3AJhgrnPA#S40>GXa36wF*N9Z0I@<Mxu%
z{&Ub8)m@X>t{X7}-NOjPvdHdANi9gtOG(X3u8hyg%*!qYIq)$P1FG&RzN!bcfw~-l
zSQ1%xYF<fEWqd(?W?l(cXSd(E^V;Xmd-m%4>7CNi(Cm9!wASN{?g`J(4WS;b8`cyF
z8-Lyrw2`}*5zU6XDV#xEK$AIuSPa>QlKg`BoYb<^9FW7jA%;CgcOSCvP!dX2W`S;T
zVp=MSkE(!4OG@)#g(A=%5EcgF)QZI1f}B+S`1s7c%#!$cy@E<_Pv77ZzGu!{zOdy{
z5JS_VE0ZoQvSIytrR&I@ra2*{dT2gSDqd(m7iiKmAO?jM!o-5g<izBR)cAOW>B$9^
zB^mj7y2fTei;|6>J$<?==a=Z>69*1_n8C<tz_^iFK>Ra9r%0Q~F|js{Hj!lsY`)J@
zQc8Oq-tYt+X9_ybF(v)e?xXXfCeDbSFnQOcg&Zk-O+Qj6gv^>bdC~kSlOkglO`kk7
zJZfQdVxm}n+M@Zh=B?wux=dbv{><r-Lh|dw11h^!%?*wDQ@jm@Z|qZ=;956JK<exd
zr8I@Y?!#*4_DfCFukx+oUcw3VB_opvGww_Y^ePxEX#`R5^bX6S=-SaU2t+dj!;;3$
z$l8&z3%Uu&kqt`9FtDW2n-R$Y*b+9nQRwL!VN@rwQRt~0-5B)5i!kOjvN0%08QlzI
zUxAV^3@mBXWJ2;4EI}h{$CjQE+M|Km5or;gx{(b4m9^-}7h%9!6axq*<^XS2Hjrix
NAT$7KoeU~=7yzVQ%1;0Q

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/fixtures.py b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/fixtures.py
new file mode 100644
index 00000000000..0d834c6580c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/fixtures.py
@@ -0,0 +1,263 @@
+from __future__ import unicode_literals
+
+import os
+import sys
+import shutil
+import tempfile
+import textwrap
+
+from .py39compat import FS_NONASCII
+
+from importlib_metadata._compat import pathlib, contextlib
+
+
+__metaclass__ = type
+
+
+@contextlib.contextmanager
+def tempdir():
+    tmpdir = tempfile.mkdtemp()
+    try:
+        yield pathlib.Path(tmpdir)
+    finally:
+        shutil.rmtree(tmpdir)
+
+
+@contextlib.contextmanager
+def save_cwd():
+    orig = os.getcwd()
+    try:
+        yield
+    finally:
+        os.chdir(orig)
+
+
+@contextlib.contextmanager
+def tempdir_as_cwd():
+    with tempdir() as tmp:
+        with save_cwd():
+            os.chdir(str(tmp))
+            yield tmp
+
+
+@contextlib.contextmanager
+def install_finder(finder):
+    sys.meta_path.append(finder)
+    try:
+        yield
+    finally:
+        sys.meta_path.remove(finder)
+
+
+class Fixtures:
+    def setUp(self):
+        self.fixtures = contextlib.ExitStack()
+        self.addCleanup(self.fixtures.close)
+
+
+class SiteDir(Fixtures):
+    def setUp(self):
+        super(SiteDir, self).setUp()
+        self.site_dir = self.fixtures.enter_context(tempdir())
+
+
+class OnSysPath(Fixtures):
+    @staticmethod
+    @contextlib.contextmanager
+    def add_sys_path(dir):
+        sys.path[:0] = [str(dir)]
+        try:
+            yield
+        finally:
+            sys.path.remove(str(dir))
+
+    def setUp(self):
+        super(OnSysPath, self).setUp()
+        self.fixtures.enter_context(self.add_sys_path(self.site_dir))
+
+
+class DistInfoPkg(OnSysPath, SiteDir):
+    files = {
+        "distinfo_pkg-1.0.0.dist-info": {
+            "METADATA": """
+                Name: distinfo-pkg
+                Author: Steven Ma
+                Version: 1.0.0
+                Requires-Dist: wheel >= 1.0
+                Requires-Dist: pytest; extra == 'test'
+                """,
+            "RECORD": "mod.py,sha256=abc,20\n",
+            "entry_points.txt": """
+                [entries]
+                main = mod:main
+                ns:sub = mod:main
+            """
+            },
+        "mod.py": """
+            def main():
+                print("hello world")
+            """,
+        }
+
+    def setUp(self):
+        super(DistInfoPkg, self).setUp()
+        build_files(DistInfoPkg.files, self.site_dir)
+
+
+class DistInfoPkgWithDot(OnSysPath, SiteDir):
+    files = {
+        "pkg_dot-1.0.0.dist-info": {
+            "METADATA": """
+                Name: pkg.dot
+                Version: 1.0.0
+                """,
+            },
+        }
+
+    def setUp(self):
+        super(DistInfoPkgWithDot, self).setUp()
+        build_files(DistInfoPkgWithDot.files, self.site_dir)
+
+
+class DistInfoPkgWithDotLegacy(OnSysPath, SiteDir):
+    files = {
+        "pkg.dot-1.0.0.dist-info": {
+            "METADATA": """
+                Name: pkg.dot
+                Version: 1.0.0
+                """,
+            },
+        }
+
+    def setUp(self):
+        super(DistInfoPkgWithDotLegacy, self).setUp()
+        build_files(DistInfoPkgWithDotLegacy.files, self.site_dir)
+
+
+class DistInfoPkgOffPath(SiteDir):
+    def setUp(self):
+        super(DistInfoPkgOffPath, self).setUp()
+        build_files(DistInfoPkg.files, self.site_dir)
+
+
+class EggInfoPkg(OnSysPath, SiteDir):
+    files = {
+        "egginfo_pkg.egg-info": {
+            "PKG-INFO": """
+                Name: egginfo-pkg
+                Author: Steven Ma
+                License: Unknown
+                Version: 1.0.0
+                Classifier: Intended Audience :: Developers
+                Classifier: Topic :: Software Development :: Libraries
+                """,
+            "SOURCES.txt": """
+                mod.py
+                egginfo_pkg.egg-info/top_level.txt
+            """,
+            "entry_points.txt": """
+                [entries]
+                main = mod:main
+            """,
+            "requires.txt": """
+                wheel >= 1.0; python_version >= "2.7"
+                [test]
+                pytest
+            """,
+            "top_level.txt": "mod\n"
+            },
+        "mod.py": """
+            def main():
+                print("hello world")
+            """,
+        }
+
+    def setUp(self):
+        super(EggInfoPkg, self).setUp()
+        build_files(EggInfoPkg.files, prefix=self.site_dir)
+
+
+class EggInfoFile(OnSysPath, SiteDir):
+    files = {
+        "egginfo_file.egg-info": """
+            Metadata-Version: 1.0
+            Name: egginfo_file
+            Version: 0.1
+            Summary: An example package
+            Home-page: www.example.com
+            Author: Eric Haffa-Vee
+            Author-email: eric@example.coms
+            License: UNKNOWN
+            Description: UNKNOWN
+            Platform: UNKNOWN
+            """,
+        }
+
+    def setUp(self):
+        super(EggInfoFile, self).setUp()
+        build_files(EggInfoFile.files, prefix=self.site_dir)
+
+
+class LocalPackage:
+    files = {
+        "setup.py": """
+            import setuptools
+            setuptools.setup(name="local-pkg", version="2.0.1")
+            """,
+        }
+
+    def setUp(self):
+        self.fixtures = contextlib.ExitStack()
+        self.addCleanup(self.fixtures.close)
+        self.fixtures.enter_context(tempdir_as_cwd())
+        build_files(self.files)
+
+
+def build_files(file_defs, prefix=pathlib.Path()):
+    """Build a set of files/directories, as described by the
+
+    file_defs dictionary.  Each key/value pair in the dictionary is
+    interpreted as a filename/contents pair.  If the contents value is a
+    dictionary, a directory is created, and the dictionary interpreted
+    as the files within it, recursively.
+
+    For example:
+
+    {"README.txt": "A README file",
+     "foo": {
+        "__init__.py": "",
+        "bar": {
+            "__init__.py": "",
+        },
+        "baz.py": "# Some code",
+     }
+    }
+    """
+    for name, contents in file_defs.items():
+        full_name = prefix / name
+        if isinstance(contents, dict):
+            full_name.mkdir()
+            build_files(contents, prefix=full_name)
+        else:
+            if isinstance(contents, bytes):
+                with full_name.open('wb') as f:
+                    f.write(contents)
+            else:
+                with full_name.open('w') as f:
+                    f.write(DALS(contents))
+
+
+class FileBuilder:
+    def unicode_filename(self):
+        return FS_NONASCII or \
+            self.skip("File system does not support non-ascii.")
+
+
+def DALS(str):
+    "Dedent and left-strip"
+    return textwrap.dedent(str).lstrip()
+
+
+class NullFinder:
+    def find_module(self, name):
+        pass
diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/py39compat.py b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/py39compat.py
new file mode 100644
index 00000000000..a175d4c355a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/py39compat.py
@@ -0,0 +1,4 @@
+try:
+    from test.support.os_helpers import FS_NONASCII
+except ImportError:
+    from test.support import FS_NONASCII  # noqa
diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/test_api.py b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/test_api.py
new file mode 100644
index 00000000000..efa97996423
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/test_api.py
@@ -0,0 +1,196 @@
+import re
+import textwrap
+
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+
+from . import fixtures
+from importlib_metadata import (
+    Distribution, PackageNotFoundError, distribution,
+    entry_points, files, metadata, requires, version,
+    )
+
+try:
+    from collections.abc import Iterator
+except ImportError:
+    from collections import Iterator  # noqa: F401
+
+try:
+    from builtins import str as text
+except ImportError:
+    from __builtin__ import unicode as text
+
+
+class APITests(
+        fixtures.EggInfoPkg,
+        fixtures.DistInfoPkg,
+        fixtures.DistInfoPkgWithDot,
+        fixtures.EggInfoFile,
+        unittest.TestCase):
+
+    version_pattern = r'\d+\.\d+(\.\d)?'
+
+    def test_retrieves_version_of_self(self):
+        pkg_version = version('egginfo-pkg')
+        assert isinstance(pkg_version, text)
+        assert re.match(self.version_pattern, pkg_version)
+
+    def test_retrieves_version_of_distinfo_pkg(self):
+        pkg_version = version('distinfo-pkg')
+        assert isinstance(pkg_version, text)
+        assert re.match(self.version_pattern, pkg_version)
+
+    def test_for_name_does_not_exist(self):
+        with self.assertRaises(PackageNotFoundError):
+            distribution('does-not-exist')
+
+    def test_name_normalization(self):
+        names = 'pkg.dot', 'pkg_dot', 'pkg-dot', 'pkg..dot', 'Pkg.Dot'
+        for name in names:
+            with self.subTest(name):
+                assert distribution(name).metadata['Name'] == 'pkg.dot'
+
+    def test_for_top_level(self):
+        self.assertEqual(
+            distribution('egginfo-pkg').read_text('top_level.txt').strip(),
+            'mod')
+
+    def test_read_text(self):
+        top_level = [
+            path for path in files('egginfo-pkg')
+            if path.name == 'top_level.txt'
+            ][0]
+        self.assertEqual(top_level.read_text(), 'mod\n')
+
+    def test_entry_points(self):
+        entries = dict(entry_points()['entries'])
+        ep = entries['main']
+        self.assertEqual(ep.value, 'mod:main')
+        self.assertEqual(ep.extras, [])
+
+    def test_metadata_for_this_package(self):
+        md = metadata('egginfo-pkg')
+        assert md['author'] == 'Steven Ma'
+        assert md['LICENSE'] == 'Unknown'
+        assert md['Name'] == 'egginfo-pkg'
+        classifiers = md.get_all('Classifier')
+        assert 'Topic :: Software Development :: Libraries' in classifiers
+
+    def test_importlib_metadata_version(self):
+        resolved = version('importlib-metadata')
+        assert re.match(self.version_pattern, resolved)
+
+    @staticmethod
+    def _test_files(files):
+        root = files[0].root
+        for file in files:
+            assert file.root == root
+            assert not file.hash or file.hash.value
+            assert not file.hash or file.hash.mode == 'sha256'
+            assert not file.size or file.size >= 0
+            assert file.locate().exists()
+            assert isinstance(file.read_binary(), bytes)
+            if file.name.endswith('.py'):
+                file.read_text()
+
+    def test_file_hash_repr(self):
+        try:
+            assertRegex = self.assertRegex
+        except AttributeError:
+            # Python 2
+            assertRegex = self.assertRegexpMatches
+
+        util = [
+            p for p in files('distinfo-pkg')
+            if p.name == 'mod.py'
+            ][0]
+        assertRegex(
+            repr(util.hash),
+            '<FileHash mode: sha256 value: .*>')
+
+    def test_files_dist_info(self):
+        self._test_files(files('distinfo-pkg'))
+
+    def test_files_egg_info(self):
+        self._test_files(files('egginfo-pkg'))
+
+    def test_version_egg_info_file(self):
+        self.assertEqual(version('egginfo-file'), '0.1')
+
+    def test_requires_egg_info_file(self):
+        requirements = requires('egginfo-file')
+        self.assertIsNone(requirements)
+
+    def test_requires_egg_info(self):
+        deps = requires('egginfo-pkg')
+        assert len(deps) == 2
+        assert any(
+            dep == 'wheel >= 1.0; python_version >= "2.7"'
+            for dep in deps
+            )
+
+    def test_requires_dist_info(self):
+        deps = requires('distinfo-pkg')
+        assert len(deps) == 2
+        assert all(deps)
+        assert 'wheel >= 1.0' in deps
+        assert "pytest; extra == 'test'" in deps
+
+    def test_more_complex_deps_requires_text(self):
+        requires = textwrap.dedent("""
+            dep1
+            dep2
+
+            [:python_version < "3"]
+            dep3
+
+            [extra1]
+            dep4
+
+            [extra2:python_version < "3"]
+            dep5
+            """)
+        deps = sorted(Distribution._deps_from_requires_text(requires))
+        expected = [
+            'dep1',
+            'dep2',
+            'dep3; python_version < "3"',
+            'dep4; extra == "extra1"',
+            'dep5; (python_version < "3") and extra == "extra2"',
+            ]
+        # It's important that the environment marker expression be
+        # wrapped in parentheses to avoid the following 'and' binding more
+        # tightly than some other part of the environment expression.
+
+        assert deps == expected
+
+
+class LegacyDots(fixtures.DistInfoPkgWithDotLegacy, unittest.TestCase):
+    def test_name_normalization(self):
+        names = 'pkg.dot', 'pkg_dot', 'pkg-dot', 'pkg..dot', 'Pkg.Dot'
+        for name in names:
+            with self.subTest(name):
+                assert distribution(name).metadata['Name'] == 'pkg.dot'
+
+
+class OffSysPathTests(fixtures.DistInfoPkgOffPath, unittest.TestCase):
+    def test_find_distributions_specified_path(self):
+        dists = Distribution.discover(path=[str(self.site_dir)])
+        assert any(
+            dist.metadata['Name'] == 'distinfo-pkg'
+            for dist in dists
+            )
+
+    def test_distribution_at_pathlib(self):
+        """Demonstrate how to load metadata direct from a directory.
+        """
+        dist_info_path = self.site_dir / 'distinfo_pkg-1.0.0.dist-info'
+        dist = Distribution.at(dist_info_path)
+        assert dist.version == '1.0.0'
+
+    def test_distribution_at_str(self):
+        dist_info_path = self.site_dir / 'distinfo_pkg-1.0.0.dist-info'
+        dist = Distribution.at(str(dist_info_path))
+        assert dist.version == '1.0.0'
diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/test_integration.py b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/test_integration.py
new file mode 100644
index 00000000000..377574c448f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/test_integration.py
@@ -0,0 +1,54 @@
+# coding: utf-8
+
+from __future__ import unicode_literals
+
+import unittest
+import packaging.requirements
+import packaging.version
+
+from . import fixtures
+from importlib_metadata import (
+    Distribution,
+    _compat,
+    version,
+    )
+
+
+class IntegrationTests(fixtures.DistInfoPkg, unittest.TestCase):
+
+    def test_package_spec_installed(self):
+        """
+        Illustrate the recommended procedure to determine if
+        a specified version of a package is installed.
+        """
+        def is_installed(package_spec):
+            req = packaging.requirements.Requirement(package_spec)
+            return version(req.name) in req.specifier
+
+        assert is_installed('distinfo-pkg==1.0')
+        assert is_installed('distinfo-pkg>=1.0,<2.0')
+        assert not is_installed('distinfo-pkg<1.0')
+
+
+class FinderTests(fixtures.Fixtures, unittest.TestCase):
+
+    def test_finder_without_module(self):
+        class ModuleFreeFinder(fixtures.NullFinder):
+            """
+            A finder without an __module__ attribute
+            """
+            def __getattribute__(self, name):
+                if name == '__module__':
+                    raise AttributeError(name)
+                return super().__getattribute__(name)
+
+        self.fixtures.enter_context(
+            fixtures.install_finder(ModuleFreeFinder()))
+        _compat.disable_stdlib_finder()
+
+
+class LocalProjectTests(fixtures.LocalPackage, unittest.TestCase):
+    def test_find_local(self):
+        dist = Distribution._local()
+        assert dist.metadata['Name'] == 'local-pkg'
+        assert dist.version == '2.0.1'
diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/test_main.py b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/test_main.py
new file mode 100644
index 00000000000..847750bc301
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/test_main.py
@@ -0,0 +1,285 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
+import re
+import json
+import pickle
+import textwrap
+import unittest
+import importlib
+import importlib_metadata
+import pyfakefs.fake_filesystem_unittest as ffs
+
+from . import fixtures
+from importlib_metadata import (
+    Distribution, EntryPoint, MetadataPathFinder,
+    PackageNotFoundError, distributions,
+    entry_points, metadata, version,
+    )
+
+try:
+    from builtins import str as text
+except ImportError:
+    from __builtin__ import unicode as text
+
+
+class BasicTests(fixtures.DistInfoPkg, unittest.TestCase):
+    version_pattern = r'\d+\.\d+(\.\d)?'
+
+    def test_retrieves_version_of_self(self):
+        dist = Distribution.from_name('distinfo-pkg')
+        assert isinstance(dist.version, text)
+        assert re.match(self.version_pattern, dist.version)
+
+    def test_for_name_does_not_exist(self):
+        with self.assertRaises(PackageNotFoundError):
+            Distribution.from_name('does-not-exist')
+
+    def test_package_not_found_mentions_metadata(self):
+        """
+        When a package is not found, that could indicate that the
+        packgae is not installed or that it is installed without
+        metadata. Ensure the exception mentions metadata to help
+        guide users toward the cause. See #124.
+        """
+        with self.assertRaises(PackageNotFoundError) as ctx:
+            Distribution.from_name('does-not-exist')
+
+        assert "metadata" in str(ctx.exception)
+
+    def test_new_style_classes(self):
+        self.assertIsInstance(Distribution, type)
+        self.assertIsInstance(MetadataPathFinder, type)
+
+
+class ImportTests(fixtures.DistInfoPkg, unittest.TestCase):
+    def test_import_nonexistent_module(self):
+        # Ensure that the MetadataPathFinder does not crash an import of a
+        # non-existent module.
+        with self.assertRaises(ImportError):
+            importlib.import_module('does_not_exist')
+
+    def test_resolve(self):
+        entries = dict(entry_points()['entries'])
+        ep = entries['main']
+        self.assertEqual(ep.load().__name__, "main")
+
+    def test_entrypoint_with_colon_in_name(self):
+        entries = dict(entry_points()['entries'])
+        ep = entries['ns:sub']
+        self.assertEqual(ep.value, 'mod:main')
+
+    def test_resolve_without_attr(self):
+        ep = EntryPoint(
+            name='ep',
+            value='importlib_metadata',
+            group='grp',
+            )
+        assert ep.load() is importlib_metadata
+
+
+class NameNormalizationTests(
+        fixtures.OnSysPath, fixtures.SiteDir, unittest.TestCase):
+    @staticmethod
+    def pkg_with_dashes(site_dir):
+        """
+        Create minimal metadata for a package with dashes
+        in the name (and thus underscores in the filename).
+        """
+        metadata_dir = site_dir / 'my_pkg.dist-info'
+        metadata_dir.mkdir()
+        metadata = metadata_dir / 'METADATA'
+        with metadata.open('w') as strm:
+            strm.write('Version: 1.0\n')
+        return 'my-pkg'
+
+    def test_dashes_in_dist_name_found_as_underscores(self):
+        """
+        For a package with a dash in the name, the dist-info metadata
+        uses underscores in the name. Ensure the metadata loads.
+        """
+        pkg_name = self.pkg_with_dashes(self.site_dir)
+        assert version(pkg_name) == '1.0'
+
+    @staticmethod
+    def pkg_with_mixed_case(site_dir):
+        """
+        Create minimal metadata for a package with mixed case
+        in the name.
+        """
+        metadata_dir = site_dir / 'CherryPy.dist-info'
+        metadata_dir.mkdir()
+        metadata = metadata_dir / 'METADATA'
+        with metadata.open('w') as strm:
+            strm.write('Version: 1.0\n')
+        return 'CherryPy'
+
+    def test_dist_name_found_as_any_case(self):
+        """
+        Ensure the metadata loads when queried with any case.
+        """
+        pkg_name = self.pkg_with_mixed_case(self.site_dir)
+        assert version(pkg_name) == '1.0'
+        assert version(pkg_name.lower()) == '1.0'
+        assert version(pkg_name.upper()) == '1.0'
+
+
+class NonASCIITests(fixtures.OnSysPath, fixtures.SiteDir, unittest.TestCase):
+    @staticmethod
+    def pkg_with_non_ascii_description(site_dir):
+        """
+        Create minimal metadata for a package with non-ASCII in
+        the description.
+        """
+        metadata_dir = site_dir / 'portend.dist-info'
+        metadata_dir.mkdir()
+        metadata = metadata_dir / 'METADATA'
+        with metadata.open('w', encoding='utf-8') as fp:
+            fp.write('Description: pôrˈtend\n')
+        return 'portend'
+
+    @staticmethod
+    def pkg_with_non_ascii_description_egg_info(site_dir):
+        """
+        Create minimal metadata for an egg-info package with
+        non-ASCII in the description.
+        """
+        metadata_dir = site_dir / 'portend.dist-info'
+        metadata_dir.mkdir()
+        metadata = metadata_dir / 'METADATA'
+        with metadata.open('w', encoding='utf-8') as fp:
+            fp.write(textwrap.dedent("""
+                Name: portend
+
+                pôrˈtend
+                """).lstrip())
+        return 'portend'
+
+    def test_metadata_loads(self):
+        pkg_name = self.pkg_with_non_ascii_description(self.site_dir)
+        meta = metadata(pkg_name)
+        assert meta['Description'] == 'pôrˈtend'
+
+    def test_metadata_loads_egg_info(self):
+        pkg_name = self.pkg_with_non_ascii_description_egg_info(self.site_dir)
+        meta = metadata(pkg_name)
+        assert meta.get_payload() == 'pôrˈtend\n'
+
+
+class DiscoveryTests(fixtures.EggInfoPkg,
+                     fixtures.DistInfoPkg,
+                     unittest.TestCase):
+
+    def test_package_discovery(self):
+        dists = list(distributions())
+        assert all(
+            isinstance(dist, Distribution)
+            for dist in dists
+            )
+        assert any(
+            dist.metadata['Name'] == 'egginfo-pkg'
+            for dist in dists
+            )
+        assert any(
+            dist.metadata['Name'] == 'distinfo-pkg'
+            for dist in dists
+            )
+
+    def test_invalid_usage(self):
+        with self.assertRaises(ValueError):
+            list(distributions(context='something', name='else'))
+
+
+class DirectoryTest(fixtures.OnSysPath, fixtures.SiteDir, unittest.TestCase):
+    def test_egg_info(self):
+        # make an `EGG-INFO` directory that's unrelated
+        self.site_dir.joinpath('EGG-INFO').mkdir()
+        # used to crash with `IsADirectoryError`
+        with self.assertRaises(PackageNotFoundError):
+            version('unknown-package')
+
+    def test_egg(self):
+        egg = self.site_dir.joinpath('foo-3.6.egg')
+        egg.mkdir()
+        with self.add_sys_path(egg):
+            with self.assertRaises(PackageNotFoundError):
+                version('foo')
+
+
+class MissingSysPath(fixtures.OnSysPath, unittest.TestCase):
+    site_dir = '/does-not-exist'
+
+    def test_discovery(self):
+        """
+        Discovering distributions should succeed even if
+        there is an invalid path on sys.path.
+        """
+        importlib_metadata.distributions()
+
+
+class InaccessibleSysPath(fixtures.OnSysPath, ffs.TestCase):
+    site_dir = '/access-denied'
+
+    def setUp(self):
+        super(InaccessibleSysPath, self).setUp()
+        self.setUpPyfakefs()
+        self.fs.create_dir(self.site_dir, perm_bits=000)
+
+    def test_discovery(self):
+        """
+        Discovering distributions should succeed even if
+        there is an invalid path on sys.path.
+        """
+        list(importlib_metadata.distributions())
+
+
+class TestEntryPoints(unittest.TestCase):
+    def __init__(self, *args):
+        super(TestEntryPoints, self).__init__(*args)
+        self.ep = importlib_metadata.EntryPoint('name', 'value', 'group')
+
+    def test_entry_point_pickleable(self):
+        revived = pickle.loads(pickle.dumps(self.ep))
+        assert revived == self.ep
+
+    def test_immutable(self):
+        """EntryPoints should be immutable"""
+        with self.assertRaises(AttributeError):
+            self.ep.name = 'badactor'
+
+    def test_repr(self):
+        assert 'EntryPoint' in repr(self.ep)
+        assert 'name=' in repr(self.ep)
+        assert "'name'" in repr(self.ep)
+
+    def test_hashable(self):
+        """EntryPoints should be hashable"""
+        hash(self.ep)
+
+    def test_json_dump(self):
+        """
+        json should not expect to be able to dump an EntryPoint
+        """
+        with self.assertRaises(Exception):
+            json.dumps(self.ep)
+
+    def test_module(self):
+        assert self.ep.module == 'value'
+
+    def test_attr(self):
+        assert self.ep.attr is None
+
+
+class FileSystem(
+        fixtures.OnSysPath, fixtures.SiteDir, fixtures.FileBuilder,
+        unittest.TestCase):
+    def test_unicode_dir_on_sys_path(self):
+        """
+        Ensure a Unicode subdirectory of a directory on sys.path
+        does not crash.
+        """
+        fixtures.build_files(
+            {self.unicode_filename(): {}},
+            prefix=self.site_dir,
+            )
+        list(distributions())
diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/test_zip.py b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/test_zip.py
new file mode 100644
index 00000000000..5cebcd02f7a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/test_zip.py
@@ -0,0 +1,80 @@
+import sys
+import unittest
+
+from importlib_metadata import (
+    distribution, entry_points, files, PackageNotFoundError,
+    version, distributions,
+    )
+
+try:
+    from importlib import resources
+    getattr(resources, 'files')
+    getattr(resources, 'as_file')
+except (ImportError, AttributeError):
+    import importlib_resources as resources
+
+try:
+    from contextlib import ExitStack
+except ImportError:
+    from contextlib2 import ExitStack
+
+
+class TestZip(unittest.TestCase):
+    root = 'tests.data'
+
+    def _fixture_on_path(self, filename):
+        pkg_file = resources.files(self.root).joinpath(filename)
+        file = self.resources.enter_context(resources.as_file(pkg_file))
+        assert file.name.startswith('example-'), file.name
+        sys.path.insert(0, str(file))
+        self.resources.callback(sys.path.pop, 0)
+
+    def setUp(self):
+        # Find the path to the example-*.whl so we can add it to the front of
+        # sys.path, where we'll then try to find the metadata thereof.
+        self.resources = ExitStack()
+        self.addCleanup(self.resources.close)
+        self._fixture_on_path('example-21.12-py3-none-any.whl')
+
+    def test_zip_version(self):
+        self.assertEqual(version('example'), '21.12')
+
+    def test_zip_version_does_not_match(self):
+        with self.assertRaises(PackageNotFoundError):
+            version('definitely-not-installed')
+
+    def test_zip_entry_points(self):
+        scripts = dict(entry_points()['console_scripts'])
+        entry_point = scripts['example']
+        self.assertEqual(entry_point.value, 'example:main')
+        entry_point = scripts['Example']
+        self.assertEqual(entry_point.value, 'example:main')
+
+    def test_missing_metadata(self):
+        self.assertIsNone(distribution('example').read_text('does not exist'))
+
+    def test_case_insensitive(self):
+        self.assertEqual(version('Example'), '21.12')
+
+    def test_files(self):
+        for file in files('example'):
+            path = str(file.dist.locate_file(file))
+            assert '.whl/' in path, path
+
+    def test_one_distribution(self):
+        dists = list(distributions(path=sys.path[:1]))
+        assert len(dists) == 1
+
+
+class TestEgg(TestZip):
+    def setUp(self):
+        # Find the path to the example-*.egg so we can add it to the front of
+        # sys.path, where we'll then try to find the metadata thereof.
+        self.resources = ExitStack()
+        self.addCleanup(self.resources.close)
+        self._fixture_on_path('example-21.12-py3.6.egg')
+
+    def test_files(self):
+        for file in files('example'):
+            path = str(file.dist.locate_file(file))
+            assert '.egg/' in path, path
diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tox.ini b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tox.ini
new file mode 100644
index 00000000000..1f0e9757837
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tox.ini
@@ -0,0 +1,97 @@
+[tox]
+envlist = {py27,py35,py36,py37,py38}{,-cov,-diffcov},qa,docs,perf
+skip_missing_interpreters = True
+minversion = 3.2
+# Ensure that a late version of pip is used even on tox-venv.
+requires =
+    tox-pip-version>=0.0.6
+
+[testenv]
+pip_version = pip
+commands =
+    !cov,!diffcov: python -m unittest discover {posargs}
+    cov,diffcov: python -m coverage run {[coverage]rc} -m unittest discover {posargs}
+    cov,diffcov: python -m coverage combine {[coverage]rc}
+    cov: python -m coverage html {[coverage]rc}
+    cov: python -m coverage xml {[coverage]rc}
+    cov: python -m coverage report -m {[coverage]rc} --fail-under=100
+    diffcov: python -m coverage xml {[coverage]rc}
+    diffcov: diff-cover coverage.xml --html-report diffcov.html
+    diffcov: diff-cover coverage.xml --fail-under=100
+usedevelop = True
+passenv =
+    PYTHON*
+    LANG*
+    LC_*
+    PYV
+deps =
+    cov,diffcov: coverage>=4.5
+    diffcov: diff_cover
+    pyfakefs
+setenv =
+    cov: COVERAGE_PROCESS_START={[coverage]rcfile}
+    cov: COVERAGE_OPTIONS="-p"
+    cov: COVERAGE_FILE={toxinidir}/.coverage
+    py27: PYV=2
+    py35,py36,py37,py38: PYV=3
+    # workaround deprecation warnings in pip's vendored packages
+    PYTHONWARNINGS=ignore:Using or importing the ABCs:DeprecationWarning:pip._vendor
+extras =
+    testing
+
+
+[testenv:qa]
+basepython = python3.7
+commands =
+    python -m flake8 importlib_metadata
+    mypy importlib_metadata
+deps =
+    mypy
+    flake8
+    flufl.flake8
+extras =
+
+
+[testenv:docs]
+basepython = python3
+commands =
+    sphinx-build docs build/sphinx/html
+extras =
+    docs
+
+
+[testenv:perf]
+use_develop = False
+deps =
+    ipython
+commands =
+    python -m timeit -s 'import importlib_metadata' -- 'importlib_metadata.distribution("ipython")'
+
+
+[testenv:release]
+basepython = python3
+deps =
+    twine
+    wheel
+    setuptools
+    keyring
+    setuptools_scm
+passenv =
+    TWINE_PASSWORD
+setenv =
+    TWINE_USERNAME = {env:TWINE_USERNAME:__token__}
+commands =
+    python setup.py sdist bdist_wheel
+    python -m twine {posargs} upload dist/*
+
+
+[coverage]
+rcfile = {toxinidir}/coverage.ini
+rc = --rcfile="{[coverage]rcfile}"
+
+
+[flake8]
+hang-closing = True
+jobs = 1
+max-line-length = 79
+enable-extensions = U4
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/.coveragerc b/tests/wpt/web-platform-tests/tools/third_party/packaging/.coveragerc
new file mode 100644
index 00000000000..da205e5a149
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/.coveragerc
@@ -0,0 +1,9 @@
+[run]
+branch = True
+omit = packaging/_compat.py
+
+[report]
+exclude_lines =
+    pragma: no cover
+    @abc.abstractmethod
+    @abc.abstractproperty
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/.flake8 b/tests/wpt/web-platform-tests/tools/third_party/packaging/.flake8
new file mode 100644
index 00000000000..b5a35be92af
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/.flake8
@@ -0,0 +1,3 @@
+[flake8]
+max-line-length = 88
+ignore = E203,W503,W504
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/.github/workflows/docs.yml b/tests/wpt/web-platform-tests/tools/third_party/packaging/.github/workflows/docs.yml
new file mode 100644
index 00000000000..2c157387790
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/.github/workflows/docs.yml
@@ -0,0 +1,30 @@
+name: Documentation
+
+on:
+  pull_request:
+    paths:
+      - 'docs/**'
+  push:
+    paths:
+      - 'docs/**'
+
+jobs:
+  docs:
+    name: nox -s docs
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - uses: actions/setup-python@v2
+      name: Install Python
+      with:
+        python-version: '3.9'
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install --upgrade nox
+
+    - name: Build documentation
+      run: python -m nox -s docs
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/.github/workflows/lint.yml b/tests/wpt/web-platform-tests/tools/third_party/packaging/.github/workflows/lint.yml
new file mode 100644
index 00000000000..d03f16fd681
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/.github/workflows/lint.yml
@@ -0,0 +1,59 @@
+name: Linting
+
+on:
+  pull_request:
+    paths:
+      - "**.py"
+  push:
+    paths:
+      - "**.py"
+
+jobs:
+  lint:
+    name: nox -s lint
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+
+      - uses: actions/setup-python@v2
+        name: Install Python
+        with:
+          python-version: "3.9"
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install --upgrade nox
+
+      - name: Run `nox -s lint`
+        run: python -m nox -s lint
+
+  build:
+    name: Build sdist and wheel
+    runs-on: ubuntu-latest
+    # Linting verifies that the project is in an acceptable state to create files
+    # for releasing.
+    # And this action should be run whenever a release is ready to go public as
+    # the version number will be changed by editing __about__.py.
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+
+      - uses: actions/setup-python@v2
+        name: Install Python
+        with:
+          python-version: "3.9"
+
+      - name: Install dependencies
+        run: python -m pip install --upgrade build
+
+      - name: Build
+        run: python -m build
+
+      - name: Archive files
+        uses: actions/upload-artifact@v1
+        with:
+          name: dist
+          path: dist
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/.github/workflows/test.yml b/tests/wpt/web-platform-tests/tools/third_party/packaging/.github/workflows/test.yml
new file mode 100644
index 00000000000..180310716e6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/.github/workflows/test.yml
@@ -0,0 +1,75 @@
+name: Test
+
+on:
+  pull_request:
+    paths:
+      - ".github/workflows/test.yml"
+      - "**.py"
+  push:
+    paths:
+      - ".github/workflows/test.yml"
+      - "**.py"
+
+jobs:
+  test:
+    name: ${{ matrix.os }} / ${{ matrix.python_version }}
+    runs-on: ${{ matrix.os }}-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [Ubuntu, Windows, macOS]
+        # Python 3.4 is not available from actions/setup-python@v2.
+        python_version:
+          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "pypy2", "pypy3"]
+        exclude:
+          # This is failing due to pip not being in the virtual environment.
+          # https://github.com/pypa/packaging/runs/424785871#step:7:9
+          - os: windows
+            python_version: pypy3
+
+    steps:
+      - uses: actions/checkout@v1
+
+      - uses: actions/setup-python@v2
+        name: Install Python ${{ matrix.python_version }}
+        with:
+          python-version: ${{ matrix.python_version }}
+
+      # Set `python` to a recent 3.x version if we're not testing Python 3.6+.
+      #    Why? Nox needs Python 3.5+ and everyone likes f-strings.
+      - uses: actions/setup-python@v2
+        name: Install Python 3.x
+        with:
+          python-version: 3.x
+        if: >
+          (
+            matrix.python_version == '2.7' ||
+            matrix.python_version == 'pypy2' ||
+            matrix.python_version == '3.5'
+          )
+
+      # Workaround https://github.com/theacodes/nox/issues/250
+      - name: Workaround for Windows Python 2.7
+        # This is in PATH, so nox resolves to it - but then subsequent steps fail.
+        run: rm C:/ProgramData/Chocolatey/bin/python2.7.exe
+        shell: bash
+        if: runner.os == 'Windows' && matrix.python_version == '2.7'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install nox
+        shell: bash
+
+      - name: Run nox
+        run: |
+          python -m nox --error-on-missing-interpreters -s tests-${{ matrix.python_version }}
+        shell: bash
+        if: matrix.python_version != 'pypy2'
+
+      # Binary is named 'pypy', but setup-python specifies it as 'pypy2'.
+      - name: Run nox for pypy2
+        run: |
+          python -m nox --error-on-missing-interpreters -s tests-pypy
+        shell: bash
+        if: matrix.python_version == 'pypy2'
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/.gitignore b/tests/wpt/web-platform-tests/tools/third_party/packaging/.gitignore
new file mode 100644
index 00000000000..05e554a64c2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/.gitignore
@@ -0,0 +1,18 @@
+*.egg-info/
+*.egg
+*.py[co]
+
+.[nt]ox/
+.cache/
+.coverage
+.idea
+.venv*
+.vscode/
+
+.mypy_cache/
+.pytest_cache/
+__pycache__/
+_build/
+build/
+dist/
+htmlcov/
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/.pre-commit-config.yaml b/tests/wpt/web-platform-tests/tools/third_party/packaging/.pre-commit-config.yaml
new file mode 100644
index 00000000000..ec7765edd10
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/.pre-commit-config.yaml
@@ -0,0 +1,32 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.3.0
+    hooks:
+      - id: check-toml
+      - id: check-yaml
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v0.790
+    hooks:
+      - id: mypy
+        exclude: '^(docs|tasks|tests)|setup\.py'
+        args: []
+      - id: mypy
+        name: mypy for Python 2
+        exclude: '^(docs|tasks|tests)|setup\.py|noxfile\.py'
+        args: ["--py2"]
+
+  - repo: https://github.com/psf/black
+    rev: 19.3b0
+    hooks:
+      - id: black
+
+  - repo: https://gitlab.com/PyCQA/flake8
+    rev: "3.7.8"
+    hooks:
+      - id: flake8
+        additional_dependencies: ["pep8-naming"]
+        # Ignore all format-related checks as Black takes care of those.
+        args: ["--ignore", "E2,W5", "--select", "E,W,F,N"]
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/.readthedocs.yml b/tests/wpt/web-platform-tests/tools/third_party/packaging/.readthedocs.yml
new file mode 100644
index 00000000000..d8ac2166879
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/.readthedocs.yml
@@ -0,0 +1,15 @@
+version: 2
+
+build:
+  image: latest
+
+formats: [pdf]
+sphinx:
+  configuration: docs/conf.py
+
+python:
+  version: 3.8
+  install:
+    - requirements: docs/requirements.txt
+    - method: pip
+      path: .
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/.travis.yml b/tests/wpt/web-platform-tests/tools/third_party/packaging/.travis.yml
new file mode 100644
index 00000000000..7f0973ae2c1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/.travis.yml
@@ -0,0 +1,42 @@
+language: python
+cache: pip
+python: 3.8
+
+matrix:
+  include:
+    - python: 2.7
+      env: NOXSESSION=tests-2.7
+    - python: pypy
+      env: NOXSESSION=tests-pypy
+    - python: pypy3
+      env: NOXSESSION=tests-pypy3
+    - python: 3.4
+      env: NOXSESSION=tests-3.4
+    - python: 3.5
+      env: NOXSESSION=tests-3.5
+    - python: 3.6
+      env: NOXSESSION=tests-3.6
+    - python: 3.7
+      env: NOXSESSION=tests-3.7
+    - python: 3.8
+      env: NOXSESSION=tests-3.8
+    - env: NOXSESSION=lint
+    - env: NOXSESSION=docs
+
+install:
+  - pyenv global 3.7.1
+  - python3.7 -m pip install nox
+
+script:
+  - python3.7 -m nox
+
+notifications:
+  irc:
+    channels:
+      # This is set to a secure variable to prevent forks from notifying the
+      # IRC channel whenever they fail a build. This can be removed when travis
+      # implements https://github.com/travis-ci/travis-ci/issues/1094.
+      # The actual value here is: irc.freenode.org#pypa-dev
+      - secure: "Br6aYBYkjL17fBZ6+AczCkaBMWQAY6To8IH4zqhHrORXAWq4zeuC4VyCZ4MXmDzk0WbA3h3Ea7u9kodUf1sVK1h0q7HX66p8qmFyTncQoLFgo2LF/x1aU1FGWKDDSX5K6qKOzUKrHUhQyVq+uAuRVUm7bJhJL0/viPwEoh+bONo="
+    use_notice: true
+    skip_join: true
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/CHANGELOG.rst b/tests/wpt/web-platform-tests/tools/third_party/packaging/CHANGELOG.rst
new file mode 100644
index 00000000000..8b275b06460
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/CHANGELOG.rst
@@ -0,0 +1,295 @@
+Changelog
+---------
+
+20.7 - 2020-11-28
+~~~~~~~~~~~~~~~~~
+
+No unreleased changes.
+
+20.6 - 2020-11-28
+~~~~~~~~~~~~~~~~~
+
+* Fix flit configuration, to include LICENSE files (:issue:`357`)
+
+20.5 - 2020-11-27
+~~~~~~~~~~~~~~~~~
+
+* Officially support Python 3.9 (:issue:`343`)
+* Deprecate the ``LegacyVersion`` and ``LegacySpecifier`` classes (:issue:`321`)
+* Handle ``OSError`` on non-dynamic executables when attempting to resolve
+  the glibc version string.
+
+20.4 - 2020-05-19
+~~~~~~~~~~~~~~~~~
+
+* Canonicalize version before comparing specifiers. (:issue:`282`)
+* Change type hint for ``canonicalize_name`` to return
+  ``packaging.utils.NormalizedName``.
+  This enables the use of static typing tools (like mypy) to detect mixing of
+  normalized and un-normalized names.
+
+20.3 - 2020-03-05
+~~~~~~~~~~~~~~~~~
+
+* Fix changelog for 20.2.
+
+20.2 - 2020-03-05
+~~~~~~~~~~~~~~~~~
+
+* Fix a bug that caused a 32-bit OS that runs on a 64-bit ARM CPU (e.g. ARM-v8,
+  aarch64), to report the wrong bitness.
+
+20.1 - 2020-01-24
+~~~~~~~~~~~~~~~~~~~
+
+* Fix a bug caused by reuse of an exhausted iterator. (:issue:`257`)
+
+20.0 - 2020-01-06
+~~~~~~~~~~~~~~~~~
+
+* Add type hints (:issue:`191`)
+
+* Add proper trove classifiers for PyPy support (:issue:`198`)
+
+* Scale back depending on ``ctypes`` for manylinux support detection (:issue:`171`)
+
+* Use ``sys.implementation.name`` where appropriate for ``packaging.tags`` (:issue:`193`)
+
+* Expand upon the API provded by ``packaging.tags``: ``interpreter_name()``, ``mac_platforms()``, ``compatible_tags()``, ``cpython_tags()``, ``generic_tags()`` (:issue:`187`)
+
+* Officially support Python 3.8 (:issue:`232`)
+
+* Add ``major``, ``minor``, and ``micro`` aliases to ``packaging.version.Version`` (:issue:`226`)
+
+* Properly mark ``packaging`` has being fully typed by adding a `py.typed` file (:issue:`226`)
+
+19.2 - 2019-09-18
+~~~~~~~~~~~~~~~~~
+
+* Remove dependency on ``attrs`` (:issue:`178`, :issue:`179`)
+
+* Use appropriate fallbacks for CPython ABI tag (:issue:`181`, :issue:`185`)
+
+* Add manylinux2014 support (:issue:`186`)
+
+* Improve ABI detection (:issue:`181`)
+
+* Properly handle debug wheels for Python 3.8 (:issue:`172`)
+
+* Improve detection of debug builds on Windows (:issue:`194`)
+
+19.1 - 2019-07-30
+~~~~~~~~~~~~~~~~~
+
+* Add the ``packaging.tags`` module. (:issue:`156`)
+
+* Correctly handle two-digit versions in ``python_version`` (:issue:`119`)
+
+
+19.0 - 2019-01-20
+~~~~~~~~~~~~~~~~~
+
+* Fix string representation of PEP 508 direct URL requirements with markers.
+
+* Better handling of file URLs
+
+  This allows for using ``file:///absolute/path``, which was previously
+  prevented due to the missing ``netloc``.
+
+  This allows for all file URLs that ``urlunparse`` turns back into the
+  original URL to be valid.
+
+
+18.0 - 2018-09-26
+~~~~~~~~~~~~~~~~~
+
+* Improve error messages when invalid requirements are given. (:issue:`129`)
+
+
+17.1 - 2017-02-28
+~~~~~~~~~~~~~~~~~
+
+* Fix ``utils.canonicalize_version`` when supplying non PEP 440 versions.
+
+
+17.0 - 2017-02-28
+~~~~~~~~~~~~~~~~~
+
+* Drop support for python 2.6, 3.2, and 3.3.
+
+* Define minimal pyparsing version to 2.0.2 (:issue:`91`).
+
+* Add ``epoch``, ``release``, ``pre``, ``dev``, and ``post`` attributes to
+  ``Version`` and ``LegacyVersion`` (:issue:`34`).
+
+* Add ``Version().is_devrelease`` and ``LegacyVersion().is_devrelease`` to
+  make it easy to determine if a release is a development release.
+
+* Add ``utils.canonicalize_version`` to canonicalize version strings or
+  ``Version`` instances (:issue:`121`).
+
+
+16.8 - 2016-10-29
+~~~~~~~~~~~~~~~~~
+
+* Fix markers that utilize ``in`` so that they render correctly.
+
+* Fix an erroneous test on Python RC releases.
+
+
+16.7 - 2016-04-23
+~~~~~~~~~~~~~~~~~
+
+* Add support for the deprecated ``python_implementation`` marker which was
+  an undocumented setuptools marker in addition to the newer markers.
+
+
+16.6 - 2016-03-29
+~~~~~~~~~~~~~~~~~
+
+* Add support for the deprecated, PEP 345 environment markers in addition to
+  the newer markers.
+
+
+16.5 - 2016-02-26
+~~~~~~~~~~~~~~~~~
+
+* Fix a regression in parsing requirements with whitespaces between the comma
+  separators.
+
+
+16.4 - 2016-02-22
+~~~~~~~~~~~~~~~~~
+
+* Fix a regression in parsing requirements like ``foo (==4)``.
+
+
+16.3 - 2016-02-21
+~~~~~~~~~~~~~~~~~
+
+* Fix a bug where ``packaging.requirements:Requirement`` was overly strict when
+  matching legacy requirements.
+
+
+16.2 - 2016-02-09
+~~~~~~~~~~~~~~~~~
+
+* Add a function that implements the name canonicalization from PEP 503.
+
+
+16.1 - 2016-02-07
+~~~~~~~~~~~~~~~~~
+
+* Implement requirement specifiers from PEP 508.
+
+
+16.0 - 2016-01-19
+~~~~~~~~~~~~~~~~~
+
+* Relicense so that packaging is available under *either* the Apache License,
+  Version 2.0 or a 2 Clause BSD license.
+
+* Support installation of packaging when only distutils is available.
+
+* Fix ``==`` comparison when there is a prefix and a local version in play.
+  (:issue:`41`).
+
+* Implement environment markers from PEP 508.
+
+
+15.3 - 2015-08-01
+~~~~~~~~~~~~~~~~~
+
+* Normalize post-release spellings for rev/r prefixes. :issue:`35`
+
+
+15.2 - 2015-05-13
+~~~~~~~~~~~~~~~~~
+
+* Fix an error where the arbitary specifier (``===``) was not correctly
+  allowing pre-releases when it was being used.
+
+* Expose the specifier and version parts through properties on the
+  ``Specifier`` classes.
+
+* Allow iterating over the ``SpecifierSet`` to get access to all of the
+  ``Specifier`` instances.
+
+* Allow testing if a version is contained within a specifier via the ``in``
+  operator.
+
+
+15.1 - 2015-04-13
+~~~~~~~~~~~~~~~~~
+
+* Fix a logic error that was causing inconsistent answers about whether or not
+  a pre-release was contained within a ``SpecifierSet`` or not.
+
+
+15.0 - 2015-01-02
+~~~~~~~~~~~~~~~~~
+
+* Add ``Version().is_postrelease`` and ``LegacyVersion().is_postrelease`` to
+  make it easy to determine if a release is a post release.
+
+* Add ``Version().base_version`` and ``LegacyVersion().base_version`` to make
+  it easy to get the public version without any pre or post release markers.
+
+* Support the update to PEP 440 which removed the implied ``!=V.*`` when using
+  either ``>V`` or ``<V`` and which instead special cased the handling of
+  pre-releases, post-releases, and local versions when using ``>V`` or ``<V``.
+
+
+14.5 - 2014-12-17
+~~~~~~~~~~~~~~~~~
+
+* Normalize release candidates as ``rc`` instead of ``c``.
+
+* Expose the ``VERSION_PATTERN`` constant, a regular expression matching
+  a valid version.
+
+
+14.4 - 2014-12-15
+~~~~~~~~~~~~~~~~~
+
+* Ensure that versions are normalized before comparison when used in a
+  specifier with a less than (``<``) or greater than (``>``) operator.
+
+
+14.3 - 2014-11-19
+~~~~~~~~~~~~~~~~~
+
+* **BACKWARDS INCOMPATIBLE** Refactor specifier support so that it can sanely
+  handle legacy specifiers as well as PEP 440 specifiers.
+
+* **BACKWARDS INCOMPATIBLE** Move the specifier support out of
+  ``packaging.version`` into ``packaging.specifiers``.
+
+
+14.2 - 2014-09-10
+~~~~~~~~~~~~~~~~~
+
+* Add prerelease support to ``Specifier``.
+* Remove the ability to do ``item in Specifier()`` and replace it with
+  ``Specifier().contains(item)`` in order to allow flags that signal if a
+  prerelease should be accepted or not.
+* Add a method ``Specifier().filter()`` which will take an iterable and returns
+  an iterable with items that do not match the specifier filtered out.
+
+
+14.1 - 2014-09-08
+~~~~~~~~~~~~~~~~~
+
+* Allow ``LegacyVersion`` and ``Version`` to be sorted together.
+* Add ``packaging.version.parse()`` to enable easily parsing a version string
+  as either a ``Version`` or a ``LegacyVersion`` depending on it's PEP 440
+  validity.
+
+
+14.0 - 2014-09-05
+~~~~~~~~~~~~~~~~~
+
+* Initial release.
+
+
+.. _`master`: https://github.com/pypa/packaging/
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/CONTRIBUTING.rst b/tests/wpt/web-platform-tests/tools/third_party/packaging/CONTRIBUTING.rst
new file mode 100644
index 00000000000..d9d70ec047a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/CONTRIBUTING.rst
@@ -0,0 +1,23 @@
+Contributing to packaging
+=========================
+
+As an open source project, packaging welcomes contributions of many forms.
+
+Examples of contributions include:
+
+* Code patches
+* Documentation improvements
+* Bug reports and patch reviews
+
+Extensive contribution guidelines are available in the repository at
+``docs/development/index.rst``, or online at:
+
+https://packaging.pypa.io/en/latest/development/
+
+Security issues
+---------------
+
+To report a security issue, please follow the special `security reporting
+guidelines`_, do not report them in the public issue tracker.
+
+.. _`security reporting guidelines`: https://packaging.pypa.io/en/latest/security/
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/LICENSE b/tests/wpt/web-platform-tests/tools/third_party/packaging/LICENSE
new file mode 100644
index 00000000000..6f62d44e4ef
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/LICENSE
@@ -0,0 +1,3 @@
+This software is made available under the terms of *either* of the licenses
+found in LICENSE.APACHE or LICENSE.BSD. Contributions to this software is made
+under the terms of *both* these licenses.
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/LICENSE.APACHE b/tests/wpt/web-platform-tests/tools/third_party/packaging/LICENSE.APACHE
new file mode 100644
index 00000000000..f433b1a53f5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/LICENSE.APACHE
@@ -0,0 +1,177 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/LICENSE.BSD b/tests/wpt/web-platform-tests/tools/third_party/packaging/LICENSE.BSD
new file mode 100644
index 00000000000..42ce7b75c92
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/LICENSE.BSD
@@ -0,0 +1,23 @@
+Copyright (c) Donald Stufft and individual contributors.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/README.rst b/tests/wpt/web-platform-tests/tools/third_party/packaging/README.rst
new file mode 100644
index 00000000000..e8bebe74dc1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/README.rst
@@ -0,0 +1,73 @@
+packaging
+=========
+
+.. start-intro
+
+Reusable core utilities for various Python Packaging
+`interoperability specifications <https://packaging.python.org/specifications/>`_.
+
+This library provides utilities that implement the interoperability
+specifications which have clearly one correct behaviour (eg: :pep:`440`)
+or benefit greatly from having a single shared implementation (eg: :pep:`425`).
+
+.. end-intro
+
+The ``packaging`` project includes the following: version handling, specifiers,
+markers, requirements, tags, utilities.
+
+Documentation
+-------------
+
+The `documentation`_ provides information and the API for the following:
+
+- Version Handling
+- Specifiers
+- Markers
+- Requirements
+- Tags
+- Utilities
+
+Installation
+------------
+
+Use ``pip`` to install these utilities::
+
+    pip install packaging
+
+Discussion
+----------
+
+If you run into bugs, you can file them in our `issue tracker`_.
+
+You can also join ``#pypa`` on Freenode to ask questions or get involved.
+
+
+.. _`documentation`: https://packaging.pypa.io/
+.. _`issue tracker`: https://github.com/pypa/packaging/issues
+
+
+Code of Conduct
+---------------
+
+Everyone interacting in the packaging project's codebases, issue trackers, chat
+rooms, and mailing lists is expected to follow the `PSF Code of Conduct`_.
+
+.. _PSF Code of Conduct: https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md
+
+Contributing
+------------
+
+The ``CONTRIBUTING.rst`` file outlines how to contribute to this project as
+well as how to report a potential security issue. The documentation for this
+project also covers information about `project development`_ and `security`_.
+
+.. _`project development`: https://packaging.pypa.io/en/latest/development/
+.. _`security`: https://packaging.pypa.io/en/latest/security/
+
+Project History
+---------------
+
+Please review the ``CHANGELOG.rst`` file or the `Changelog documentation`_ for
+recent changes and project history.
+
+.. _`Changelog documentation`: https://packaging.pypa.io/en/latest/changelog/
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/Makefile b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/Makefile
new file mode 100644
index 00000000000..9d683b40247
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/Makefile
@@ -0,0 +1,153 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = _build
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  texinfo    to make Texinfo files"
+	@echo "  info       to make Texinfo files and run them through makeinfo"
+	@echo "  gettext    to make PO message catalogs"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+
+clean:
+	-rm -rf $(BUILDDIR)/*
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/packaging.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/packaging.qhc"
+
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/packaging"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/packaging"
+	@echo "# devhelp"
+
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+texinfo:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo
+	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Run \`make' in that directory to run these through makeinfo" \
+	      "(use \`make info' here to do that automatically)."
+
+info:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo "Running Texinfo files through makeinfo..."
+	make -C $(BUILDDIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+gettext:
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	@echo
+	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/_static/.empty b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/_static/.empty
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/changelog.rst b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/changelog.rst
new file mode 100644
index 00000000000..565b0521d0c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/changelog.rst
@@ -0,0 +1 @@
+.. include:: ../CHANGELOG.rst
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/conf.py b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/conf.py
new file mode 100644
index 00000000000..3bd4b13aa34
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/conf.py
@@ -0,0 +1,113 @@
+# -*- coding: utf-8 -*-
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import os
+import sys
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+sys.path.insert(0, os.path.abspath("."))
+
+# -- General configuration ----------------------------------------------------
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions  coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+extensions = [
+    "sphinx.ext.autodoc",
+    "sphinx.ext.doctest",
+    "sphinx.ext.extlinks",
+    "sphinx.ext.intersphinx",
+    "sphinx.ext.viewcode",
+]
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ["_templates"]
+
+# The suffix of source filenames.
+source_suffix = ".rst"
+
+# The master toctree document.
+master_doc = "index"
+
+# General information about the project.
+project = "Packaging"
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+
+base_dir = os.path.join(os.path.dirname(__file__), os.pardir)
+about = {}
+with open(os.path.join(base_dir, "packaging", "__init__.py")) as f:
+    exec(f.read(), about)
+
+version = release = about["__version__"]
+copyright = "2014-2019 Donald Stufft and individual contributors"
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = ["_build"]
+
+extlinks = {
+    "issue": ("https://github.com/pypa/packaging/issues/%s", "#"),
+    "pull": ("https://github.com/pypa/packaging/pull/%s", "PR #"),
+}
+# -- Options for HTML output --------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+
+html_theme = "furo"
+html_title = "packaging"
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ["_static"]
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = "packagingdoc"
+
+
+# -- Options for LaTeX output -------------------------------------------------
+
+latex_elements = {}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author, documentclass [howto/manual])
+latex_documents = [
+    ("index", "packaging.tex", "Packaging Documentation", "Donald Stufft", "manual")
+]
+
+# -- Options for manual page output -------------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [("index", "packaging", "Packaging Documentation", ["Donald Stufft"], 1)]
+
+# -- Options for Texinfo output -----------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+    (
+        "index",
+        "packaging",
+        "Packaging Documentation",
+        "Donald Stufft",
+        "packaging",
+        "Core utilities for Python packages",
+        "Miscellaneous",
+    )
+]
+
+# Example configuration for intersphinx: refer to the Python standard library.
+intersphinx_mapping = {"https://docs.python.org/": None}
+
+epub_theme = "epub"
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/development/getting-started.rst b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/development/getting-started.rst
new file mode 100644
index 00000000000..c8e9487827b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/development/getting-started.rst
@@ -0,0 +1,80 @@
+Getting started
+===============
+
+Working on packaging requires the installation of a small number of
+development dependencies. To see what dependencies are required to
+run the tests manually, please look at the ``noxfile.py`` file.
+
+Running tests
+~~~~~~~~~~~~~
+
+The packaging unit tests are found in the ``tests/`` directory and are
+designed to be run using `pytest`_. `pytest`_ will discover the tests
+automatically, so all you have to do is:
+
+.. code-block:: console
+
+    $ python -m pytest
+    ...
+    29204 passed, 4 skipped, 1 xfailed in 83.98 seconds
+
+This runs the tests with the default Python interpreter. This also allows
+you to run select tests instead of the entire test suite.
+
+You can also verify that the tests pass on other supported Python interpreters.
+For this we use `nox`_, which will automatically create a `virtualenv`_ for
+each supported Python version and run the tests. For example:
+
+.. code-block:: console
+
+    $ nox -s tests
+    ...
+    nox > Ran multiple sessions:
+    nox > * tests-2.7: success
+    nox > * tests-3.4: skipped
+    nox > * tests-3.5: success
+    nox > * tests-3.6: success
+    nox > * tests-3.7: success
+    nox > * tests-3.8: success
+    nox > * tests-pypy: skipped
+    nox > * tests-pypy3: skipped
+
+You may not have all the required Python versions installed, in which case you
+will see one or more ``InterpreterNotFound`` errors.
+
+Running linters
+~~~~~~~~~~~~~~~
+
+If you wish to run the linting rules, you may use `pre-commit`_ or run
+``nox -s lint``.
+
+.. code-block:: console
+
+    $ nox -s lint
+    ...
+    nox > Session lint was successful.
+
+Building documentation
+~~~~~~~~~~~~~~~~~~~~~~
+
+packaging documentation is stored in the ``docs/`` directory. It is
+written in `reStructured Text`_ and rendered using `Sphinx`_.
+
+Use `nox`_ to build the documentation. For example:
+
+.. code-block:: console
+
+    $ nox -s docs
+    ...
+    nox > Session docs was successful.
+
+The HTML documentation index can now be found at
+``docs/_build/html/index.html``.
+
+.. _`pytest`: https://pypi.org/project/pytest/
+.. _`nox`: https://pypi.org/project/nox/
+.. _`virtualenv`: https://pypi.org/project/virtualenv/
+.. _`pip`: https://pypi.org/project/pip/
+.. _`sphinx`: https://pypi.org/project/Sphinx/
+.. _`reStructured Text`: http://sphinx-doc.org/rest.html
+.. _`pre-commit`: https://pre-commit.com
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/development/index.rst b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/development/index.rst
new file mode 100644
index 00000000000..c0aea8acb39
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/development/index.rst
@@ -0,0 +1,19 @@
+Development
+===========
+
+As an open source project, packaging welcomes contributions of all
+forms. The sections below will help you get started.
+
+File bugs and feature requests on our issue tracker on `GitHub`_. If it is a
+bug check out `what to put in your bug report`_.
+
+.. toctree::
+    :maxdepth: 2
+
+    getting-started
+    submitting-patches
+    reviewing-patches
+    release-process
+
+.. _`GitHub`: https://github.com/pypa/packaging
+.. _`what to put in your bug report`: http://www.contribution-guide.org/#what-to-put-in-your-bug-report
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/development/release-process.rst b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/development/release-process.rst
new file mode 100644
index 00000000000..f634ac40bde
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/development/release-process.rst
@@ -0,0 +1,21 @@
+Release Process
+===============
+
+#. Checkout the current ``master`` branch.
+#. Install the latest ``nox``::
+
+    $ pip install nox
+
+#. Run the release automation with the required version number (YY.N)::
+
+    $ nox -s release -- YY.N
+
+#. Notify the other project owners of the release.
+
+.. note::
+
+   Access needed for making the release are:
+
+   - PyPI maintainer (or owner) access to `packaging`
+   - push directly to the `master` branch on the source repository
+   - push tags directly to the source repository
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/development/reviewing-patches.rst b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/development/reviewing-patches.rst
new file mode 100644
index 00000000000..c476c7512de
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/development/reviewing-patches.rst
@@ -0,0 +1,37 @@
+Reviewing and merging patches
+=============================
+
+Everyone is encouraged to review open pull requests. We only ask that you try
+and think carefully, ask questions and are `excellent to one another`_. Code
+review is our opportunity to share knowledge, design ideas and make friends.
+
+When reviewing a patch try to keep each of these concepts in mind:
+
+Architecture
+------------
+
+* Is the proposed change being made in the correct place?
+
+Intent
+------
+
+* What is the change being proposed?
+* Do we want this feature or is the bug they're fixing really a bug?
+
+Implementation
+--------------
+
+* Does the change do what the author claims?
+* Are there sufficient tests?
+* Has it been documented?
+* Will this change introduce new bugs?
+
+Grammar and style
+-----------------
+
+These are small things that are not caught by the automated style checkers.
+
+* Does a variable need a better name?
+* Should this be a keyword argument?
+
+.. _`excellent to one another`: https://speakerdeck.com/ohrite/better-code-review
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/development/submitting-patches.rst b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/development/submitting-patches.rst
new file mode 100644
index 00000000000..cf433c45f20
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/development/submitting-patches.rst
@@ -0,0 +1,81 @@
+Submitting patches
+==================
+
+* Always make a new branch for your work.
+* Patches should be small to facilitate easier review. `Studies have shown`_
+  that review quality falls off as patch size grows. Sometimes this will result
+  in many small PRs to land a single large feature.
+* Larger changes should be discussed in a ticket before submission.
+* New features and significant bug fixes should be documented in the
+  :doc:`/changelog`.
+* You must have legal permission to distribute any code you contribute and it
+  must be available under both the BSD and Apache Software License Version 2.0
+  licenses.
+
+If you believe you've identified a security issue in packaging, please
+follow the directions on the :doc:`security page </security>`.
+
+Code
+----
+
+This project's source is auto-formatted with |black|. You can check if your
+code meets our requirements by running our linters against it with ``nox -s
+lint`` or ``pre-commit run --all-files``.
+
+`Write comments as complete sentences.`_
+
+Every code file must start with the boilerplate licensing notice:
+
+.. code-block:: python
+
+    # This file is dual licensed under the terms of the Apache License, Version
+    # 2.0, and the BSD License. See the LICENSE file in the root of this repository
+    # for complete details.
+
+Additionally, every Python code file must contain
+
+.. code-block:: python
+
+    from __future__ import absolute_import, division, print_function
+
+
+Tests
+-----
+
+All code changes must be accompanied by unit tests with 100% code coverage (as
+measured by the combined metrics across our build matrix).
+
+
+Documentation
+-------------
+
+All features should be documented with prose in the ``docs`` section.
+
+When referring to a hypothetical individual (such as "a person receiving an
+encrypted message") use gender neutral pronouns (they/them/their).
+
+Docstrings are typically only used when writing abstract classes, but should
+be written like this if required:
+
+.. code-block:: python
+
+    def some_function(some_arg):
+        """
+        Does some things.
+
+        :param some_arg: Some argument.
+        """
+
+So, specifically:
+
+* Always use three double quotes.
+* Put the three double quotes on their own line.
+* No blank line at the end.
+* Use Sphinx parameter/attribute documentation `syntax`_.
+
+
+.. |black| replace:: ``black``
+.. _black: https://pypi.org/project/black/
+.. _`Write comments as complete sentences.`: https://nedbatchelder.com/blog/201401/comments_should_be_sentences.html
+.. _`syntax`: http://sphinx-doc.org/domains.html#info-field-lists
+.. _`Studies have shown`: http://www.ibm.com/developerworks/rational/library/11-proven-practices-for-peer-review/
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/index.rst b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/index.rst
new file mode 100644
index 00000000000..aafdae83c46
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/index.rst
@@ -0,0 +1,38 @@
+Welcome to packaging
+====================
+
+.. include:: ../README.rst
+   :start-after: start-intro
+   :end-before: end-intro
+
+
+Installation
+------------
+
+You can install packaging with ``pip``:
+
+.. code-block:: console
+
+    $ pip install packaging
+
+
+.. toctree::
+    :maxdepth: 1
+    :caption: API Documentation
+    :hidden:
+
+    version
+    specifiers
+    markers
+    requirements
+    tags
+    utils
+
+.. toctree::
+    :maxdepth: 2
+    :caption: Project
+    :hidden:
+
+    development/index
+    security
+    changelog
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/markers.rst b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/markers.rst
new file mode 100644
index 00000000000..ad253616476
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/markers.rst
@@ -0,0 +1,93 @@
+Markers
+=======
+
+.. currentmodule:: packaging.markers
+
+One extra requirement of dealing with dependencies is the ability to specify
+if it is required depending on the operating system or Python version in use.
+`PEP 508`_ defines the scheme which has been implemented by this module.
+
+Usage
+-----
+
+.. doctest::
+
+    >>> from packaging.markers import Marker, UndefinedEnvironmentName
+    >>> marker = Marker("python_version>'2'")
+    >>> marker
+    <Marker('python_version > "2"')>
+    >>> # We can evaluate the marker to see if it is satisfied
+    >>> marker.evaluate()
+    True
+    >>> # We can also override the environment
+    >>> env = {'python_version': '1.5.4'}
+    >>> marker.evaluate(environment=env)
+    False
+    >>> # Multiple markers can be ANDed
+    >>> and_marker = Marker("os_name=='a' and os_name=='b'")
+    >>> and_marker
+    <Marker('os_name == "a" and os_name == "b"')>
+    >>> # Multiple markers can be ORed
+    >>> or_marker = Marker("os_name=='a' or os_name=='b'")
+    >>> or_marker
+    <Marker('os_name == "a" or os_name == "b"')>
+    >>> # Markers can be also used with extras, to pull in dependencies if
+    >>> # a certain extra is being installed
+    >>> extra = Marker('extra == "bar"')
+    >>> # Evaluating an extra marker with no environment is an error
+    >>> try:
+    ...     extra.evaluate()
+    ... except UndefinedEnvironmentName:
+    ...     pass
+    >>> extra_environment = {'extra': ''}
+    >>> extra.evaluate(environment=extra_environment)
+    False
+    >>> extra_environment['extra'] = 'bar'
+    >>> extra.evaluate(environment=extra_environment)
+    True
+
+
+Reference
+---------
+
+.. class:: Marker(markers)
+
+    This class abstracts handling markers for dependencies of a project. It can
+    be passed a single marker or multiple markers that are ANDed or ORed
+    together. Each marker will be parsed according to PEP 508.
+
+    :param str markers: The string representation of a marker or markers.
+    :raises InvalidMarker: If the given ``markers`` are not parseable, then
+                           this exception will be raised.
+
+    .. method:: evaluate(environment=None)
+
+    Evaluate the marker given the context of the current Python process.
+
+    :param dict environment: A dictionary containing keys and values to
+                             override the detected environment.
+    :raises: UndefinedComparison: If the marker uses a PEP 440 comparison on
+                                  strings which are not valid PEP 440 versions.
+    :raises: UndefinedEnvironmentName: If the marker accesses a value that
+                                       isn't present inside of the environment
+                                       dictionary.
+
+.. exception:: InvalidMarker
+
+    Raised when attempting to create a :class:`Marker` with a string that
+    does not conform to PEP 508.
+
+
+.. exception:: UndefinedComparison
+
+    Raised when attempting to evaluate a :class:`Marker` with a PEP 440
+    comparison operator against values that are not valid PEP 440 versions.
+
+
+.. exception:: UndefinedEnvironmentName
+
+    Raised when attempting to evaluate a :class:`Marker` with a value that is
+    missing from the evaluation environment.
+
+
+.. _`PEP 508`: https://www.python.org/dev/peps/pep-0508/
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/requirements.rst b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/requirements.rst
new file mode 100644
index 00000000000..e7c5a85a5e5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/requirements.rst
@@ -0,0 +1,89 @@
+Requirements
+============
+
+.. currentmodule:: packaging.requirements
+
+Parse a given requirements line for specifying dependencies of a Python
+project, using `PEP 508`_ which defines the scheme that has been implemented
+by this module.
+
+Usage
+-----
+
+.. doctest::
+
+    >>> from packaging.requirements import Requirement
+    >>> simple_req = Requirement("name")
+    >>> simple_req
+    <Requirement('name')>
+    >>> simple_req.name
+    'name'
+    >>> simple_req.url is None
+    True
+    >>> simple_req.extras
+    set()
+    >>> simple_req.specifier
+    <SpecifierSet('')>
+    >>> simple_req.marker is None
+    True
+    >>> # Requirements can be specified with extras, specifiers and markers
+    >>> req = Requirement('name[foo]>=2,<3; python_version>"2.0"')
+    >>> req.name
+    'name'
+    >>> req.extras
+    {'foo'}
+    >>> req.specifier
+    <SpecifierSet('<3,>=2')>
+    >>> req.marker
+    <Marker('python_version > "2.0"')>
+    >>> # Requirements can also be specified with a URL, but may not specify
+    >>> # a version.
+    >>> url_req = Requirement('name @ https://github.com/pypa ;os_name=="a"')
+    >>> url_req.name
+    'name'
+    >>> url_req.url
+    'https://github.com/pypa'
+    >>> url_req.extras
+    set()
+    >>> url_req.marker
+    <Marker('os_name == "a"')>
+
+
+Reference
+---------
+
+.. class:: Requirement(requirement)
+
+    This class abstracts handling the details of a requirement for a project.
+    Each requirement will be parsed according to PEP 508.
+
+    :param str requirement: The string representation of a requirement.
+    :raises InvalidRequirement: If the given ``requirement`` is not parseable,
+                                then this exception will be raised.
+
+    .. attribute:: name
+
+       The name of the requirement.
+
+    .. attribute:: url
+
+      The URL, if any where to download the requirement from. Can be None.
+
+    .. attribute:: extras
+
+      A set of extras that the requirement specifies.
+
+    .. attribute:: specifier
+
+      A :class:`~.SpecifierSet` of the version specified by the requirement.
+
+    .. attribute:: marker
+
+      A :class:`~.Marker` of the marker for the requirement. Can be None.
+
+.. exception:: InvalidRequirement
+
+    Raised when attempting to create a :class:`Requirement` with a string that
+    does not conform to PEP 508.
+
+.. _`PEP 508`: https://www.python.org/dev/peps/pep-0508/
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/requirements.txt b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/requirements.txt
new file mode 100644
index 00000000000..a95ae18b4f9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/requirements.txt
@@ -0,0 +1 @@
+furo
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/security.rst b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/security.rst
new file mode 100644
index 00000000000..f7fdb00029e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/security.rst
@@ -0,0 +1,18 @@
+Security
+========
+
+We take the security of packaging seriously. If you believe you've identified a
+security issue in it, DO NOT report the issue in any public forum, including
+(but not limited to):
+
+- GitHub issue tracker
+- Official or unofficial chat channels
+- Official or unofficial mailing lists
+
+Please report your issue to ``security@python.org``. Messages may be optionally
+encrypted with GPG using key fingerprints available at the `Python Security
+page <https://www.python.org/news/security/>`_.
+
+Once you've submitted an issue via email, you should receive an acknowledgment
+within 48 hours, and depending on the action to be taken, you may receive
+further follow-up emails.
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/specifiers.rst b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/specifiers.rst
new file mode 100644
index 00000000000..e1e458b8789
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/specifiers.rst
@@ -0,0 +1,222 @@
+Specifiers
+==========
+
+.. currentmodule:: packaging.specifiers
+
+A core requirement of dealing with dependencies is the ability to specify what
+versions of a dependency are acceptable for you. `PEP 440`_ defines the
+standard specifier scheme which has been implemented by this module.
+
+Usage
+-----
+
+.. doctest::
+
+    >>> from packaging.specifiers import SpecifierSet
+    >>> from packaging.version import Version
+    >>> spec1 = SpecifierSet("~=1.0")
+    >>> spec1
+    <SpecifierSet('~=1.0')>
+    >>> spec2 = SpecifierSet(">=1.0")
+    >>> spec2
+    <SpecifierSet('>=1.0')>
+    >>> # We can combine specifiers
+    >>> combined_spec = spec1 & spec2
+    >>> combined_spec
+    <SpecifierSet('>=1.0,~=1.0')>
+    >>> # We can also implicitly combine a string specifier
+    >>> combined_spec &= "!=1.1"
+    >>> combined_spec
+    <SpecifierSet('!=1.1,>=1.0,~=1.0')>
+    >>> # Create a few versions to check for contains.
+    >>> v1 = Version("1.0a5")
+    >>> v2 = Version("1.0")
+    >>> # We can check a version object to see if it falls within a specifier
+    >>> v1 in combined_spec
+    False
+    >>> v2 in combined_spec
+    True
+    >>> # We can even do the same with a string based version
+    >>> "1.4" in combined_spec
+    True
+    >>> # Finally we can filter a list of versions to get only those which are
+    >>> # contained within our specifier.
+    >>> list(combined_spec.filter([v1, v2, "1.4"]))
+    [<Version('1.0')>, '1.4']
+
+
+Reference
+---------
+
+.. class:: SpecifierSet(specifiers, prereleases=None)
+
+    This class abstracts handling specifying the dependencies of a project. It
+    can be passed a single specifier (``>=3.0``), a comma-separated list of
+    specifiers (``>=3.0,!=3.1``), or no specifier at all. Each individual
+    specifier will be attempted to be parsed as a PEP 440 specifier
+    (:class:`Specifier`) or as a legacy, setuptools style specifier
+    (deprecated :class:`LegacySpecifier`). You may combine
+    :class:`SpecifierSet` instances using the ``&`` operator
+    (``SpecifierSet(">2") & SpecifierSet("<4")``).
+
+    Both the membership tests and the combination support using raw strings
+    in place of already instantiated objects.
+
+    :param str specifiers: The string representation of a specifier or a
+                           comma-separated list of specifiers which will
+                           be parsed and normalized before use.
+    :param bool prereleases: This tells the SpecifierSet if it should accept
+                             prerelease versions if applicable or not. The
+                             default of ``None`` will autodetect it from the
+                             given specifiers.
+    :raises InvalidSpecifier: If the given ``specifiers`` are not parseable
+                              than this exception will be raised.
+
+    .. attribute:: prereleases
+
+        A boolean value indicating whether this :class:`SpecifierSet`
+        represents a specifier that includes a pre-release versions. This can be
+        set to either ``True`` or ``False`` to explicitly enable or disable
+        prereleases or it can be set to ``None`` (the default) to enable
+        autodetection.
+
+    .. method:: __contains__(version)
+
+        This is the more Pythonic version of :meth:`contains()`, but does
+        not allow you to override the ``prereleases`` argument.  If you
+        need that, use :meth:`contains()`.
+
+        See :meth:`contains()`.
+
+    .. method:: contains(version, prereleases=None)
+
+        Determines if ``version``, which can be either a version string, a
+        :class:`Version`, or a deprecated :class:`LegacyVersion` object, is
+        contained within this set of specifiers.
+
+        This will either match or not match prereleases based on the
+        ``prereleases`` parameter. When ``prereleases`` is set to ``None``
+        (the default) it will use the ``Specifier().prereleases`` attribute to
+        determine if to allow them. Otherwise it will use the boolean value of
+        the passed in value to determine if to allow them or not.
+
+    .. method:: __len__()
+
+        Returns the number of specifiers in this specifier set.
+
+    .. method:: __iter__()
+
+        Returns an iterator over all the underlying :class:`Specifier` (or
+        deprecated :class:`LegacySpecifier`) instances in this specifier set.
+
+    .. method:: filter(iterable, prereleases=None)
+
+        Takes an iterable that can contain version strings, :class:`~.Version`,
+        and deprecated :class:`~.LegacyVersion` instances and will then filter
+        it, returning an iterable that contains only items which match the
+        rules of this specifier object.
+
+        This method is smarter than just
+        ``filter(Specifier().contains, [...])`` because it implements the rule
+        from PEP 440 where a prerelease item SHOULD be accepted if no other
+        versions match the given specifier.
+
+        The ``prereleases`` parameter functions similarly to that of the same
+        parameter in ``contains``. If the value is ``None`` (the default) then
+        it will intelligently decide if to allow prereleases based on the
+        specifier, the ``Specifier().prereleases`` value, and the PEP 440
+        rules. Otherwise it will act as a boolean which will enable or disable
+        all prerelease versions from being included.
+
+
+.. class:: Specifier(specifier, prereleases=None)
+
+    This class abstracts the handling of a single `PEP 440`_ compatible
+    specifier. It is generally not required to instantiate this manually,
+    preferring instead to work with :class:`SpecifierSet`.
+
+    :param str specifier: The string representation of a specifier which will
+                          be parsed and normalized before use.
+    :param bool prereleases: This tells the specifier if it should accept
+                             prerelease versions if applicable or not. The
+                             default of ``None`` will autodetect it from the
+                             given specifiers.
+    :raises InvalidSpecifier: If the ``specifier`` does not conform to PEP 440
+                              in any way then this exception will be raised.
+
+    .. attribute:: operator
+
+        The string value of the operator part of this specifier.
+
+    .. attribute:: version
+
+        The string version of the version part of this specifier.
+
+    .. attribute:: prereleases
+
+        See :attr:`SpecifierSet.prereleases`.
+
+    .. method:: __contains__(version)
+
+        See :meth:`SpecifierSet.__contains__()`.
+
+    .. method:: contains(version, prereleases=None)
+
+        See :meth:`SpecifierSet.contains()`.
+
+    .. method:: filter(iterable, prereleases=None)
+
+        See :meth:`SpecifierSet.filter()`.
+
+
+.. class:: LegacySpecifier(specifier, prereleases=None)
+
+    .. deprecated:: 20.5
+
+        Use :class:`Specifier` instead.
+
+    This class abstracts the handling of a single legacy, setuptools style
+    specifier. It is generally not required to instantiate this manually,
+    preferring instead to work with :class:`SpecifierSet`.
+
+    :param str specifier: The string representation of a specifier which will
+                          be parsed and normalized before use.
+    :param bool prereleases: This tells the specifier if it should accept
+                             prerelease versions if applicable or not. The
+                             default of ``None`` will autodetect it from the
+                             given specifiers.
+    :raises InvalidSpecifier: If the ``specifier`` is not parseable then this
+                              will be raised.
+
+    .. attribute:: operator
+
+        The string value of the operator part of this specifier.
+
+    .. attribute:: version
+
+        The string version of the version part of this specifier.
+
+    .. attribute:: prereleases
+
+        See :attr:`SpecifierSet.prereleases`.
+
+    .. method:: __contains__(version)
+
+        See :meth:`SpecifierSet.__contains__()`.
+
+    .. method:: contains(version, prereleases=None)
+
+        See :meth:`SpecifierSet.contains()`.
+
+    .. method:: filter(iterable, prereleases=None)
+
+        See :meth:`SpecifierSet.filter()`.
+
+
+.. exception:: InvalidSpecifier
+
+    Raised when attempting to create a :class:`Specifier` with a specifier
+    string that does not conform to `PEP 440`_.
+
+
+.. _`PEP 440`: https://www.python.org/dev/peps/pep-0440/
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/tags.rst b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/tags.rst
new file mode 100644
index 00000000000..4d7e10ab636
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/tags.rst
@@ -0,0 +1,220 @@
+Tags
+====
+
+.. currentmodule:: packaging.tags
+
+Wheels encode the Python interpreter, ABI, and platform that they support in
+their filenames using `platform compatibility tags`_. This module provides
+support for both parsing these tags as well as discovering what tags the
+running Python interpreter supports.
+
+Usage
+-----
+
+.. doctest::
+
+    >>> from packaging.tags import Tag, sys_tags
+    >>> import sys
+    >>> looking_for = Tag("py{major}".format(major=sys.version_info.major), "none", "any")
+    >>> supported_tags = list(sys_tags())
+    >>> looking_for in supported_tags
+    True
+    >>> really_old = Tag("py1", "none", "any")
+    >>> wheels = {really_old, looking_for}
+    >>> best_wheel = None
+    >>> for supported_tag in supported_tags:
+    ...     for wheel_tag in wheels:
+    ...         if supported_tag == wheel_tag:
+    ...             best_wheel = wheel_tag
+    ...             break
+    >>> best_wheel == looking_for
+    True
+
+Reference
+---------
+
+High Level Interface
+''''''''''''''''''''
+
+The following functions are the main interface to the library, and are typically the only
+items that applications should need to reference, in order to parse and check tags.
+
+.. class:: Tag(interpreter, abi, platform)
+
+    A representation of the tag triple for a wheel. Instances are considered
+    immutable and thus are hashable. Equality checking is also supported.
+
+    :param str interpreter: The interpreter name, e.g. ``"py"``
+                            (see :attr:`INTERPRETER_SHORT_NAMES` for mapping
+                            well-known interpreter names to their short names).
+    :param str abi: The ABI that a wheel supports, e.g. ``"cp37m"``.
+    :param str platform: The OS/platform the wheel supports,
+                         e.g. ``"win_amd64"``.
+
+    .. attribute:: interpreter
+
+        The interpreter name.
+
+    .. attribute:: abi
+
+        The supported ABI.
+
+    .. attribute:: platform
+
+        The OS/platform.
+
+
+.. function:: parse_tag(tag)
+
+    Parses the provided ``tag`` into a set of :class:`Tag` instances.
+
+    Returning a set is required due to the possibility that the tag is a
+    `compressed tag set`_, e.g. ``"py2.py3-none-any"`` which supports both
+    Python 2 and Python 3.
+
+    :param str tag: The tag to parse, e.g. ``"py3-none-any"``.
+
+
+.. function:: sys_tags(*, warn=False)
+
+    Yields the tags that the running interpreter supports.
+
+    The iterable is ordered so that the best-matching tag is first in the
+    sequence. The exact preferential order to tags is interpreter-specific, but
+    in general the tag importance is in the order of:
+
+    1. Interpreter
+    2. Platform
+    3. ABI
+
+    This order is due to the fact that an ABI is inherently tied to the
+    platform, but platform-specific code is not necessarily tied to the ABI. The
+    interpreter is the most important tag as it dictates basic support for any
+    wheel.
+
+    The function returns an iterable in order to allow for the possible
+    short-circuiting of tag generation if the entire sequence is not necessary
+    and tag calculation happens to be expensive.
+
+    :param bool warn: Whether warnings should be logged. Defaults to ``False``.
+
+
+Low Level Interface
+'''''''''''''''''''
+
+The following functions are low-level implementation details. They should typically not
+be needed in application code, unless the application has specialised requirements (for
+example, constructing sets of supported tags for environments other than the running
+interpreter).
+
+These functions capture the precise details of which environments support which tags. That
+information is not defined in the compatibility tag standards but is noted as being up
+to the implementation to provide.
+
+
+.. attribute:: INTERPRETER_SHORT_NAMES
+
+    A dictionary mapping interpreter names to their `abbreviation codes`_
+    (e.g. ``"cpython"`` is ``"cp"``). All interpreter names are lower-case.
+
+
+.. function:: interpreter_name()
+
+    Returns the running interpreter's name.
+
+    This typically acts as the prefix to the :attr:`~Tag.interpreter` tag.
+
+
+.. function:: interpreter_version(*, warn=False)
+
+    Returns the running interpreter's version.
+
+    This typically acts as the suffix to the :attr:`~Tag.interpreter` tag.
+
+
+.. function:: mac_platforms(version=None, arch=None)
+
+    Yields the :attr:`~Tag.platform` tags for macOS.
+
+    :param tuple version: A two-item tuple presenting the version of macOS.
+                          Defaults to the current system's version.
+    :param str arch: The CPU architecture. Defaults to the architecture of the
+                     current system, e.g. ``"x86_64"``.
+
+    .. note::
+        Equivalent support for the other major platforms is purposefully not
+        provided:
+
+        - On Windows, platform compatibility is statically specified
+        - On Linux, code must be run on the system itself to determine
+          compatibility
+
+
+.. function:: compatible_tags(python_version=None, interpreter=None, platforms=None)
+
+    Yields the tags for an interpreter compatible with the Python version
+    specified by ``python_version``.
+
+    The specific tags generated are:
+
+    - ``py*-none-<platform>``
+    - ``<interpreter>-none-any`` if ``interpreter`` is provided
+    - ``py*-none-any``
+
+    :param Sequence python_version: A one- or two-item sequence representing the
+                                 compatible version of Python. Defaults to
+                                 ``sys.version_info[:2]``.
+    :param str interpreter: The name of the interpreter (if known), e.g.
+                            ``"cp38"``. Defaults to the current interpreter.
+    :param Iterable platforms: Iterable of compatible platforms. Defaults to the
+                               platforms compatible with the current system.
+
+.. function:: cpython_tags(python_version=None, abis=None, platforms=None, *, warn=False)
+
+    Yields the tags for the CPython interpreter.
+
+    The specific tags generated are:
+
+    - ``cp<python_version>-<abi>-<platform>``
+    - ``cp<python_version>-abi3-<platform>``
+    - ``cp<python_version>-none-<platform>``
+    - ``cp<older version>-abi3-<platform>`` where "older version" is all older
+      minor versions down to Python 3.2 (when ``abi3`` was introduced)
+
+    If ``python_version`` only provides a major-only version then only
+    user-provided ABIs via ``abis`` and the ``none`` ABI will be used.
+
+    :param Sequence python_version: A one- or two-item sequence representing the
+                                 targetted Python version. Defaults to
+                                 ``sys.version_info[:2]``.
+    :param Iterable abis: Iterable of compatible ABIs. Defaults to the ABIs
+                          compatible with the current system.
+    :param Iterable platforms: Iterable of compatible platforms. Defaults to the
+                               platforms compatible with the current system.
+    :param bool warn: Whether warnings should be logged. Defaults to ``False``.
+
+.. function:: generic_tags(interpreter=None, abis=None, platforms=None, *, warn=False)
+
+    Yields the tags for an interpreter which requires no specialization.
+
+    This function should be used if one of the other interpreter-specific
+    functions provided by this module is not appropriate (i.e. not calculating
+    tags for a CPython interpreter).
+
+    The specific tags generated are:
+
+    - ``<interpreter>-<abi>-<platform>``
+
+    The ``"none"`` ABI will be added if it was not explicitly provided.
+
+    :param str interpreter: The name of the interpreter. Defaults to being
+                            calculated.
+    :param Iterable abis: Iterable of compatible ABIs. Defaults to the ABIs
+                          compatible with the current system.
+    :param Iterable platforms: Iterable of compatible platforms. Defaults to the
+                               platforms compatible with the current system.
+    :param bool warn: Whether warnings should be logged. Defaults to ``False``.
+
+.. _`abbreviation codes`: https://www.python.org/dev/peps/pep-0425/#python-tag
+.. _`compressed tag set`: https://www.python.org/dev/peps/pep-0425/#compressed-tag-sets
+.. _`platform compatibility tags`: https://packaging.python.org/specifications/platform-compatibility-tags/
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/utils.rst b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/utils.rst
new file mode 100644
index 00000000000..134094aa30e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/utils.rst
@@ -0,0 +1,41 @@
+Utilities
+=========
+
+.. currentmodule:: packaging.utils
+
+
+A set of small, helper utilities for dealing with Python packages.
+
+
+Reference
+---------
+
+.. function:: canonicalize_name(name)
+
+    This function takes a valid Python package name, and returns the normalized
+    form of it.
+
+    :param str name: The name to normalize.
+
+    .. doctest::
+
+        >>> from packaging.utils import canonicalize_name
+        >>> canonicalize_name("Django")
+        'django'
+        >>> canonicalize_name("oslo.concurrency")
+        'oslo-concurrency'
+        >>> canonicalize_name("requests")
+        'requests'
+
+.. function:: canonicalize_version(version)
+
+    This function takes a string representing a package version (or a
+    ``Version`` instance), and returns the normalized form of it.
+
+    :param str version: The version to normalize.
+
+    .. doctest::
+
+        >>> from packaging.utils import canonicalize_version
+        >>> canonicalize_version('1.4.0.0.0')
+        '1.4'
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/version.rst b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/version.rst
new file mode 100644
index 00000000000..a43cf7868e9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/version.rst
@@ -0,0 +1,292 @@
+Version Handling
+================
+
+.. currentmodule:: packaging.version
+
+A core requirement of dealing with packages is the ability to work with
+versions. `PEP 440`_ defines the standard version scheme for Python packages
+which has been implemented by this module.
+
+Usage
+-----
+
+.. doctest::
+
+    >>> from packaging.version import Version, parse
+    >>> v1 = parse("1.0a5")
+    >>> v2 = Version("1.0")
+    >>> v1
+    <Version('1.0a5')>
+    >>> v2
+    <Version('1.0')>
+    >>> v1 < v2
+    True
+    >>> v1.epoch
+    0
+    >>> v1.release
+    (1, 0)
+    >>> v1.pre
+    ('a', 5)
+    >>> v1.is_prerelease
+    True
+    >>> v2.is_prerelease
+    False
+    >>> Version("french toast")
+    Traceback (most recent call last):
+        ...
+    InvalidVersion: Invalid version: 'french toast'
+    >>> Version("1.0").post
+    >>> Version("1.0").is_postrelease
+    False
+    >>> Version("1.0.post0").post
+    0
+    >>> Version("1.0.post0").is_postrelease
+    True
+
+
+Reference
+---------
+
+.. function:: parse(version)
+
+    This function takes a version string and will parse it as a
+    :class:`Version` if the version is a valid PEP 440 version, otherwise it
+    will parse it as a deprecated :class:`LegacyVersion`.
+
+
+.. class:: Version(version)
+
+    This class abstracts handling of a project's versions. It implements the
+    scheme defined in `PEP 440`_. A :class:`Version` instance is comparison
+    aware and can be compared and sorted using the standard Python interfaces.
+
+    :param str version: The string representation of a version which will be
+                        parsed and normalized before use.
+    :raises InvalidVersion: If the ``version`` does not conform to PEP 440 in
+                            any way then this exception will be raised.
+
+    .. attribute:: public
+
+        A string representing the public version portion of this ``Version()``.
+
+    .. attribute:: base_version
+
+        A string representing the base version of this :class:`Version`
+        instance. The base version is the public version of the project without
+        any pre or post release markers.
+
+    .. attribute:: epoch
+
+        An integer giving the version epoch of this :class:`Version` instance
+
+    .. attribute:: release
+
+        A tuple of integers giving the components of the release segment of
+        this :class:`Version` instance; that is, the ``1.2.3`` part of the
+        version number, including trailing zeroes but not including the epoch
+        or any prerelease/development/postrelease suffixes
+
+    .. attribute:: major
+
+        An integer representing the first item of :attr:`release` or ``0`` if unavailable.
+
+    .. attribute:: minor
+
+        An integer representing the second item of :attr:`release` or ``0`` if unavailable.
+
+    .. attribute:: micro
+
+        An integer representing the third item of :attr:`release` or ``0`` if unavailable.
+
+    .. attribute:: local
+
+        A string representing the local version portion of this ``Version()``
+        if it has one, or ``None`` otherwise.
+
+    .. attribute:: pre
+
+        If this :class:`Version` instance represents a prerelease, this
+        attribute will be a pair of the prerelease phase (the string ``"a"``,
+        ``"b"``, or ``"rc"``) and the prerelease number (an integer).  If this
+        instance is not a prerelease, the attribute will be `None`.
+
+    .. attribute:: is_prerelease
+
+        A boolean value indicating whether this :class:`Version` instance
+        represents a prerelease and/or development release.
+
+    .. attribute:: dev
+
+        If this :class:`Version` instance represents a development release,
+        this attribute will be the development release number (an integer);
+        otherwise, it will be `None`.
+
+    .. attribute:: is_devrelease
+
+        A boolean value indicating whether this :class:`Version` instance
+        represents a development release.
+
+    .. attribute:: post
+
+        If this :class:`Version` instance represents a postrelease, this
+        attribute will be the postrelease number (an integer); otherwise, it
+        will be `None`.
+
+    .. attribute:: is_postrelease
+
+        A boolean value indicating whether this :class:`Version` instance
+        represents a post-release.
+
+
+.. class:: LegacyVersion(version)
+
+    .. deprecated:: 20.5
+
+        Use :class:`Version` instead.
+
+    This class abstracts handling of a project's versions if they are not
+    compatible with the scheme defined in `PEP 440`_. It implements a similar
+    interface to that of :class:`Version`.
+
+    This class implements the previous de facto sorting algorithm used by
+    setuptools, however it will always sort as less than a :class:`Version`
+    instance.
+
+    :param str version: The string representation of a version which will be
+                        used as is.
+
+    .. note::
+
+        :class:`LegacyVersion` instances are always ordered lower than :class:`Version` instances.
+
+        >>> from packaging.version import Version, LegacyVersion
+        >>> v1 = Version("1.0")
+        >>> v2 = LegacyVersion("1.0")
+        >>> v1 > v2
+        True
+        >>> v3 = LegacyVersion("1.3")
+        >>> v1 > v3
+        True
+
+        Also note that some strings are still valid PEP 440 strings (:class:`Version`), even if they look very similar to
+        other versions that are not (:class:`LegacyVersion`). Examples include versions with `Pre-release spelling`_ and
+        `Post-release spelling`_.
+
+        >>> from packaging.version import parse
+        >>> v1 = parse('0.9.8a')
+        >>> v2 = parse('0.9.8beta')
+        >>> v3 = parse('0.9.8r')
+        >>> v4 = parse('0.9.8rev')
+        >>> v5 = parse('0.9.8t')
+        >>> v1
+        <Version('0.9.8a0')>
+        >>> v1.is_prerelease
+        True
+        >>> v2
+        <Version('0.9.8b0')>
+        >>> v2.is_prerelease
+        True
+        >>> v3
+        <Version('0.9.8.post0')>
+        >>> v3.is_postrelease
+        True
+        >>> v4
+        <Version('0.9.8.post0')>
+        >>> v4.is_postrelease
+        True
+        >>> v5
+        <LegacyVersion('0.9.8t')>
+        >>> v5.is_prerelease
+        False
+        >>> v5.is_postrelease
+        False
+
+    .. attribute:: public
+
+        A string representing the public version portion of this
+        :class:`LegacyVersion`. This will always be the entire version string.
+
+    .. attribute:: base_version
+
+        A string representing the base version portion of this
+        :class:`LegacyVersion` instance. This will always be the entire version
+        string.
+
+    .. attribute:: epoch
+
+        This will always be ``-1`` since without `PEP 440`_ we do not have the
+        concept of version epochs.  The value reflects the fact that
+        :class:`LegacyVersion` instances always compare less than
+        :class:`Version` instances.
+
+    .. attribute:: release
+
+        This will always be ``None`` since without `PEP 440`_ we do not have
+        the concept of a release segment or its components.  It exists
+        primarily to allow a :class:`LegacyVersion` to be used as a stand in
+        for a :class:`Version`.
+
+    .. attribute:: local
+
+        This will always be ``None`` since without `PEP 440`_ we do not have
+        the concept of a local version. It exists primarily to allow a
+        :class:`LegacyVersion` to be used as a stand in for a :class:`Version`.
+
+    .. attribute:: pre
+
+        This will always be ``None`` since without `PEP 440`_ we do not have
+        the concept of a prerelease. It exists primarily to allow a
+        :class:`LegacyVersion` to be used as a stand in for a :class:`Version`.
+
+    .. attribute:: is_prerelease
+
+        A boolean value indicating whether this :class:`LegacyVersion`
+        represents a prerelease and/or development release.  Since without
+        `PEP 440`_ there is no concept of pre or dev releases this will
+        always be `False` and exists for compatibility with :class:`Version`.
+
+    .. attribute:: dev
+
+        This will always be ``None`` since without `PEP 440`_ we do not have
+        the concept of a development release. It exists primarily to allow a
+        :class:`LegacyVersion` to be used as a stand in for a :class:`Version`.
+
+    .. attribute:: is_devrelease
+
+        A boolean value indicating whether this :class:`LegacyVersion`
+        represents a development release.  Since without `PEP 440`_ there is
+        no concept of dev releases this will always be `False` and exists for
+        compatibility with :class:`Version`.
+
+    .. attribute:: post
+
+        This will always be ``None`` since without `PEP 440`_ we do not have
+        the concept of a postrelease. It exists primarily to allow a
+        :class:`LegacyVersion` to be used as a stand in for a :class:`Version`.
+
+    .. attribute:: is_postrelease
+
+        A boolean value indicating whether this :class:`LegacyVersion`
+        represents a post-release. Since without `PEP 440`_ there is no concept
+        of post-releases this will always be ``False`` and exists for
+        compatibility with :class:`Version`.
+
+
+.. exception:: InvalidVersion
+
+    Raised when attempting to create a :class:`Version` with a version string
+    that does not conform to `PEP 440`_.
+
+
+.. data:: VERSION_PATTERN
+
+    A string containing the regular expression used to match a valid version.
+    The pattern is not anchored at either end, and is intended for embedding
+    in larger expressions (for example, matching a version number as part of
+    a file name). The regular expression should be compiled with the
+    ``re.VERBOSE`` and ``re.IGNORECASE`` flags set.
+
+
+.. _PEP 440: https://www.python.org/dev/peps/pep-0440/
+.. _Pre-release spelling : https://www.python.org/dev/peps/pep-0440/#pre-release-spelling
+.. _Post-release spelling : https://www.python.org/dev/peps/pep-0440/#post-release-spelling
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/mypy.ini b/tests/wpt/web-platform-tests/tools/third_party/packaging/mypy.ini
new file mode 100644
index 00000000000..e1973485503
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/mypy.ini
@@ -0,0 +1,20 @@
+[mypy]
+ignore_missing_imports = True
+
+# The following are the flags enabled by --strict
+#
+# Note: warn_unused_ignores is False due to incorrect typeshed annotations for
+# platform.mac_ver()
+warn_unused_configs = True
+disallow_subclassing_any = True
+disallow_any_generics = True
+disallow_untyped_calls = True
+disallow_untyped_defs = True
+disallow_incomplete_defs = True
+check_untyped_defs = True
+disallow_untyped_decorators = True
+no_implicit_optional = True
+warn_redundant_casts = True
+warn_unused_ignores = False
+warn_return_any = True
+no_implicit_reexport = True
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/noxfile.py b/tests/wpt/web-platform-tests/tools/third_party/packaging/noxfile.py
new file mode 100644
index 00000000000..75845ab8047
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/noxfile.py
@@ -0,0 +1,309 @@
+# mypy: disallow-untyped-defs=False, disallow-untyped-calls=False
+
+import time
+import re
+import os
+import sys
+import glob
+import shutil
+import difflib
+import tempfile
+import textwrap
+import datetime
+import contextlib
+import subprocess
+from pathlib import Path
+
+import nox
+
+nox.options.sessions = ["lint"]
+nox.options.reuse_existing_virtualenvs = True
+
+
+@nox.session(python=["2.7", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9", "pypy", "pypy3"])
+def tests(session):
+    def coverage(*args):
+        session.run("python", "-m", "coverage", *args)
+
+    # Once coverage 5 is used then `.coverage` can move into `pyproject.toml`.
+    session.install("coverage<5.0.0", "pretend", "pytest", "pip>=9.0.2")
+
+    if "pypy" not in session.python:
+        coverage(
+            "run",
+            "--source",
+            "packaging/",
+            "-m",
+            "pytest",
+            "--strict",
+            *session.posargs,
+        )
+        coverage("report", "-m", "--fail-under", "100")
+    else:
+        # Don't do coverage tracking for PyPy, since it's SLOW.
+        session.run(
+            "python", "-m", "pytest", "--capture=no", "--strict", *session.posargs
+        )
+
+
+@nox.session(python="3.9")
+def lint(session):
+    # Run the linters (via pre-commit)
+    session.install("pre-commit")
+    session.run("pre-commit", "run", "--all-files")
+
+    # Check the distribution
+    session.install("build", "twine")
+    session.run("python", "-m", "build")
+    session.run("twine", "check", *glob.glob("dist/*"))
+
+
+@nox.session(python="3.9")
+def docs(session):
+    shutil.rmtree("docs/_build", ignore_errors=True)
+    session.install("furo")
+
+    variants = [
+        # (builder, dest)
+        ("html", "html"),
+        ("latex", "latex"),
+        ("doctest", "html"),
+    ]
+
+    for builder, dest in variants:
+        session.run(
+            "sphinx-build",
+            "-W",
+            "-b",
+            builder,
+            "-d",
+            "docs/_build/doctrees/" + dest,
+            "docs",  # source directory
+            "docs/_build/" + dest,  # output directory
+        )
+
+
+@nox.session
+def release(session):
+    package_name = "packaging"
+    version_file = Path(f"{package_name}/__init__.py")
+    changelog_file = Path("CHANGELOG.rst")
+
+    try:
+        release_version = _get_version_from_arguments(session.posargs)
+    except ValueError as e:
+        session.error(f"Invalid arguments: {e}")
+
+    # Check state of working directory and git.
+    _check_working_directory_state(session)
+    _check_git_state(session, release_version)
+
+    # Prepare for release.
+    _changelog_update_unreleased_title(release_version, file=changelog_file)
+    session.run("git", "add", str(changelog_file), external=True)
+    _bump(session, version=release_version, file=version_file, kind="release")
+
+    # Tag the release commit.
+    # fmt: off
+    session.run(
+        "git", "tag",
+        "-s", release_version,
+        "-m", f"Release {release_version}",
+        external=True,
+    )
+    # fmt: on
+
+    # Prepare for development.
+    _changelog_add_unreleased_title(file=changelog_file)
+    session.run("git", "add", str(changelog_file), external=True)
+
+    major, minor = map(int, release_version.split("."))
+    next_version = f"{major}.{minor + 1}.dev0"
+    _bump(session, version=next_version, file=version_file, kind="development")
+
+    # Checkout the git tag.
+    session.run("git", "checkout", "-q", release_version, external=True)
+
+    session.install("build", "twine")
+
+    # Build the distribution.
+    session.run("python", "-m", "build")
+
+    # Check what files are in dist/ for upload.
+    files = sorted(glob.glob("dist/*"))
+    expected = [
+        f"dist/{package_name}-{release_version}-py2.py3-none-any.whl",
+        f"dist/{package_name}-{release_version}.tar.gz",
+    ]
+    if files != expected:
+        diff_generator = difflib.context_diff(
+            expected, files, fromfile="expected", tofile="got", lineterm=""
+        )
+        diff = "\n".join(diff_generator)
+        session.error(f"Got the wrong files:\n{diff}")
+
+    # Get back out into master.
+    session.run("git", "checkout", "-q", "master", external=True)
+
+    # Check and upload distribution files.
+    session.run("twine", "check", *files)
+
+    # Upload the distribution.
+    session.run("twine", "upload", *files)
+
+    # Push the commits and tag.
+    # NOTE: The following fails if pushing to the branch is not allowed. This can
+    #       happen on GitHub, if the master branch is protected, there are required
+    #       CI checks and "Include administrators" is enabled on the protection.
+    session.run("git", "push", "upstream", "master", release_version, external=True)
+
+
+# -----------------------------------------------------------------------------
+# Helpers
+# -----------------------------------------------------------------------------
+def _get_version_from_arguments(arguments):
+    """Checks the arguments passed to `nox -s release`.
+
+    Only 1 argument that looks like a version? Return the argument.
+    Otherwise, raise a ValueError describing what's wrong.
+    """
+    if len(arguments) != 1:
+        raise ValueError("Expected exactly 1 argument")
+
+    version = arguments[0]
+    parts = version.split(".")
+
+    if len(parts) != 2:
+        # Not of the form: YY.N
+        raise ValueError("not of the form: YY.N")
+
+    if not all(part.isdigit() for part in parts):
+        # Not all segments are integers.
+        raise ValueError("non-integer segments")
+
+    # All is good.
+    return version
+
+
+def _check_working_directory_state(session):
+    """Check state of the working directory, prior to making the release."""
+    should_not_exist = ["build/", "dist/"]
+
+    bad_existing_paths = list(filter(os.path.exists, should_not_exist))
+    if bad_existing_paths:
+        session.error(f"Remove {', '.join(bad_existing_paths)} and try again")
+
+
+def _check_git_state(session, version_tag):
+    """Check state of the git repository, prior to making the release."""
+    # Ensure the upstream remote pushes to the correct URL.
+    allowed_upstreams = [
+        "git@github.com:pypa/packaging.git",
+        "https://github.com/pypa/packaging.git",
+    ]
+    result = subprocess.run(
+        ["git", "remote", "get-url", "--push", "upstream"],
+        capture_output=True,
+        encoding="utf-8",
+    )
+    if result.stdout.rstrip() not in allowed_upstreams:
+        session.error(f"git remote `upstream` is not one of {allowed_upstreams}")
+    # Ensure we're on master branch for cutting a release.
+    result = subprocess.run(
+        ["git", "rev-parse", "--abbrev-ref", "HEAD"],
+        capture_output=True,
+        encoding="utf-8",
+    )
+    if result.stdout != "master\n":
+        session.error(f"Not on master branch: {result.stdout!r}")
+
+    # Ensure there are no uncommitted changes.
+    result = subprocess.run(
+        ["git", "status", "--porcelain"], capture_output=True, encoding="utf-8"
+    )
+    if result.stdout:
+        print(result.stdout, end="", file=sys.stderr)
+        session.error("The working tree has uncommitted changes")
+
+    # Ensure this tag doesn't exist already.
+    result = subprocess.run(
+        ["git", "rev-parse", version_tag], capture_output=True, encoding="utf-8"
+    )
+    if not result.returncode:
+        session.error(f"Tag already exists! {version_tag} -- {result.stdout!r}")
+
+    # Back up the current git reference, in a tag that's easy to clean up.
+    _release_backup_tag = "auto/release-start-" + str(int(time.time()))
+    session.run("git", "tag", _release_backup_tag, external=True)
+
+
+def _bump(session, *, version, file, kind):
+    session.log(f"Bump version to {version!r}")
+    contents = file.read_text()
+    new_contents = re.sub(
+        '__version__ = "(.+)"', f'__version__ = "{version}"', contents
+    )
+    file.write_text(new_contents)
+
+    session.log("git commit")
+    subprocess.run(["git", "add", str(file)])
+    subprocess.run(["git", "commit", "-m", f"Bump for {kind}"])
+
+
+@contextlib.contextmanager
+def _replace_file(original_path):
+    # Create a temporary file.
+    fh, replacement_path = tempfile.mkstemp()
+
+    try:
+        with os.fdopen(fh, "w") as replacement:
+            with open(original_path) as original:
+                yield original, replacement
+    except Exception:
+        raise
+    else:
+        shutil.copymode(original_path, replacement_path)
+        os.remove(original_path)
+        shutil.move(replacement_path, original_path)
+
+
+def _changelog_update_unreleased_title(version, *, file):
+    """Update an "*unreleased*" heading to "{version} - {date}" """
+    yyyy_mm_dd = datetime.datetime.today().strftime("%Y-%m-%d")
+    title = f"{version} - {yyyy_mm_dd}"
+
+    with _replace_file(file) as (original, replacement):
+        for line in original:
+            if line == "*unreleased*\n":
+                replacement.write(f"{title}\n")
+                replacement.write(len(title) * "~" + "\n")
+                # Skip processing the next line (the heading underline for *unreleased*)
+                # since we already wrote the heading underline.
+                next(original)
+            else:
+                replacement.write(line)
+
+
+def _changelog_add_unreleased_title(*, file):
+    with _replace_file(file) as (original, replacement):
+        # Duplicate first 3 lines from the original file.
+        for _ in range(3):
+            line = next(original)
+            replacement.write(line)
+
+        # Write the heading.
+        replacement.write(
+            textwrap.dedent(
+                """\
+                *unreleased*
+                ~~~~~~~~~~~~
+
+                No unreleased changes.
+
+                """
+            )
+        )
+
+        # Duplicate all the remaining lines.
+        for line in original:
+            replacement.write(line)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/__init__.py
new file mode 100644
index 00000000000..18fecb867a8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/__init__.py
@@ -0,0 +1,5 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+"""Core utilities for Python packages"""
+__version__ = "20.7"
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/_compat.py b/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/_compat.py
new file mode 100644
index 00000000000..e54bd4ede87
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/_compat.py
@@ -0,0 +1,38 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import sys
+
+from ._typing import TYPE_CHECKING
+
+if TYPE_CHECKING:  # pragma: no cover
+    from typing import Any, Dict, Tuple, Type
+
+
+PY2 = sys.version_info[0] == 2
+PY3 = sys.version_info[0] == 3
+
+# flake8: noqa
+
+if PY3:
+    string_types = (str,)
+else:
+    string_types = (basestring,)
+
+
+def with_metaclass(meta, *bases):
+    # type: (Type[Any], Tuple[Type[Any], ...]) -> Any
+    """
+    Create a base class with a metaclass.
+    """
+    # This requires a bit of explanation: the basic idea is to make a dummy
+    # metaclass for one level of class instantiation that replaces itself with
+    # the actual metaclass.
+    class metaclass(meta):  # type: ignore
+        def __new__(cls, name, this_bases, d):
+            # type: (Type[Any], str, Tuple[Any], Dict[Any, Any]) -> Any
+            return meta(name, bases, d)
+
+    return type.__new__(metaclass, "temporary_class", (), {})
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/_structures.py b/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/_structures.py
new file mode 100644
index 00000000000..800d5c5588c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/_structures.py
@@ -0,0 +1,86 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+
+class InfinityType(object):
+    def __repr__(self):
+        # type: () -> str
+        return "Infinity"
+
+    def __hash__(self):
+        # type: () -> int
+        return hash(repr(self))
+
+    def __lt__(self, other):
+        # type: (object) -> bool
+        return False
+
+    def __le__(self, other):
+        # type: (object) -> bool
+        return False
+
+    def __eq__(self, other):
+        # type: (object) -> bool
+        return isinstance(other, self.__class__)
+
+    def __ne__(self, other):
+        # type: (object) -> bool
+        return not isinstance(other, self.__class__)
+
+    def __gt__(self, other):
+        # type: (object) -> bool
+        return True
+
+    def __ge__(self, other):
+        # type: (object) -> bool
+        return True
+
+    def __neg__(self):
+        # type: (object) -> NegativeInfinityType
+        return NegativeInfinity
+
+
+Infinity = InfinityType()
+
+
+class NegativeInfinityType(object):
+    def __repr__(self):
+        # type: () -> str
+        return "-Infinity"
+
+    def __hash__(self):
+        # type: () -> int
+        return hash(repr(self))
+
+    def __lt__(self, other):
+        # type: (object) -> bool
+        return True
+
+    def __le__(self, other):
+        # type: (object) -> bool
+        return True
+
+    def __eq__(self, other):
+        # type: (object) -> bool
+        return isinstance(other, self.__class__)
+
+    def __ne__(self, other):
+        # type: (object) -> bool
+        return not isinstance(other, self.__class__)
+
+    def __gt__(self, other):
+        # type: (object) -> bool
+        return False
+
+    def __ge__(self, other):
+        # type: (object) -> bool
+        return False
+
+    def __neg__(self):
+        # type: (object) -> InfinityType
+        return Infinity
+
+
+NegativeInfinity = NegativeInfinityType()
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/_typing.py b/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/_typing.py
new file mode 100644
index 00000000000..77a8b9185a0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/_typing.py
@@ -0,0 +1,48 @@
+"""For neatly implementing static typing in packaging.
+
+`mypy` - the static type analysis tool we use - uses the `typing` module, which
+provides core functionality fundamental to mypy's functioning.
+
+Generally, `typing` would be imported at runtime and used in that fashion -
+it acts as a no-op at runtime and does not have any run-time overhead by
+design.
+
+As it turns out, `typing` is not vendorable - it uses separate sources for
+Python 2/Python 3. Thus, this codebase can not expect it to be present.
+To work around this, mypy allows the typing import to be behind a False-y
+optional to prevent it from running at runtime and type-comments can be used
+to remove the need for the types to be accessible directly during runtime.
+
+This module provides the False-y guard in a nicely named fashion so that a
+curious maintainer can reach here to read this.
+
+In packaging, all static-typing related imports should be guarded as follows:
+
+    from packaging._typing import TYPE_CHECKING
+
+    if TYPE_CHECKING:
+        from typing import ...
+
+Ref: https://github.com/python/mypy/issues/3216
+"""
+
+__all__ = ["TYPE_CHECKING", "cast"]
+
+# The TYPE_CHECKING constant defined by the typing module is False at runtime
+# but True while type checking.
+if False:  # pragma: no cover
+    from typing import TYPE_CHECKING
+else:
+    TYPE_CHECKING = False
+
+# typing's cast syntax requires calling typing.cast at runtime, but we don't
+# want to import typing at runtime. Here, we inform the type checkers that
+# we're importing `typing.cast` as `cast` and re-implement typing.cast's
+# runtime behavior in a block that is ignored by type checkers.
+if TYPE_CHECKING:  # pragma: no cover
+    # not executed at runtime
+    from typing import cast
+else:
+    # executed at runtime
+    def cast(type_, value):  # noqa
+        return value
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/markers.py b/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/markers.py
new file mode 100644
index 00000000000..87cd3f95857
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/markers.py
@@ -0,0 +1,328 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import operator
+import os
+import platform
+import sys
+
+from pyparsing import ParseException, ParseResults, stringStart, stringEnd
+from pyparsing import ZeroOrMore, Group, Forward, QuotedString
+from pyparsing import Literal as L  # noqa
+
+from ._compat import string_types
+from ._typing import TYPE_CHECKING
+from .specifiers import Specifier, InvalidSpecifier
+
+if TYPE_CHECKING:  # pragma: no cover
+    from typing import Any, Callable, Dict, List, Optional, Tuple, Union
+
+    Operator = Callable[[str, str], bool]
+
+
+__all__ = [
+    "InvalidMarker",
+    "UndefinedComparison",
+    "UndefinedEnvironmentName",
+    "Marker",
+    "default_environment",
+]
+
+
+class InvalidMarker(ValueError):
+    """
+    An invalid marker was found, users should refer to PEP 508.
+    """
+
+
+class UndefinedComparison(ValueError):
+    """
+    An invalid operation was attempted on a value that doesn't support it.
+    """
+
+
+class UndefinedEnvironmentName(ValueError):
+    """
+    A name was attempted to be used that does not exist inside of the
+    environment.
+    """
+
+
+class Node(object):
+    def __init__(self, value):
+        # type: (Any) -> None
+        self.value = value
+
+    def __str__(self):
+        # type: () -> str
+        return str(self.value)
+
+    def __repr__(self):
+        # type: () -> str
+        return "<{0}({1!r})>".format(self.__class__.__name__, str(self))
+
+    def serialize(self):
+        # type: () -> str
+        raise NotImplementedError
+
+
+class Variable(Node):
+    def serialize(self):
+        # type: () -> str
+        return str(self)
+
+
+class Value(Node):
+    def serialize(self):
+        # type: () -> str
+        return '"{0}"'.format(self)
+
+
+class Op(Node):
+    def serialize(self):
+        # type: () -> str
+        return str(self)
+
+
+VARIABLE = (
+    L("implementation_version")
+    | L("platform_python_implementation")
+    | L("implementation_name")
+    | L("python_full_version")
+    | L("platform_release")
+    | L("platform_version")
+    | L("platform_machine")
+    | L("platform_system")
+    | L("python_version")
+    | L("sys_platform")
+    | L("os_name")
+    | L("os.name")  # PEP-345
+    | L("sys.platform")  # PEP-345
+    | L("platform.version")  # PEP-345
+    | L("platform.machine")  # PEP-345
+    | L("platform.python_implementation")  # PEP-345
+    | L("python_implementation")  # undocumented setuptools legacy
+    | L("extra")  # PEP-508
+)
+ALIASES = {
+    "os.name": "os_name",
+    "sys.platform": "sys_platform",
+    "platform.version": "platform_version",
+    "platform.machine": "platform_machine",
+    "platform.python_implementation": "platform_python_implementation",
+    "python_implementation": "platform_python_implementation",
+}
+VARIABLE.setParseAction(lambda s, l, t: Variable(ALIASES.get(t[0], t[0])))
+
+VERSION_CMP = (
+    L("===") | L("==") | L(">=") | L("<=") | L("!=") | L("~=") | L(">") | L("<")
+)
+
+MARKER_OP = VERSION_CMP | L("not in") | L("in")
+MARKER_OP.setParseAction(lambda s, l, t: Op(t[0]))
+
+MARKER_VALUE = QuotedString("'") | QuotedString('"')
+MARKER_VALUE.setParseAction(lambda s, l, t: Value(t[0]))
+
+BOOLOP = L("and") | L("or")
+
+MARKER_VAR = VARIABLE | MARKER_VALUE
+
+MARKER_ITEM = Group(MARKER_VAR + MARKER_OP + MARKER_VAR)
+MARKER_ITEM.setParseAction(lambda s, l, t: tuple(t[0]))
+
+LPAREN = L("(").suppress()
+RPAREN = L(")").suppress()
+
+MARKER_EXPR = Forward()
+MARKER_ATOM = MARKER_ITEM | Group(LPAREN + MARKER_EXPR + RPAREN)
+MARKER_EXPR << MARKER_ATOM + ZeroOrMore(BOOLOP + MARKER_EXPR)
+
+MARKER = stringStart + MARKER_EXPR + stringEnd
+
+
+def _coerce_parse_result(results):
+    # type: (Union[ParseResults, List[Any]]) -> List[Any]
+    if isinstance(results, ParseResults):
+        return [_coerce_parse_result(i) for i in results]
+    else:
+        return results
+
+
+def _format_marker(marker, first=True):
+    # type: (Union[List[str], Tuple[Node, ...], str], Optional[bool]) -> str
+
+    assert isinstance(marker, (list, tuple, string_types))
+
+    # Sometimes we have a structure like [[...]] which is a single item list
+    # where the single item is itself it's own list. In that case we want skip
+    # the rest of this function so that we don't get extraneous () on the
+    # outside.
+    if (
+        isinstance(marker, list)
+        and len(marker) == 1
+        and isinstance(marker[0], (list, tuple))
+    ):
+        return _format_marker(marker[0])
+
+    if isinstance(marker, list):
+        inner = (_format_marker(m, first=False) for m in marker)
+        if first:
+            return " ".join(inner)
+        else:
+            return "(" + " ".join(inner) + ")"
+    elif isinstance(marker, tuple):
+        return " ".join([m.serialize() for m in marker])
+    else:
+        return marker
+
+
+_operators = {
+    "in": lambda lhs, rhs: lhs in rhs,
+    "not in": lambda lhs, rhs: lhs not in rhs,
+    "<": operator.lt,
+    "<=": operator.le,
+    "==": operator.eq,
+    "!=": operator.ne,
+    ">=": operator.ge,
+    ">": operator.gt,
+}  # type: Dict[str, Operator]
+
+
+def _eval_op(lhs, op, rhs):
+    # type: (str, Op, str) -> bool
+    try:
+        spec = Specifier("".join([op.serialize(), rhs]))
+    except InvalidSpecifier:
+        pass
+    else:
+        return spec.contains(lhs)
+
+    oper = _operators.get(op.serialize())  # type: Optional[Operator]
+    if oper is None:
+        raise UndefinedComparison(
+            "Undefined {0!r} on {1!r} and {2!r}.".format(op, lhs, rhs)
+        )
+
+    return oper(lhs, rhs)
+
+
+class Undefined(object):
+    pass
+
+
+_undefined = Undefined()
+
+
+def _get_env(environment, name):
+    # type: (Dict[str, str], str) -> str
+    value = environment.get(name, _undefined)  # type: Union[str, Undefined]
+
+    if isinstance(value, Undefined):
+        raise UndefinedEnvironmentName(
+            "{0!r} does not exist in evaluation environment.".format(name)
+        )
+
+    return value
+
+
+def _evaluate_markers(markers, environment):
+    # type: (List[Any], Dict[str, str]) -> bool
+    groups = [[]]  # type: List[List[bool]]
+
+    for marker in markers:
+        assert isinstance(marker, (list, tuple, string_types))
+
+        if isinstance(marker, list):
+            groups[-1].append(_evaluate_markers(marker, environment))
+        elif isinstance(marker, tuple):
+            lhs, op, rhs = marker
+
+            if isinstance(lhs, Variable):
+                lhs_value = _get_env(environment, lhs.value)
+                rhs_value = rhs.value
+            else:
+                lhs_value = lhs.value
+                rhs_value = _get_env(environment, rhs.value)
+
+            groups[-1].append(_eval_op(lhs_value, op, rhs_value))
+        else:
+            assert marker in ["and", "or"]
+            if marker == "or":
+                groups.append([])
+
+    return any(all(item) for item in groups)
+
+
+def format_full_version(info):
+    # type: (sys._version_info) -> str
+    version = "{0.major}.{0.minor}.{0.micro}".format(info)
+    kind = info.releaselevel
+    if kind != "final":
+        version += kind[0] + str(info.serial)
+    return version
+
+
+def default_environment():
+    # type: () -> Dict[str, str]
+    if hasattr(sys, "implementation"):
+        # Ignoring the `sys.implementation` reference for type checking due to
+        # mypy not liking that the attribute doesn't exist in Python 2.7 when
+        # run with the `--py27` flag.
+        iver = format_full_version(sys.implementation.version)  # type: ignore
+        implementation_name = sys.implementation.name  # type: ignore
+    else:
+        iver = "0"
+        implementation_name = ""
+
+    return {
+        "implementation_name": implementation_name,
+        "implementation_version": iver,
+        "os_name": os.name,
+        "platform_machine": platform.machine(),
+        "platform_release": platform.release(),
+        "platform_system": platform.system(),
+        "platform_version": platform.version(),
+        "python_full_version": platform.python_version(),
+        "platform_python_implementation": platform.python_implementation(),
+        "python_version": ".".join(platform.python_version_tuple()[:2]),
+        "sys_platform": sys.platform,
+    }
+
+
+class Marker(object):
+    def __init__(self, marker):
+        # type: (str) -> None
+        try:
+            self._markers = _coerce_parse_result(MARKER.parseString(marker))
+        except ParseException as e:
+            err_str = "Invalid marker: {0!r}, parse error at {1!r}".format(
+                marker, marker[e.loc : e.loc + 8]
+            )
+            raise InvalidMarker(err_str)
+
+    def __str__(self):
+        # type: () -> str
+        return _format_marker(self._markers)
+
+    def __repr__(self):
+        # type: () -> str
+        return "<Marker({0!r})>".format(str(self))
+
+    def evaluate(self, environment=None):
+        # type: (Optional[Dict[str, str]]) -> bool
+        """Evaluate a marker.
+
+        Return the boolean from evaluating the given marker against the
+        environment. environment is an optional argument to override all or
+        part of the determined environment.
+
+        The environment is determined from the current Python process.
+        """
+        current_environment = default_environment()
+        if environment is not None:
+            current_environment.update(environment)
+
+        return _evaluate_markers(self._markers, current_environment)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/py.typed b/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/py.typed
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/requirements.py b/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/requirements.py
new file mode 100644
index 00000000000..2226e984e24
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/requirements.py
@@ -0,0 +1,151 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import string
+import re
+import sys
+
+from pyparsing import stringStart, stringEnd, originalTextFor, ParseException
+from pyparsing import ZeroOrMore, Word, Optional, Regex, Combine
+from pyparsing import Literal as L  # noqa
+
+from ._typing import TYPE_CHECKING
+from .markers import MARKER_EXPR, Marker
+from .specifiers import LegacySpecifier, Specifier, SpecifierSet
+
+if sys.version_info[0] >= 3:
+    from urllib import parse as urlparse  # pragma: no cover
+else:  # pragma: no cover
+    import urlparse
+
+
+if TYPE_CHECKING:  # pragma: no cover
+    from typing import List
+
+
+class InvalidRequirement(ValueError):
+    """
+    An invalid requirement was found, users should refer to PEP 508.
+    """
+
+
+ALPHANUM = Word(string.ascii_letters + string.digits)
+
+LBRACKET = L("[").suppress()
+RBRACKET = L("]").suppress()
+LPAREN = L("(").suppress()
+RPAREN = L(")").suppress()
+COMMA = L(",").suppress()
+SEMICOLON = L(";").suppress()
+AT = L("@").suppress()
+
+PUNCTUATION = Word("-_.")
+IDENTIFIER_END = ALPHANUM | (ZeroOrMore(PUNCTUATION) + ALPHANUM)
+IDENTIFIER = Combine(ALPHANUM + ZeroOrMore(IDENTIFIER_END))
+
+NAME = IDENTIFIER("name")
+EXTRA = IDENTIFIER
+
+URI = Regex(r"[^ ]+")("url")
+URL = AT + URI
+
+EXTRAS_LIST = EXTRA + ZeroOrMore(COMMA + EXTRA)
+EXTRAS = (LBRACKET + Optional(EXTRAS_LIST) + RBRACKET)("extras")
+
+VERSION_PEP440 = Regex(Specifier._regex_str, re.VERBOSE | re.IGNORECASE)
+VERSION_LEGACY = Regex(LegacySpecifier._regex_str, re.VERBOSE | re.IGNORECASE)
+
+VERSION_ONE = VERSION_PEP440 ^ VERSION_LEGACY
+VERSION_MANY = Combine(
+    VERSION_ONE + ZeroOrMore(COMMA + VERSION_ONE), joinString=",", adjacent=False
+)("_raw_spec")
+_VERSION_SPEC = Optional(((LPAREN + VERSION_MANY + RPAREN) | VERSION_MANY))
+_VERSION_SPEC.setParseAction(lambda s, l, t: t._raw_spec or "")
+
+VERSION_SPEC = originalTextFor(_VERSION_SPEC)("specifier")
+VERSION_SPEC.setParseAction(lambda s, l, t: t[1])
+
+MARKER_EXPR = originalTextFor(MARKER_EXPR())("marker")
+MARKER_EXPR.setParseAction(
+    lambda s, l, t: Marker(s[t._original_start : t._original_end])
+)
+MARKER_SEPARATOR = SEMICOLON
+MARKER = MARKER_SEPARATOR + MARKER_EXPR
+
+VERSION_AND_MARKER = VERSION_SPEC + Optional(MARKER)
+URL_AND_MARKER = URL + Optional(MARKER)
+
+NAMED_REQUIREMENT = NAME + Optional(EXTRAS) + (URL_AND_MARKER | VERSION_AND_MARKER)
+
+REQUIREMENT = stringStart + NAMED_REQUIREMENT + stringEnd
+# pyparsing isn't thread safe during initialization, so we do it eagerly, see
+# issue #104
+REQUIREMENT.parseString("x[]")
+
+
+class Requirement(object):
+    """Parse a requirement.
+
+    Parse a given requirement string into its parts, such as name, specifier,
+    URL, and extras. Raises InvalidRequirement on a badly-formed requirement
+    string.
+    """
+
+    # TODO: Can we test whether something is contained within a requirement?
+    #       If so how do we do that? Do we need to test against the _name_ of
+    #       the thing as well as the version? What about the markers?
+    # TODO: Can we normalize the name and extra name?
+
+    def __init__(self, requirement_string):
+        # type: (str) -> None
+        try:
+            req = REQUIREMENT.parseString(requirement_string)
+        except ParseException as e:
+            raise InvalidRequirement(
+                'Parse error at "{0!r}": {1}'.format(
+                    requirement_string[e.loc : e.loc + 8], e.msg
+                )
+            )
+
+        self.name = req.name
+        if req.url:
+            parsed_url = urlparse.urlparse(req.url)
+            if parsed_url.scheme == "file":
+                if urlparse.urlunparse(parsed_url) != req.url:
+                    raise InvalidRequirement("Invalid URL given")
+            elif not (parsed_url.scheme and parsed_url.netloc) or (
+                not parsed_url.scheme and not parsed_url.netloc
+            ):
+                raise InvalidRequirement("Invalid URL: {0}".format(req.url))
+            self.url = req.url
+        else:
+            self.url = None
+        self.extras = set(req.extras.asList() if req.extras else [])
+        self.specifier = SpecifierSet(req.specifier)
+        self.marker = req.marker if req.marker else None
+
+    def __str__(self):
+        # type: () -> str
+        parts = [self.name]  # type: List[str]
+
+        if self.extras:
+            parts.append("[{0}]".format(",".join(sorted(self.extras))))
+
+        if self.specifier:
+            parts.append(str(self.specifier))
+
+        if self.url:
+            parts.append("@ {0}".format(self.url))
+            if self.marker:
+                parts.append(" ")
+
+        if self.marker:
+            parts.append("; {0}".format(self.marker))
+
+        return "".join(parts)
+
+    def __repr__(self):
+        # type: () -> str
+        return "<Requirement({0!r})>".format(str(self))
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/specifiers.py b/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/specifiers.py
new file mode 100644
index 00000000000..a42cbfef332
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/specifiers.py
@@ -0,0 +1,864 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import abc
+import functools
+import itertools
+import re
+import warnings
+
+from ._compat import string_types, with_metaclass
+from ._typing import TYPE_CHECKING
+from .utils import canonicalize_version
+from .version import Version, LegacyVersion, parse
+
+if TYPE_CHECKING:  # pragma: no cover
+    from typing import List, Dict, Union, Iterable, Iterator, Optional, Callable, Tuple
+
+    ParsedVersion = Union[Version, LegacyVersion]
+    UnparsedVersion = Union[Version, LegacyVersion, str]
+    CallableOperator = Callable[[ParsedVersion, str], bool]
+
+
+class InvalidSpecifier(ValueError):
+    """
+    An invalid specifier was found, users should refer to PEP 440.
+    """
+
+
+class BaseSpecifier(with_metaclass(abc.ABCMeta, object)):  # type: ignore
+    @abc.abstractmethod
+    def __str__(self):
+        # type: () -> str
+        """
+        Returns the str representation of this Specifier like object. This
+        should be representative of the Specifier itself.
+        """
+
+    @abc.abstractmethod
+    def __hash__(self):
+        # type: () -> int
+        """
+        Returns a hash value for this Specifier like object.
+        """
+
+    @abc.abstractmethod
+    def __eq__(self, other):
+        # type: (object) -> bool
+        """
+        Returns a boolean representing whether or not the two Specifier like
+        objects are equal.
+        """
+
+    @abc.abstractmethod
+    def __ne__(self, other):
+        # type: (object) -> bool
+        """
+        Returns a boolean representing whether or not the two Specifier like
+        objects are not equal.
+        """
+
+    @abc.abstractproperty
+    def prereleases(self):
+        # type: () -> Optional[bool]
+        """
+        Returns whether or not pre-releases as a whole are allowed by this
+        specifier.
+        """
+
+    @prereleases.setter
+    def prereleases(self, value):
+        # type: (bool) -> None
+        """
+        Sets whether or not pre-releases as a whole are allowed by this
+        specifier.
+        """
+
+    @abc.abstractmethod
+    def contains(self, item, prereleases=None):
+        # type: (str, Optional[bool]) -> bool
+        """
+        Determines if the given item is contained within this specifier.
+        """
+
+    @abc.abstractmethod
+    def filter(self, iterable, prereleases=None):
+        # type: (Iterable[UnparsedVersion], Optional[bool]) -> Iterable[UnparsedVersion]
+        """
+        Takes an iterable of items and filters them so that only items which
+        are contained within this specifier are allowed in it.
+        """
+
+
+class _IndividualSpecifier(BaseSpecifier):
+
+    _operators = {}  # type: Dict[str, str]
+
+    def __init__(self, spec="", prereleases=None):
+        # type: (str, Optional[bool]) -> None
+        match = self._regex.search(spec)
+        if not match:
+            raise InvalidSpecifier("Invalid specifier: '{0}'".format(spec))
+
+        self._spec = (
+            match.group("operator").strip(),
+            match.group("version").strip(),
+        )  # type: Tuple[str, str]
+
+        # Store whether or not this Specifier should accept prereleases
+        self._prereleases = prereleases
+
+    def __repr__(self):
+        # type: () -> str
+        pre = (
+            ", prereleases={0!r}".format(self.prereleases)
+            if self._prereleases is not None
+            else ""
+        )
+
+        return "<{0}({1!r}{2})>".format(self.__class__.__name__, str(self), pre)
+
+    def __str__(self):
+        # type: () -> str
+        return "{0}{1}".format(*self._spec)
+
+    @property
+    def _canonical_spec(self):
+        # type: () -> Tuple[str, Union[Version, str]]
+        return self._spec[0], canonicalize_version(self._spec[1])
+
+    def __hash__(self):
+        # type: () -> int
+        return hash(self._canonical_spec)
+
+    def __eq__(self, other):
+        # type: (object) -> bool
+        if isinstance(other, string_types):
+            try:
+                other = self.__class__(str(other))
+            except InvalidSpecifier:
+                return NotImplemented
+        elif not isinstance(other, self.__class__):
+            return NotImplemented
+
+        return self._canonical_spec == other._canonical_spec
+
+    def __ne__(self, other):
+        # type: (object) -> bool
+        if isinstance(other, string_types):
+            try:
+                other = self.__class__(str(other))
+            except InvalidSpecifier:
+                return NotImplemented
+        elif not isinstance(other, self.__class__):
+            return NotImplemented
+
+        return self._spec != other._spec
+
+    def _get_operator(self, op):
+        # type: (str) -> CallableOperator
+        operator_callable = getattr(
+            self, "_compare_{0}".format(self._operators[op])
+        )  # type: CallableOperator
+        return operator_callable
+
+    def _coerce_version(self, version):
+        # type: (UnparsedVersion) -> ParsedVersion
+        if not isinstance(version, (LegacyVersion, Version)):
+            version = parse(version)
+        return version
+
+    @property
+    def operator(self):
+        # type: () -> str
+        return self._spec[0]
+
+    @property
+    def version(self):
+        # type: () -> str
+        return self._spec[1]
+
+    @property
+    def prereleases(self):
+        # type: () -> Optional[bool]
+        return self._prereleases
+
+    @prereleases.setter
+    def prereleases(self, value):
+        # type: (bool) -> None
+        self._prereleases = value
+
+    def __contains__(self, item):
+        # type: (str) -> bool
+        return self.contains(item)
+
+    def contains(self, item, prereleases=None):
+        # type: (UnparsedVersion, Optional[bool]) -> bool
+
+        # Determine if prereleases are to be allowed or not.
+        if prereleases is None:
+            prereleases = self.prereleases
+
+        # Normalize item to a Version or LegacyVersion, this allows us to have
+        # a shortcut for ``"2.0" in Specifier(">=2")
+        normalized_item = self._coerce_version(item)
+
+        # Determine if we should be supporting prereleases in this specifier
+        # or not, if we do not support prereleases than we can short circuit
+        # logic if this version is a prereleases.
+        if normalized_item.is_prerelease and not prereleases:
+            return False
+
+        # Actually do the comparison to determine if this item is contained
+        # within this Specifier or not.
+        operator_callable = self._get_operator(self.operator)  # type: CallableOperator
+        return operator_callable(normalized_item, self.version)
+
+    def filter(self, iterable, prereleases=None):
+        # type: (Iterable[UnparsedVersion], Optional[bool]) -> Iterable[UnparsedVersion]
+
+        yielded = False
+        found_prereleases = []
+
+        kw = {"prereleases": prereleases if prereleases is not None else True}
+
+        # Attempt to iterate over all the values in the iterable and if any of
+        # them match, yield them.
+        for version in iterable:
+            parsed_version = self._coerce_version(version)
+
+            if self.contains(parsed_version, **kw):
+                # If our version is a prerelease, and we were not set to allow
+                # prereleases, then we'll store it for later incase nothing
+                # else matches this specifier.
+                if parsed_version.is_prerelease and not (
+                    prereleases or self.prereleases
+                ):
+                    found_prereleases.append(version)
+                # Either this is not a prerelease, or we should have been
+                # accepting prereleases from the beginning.
+                else:
+                    yielded = True
+                    yield version
+
+        # Now that we've iterated over everything, determine if we've yielded
+        # any values, and if we have not and we have any prereleases stored up
+        # then we will go ahead and yield the prereleases.
+        if not yielded and found_prereleases:
+            for version in found_prereleases:
+                yield version
+
+
+class LegacySpecifier(_IndividualSpecifier):
+
+    _regex_str = r"""
+        (?P<operator>(==|!=|<=|>=|<|>))
+        \s*
+        (?P<version>
+            [^,;\s)]* # Since this is a "legacy" specifier, and the version
+                      # string can be just about anything, we match everything
+                      # except for whitespace, a semi-colon for marker support,
+                      # a closing paren since versions can be enclosed in
+                      # them, and a comma since it's a version separator.
+        )
+        """
+
+    _regex = re.compile(r"^\s*" + _regex_str + r"\s*$", re.VERBOSE | re.IGNORECASE)
+
+    _operators = {
+        "==": "equal",
+        "!=": "not_equal",
+        "<=": "less_than_equal",
+        ">=": "greater_than_equal",
+        "<": "less_than",
+        ">": "greater_than",
+    }
+
+    def __init__(self, spec="", prereleases=None):
+        # type: (str, Optional[bool]) -> None
+        super(LegacySpecifier, self).__init__(spec, prereleases)
+
+        warnings.warn(
+            "Creating a LegacyVersion has been deprecated and will be "
+            "removed in the next major release",
+            DeprecationWarning,
+        )
+
+    def _coerce_version(self, version):
+        # type: (Union[ParsedVersion, str]) -> LegacyVersion
+        if not isinstance(version, LegacyVersion):
+            version = LegacyVersion(str(version))
+        return version
+
+    def _compare_equal(self, prospective, spec):
+        # type: (LegacyVersion, str) -> bool
+        return prospective == self._coerce_version(spec)
+
+    def _compare_not_equal(self, prospective, spec):
+        # type: (LegacyVersion, str) -> bool
+        return prospective != self._coerce_version(spec)
+
+    def _compare_less_than_equal(self, prospective, spec):
+        # type: (LegacyVersion, str) -> bool
+        return prospective <= self._coerce_version(spec)
+
+    def _compare_greater_than_equal(self, prospective, spec):
+        # type: (LegacyVersion, str) -> bool
+        return prospective >= self._coerce_version(spec)
+
+    def _compare_less_than(self, prospective, spec):
+        # type: (LegacyVersion, str) -> bool
+        return prospective < self._coerce_version(spec)
+
+    def _compare_greater_than(self, prospective, spec):
+        # type: (LegacyVersion, str) -> bool
+        return prospective > self._coerce_version(spec)
+
+
+def _require_version_compare(
+    fn,  # type: (Callable[[Specifier, ParsedVersion, str], bool])
+):
+    # type: (...) -> Callable[[Specifier, ParsedVersion, str], bool]
+    @functools.wraps(fn)
+    def wrapped(self, prospective, spec):
+        # type: (Specifier, ParsedVersion, str) -> bool
+        if not isinstance(prospective, Version):
+            return False
+        return fn(self, prospective, spec)
+
+    return wrapped
+
+
+class Specifier(_IndividualSpecifier):
+
+    _regex_str = r"""
+        (?P<operator>(~=|==|!=|<=|>=|<|>|===))
+        (?P<version>
+            (?:
+                # The identity operators allow for an escape hatch that will
+                # do an exact string match of the version you wish to install.
+                # This will not be parsed by PEP 440 and we cannot determine
+                # any semantic meaning from it. This operator is discouraged
+                # but included entirely as an escape hatch.
+                (?<====)  # Only match for the identity operator
+                \s*
+                [^\s]*    # We just match everything, except for whitespace
+                          # since we are only testing for strict identity.
+            )
+            |
+            (?:
+                # The (non)equality operators allow for wild card and local
+                # versions to be specified so we have to define these two
+                # operators separately to enable that.
+                (?<===|!=)            # Only match for equals and not equals
+
+                \s*
+                v?
+                (?:[0-9]+!)?          # epoch
+                [0-9]+(?:\.[0-9]+)*   # release
+                (?:                   # pre release
+                    [-_\.]?
+                    (a|b|c|rc|alpha|beta|pre|preview)
+                    [-_\.]?
+                    [0-9]*
+                )?
+                (?:                   # post release
+                    (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
+                )?
+
+                # You cannot use a wild card and a dev or local version
+                # together so group them with a | and make them optional.
+                (?:
+                    (?:[-_\.]?dev[-_\.]?[0-9]*)?         # dev release
+                    (?:\+[a-z0-9]+(?:[-_\.][a-z0-9]+)*)? # local
+                    |
+                    \.\*  # Wild card syntax of .*
+                )?
+            )
+            |
+            (?:
+                # The compatible operator requires at least two digits in the
+                # release segment.
+                (?<=~=)               # Only match for the compatible operator
+
+                \s*
+                v?
+                (?:[0-9]+!)?          # epoch
+                [0-9]+(?:\.[0-9]+)+   # release  (We have a + instead of a *)
+                (?:                   # pre release
+                    [-_\.]?
+                    (a|b|c|rc|alpha|beta|pre|preview)
+                    [-_\.]?
+                    [0-9]*
+                )?
+                (?:                                   # post release
+                    (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
+                )?
+                (?:[-_\.]?dev[-_\.]?[0-9]*)?          # dev release
+            )
+            |
+            (?:
+                # All other operators only allow a sub set of what the
+                # (non)equality operators do. Specifically they do not allow
+                # local versions to be specified nor do they allow the prefix
+                # matching wild cards.
+                (?<!==|!=|~=)         # We have special cases for these
+                                      # operators so we want to make sure they
+                                      # don't match here.
+
+                \s*
+                v?
+                (?:[0-9]+!)?          # epoch
+                [0-9]+(?:\.[0-9]+)*   # release
+                (?:                   # pre release
+                    [-_\.]?
+                    (a|b|c|rc|alpha|beta|pre|preview)
+                    [-_\.]?
+                    [0-9]*
+                )?
+                (?:                                   # post release
+                    (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
+                )?
+                (?:[-_\.]?dev[-_\.]?[0-9]*)?          # dev release
+            )
+        )
+        """
+
+    _regex = re.compile(r"^\s*" + _regex_str + r"\s*$", re.VERBOSE | re.IGNORECASE)
+
+    _operators = {
+        "~=": "compatible",
+        "==": "equal",
+        "!=": "not_equal",
+        "<=": "less_than_equal",
+        ">=": "greater_than_equal",
+        "<": "less_than",
+        ">": "greater_than",
+        "===": "arbitrary",
+    }
+
+    @_require_version_compare
+    def _compare_compatible(self, prospective, spec):
+        # type: (ParsedVersion, str) -> bool
+
+        # Compatible releases have an equivalent combination of >= and ==. That
+        # is that ~=2.2 is equivalent to >=2.2,==2.*. This allows us to
+        # implement this in terms of the other specifiers instead of
+        # implementing it ourselves. The only thing we need to do is construct
+        # the other specifiers.
+
+        # We want everything but the last item in the version, but we want to
+        # ignore post and dev releases and we want to treat the pre-release as
+        # it's own separate segment.
+        prefix = ".".join(
+            list(
+                itertools.takewhile(
+                    lambda x: (not x.startswith("post") and not x.startswith("dev")),
+                    _version_split(spec),
+                )
+            )[:-1]
+        )
+
+        # Add the prefix notation to the end of our string
+        prefix += ".*"
+
+        return self._get_operator(">=")(prospective, spec) and self._get_operator("==")(
+            prospective, prefix
+        )
+
+    @_require_version_compare
+    def _compare_equal(self, prospective, spec):
+        # type: (ParsedVersion, str) -> bool
+
+        # We need special logic to handle prefix matching
+        if spec.endswith(".*"):
+            # In the case of prefix matching we want to ignore local segment.
+            prospective = Version(prospective.public)
+            # Split the spec out by dots, and pretend that there is an implicit
+            # dot in between a release segment and a pre-release segment.
+            split_spec = _version_split(spec[:-2])  # Remove the trailing .*
+
+            # Split the prospective version out by dots, and pretend that there
+            # is an implicit dot in between a release segment and a pre-release
+            # segment.
+            split_prospective = _version_split(str(prospective))
+
+            # Shorten the prospective version to be the same length as the spec
+            # so that we can determine if the specifier is a prefix of the
+            # prospective version or not.
+            shortened_prospective = split_prospective[: len(split_spec)]
+
+            # Pad out our two sides with zeros so that they both equal the same
+            # length.
+            padded_spec, padded_prospective = _pad_version(
+                split_spec, shortened_prospective
+            )
+
+            return padded_prospective == padded_spec
+        else:
+            # Convert our spec string into a Version
+            spec_version = Version(spec)
+
+            # If the specifier does not have a local segment, then we want to
+            # act as if the prospective version also does not have a local
+            # segment.
+            if not spec_version.local:
+                prospective = Version(prospective.public)
+
+            return prospective == spec_version
+
+    @_require_version_compare
+    def _compare_not_equal(self, prospective, spec):
+        # type: (ParsedVersion, str) -> bool
+        return not self._compare_equal(prospective, spec)
+
+    @_require_version_compare
+    def _compare_less_than_equal(self, prospective, spec):
+        # type: (ParsedVersion, str) -> bool
+
+        # NB: Local version identifiers are NOT permitted in the version
+        # specifier, so local version labels can be universally removed from
+        # the prospective version.
+        return Version(prospective.public) <= Version(spec)
+
+    @_require_version_compare
+    def _compare_greater_than_equal(self, prospective, spec):
+        # type: (ParsedVersion, str) -> bool
+
+        # NB: Local version identifiers are NOT permitted in the version
+        # specifier, so local version labels can be universally removed from
+        # the prospective version.
+        return Version(prospective.public) >= Version(spec)
+
+    @_require_version_compare
+    def _compare_less_than(self, prospective, spec_str):
+        # type: (ParsedVersion, str) -> bool
+
+        # Convert our spec to a Version instance, since we'll want to work with
+        # it as a version.
+        spec = Version(spec_str)
+
+        # Check to see if the prospective version is less than the spec
+        # version. If it's not we can short circuit and just return False now
+        # instead of doing extra unneeded work.
+        if not prospective < spec:
+            return False
+
+        # This special case is here so that, unless the specifier itself
+        # includes is a pre-release version, that we do not accept pre-release
+        # versions for the version mentioned in the specifier (e.g. <3.1 should
+        # not match 3.1.dev0, but should match 3.0.dev0).
+        if not spec.is_prerelease and prospective.is_prerelease:
+            if Version(prospective.base_version) == Version(spec.base_version):
+                return False
+
+        # If we've gotten to here, it means that prospective version is both
+        # less than the spec version *and* it's not a pre-release of the same
+        # version in the spec.
+        return True
+
+    @_require_version_compare
+    def _compare_greater_than(self, prospective, spec_str):
+        # type: (ParsedVersion, str) -> bool
+
+        # Convert our spec to a Version instance, since we'll want to work with
+        # it as a version.
+        spec = Version(spec_str)
+
+        # Check to see if the prospective version is greater than the spec
+        # version. If it's not we can short circuit and just return False now
+        # instead of doing extra unneeded work.
+        if not prospective > spec:
+            return False
+
+        # This special case is here so that, unless the specifier itself
+        # includes is a post-release version, that we do not accept
+        # post-release versions for the version mentioned in the specifier
+        # (e.g. >3.1 should not match 3.0.post0, but should match 3.2.post0).
+        if not spec.is_postrelease and prospective.is_postrelease:
+            if Version(prospective.base_version) == Version(spec.base_version):
+                return False
+
+        # Ensure that we do not allow a local version of the version mentioned
+        # in the specifier, which is technically greater than, to match.
+        if prospective.local is not None:
+            if Version(prospective.base_version) == Version(spec.base_version):
+                return False
+
+        # If we've gotten to here, it means that prospective version is both
+        # greater than the spec version *and* it's not a pre-release of the
+        # same version in the spec.
+        return True
+
+    def _compare_arbitrary(self, prospective, spec):
+        # type: (Version, str) -> bool
+        return str(prospective).lower() == str(spec).lower()
+
+    @property
+    def prereleases(self):
+        # type: () -> bool
+
+        # If there is an explicit prereleases set for this, then we'll just
+        # blindly use that.
+        if self._prereleases is not None:
+            return self._prereleases
+
+        # Look at all of our specifiers and determine if they are inclusive
+        # operators, and if they are if they are including an explicit
+        # prerelease.
+        operator, version = self._spec
+        if operator in ["==", ">=", "<=", "~=", "==="]:
+            # The == specifier can include a trailing .*, if it does we
+            # want to remove before parsing.
+            if operator == "==" and version.endswith(".*"):
+                version = version[:-2]
+
+            # Parse the version, and if it is a pre-release than this
+            # specifier allows pre-releases.
+            if parse(version).is_prerelease:
+                return True
+
+        return False
+
+    @prereleases.setter
+    def prereleases(self, value):
+        # type: (bool) -> None
+        self._prereleases = value
+
+
+_prefix_regex = re.compile(r"^([0-9]+)((?:a|b|c|rc)[0-9]+)$")
+
+
+def _version_split(version):
+    # type: (str) -> List[str]
+    result = []  # type: List[str]
+    for item in version.split("."):
+        match = _prefix_regex.search(item)
+        if match:
+            result.extend(match.groups())
+        else:
+            result.append(item)
+    return result
+
+
+def _pad_version(left, right):
+    # type: (List[str], List[str]) -> Tuple[List[str], List[str]]
+    left_split, right_split = [], []
+
+    # Get the release segment of our versions
+    left_split.append(list(itertools.takewhile(lambda x: x.isdigit(), left)))
+    right_split.append(list(itertools.takewhile(lambda x: x.isdigit(), right)))
+
+    # Get the rest of our versions
+    left_split.append(left[len(left_split[0]) :])
+    right_split.append(right[len(right_split[0]) :])
+
+    # Insert our padding
+    left_split.insert(1, ["0"] * max(0, len(right_split[0]) - len(left_split[0])))
+    right_split.insert(1, ["0"] * max(0, len(left_split[0]) - len(right_split[0])))
+
+    return (list(itertools.chain(*left_split)), list(itertools.chain(*right_split)))
+
+
+class SpecifierSet(BaseSpecifier):
+    def __init__(self, specifiers="", prereleases=None):
+        # type: (str, Optional[bool]) -> None
+
+        # Split on , to break each individual specifier into it's own item, and
+        # strip each item to remove leading/trailing whitespace.
+        split_specifiers = [s.strip() for s in specifiers.split(",") if s.strip()]
+
+        # Parsed each individual specifier, attempting first to make it a
+        # Specifier and falling back to a LegacySpecifier.
+        parsed = set()
+        for specifier in split_specifiers:
+            try:
+                parsed.add(Specifier(specifier))
+            except InvalidSpecifier:
+                parsed.add(LegacySpecifier(specifier))
+
+        # Turn our parsed specifiers into a frozen set and save them for later.
+        self._specs = frozenset(parsed)
+
+        # Store our prereleases value so we can use it later to determine if
+        # we accept prereleases or not.
+        self._prereleases = prereleases
+
+    def __repr__(self):
+        # type: () -> str
+        pre = (
+            ", prereleases={0!r}".format(self.prereleases)
+            if self._prereleases is not None
+            else ""
+        )
+
+        return "<SpecifierSet({0!r}{1})>".format(str(self), pre)
+
+    def __str__(self):
+        # type: () -> str
+        return ",".join(sorted(str(s) for s in self._specs))
+
+    def __hash__(self):
+        # type: () -> int
+        return hash(self._specs)
+
+    def __and__(self, other):
+        # type: (Union[SpecifierSet, str]) -> SpecifierSet
+        if isinstance(other, string_types):
+            other = SpecifierSet(other)
+        elif not isinstance(other, SpecifierSet):
+            return NotImplemented
+
+        specifier = SpecifierSet()
+        specifier._specs = frozenset(self._specs | other._specs)
+
+        if self._prereleases is None and other._prereleases is not None:
+            specifier._prereleases = other._prereleases
+        elif self._prereleases is not None and other._prereleases is None:
+            specifier._prereleases = self._prereleases
+        elif self._prereleases == other._prereleases:
+            specifier._prereleases = self._prereleases
+        else:
+            raise ValueError(
+                "Cannot combine SpecifierSets with True and False prerelease "
+                "overrides."
+            )
+
+        return specifier
+
+    def __eq__(self, other):
+        # type: (object) -> bool
+        if isinstance(other, (string_types, _IndividualSpecifier)):
+            other = SpecifierSet(str(other))
+        elif not isinstance(other, SpecifierSet):
+            return NotImplemented
+
+        return self._specs == other._specs
+
+    def __ne__(self, other):
+        # type: (object) -> bool
+        if isinstance(other, (string_types, _IndividualSpecifier)):
+            other = SpecifierSet(str(other))
+        elif not isinstance(other, SpecifierSet):
+            return NotImplemented
+
+        return self._specs != other._specs
+
+    def __len__(self):
+        # type: () -> int
+        return len(self._specs)
+
+    def __iter__(self):
+        # type: () -> Iterator[_IndividualSpecifier]
+        return iter(self._specs)
+
+    @property
+    def prereleases(self):
+        # type: () -> Optional[bool]
+
+        # If we have been given an explicit prerelease modifier, then we'll
+        # pass that through here.
+        if self._prereleases is not None:
+            return self._prereleases
+
+        # If we don't have any specifiers, and we don't have a forced value,
+        # then we'll just return None since we don't know if this should have
+        # pre-releases or not.
+        if not self._specs:
+            return None
+
+        # Otherwise we'll see if any of the given specifiers accept
+        # prereleases, if any of them do we'll return True, otherwise False.
+        return any(s.prereleases for s in self._specs)
+
+    @prereleases.setter
+    def prereleases(self, value):
+        # type: (bool) -> None
+        self._prereleases = value
+
+    def __contains__(self, item):
+        # type: (Union[ParsedVersion, str]) -> bool
+        return self.contains(item)
+
+    def contains(self, item, prereleases=None):
+        # type: (Union[ParsedVersion, str], Optional[bool]) -> bool
+
+        # Ensure that our item is a Version or LegacyVersion instance.
+        if not isinstance(item, (LegacyVersion, Version)):
+            item = parse(item)
+
+        # Determine if we're forcing a prerelease or not, if we're not forcing
+        # one for this particular filter call, then we'll use whatever the
+        # SpecifierSet thinks for whether or not we should support prereleases.
+        if prereleases is None:
+            prereleases = self.prereleases
+
+        # We can determine if we're going to allow pre-releases by looking to
+        # see if any of the underlying items supports them. If none of them do
+        # and this item is a pre-release then we do not allow it and we can
+        # short circuit that here.
+        # Note: This means that 1.0.dev1 would not be contained in something
+        #       like >=1.0.devabc however it would be in >=1.0.debabc,>0.0.dev0
+        if not prereleases and item.is_prerelease:
+            return False
+
+        # We simply dispatch to the underlying specs here to make sure that the
+        # given version is contained within all of them.
+        # Note: This use of all() here means that an empty set of specifiers
+        #       will always return True, this is an explicit design decision.
+        return all(s.contains(item, prereleases=prereleases) for s in self._specs)
+
+    def filter(
+        self,
+        iterable,  # type: Iterable[Union[ParsedVersion, str]]
+        prereleases=None,  # type: Optional[bool]
+    ):
+        # type: (...) -> Iterable[Union[ParsedVersion, str]]
+
+        # Determine if we're forcing a prerelease or not, if we're not forcing
+        # one for this particular filter call, then we'll use whatever the
+        # SpecifierSet thinks for whether or not we should support prereleases.
+        if prereleases is None:
+            prereleases = self.prereleases
+
+        # If we have any specifiers, then we want to wrap our iterable in the
+        # filter method for each one, this will act as a logical AND amongst
+        # each specifier.
+        if self._specs:
+            for spec in self._specs:
+                iterable = spec.filter(iterable, prereleases=bool(prereleases))
+            return iterable
+        # If we do not have any specifiers, then we need to have a rough filter
+        # which will filter out any pre-releases, unless there are no final
+        # releases, and which will filter out LegacyVersion in general.
+        else:
+            filtered = []  # type: List[Union[ParsedVersion, str]]
+            found_prereleases = []  # type: List[Union[ParsedVersion, str]]
+
+            for item in iterable:
+                # Ensure that we some kind of Version class for this item.
+                if not isinstance(item, (LegacyVersion, Version)):
+                    parsed_version = parse(item)
+                else:
+                    parsed_version = item
+
+                # Filter out any item which is parsed as a LegacyVersion
+                if isinstance(parsed_version, LegacyVersion):
+                    continue
+
+                # Store any item which is a pre-release for later unless we've
+                # already found a final version or we are accepting prereleases
+                if parsed_version.is_prerelease and not prereleases:
+                    if not filtered:
+                        found_prereleases.append(item)
+                else:
+                    filtered.append(item)
+
+            # If we've found no items except for pre-releases, then we'll go
+            # ahead and use the pre-releases
+            if not filtered and found_prereleases and prereleases is None:
+                return found_prereleases
+
+            return filtered
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/tags.py b/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/tags.py
new file mode 100644
index 00000000000..842447d863b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/tags.py
@@ -0,0 +1,856 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+
+from __future__ import absolute_import
+
+import distutils.util
+
+try:
+    from importlib.machinery import EXTENSION_SUFFIXES
+except ImportError:  # pragma: no cover
+    import imp
+
+    EXTENSION_SUFFIXES = [x[0] for x in imp.get_suffixes()]
+    del imp
+import collections
+import logging
+import os
+import platform
+import re
+import struct
+import sys
+import sysconfig
+import warnings
+
+from ._typing import TYPE_CHECKING, cast
+
+if TYPE_CHECKING:  # pragma: no cover
+    from typing import (
+        Dict,
+        FrozenSet,
+        IO,
+        Iterable,
+        Iterator,
+        List,
+        Optional,
+        Sequence,
+        Tuple,
+        Union,
+    )
+
+    PythonVersion = Sequence[int]
+    MacVersion = Tuple[int, int]
+    GlibcVersion = Tuple[int, int]
+
+
+logger = logging.getLogger(__name__)
+
+INTERPRETER_SHORT_NAMES = {
+    "python": "py",  # Generic.
+    "cpython": "cp",
+    "pypy": "pp",
+    "ironpython": "ip",
+    "jython": "jy",
+}  # type: Dict[str, str]
+
+
+_32_BIT_INTERPRETER = sys.maxsize <= 2 ** 32
+
+
+_LEGACY_MANYLINUX_MAP = {
+    # CentOS 7 w/ glibc 2.17 (PEP 599)
+    (2, 17): "manylinux2014",
+    # CentOS 6 w/ glibc 2.12 (PEP 571)
+    (2, 12): "manylinux2010",
+    # CentOS 5 w/ glibc 2.5 (PEP 513)
+    (2, 5): "manylinux1",
+}
+
+# If glibc ever changes its major version, we need to know what the last
+# minor version was, so we can build the complete list of all versions.
+# For now, guess what the highest minor version might be, assume it will
+# be 50 for testing. Once this actually happens, update the dictionary
+# with the actual value.
+_LAST_GLIBC_MINOR = collections.defaultdict(lambda: 50)  # type: Dict[int, int]
+glibcVersion = collections.namedtuple("Version", ["major", "minor"])
+
+
+class Tag(object):
+    """
+    A representation of the tag triple for a wheel.
+
+    Instances are considered immutable and thus are hashable. Equality checking
+    is also supported.
+    """
+
+    __slots__ = ["_interpreter", "_abi", "_platform", "_hash"]
+
+    def __init__(self, interpreter, abi, platform):
+        # type: (str, str, str) -> None
+        self._interpreter = interpreter.lower()
+        self._abi = abi.lower()
+        self._platform = platform.lower()
+        # The __hash__ of every single element in a Set[Tag] will be evaluated each time
+        # that a set calls its `.disjoint()` method, which may be called hundreds of
+        # times when scanning a page of links for packages with tags matching that
+        # Set[Tag]. Pre-computing the value here produces significant speedups for
+        # downstream consumers.
+        self._hash = hash((self._interpreter, self._abi, self._platform))
+
+    @property
+    def interpreter(self):
+        # type: () -> str
+        return self._interpreter
+
+    @property
+    def abi(self):
+        # type: () -> str
+        return self._abi
+
+    @property
+    def platform(self):
+        # type: () -> str
+        return self._platform
+
+    def __eq__(self, other):
+        # type: (object) -> bool
+        if not isinstance(other, Tag):
+            return NotImplemented
+
+        return (
+            (self.platform == other.platform)
+            and (self.abi == other.abi)
+            and (self.interpreter == other.interpreter)
+        )
+
+    def __hash__(self):
+        # type: () -> int
+        return self._hash
+
+    def __str__(self):
+        # type: () -> str
+        return "{}-{}-{}".format(self._interpreter, self._abi, self._platform)
+
+    def __repr__(self):
+        # type: () -> str
+        return "<{self} @ {self_id}>".format(self=self, self_id=id(self))
+
+
+def parse_tag(tag):
+    # type: (str) -> FrozenSet[Tag]
+    """
+    Parses the provided tag (e.g. `py3-none-any`) into a frozenset of Tag instances.
+
+    Returning a set is required due to the possibility that the tag is a
+    compressed tag set.
+    """
+    tags = set()
+    interpreters, abis, platforms = tag.split("-")
+    for interpreter in interpreters.split("."):
+        for abi in abis.split("."):
+            for platform_ in platforms.split("."):
+                tags.add(Tag(interpreter, abi, platform_))
+    return frozenset(tags)
+
+
+def _warn_keyword_parameter(func_name, kwargs):
+    # type: (str, Dict[str, bool]) -> bool
+    """
+    Backwards-compatibility with Python 2.7 to allow treating 'warn' as keyword-only.
+    """
+    if not kwargs:
+        return False
+    elif len(kwargs) > 1 or "warn" not in kwargs:
+        kwargs.pop("warn", None)
+        arg = next(iter(kwargs.keys()))
+        raise TypeError(
+            "{}() got an unexpected keyword argument {!r}".format(func_name, arg)
+        )
+    return kwargs["warn"]
+
+
+def _get_config_var(name, warn=False):
+    # type: (str, bool) -> Union[int, str, None]
+    value = sysconfig.get_config_var(name)
+    if value is None and warn:
+        logger.debug(
+            "Config variable '%s' is unset, Python ABI tag may be incorrect", name
+        )
+    return value
+
+
+def _normalize_string(string):
+    # type: (str) -> str
+    return string.replace(".", "_").replace("-", "_")
+
+
+def _abi3_applies(python_version):
+    # type: (PythonVersion) -> bool
+    """
+    Determine if the Python version supports abi3.
+
+    PEP 384 was first implemented in Python 3.2.
+    """
+    return len(python_version) > 1 and tuple(python_version) >= (3, 2)
+
+
+def _cpython_abis(py_version, warn=False):
+    # type: (PythonVersion, bool) -> List[str]
+    py_version = tuple(py_version)  # To allow for version comparison.
+    abis = []
+    version = _version_nodot(py_version[:2])
+    debug = pymalloc = ucs4 = ""
+    with_debug = _get_config_var("Py_DEBUG", warn)
+    has_refcount = hasattr(sys, "gettotalrefcount")
+    # Windows doesn't set Py_DEBUG, so checking for support of debug-compiled
+    # extension modules is the best option.
+    # https://github.com/pypa/pip/issues/3383#issuecomment-173267692
+    has_ext = "_d.pyd" in EXTENSION_SUFFIXES
+    if with_debug or (with_debug is None and (has_refcount or has_ext)):
+        debug = "d"
+    if py_version < (3, 8):
+        with_pymalloc = _get_config_var("WITH_PYMALLOC", warn)
+        if with_pymalloc or with_pymalloc is None:
+            pymalloc = "m"
+        if py_version < (3, 3):
+            unicode_size = _get_config_var("Py_UNICODE_SIZE", warn)
+            if unicode_size == 4 or (
+                unicode_size is None and sys.maxunicode == 0x10FFFF
+            ):
+                ucs4 = "u"
+    elif debug:
+        # Debug builds can also load "normal" extension modules.
+        # We can also assume no UCS-4 or pymalloc requirement.
+        abis.append("cp{version}".format(version=version))
+    abis.insert(
+        0,
+        "cp{version}{debug}{pymalloc}{ucs4}".format(
+            version=version, debug=debug, pymalloc=pymalloc, ucs4=ucs4
+        ),
+    )
+    return abis
+
+
+def cpython_tags(
+    python_version=None,  # type: Optional[PythonVersion]
+    abis=None,  # type: Optional[Iterable[str]]
+    platforms=None,  # type: Optional[Iterable[str]]
+    **kwargs  # type: bool
+):
+    # type: (...) -> Iterator[Tag]
+    """
+    Yields the tags for a CPython interpreter.
+
+    The tags consist of:
+    - cp<python_version>-<abi>-<platform>
+    - cp<python_version>-abi3-<platform>
+    - cp<python_version>-none-<platform>
+    - cp<less than python_version>-abi3-<platform>  # Older Python versions down to 3.2.
+
+    If python_version only specifies a major version then user-provided ABIs and
+    the 'none' ABItag will be used.
+
+    If 'abi3' or 'none' are specified in 'abis' then they will be yielded at
+    their normal position and not at the beginning.
+    """
+    warn = _warn_keyword_parameter("cpython_tags", kwargs)
+    if not python_version:
+        python_version = sys.version_info[:2]
+
+    interpreter = "cp{}".format(_version_nodot(python_version[:2]))
+
+    if abis is None:
+        if len(python_version) > 1:
+            abis = _cpython_abis(python_version, warn)
+        else:
+            abis = []
+    abis = list(abis)
+    # 'abi3' and 'none' are explicitly handled later.
+    for explicit_abi in ("abi3", "none"):
+        try:
+            abis.remove(explicit_abi)
+        except ValueError:
+            pass
+
+    platforms = list(platforms or _platform_tags())
+    for abi in abis:
+        for platform_ in platforms:
+            yield Tag(interpreter, abi, platform_)
+    if _abi3_applies(python_version):
+        for tag in (Tag(interpreter, "abi3", platform_) for platform_ in platforms):
+            yield tag
+    for tag in (Tag(interpreter, "none", platform_) for platform_ in platforms):
+        yield tag
+
+    if _abi3_applies(python_version):
+        for minor_version in range(python_version[1] - 1, 1, -1):
+            for platform_ in platforms:
+                interpreter = "cp{version}".format(
+                    version=_version_nodot((python_version[0], minor_version))
+                )
+                yield Tag(interpreter, "abi3", platform_)
+
+
+def _generic_abi():
+    # type: () -> Iterator[str]
+    abi = sysconfig.get_config_var("SOABI")
+    if abi:
+        yield _normalize_string(abi)
+
+
+def generic_tags(
+    interpreter=None,  # type: Optional[str]
+    abis=None,  # type: Optional[Iterable[str]]
+    platforms=None,  # type: Optional[Iterable[str]]
+    **kwargs  # type: bool
+):
+    # type: (...) -> Iterator[Tag]
+    """
+    Yields the tags for a generic interpreter.
+
+    The tags consist of:
+    - <interpreter>-<abi>-<platform>
+
+    The "none" ABI will be added if it was not explicitly provided.
+    """
+    warn = _warn_keyword_parameter("generic_tags", kwargs)
+    if not interpreter:
+        interp_name = interpreter_name()
+        interp_version = interpreter_version(warn=warn)
+        interpreter = "".join([interp_name, interp_version])
+    if abis is None:
+        abis = _generic_abi()
+    platforms = list(platforms or _platform_tags())
+    abis = list(abis)
+    if "none" not in abis:
+        abis.append("none")
+    for abi in abis:
+        for platform_ in platforms:
+            yield Tag(interpreter, abi, platform_)
+
+
+def _py_interpreter_range(py_version):
+    # type: (PythonVersion) -> Iterator[str]
+    """
+    Yields Python versions in descending order.
+
+    After the latest version, the major-only version will be yielded, and then
+    all previous versions of that major version.
+    """
+    if len(py_version) > 1:
+        yield "py{version}".format(version=_version_nodot(py_version[:2]))
+    yield "py{major}".format(major=py_version[0])
+    if len(py_version) > 1:
+        for minor in range(py_version[1] - 1, -1, -1):
+            yield "py{version}".format(version=_version_nodot((py_version[0], minor)))
+
+
+def compatible_tags(
+    python_version=None,  # type: Optional[PythonVersion]
+    interpreter=None,  # type: Optional[str]
+    platforms=None,  # type: Optional[Iterable[str]]
+):
+    # type: (...) -> Iterator[Tag]
+    """
+    Yields the sequence of tags that are compatible with a specific version of Python.
+
+    The tags consist of:
+    - py*-none-<platform>
+    - <interpreter>-none-any  # ... if `interpreter` is provided.
+    - py*-none-any
+    """
+    if not python_version:
+        python_version = sys.version_info[:2]
+    platforms = list(platforms or _platform_tags())
+    for version in _py_interpreter_range(python_version):
+        for platform_ in platforms:
+            yield Tag(version, "none", platform_)
+    if interpreter:
+        yield Tag(interpreter, "none", "any")
+    for version in _py_interpreter_range(python_version):
+        yield Tag(version, "none", "any")
+
+
+def _mac_arch(arch, is_32bit=_32_BIT_INTERPRETER):
+    # type: (str, bool) -> str
+    if not is_32bit:
+        return arch
+
+    if arch.startswith("ppc"):
+        return "ppc"
+
+    return "i386"
+
+
+def _mac_binary_formats(version, cpu_arch):
+    # type: (MacVersion, str) -> List[str]
+    formats = [cpu_arch]
+    if cpu_arch == "x86_64":
+        if version < (10, 4):
+            return []
+        formats.extend(["intel", "fat64", "fat32"])
+
+    elif cpu_arch == "i386":
+        if version < (10, 4):
+            return []
+        formats.extend(["intel", "fat32", "fat"])
+
+    elif cpu_arch == "ppc64":
+        # TODO: Need to care about 32-bit PPC for ppc64 through 10.2?
+        if version > (10, 5) or version < (10, 4):
+            return []
+        formats.append("fat64")
+
+    elif cpu_arch == "ppc":
+        if version > (10, 6):
+            return []
+        formats.extend(["fat32", "fat"])
+
+    if cpu_arch in {"arm64", "x86_64"}:
+        formats.append("universal2")
+
+    if cpu_arch in {"x86_64", "i386", "ppc64", "ppc"}:
+        formats.append("universal")
+
+    return formats
+
+
+def mac_platforms(version=None, arch=None):
+    # type: (Optional[MacVersion], Optional[str]) -> Iterator[str]
+    """
+    Yields the platform tags for a macOS system.
+
+    The `version` parameter is a two-item tuple specifying the macOS version to
+    generate platform tags for. The `arch` parameter is the CPU architecture to
+    generate platform tags for. Both parameters default to the appropriate value
+    for the current system.
+    """
+    version_str, _, cpu_arch = platform.mac_ver()  # type: ignore
+    if version is None:
+        version = cast("MacVersion", tuple(map(int, version_str.split(".")[:2])))
+    else:
+        version = version
+    if arch is None:
+        arch = _mac_arch(cpu_arch)
+    else:
+        arch = arch
+
+    if (10, 0) <= version and version < (11, 0):
+        # Prior to Mac OS 11, each yearly release of Mac OS bumped the
+        # "minor" version number.  The major version was always 10.
+        for minor_version in range(version[1], -1, -1):
+            compat_version = 10, minor_version
+            binary_formats = _mac_binary_formats(compat_version, arch)
+            for binary_format in binary_formats:
+                yield "macosx_{major}_{minor}_{binary_format}".format(
+                    major=10, minor=minor_version, binary_format=binary_format
+                )
+
+    if version >= (11, 0):
+        # Starting with Mac OS 11, each yearly release bumps the major version
+        # number.   The minor versions are now the midyear updates.
+        for major_version in range(version[0], 10, -1):
+            compat_version = major_version, 0
+            binary_formats = _mac_binary_formats(compat_version, arch)
+            for binary_format in binary_formats:
+                yield "macosx_{major}_{minor}_{binary_format}".format(
+                    major=major_version, minor=0, binary_format=binary_format
+                )
+
+    if version >= (11, 0) and arch == "x86_64":
+        # Mac OS 11 on x86_64 is compatible with binaries from previous releases.
+        # Arm64 support was introduced in 11.0, so no Arm binaries from previous
+        # releases exist.
+        for minor_version in range(16, 3, -1):
+            compat_version = 10, minor_version
+            binary_formats = _mac_binary_formats(compat_version, arch)
+            for binary_format in binary_formats:
+                yield "macosx_{major}_{minor}_{binary_format}".format(
+                    major=compat_version[0],
+                    minor=compat_version[1],
+                    binary_format=binary_format,
+                )
+
+
+# From PEP 513, PEP 600
+def _is_manylinux_compatible(name, arch, glibc_version):
+    # type: (str, str, GlibcVersion) -> bool
+    sys_glibc = _get_glibc_version()
+    if sys_glibc < glibc_version:
+        return False
+    # Check for presence of _manylinux module.
+    try:
+        import _manylinux  # noqa
+    except ImportError:
+        pass
+    else:
+        if hasattr(_manylinux, "manylinux_compatible"):
+            result = _manylinux.manylinux_compatible(
+                glibc_version[0], glibc_version[1], arch
+            )
+            if result is not None:
+                return bool(result)
+        else:
+            if glibc_version == (2, 5):
+                if hasattr(_manylinux, "manylinux1_compatible"):
+                    return bool(_manylinux.manylinux1_compatible)
+            if glibc_version == (2, 12):
+                if hasattr(_manylinux, "manylinux2010_compatible"):
+                    return bool(_manylinux.manylinux2010_compatible)
+            if glibc_version == (2, 17):
+                if hasattr(_manylinux, "manylinux2014_compatible"):
+                    return bool(_manylinux.manylinux2014_compatible)
+    return True
+
+
+def _glibc_version_string():
+    # type: () -> Optional[str]
+    # Returns glibc version string, or None if not using glibc.
+    return _glibc_version_string_confstr() or _glibc_version_string_ctypes()
+
+
+def _glibc_version_string_confstr():
+    # type: () -> Optional[str]
+    """
+    Primary implementation of glibc_version_string using os.confstr.
+    """
+    # os.confstr is quite a bit faster than ctypes.DLL. It's also less likely
+    # to be broken or missing. This strategy is used in the standard library
+    # platform module.
+    # https://github.com/python/cpython/blob/fcf1d003bf4f0100c9d0921ff3d70e1127ca1b71/Lib/platform.py#L175-L183
+    try:
+        # os.confstr("CS_GNU_LIBC_VERSION") returns a string like "glibc 2.17".
+        version_string = os.confstr(  # type: ignore[attr-defined] # noqa: F821
+            "CS_GNU_LIBC_VERSION"
+        )
+        assert version_string is not None
+        _, version = version_string.split()  # type: Tuple[str, str]
+    except (AssertionError, AttributeError, OSError, ValueError):
+        # os.confstr() or CS_GNU_LIBC_VERSION not available (or a bad value)...
+        return None
+    return version
+
+
+def _glibc_version_string_ctypes():
+    # type: () -> Optional[str]
+    """
+    Fallback implementation of glibc_version_string using ctypes.
+    """
+    try:
+        import ctypes
+    except ImportError:
+        return None
+
+    # ctypes.CDLL(None) internally calls dlopen(NULL), and as the dlopen
+    # manpage says, "If filename is NULL, then the returned handle is for the
+    # main program". This way we can let the linker do the work to figure out
+    # which libc our process is actually using.
+    #
+    # We must also handle the special case where the executable is not a
+    # dynamically linked executable. This can occur when using musl libc,
+    # for example. In this situation, dlopen() will error, leading to an
+    # OSError. Interestingly, at least in the case of musl, there is no
+    # errno set on the OSError. The single string argument used to construct
+    # OSError comes from libc itself and is therefore not portable to
+    # hard code here. In any case, failure to call dlopen() means we
+    # can proceed, so we bail on our attempt.
+    try:
+        # Note: typeshed is wrong here so we are ignoring this line.
+        process_namespace = ctypes.CDLL(None)  # type: ignore
+    except OSError:
+        return None
+
+    try:
+        gnu_get_libc_version = process_namespace.gnu_get_libc_version
+    except AttributeError:
+        # Symbol doesn't exist -> therefore, we are not linked to
+        # glibc.
+        return None
+
+    # Call gnu_get_libc_version, which returns a string like "2.5"
+    gnu_get_libc_version.restype = ctypes.c_char_p
+    version_str = gnu_get_libc_version()  # type: str
+    # py2 / py3 compatibility:
+    if not isinstance(version_str, str):
+        version_str = version_str.decode("ascii")
+
+    return version_str
+
+
+def _parse_glibc_version(version_str):
+    # type: (str) -> Tuple[int, int]
+    # Parse glibc version.
+    #
+    # We use a regexp instead of str.split because we want to discard any
+    # random junk that might come after the minor version -- this might happen
+    # in patched/forked versions of glibc (e.g. Linaro's version of glibc
+    # uses version strings like "2.20-2014.11"). See gh-3588.
+    m = re.match(r"(?P<major>[0-9]+)\.(?P<minor>[0-9]+)", version_str)
+    if not m:
+        warnings.warn(
+            "Expected glibc version with 2 components major.minor,"
+            " got: %s" % version_str,
+            RuntimeWarning,
+        )
+        return -1, -1
+    return (int(m.group("major")), int(m.group("minor")))
+
+
+_glibc_version = []  #  type: List[Tuple[int, int]]
+
+
+def _get_glibc_version():
+    # type: () -> Tuple[int, int]
+    if _glibc_version:
+        return _glibc_version[0]
+    version_str = _glibc_version_string()
+    if version_str is None:
+        _glibc_version.append((-1, -1))
+    else:
+        _glibc_version.append(_parse_glibc_version(version_str))
+    return _glibc_version[0]
+
+
+# Python does not provide platform information at sufficient granularity to
+# identify the architecture of the running executable in some cases, so we
+# determine it dynamically by reading the information from the running
+# process. This only applies on Linux, which uses the ELF format.
+class _ELFFileHeader(object):
+    # https://en.wikipedia.org/wiki/Executable_and_Linkable_Format#File_header
+    class _InvalidELFFileHeader(ValueError):
+        """
+        An invalid ELF file header was found.
+        """
+
+    ELF_MAGIC_NUMBER = 0x7F454C46
+    ELFCLASS32 = 1
+    ELFCLASS64 = 2
+    ELFDATA2LSB = 1
+    ELFDATA2MSB = 2
+    EM_386 = 3
+    EM_S390 = 22
+    EM_ARM = 40
+    EM_X86_64 = 62
+    EF_ARM_ABIMASK = 0xFF000000
+    EF_ARM_ABI_VER5 = 0x05000000
+    EF_ARM_ABI_FLOAT_HARD = 0x00000400
+
+    def __init__(self, file):
+        # type: (IO[bytes]) -> None
+        def unpack(fmt):
+            # type: (str) -> int
+            try:
+                (result,) = struct.unpack(
+                    fmt, file.read(struct.calcsize(fmt))
+                )  # type: (int, )
+            except struct.error:
+                raise _ELFFileHeader._InvalidELFFileHeader()
+            return result
+
+        self.e_ident_magic = unpack(">I")
+        if self.e_ident_magic != self.ELF_MAGIC_NUMBER:
+            raise _ELFFileHeader._InvalidELFFileHeader()
+        self.e_ident_class = unpack("B")
+        if self.e_ident_class not in {self.ELFCLASS32, self.ELFCLASS64}:
+            raise _ELFFileHeader._InvalidELFFileHeader()
+        self.e_ident_data = unpack("B")
+        if self.e_ident_data not in {self.ELFDATA2LSB, self.ELFDATA2MSB}:
+            raise _ELFFileHeader._InvalidELFFileHeader()
+        self.e_ident_version = unpack("B")
+        self.e_ident_osabi = unpack("B")
+        self.e_ident_abiversion = unpack("B")
+        self.e_ident_pad = file.read(7)
+        format_h = "<H" if self.e_ident_data == self.ELFDATA2LSB else ">H"
+        format_i = "<I" if self.e_ident_data == self.ELFDATA2LSB else ">I"
+        format_q = "<Q" if self.e_ident_data == self.ELFDATA2LSB else ">Q"
+        format_p = format_i if self.e_ident_class == self.ELFCLASS32 else format_q
+        self.e_type = unpack(format_h)
+        self.e_machine = unpack(format_h)
+        self.e_version = unpack(format_i)
+        self.e_entry = unpack(format_p)
+        self.e_phoff = unpack(format_p)
+        self.e_shoff = unpack(format_p)
+        self.e_flags = unpack(format_i)
+        self.e_ehsize = unpack(format_h)
+        self.e_phentsize = unpack(format_h)
+        self.e_phnum = unpack(format_h)
+        self.e_shentsize = unpack(format_h)
+        self.e_shnum = unpack(format_h)
+        self.e_shstrndx = unpack(format_h)
+
+
+def _get_elf_header():
+    # type: () -> Optional[_ELFFileHeader]
+    try:
+        with open(sys.executable, "rb") as f:
+            elf_header = _ELFFileHeader(f)
+    except (IOError, OSError, TypeError, _ELFFileHeader._InvalidELFFileHeader):
+        return None
+    return elf_header
+
+
+def _is_linux_armhf():
+    # type: () -> bool
+    # hard-float ABI can be detected from the ELF header of the running
+    # process
+    # https://static.docs.arm.com/ihi0044/g/aaelf32.pdf
+    elf_header = _get_elf_header()
+    if elf_header is None:
+        return False
+    result = elf_header.e_ident_class == elf_header.ELFCLASS32
+    result &= elf_header.e_ident_data == elf_header.ELFDATA2LSB
+    result &= elf_header.e_machine == elf_header.EM_ARM
+    result &= (
+        elf_header.e_flags & elf_header.EF_ARM_ABIMASK
+    ) == elf_header.EF_ARM_ABI_VER5
+    result &= (
+        elf_header.e_flags & elf_header.EF_ARM_ABI_FLOAT_HARD
+    ) == elf_header.EF_ARM_ABI_FLOAT_HARD
+    return result
+
+
+def _is_linux_i686():
+    # type: () -> bool
+    elf_header = _get_elf_header()
+    if elf_header is None:
+        return False
+    result = elf_header.e_ident_class == elf_header.ELFCLASS32
+    result &= elf_header.e_ident_data == elf_header.ELFDATA2LSB
+    result &= elf_header.e_machine == elf_header.EM_386
+    return result
+
+
+def _have_compatible_manylinux_abi(arch):
+    # type: (str) -> bool
+    if arch == "armv7l":
+        return _is_linux_armhf()
+    if arch == "i686":
+        return _is_linux_i686()
+    return arch in {"x86_64", "aarch64", "ppc64", "ppc64le", "s390x"}
+
+
+def _manylinux_tags(linux, arch):
+    # type: (str, str) -> Iterator[str]
+    # Oldest glibc to be supported regardless of architecture is (2, 17).
+    too_old_glibc2 = glibcVersion(2, 16)
+    if arch in {"x86_64", "i686"}:
+        # On x86/i686 also oldest glibc to be supported is (2, 5).
+        too_old_glibc2 = glibcVersion(2, 4)
+    current_glibc = glibcVersion(*_get_glibc_version())
+    glibc_max_list = [current_glibc]
+    # We can assume compatibility across glibc major versions.
+    # https://sourceware.org/bugzilla/show_bug.cgi?id=24636
+    #
+    # Build a list of maximum glibc versions so that we can
+    # output the canonical list of all glibc from current_glibc
+    # down to too_old_glibc2, including all intermediary versions.
+    for glibc_major in range(current_glibc.major - 1, 1, -1):
+        glibc_max_list.append(glibcVersion(glibc_major, _LAST_GLIBC_MINOR[glibc_major]))
+    for glibc_max in glibc_max_list:
+        if glibc_max.major == too_old_glibc2.major:
+            min_minor = too_old_glibc2.minor
+        else:
+            # For other glibc major versions oldest supported is (x, 0).
+            min_minor = -1
+        for glibc_minor in range(glibc_max.minor, min_minor, -1):
+            glibc_version = (glibc_max.major, glibc_minor)
+            tag = "manylinux_{}_{}".format(*glibc_version)
+            if _is_manylinux_compatible(tag, arch, glibc_version):
+                yield linux.replace("linux", tag)
+            # Handle the legacy manylinux1, manylinux2010, manylinux2014 tags.
+            if glibc_version in _LEGACY_MANYLINUX_MAP:
+                legacy_tag = _LEGACY_MANYLINUX_MAP[glibc_version]
+                if _is_manylinux_compatible(legacy_tag, arch, glibc_version):
+                    yield linux.replace("linux", legacy_tag)
+
+
+def _linux_platforms(is_32bit=_32_BIT_INTERPRETER):
+    # type: (bool) -> Iterator[str]
+    linux = _normalize_string(distutils.util.get_platform())
+    if is_32bit:
+        if linux == "linux_x86_64":
+            linux = "linux_i686"
+        elif linux == "linux_aarch64":
+            linux = "linux_armv7l"
+    _, arch = linux.split("_", 1)
+    if _have_compatible_manylinux_abi(arch):
+        for tag in _manylinux_tags(linux, arch):
+            yield tag
+    yield linux
+
+
+def _generic_platforms():
+    # type: () -> Iterator[str]
+    yield _normalize_string(distutils.util.get_platform())
+
+
+def _platform_tags():
+    # type: () -> Iterator[str]
+    """
+    Provides the platform tags for this installation.
+    """
+    if platform.system() == "Darwin":
+        return mac_platforms()
+    elif platform.system() == "Linux":
+        return _linux_platforms()
+    else:
+        return _generic_platforms()
+
+
+def interpreter_name():
+    # type: () -> str
+    """
+    Returns the name of the running interpreter.
+    """
+    try:
+        name = sys.implementation.name  # type: ignore
+    except AttributeError:  # pragma: no cover
+        # Python 2.7 compatibility.
+        name = platform.python_implementation().lower()
+    return INTERPRETER_SHORT_NAMES.get(name) or name
+
+
+def interpreter_version(**kwargs):
+    # type: (bool) -> str
+    """
+    Returns the version of the running interpreter.
+    """
+    warn = _warn_keyword_parameter("interpreter_version", kwargs)
+    version = _get_config_var("py_version_nodot", warn=warn)
+    if version:
+        version = str(version)
+    else:
+        version = _version_nodot(sys.version_info[:2])
+    return version
+
+
+def _version_nodot(version):
+    # type: (PythonVersion) -> str
+    if any(v >= 10 for v in version):
+        sep = "_"
+    else:
+        sep = ""
+    return sep.join(map(str, version))
+
+
+def sys_tags(**kwargs):
+    # type: (bool) -> Iterator[Tag]
+    """
+    Returns the sequence of tag triples for the running interpreter.
+
+    The order of the sequence corresponds to priority order for the
+    interpreter, from most to least important.
+    """
+    warn = _warn_keyword_parameter("sys_tags", kwargs)
+
+    interp_name = interpreter_name()
+    if interp_name == "cp":
+        for tag in cpython_tags(warn=warn):
+            yield tag
+    else:
+        for tag in generic_tags():
+            yield tag
+
+    for tag in compatible_tags():
+        yield tag
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/utils.py b/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/utils.py
new file mode 100644
index 00000000000..92c7b00b778
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/utils.py
@@ -0,0 +1,67 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import re
+
+from ._typing import TYPE_CHECKING, cast
+from .version import InvalidVersion, Version
+
+if TYPE_CHECKING:  # pragma: no cover
+    from typing import NewType, Union
+
+    NormalizedName = NewType("NormalizedName", str)
+else:
+    NormalizedName = str
+
+_canonicalize_regex = re.compile(r"[-_.]+")
+
+
+def canonicalize_name(name):
+    # type: (str) -> NormalizedName
+    # This is taken from PEP 503.
+    value = _canonicalize_regex.sub("-", name).lower()
+    return cast("NormalizedName", value)
+
+
+def canonicalize_version(version):
+    # type: (Union[Version, str]) -> Union[Version, str]
+    """
+    This is very similar to Version.__str__, but has one subtle difference
+    with the way it handles the release segment.
+    """
+    if not isinstance(version, Version):
+        try:
+            version = Version(version)
+        except InvalidVersion:
+            # Legacy versions cannot be normalized
+            return version
+
+    parts = []
+
+    # Epoch
+    if version.epoch != 0:
+        parts.append("{0}!".format(version.epoch))
+
+    # Release segment
+    # NB: This strips trailing '.0's to normalize
+    parts.append(re.sub(r"(\.0)+$", "", ".".join(str(x) for x in version.release)))
+
+    # Pre-release
+    if version.pre is not None:
+        parts.append("".join(str(x) for x in version.pre))
+
+    # Post-release
+    if version.post is not None:
+        parts.append(".post{0}".format(version.post))
+
+    # Development release
+    if version.dev is not None:
+        parts.append(".dev{0}".format(version.dev))
+
+    # Local version segment
+    if version.local is not None:
+        parts.append("+{0}".format(version.local))
+
+    return "".join(parts)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/version.py b/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/version.py
new file mode 100644
index 00000000000..517d91f2485
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/version.py
@@ -0,0 +1,556 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import collections
+import itertools
+import re
+import warnings
+
+from ._structures import Infinity, NegativeInfinity
+from ._typing import TYPE_CHECKING
+
+if TYPE_CHECKING:  # pragma: no cover
+    from typing import Callable, Iterator, List, Optional, SupportsInt, Tuple, Union
+
+    from ._structures import InfinityType, NegativeInfinityType
+
+    InfiniteTypes = Union[InfinityType, NegativeInfinityType]
+    PrePostDevType = Union[InfiniteTypes, Tuple[str, int]]
+    SubLocalType = Union[InfiniteTypes, int, str]
+    LocalType = Union[
+        NegativeInfinityType,
+        Tuple[
+            Union[
+                SubLocalType,
+                Tuple[SubLocalType, str],
+                Tuple[NegativeInfinityType, SubLocalType],
+            ],
+            ...,
+        ],
+    ]
+    CmpKey = Tuple[
+        int, Tuple[int, ...], PrePostDevType, PrePostDevType, PrePostDevType, LocalType
+    ]
+    LegacyCmpKey = Tuple[int, Tuple[str, ...]]
+    VersionComparisonMethod = Callable[
+        [Union[CmpKey, LegacyCmpKey], Union[CmpKey, LegacyCmpKey]], bool
+    ]
+
+__all__ = ["parse", "Version", "LegacyVersion", "InvalidVersion", "VERSION_PATTERN"]
+
+
+_Version = collections.namedtuple(
+    "_Version", ["epoch", "release", "dev", "pre", "post", "local"]
+)
+
+
+def parse(version):
+    # type: (str) -> Union[LegacyVersion, Version]
+    """
+    Parse the given version string and return either a :class:`Version` object
+    or a :class:`LegacyVersion` object depending on if the given version is
+    a valid PEP 440 version or a legacy version.
+    """
+    try:
+        return Version(version)
+    except InvalidVersion:
+        return LegacyVersion(version)
+
+
+class InvalidVersion(ValueError):
+    """
+    An invalid version was found, users should refer to PEP 440.
+    """
+
+
+class _BaseVersion(object):
+    _key = None  # type: Union[CmpKey, LegacyCmpKey]
+
+    def __hash__(self):
+        # type: () -> int
+        return hash(self._key)
+
+    # Please keep the duplicated `isinstance` check
+    # in the six comparisons hereunder
+    # unless you find a way to avoid adding overhead function calls.
+    def __lt__(self, other):
+        # type: (_BaseVersion) -> bool
+        if not isinstance(other, _BaseVersion):
+            return NotImplemented
+
+        return self._key < other._key
+
+    def __le__(self, other):
+        # type: (_BaseVersion) -> bool
+        if not isinstance(other, _BaseVersion):
+            return NotImplemented
+
+        return self._key <= other._key
+
+    def __eq__(self, other):
+        # type: (object) -> bool
+        if not isinstance(other, _BaseVersion):
+            return NotImplemented
+
+        return self._key == other._key
+
+    def __ge__(self, other):
+        # type: (_BaseVersion) -> bool
+        if not isinstance(other, _BaseVersion):
+            return NotImplemented
+
+        return self._key >= other._key
+
+    def __gt__(self, other):
+        # type: (_BaseVersion) -> bool
+        if not isinstance(other, _BaseVersion):
+            return NotImplemented
+
+        return self._key > other._key
+
+    def __ne__(self, other):
+        # type: (object) -> bool
+        if not isinstance(other, _BaseVersion):
+            return NotImplemented
+
+        return self._key != other._key
+
+
+class LegacyVersion(_BaseVersion):
+    def __init__(self, version):
+        # type: (str) -> None
+        self._version = str(version)
+        self._key = _legacy_cmpkey(self._version)
+
+        warnings.warn(
+            "Creating a LegacyVersion has been deprecated and will be "
+            "removed in the next major release",
+            DeprecationWarning,
+        )
+
+    def __str__(self):
+        # type: () -> str
+        return self._version
+
+    def __repr__(self):
+        # type: () -> str
+        return "<LegacyVersion({0})>".format(repr(str(self)))
+
+    @property
+    def public(self):
+        # type: () -> str
+        return self._version
+
+    @property
+    def base_version(self):
+        # type: () -> str
+        return self._version
+
+    @property
+    def epoch(self):
+        # type: () -> int
+        return -1
+
+    @property
+    def release(self):
+        # type: () -> None
+        return None
+
+    @property
+    def pre(self):
+        # type: () -> None
+        return None
+
+    @property
+    def post(self):
+        # type: () -> None
+        return None
+
+    @property
+    def dev(self):
+        # type: () -> None
+        return None
+
+    @property
+    def local(self):
+        # type: () -> None
+        return None
+
+    @property
+    def is_prerelease(self):
+        # type: () -> bool
+        return False
+
+    @property
+    def is_postrelease(self):
+        # type: () -> bool
+        return False
+
+    @property
+    def is_devrelease(self):
+        # type: () -> bool
+        return False
+
+
+_legacy_version_component_re = re.compile(r"(\d+ | [a-z]+ | \.| -)", re.VERBOSE)
+
+_legacy_version_replacement_map = {
+    "pre": "c",
+    "preview": "c",
+    "-": "final-",
+    "rc": "c",
+    "dev": "@",
+}
+
+
+def _parse_version_parts(s):
+    # type: (str) -> Iterator[str]
+    for part in _legacy_version_component_re.split(s):
+        part = _legacy_version_replacement_map.get(part, part)
+
+        if not part or part == ".":
+            continue
+
+        if part[:1] in "0123456789":
+            # pad for numeric comparison
+            yield part.zfill(8)
+        else:
+            yield "*" + part
+
+    # ensure that alpha/beta/candidate are before final
+    yield "*final"
+
+
+def _legacy_cmpkey(version):
+    # type: (str) -> LegacyCmpKey
+
+    # We hardcode an epoch of -1 here. A PEP 440 version can only have a epoch
+    # greater than or equal to 0. This will effectively put the LegacyVersion,
+    # which uses the defacto standard originally implemented by setuptools,
+    # as before all PEP 440 versions.
+    epoch = -1
+
+    # This scheme is taken from pkg_resources.parse_version setuptools prior to
+    # it's adoption of the packaging library.
+    parts = []  # type: List[str]
+    for part in _parse_version_parts(version.lower()):
+        if part.startswith("*"):
+            # remove "-" before a prerelease tag
+            if part < "*final":
+                while parts and parts[-1] == "*final-":
+                    parts.pop()
+
+            # remove trailing zeros from each series of numeric parts
+            while parts and parts[-1] == "00000000":
+                parts.pop()
+
+        parts.append(part)
+
+    return epoch, tuple(parts)
+
+
+# Deliberately not anchored to the start and end of the string, to make it
+# easier for 3rd party code to reuse
+VERSION_PATTERN = r"""
+    v?
+    (?:
+        (?:(?P<epoch>[0-9]+)!)?                           # epoch
+        (?P<release>[0-9]+(?:\.[0-9]+)*)                  # release segment
+        (?P<pre>                                          # pre-release
+            [-_\.]?
+            (?P<pre_l>(a|b|c|rc|alpha|beta|pre|preview))
+            [-_\.]?
+            (?P<pre_n>[0-9]+)?
+        )?
+        (?P<post>                                         # post release
+            (?:-(?P<post_n1>[0-9]+))
+            |
+            (?:
+                [-_\.]?
+                (?P<post_l>post|rev|r)
+                [-_\.]?
+                (?P<post_n2>[0-9]+)?
+            )
+        )?
+        (?P<dev>                                          # dev release
+            [-_\.]?
+            (?P<dev_l>dev)
+            [-_\.]?
+            (?P<dev_n>[0-9]+)?
+        )?
+    )
+    (?:\+(?P<local>[a-z0-9]+(?:[-_\.][a-z0-9]+)*))?       # local version
+"""
+
+
+class Version(_BaseVersion):
+
+    _regex = re.compile(r"^\s*" + VERSION_PATTERN + r"\s*$", re.VERBOSE | re.IGNORECASE)
+
+    def __init__(self, version):
+        # type: (str) -> None
+
+        # Validate the version and parse it into pieces
+        match = self._regex.search(version)
+        if not match:
+            raise InvalidVersion("Invalid version: '{0}'".format(version))
+
+        # Store the parsed out pieces of the version
+        self._version = _Version(
+            epoch=int(match.group("epoch")) if match.group("epoch") else 0,
+            release=tuple(int(i) for i in match.group("release").split(".")),
+            pre=_parse_letter_version(match.group("pre_l"), match.group("pre_n")),
+            post=_parse_letter_version(
+                match.group("post_l"), match.group("post_n1") or match.group("post_n2")
+            ),
+            dev=_parse_letter_version(match.group("dev_l"), match.group("dev_n")),
+            local=_parse_local_version(match.group("local")),
+        )
+
+        # Generate a key which will be used for sorting
+        self._key = _cmpkey(
+            self._version.epoch,
+            self._version.release,
+            self._version.pre,
+            self._version.post,
+            self._version.dev,
+            self._version.local,
+        )
+
+    def __repr__(self):
+        # type: () -> str
+        return "<Version({0})>".format(repr(str(self)))
+
+    def __str__(self):
+        # type: () -> str
+        parts = []
+
+        # Epoch
+        if self.epoch != 0:
+            parts.append("{0}!".format(self.epoch))
+
+        # Release segment
+        parts.append(".".join(str(x) for x in self.release))
+
+        # Pre-release
+        if self.pre is not None:
+            parts.append("".join(str(x) for x in self.pre))
+
+        # Post-release
+        if self.post is not None:
+            parts.append(".post{0}".format(self.post))
+
+        # Development release
+        if self.dev is not None:
+            parts.append(".dev{0}".format(self.dev))
+
+        # Local version segment
+        if self.local is not None:
+            parts.append("+{0}".format(self.local))
+
+        return "".join(parts)
+
+    @property
+    def epoch(self):
+        # type: () -> int
+        _epoch = self._version.epoch  # type: int
+        return _epoch
+
+    @property
+    def release(self):
+        # type: () -> Tuple[int, ...]
+        _release = self._version.release  # type: Tuple[int, ...]
+        return _release
+
+    @property
+    def pre(self):
+        # type: () -> Optional[Tuple[str, int]]
+        _pre = self._version.pre  # type: Optional[Tuple[str, int]]
+        return _pre
+
+    @property
+    def post(self):
+        # type: () -> Optional[Tuple[str, int]]
+        return self._version.post[1] if self._version.post else None
+
+    @property
+    def dev(self):
+        # type: () -> Optional[Tuple[str, int]]
+        return self._version.dev[1] if self._version.dev else None
+
+    @property
+    def local(self):
+        # type: () -> Optional[str]
+        if self._version.local:
+            return ".".join(str(x) for x in self._version.local)
+        else:
+            return None
+
+    @property
+    def public(self):
+        # type: () -> str
+        return str(self).split("+", 1)[0]
+
+    @property
+    def base_version(self):
+        # type: () -> str
+        parts = []
+
+        # Epoch
+        if self.epoch != 0:
+            parts.append("{0}!".format(self.epoch))
+
+        # Release segment
+        parts.append(".".join(str(x) for x in self.release))
+
+        return "".join(parts)
+
+    @property
+    def is_prerelease(self):
+        # type: () -> bool
+        return self.dev is not None or self.pre is not None
+
+    @property
+    def is_postrelease(self):
+        # type: () -> bool
+        return self.post is not None
+
+    @property
+    def is_devrelease(self):
+        # type: () -> bool
+        return self.dev is not None
+
+    @property
+    def major(self):
+        # type: () -> int
+        return self.release[0] if len(self.release) >= 1 else 0
+
+    @property
+    def minor(self):
+        # type: () -> int
+        return self.release[1] if len(self.release) >= 2 else 0
+
+    @property
+    def micro(self):
+        # type: () -> int
+        return self.release[2] if len(self.release) >= 3 else 0
+
+
+def _parse_letter_version(
+    letter,  # type: str
+    number,  # type: Union[str, bytes, SupportsInt]
+):
+    # type: (...) -> Optional[Tuple[str, int]]
+
+    if letter:
+        # We consider there to be an implicit 0 in a pre-release if there is
+        # not a numeral associated with it.
+        if number is None:
+            number = 0
+
+        # We normalize any letters to their lower case form
+        letter = letter.lower()
+
+        # We consider some words to be alternate spellings of other words and
+        # in those cases we want to normalize the spellings to our preferred
+        # spelling.
+        if letter == "alpha":
+            letter = "a"
+        elif letter == "beta":
+            letter = "b"
+        elif letter in ["c", "pre", "preview"]:
+            letter = "rc"
+        elif letter in ["rev", "r"]:
+            letter = "post"
+
+        return letter, int(number)
+    if not letter and number:
+        # We assume if we are given a number, but we are not given a letter
+        # then this is using the implicit post release syntax (e.g. 1.0-1)
+        letter = "post"
+
+        return letter, int(number)
+
+    return None
+
+
+_local_version_separators = re.compile(r"[\._-]")
+
+
+def _parse_local_version(local):
+    # type: (str) -> Optional[LocalType]
+    """
+    Takes a string like abc.1.twelve and turns it into ("abc", 1, "twelve").
+    """
+    if local is not None:
+        return tuple(
+            part.lower() if not part.isdigit() else int(part)
+            for part in _local_version_separators.split(local)
+        )
+    return None
+
+
+def _cmpkey(
+    epoch,  # type: int
+    release,  # type: Tuple[int, ...]
+    pre,  # type: Optional[Tuple[str, int]]
+    post,  # type: Optional[Tuple[str, int]]
+    dev,  # type: Optional[Tuple[str, int]]
+    local,  # type: Optional[Tuple[SubLocalType]]
+):
+    # type: (...) -> CmpKey
+
+    # When we compare a release version, we want to compare it with all of the
+    # trailing zeros removed. So we'll use a reverse the list, drop all the now
+    # leading zeros until we come to something non zero, then take the rest
+    # re-reverse it back into the correct order and make it a tuple and use
+    # that for our sorting key.
+    _release = tuple(
+        reversed(list(itertools.dropwhile(lambda x: x == 0, reversed(release))))
+    )
+
+    # We need to "trick" the sorting algorithm to put 1.0.dev0 before 1.0a0.
+    # We'll do this by abusing the pre segment, but we _only_ want to do this
+    # if there is not a pre or a post segment. If we have one of those then
+    # the normal sorting rules will handle this case correctly.
+    if pre is None and post is None and dev is not None:
+        _pre = NegativeInfinity  # type: PrePostDevType
+    # Versions without a pre-release (except as noted above) should sort after
+    # those with one.
+    elif pre is None:
+        _pre = Infinity
+    else:
+        _pre = pre
+
+    # Versions without a post segment should sort before those with one.
+    if post is None:
+        _post = NegativeInfinity  # type: PrePostDevType
+
+    else:
+        _post = post
+
+    # Versions without a development segment should sort after those with one.
+    if dev is None:
+        _dev = Infinity  # type: PrePostDevType
+
+    else:
+        _dev = dev
+
+    if local is None:
+        # Versions without a local segment should sort before those with one.
+        _local = NegativeInfinity  # type: LocalType
+    else:
+        # Versions with a local segment need that segment parsed to implement
+        # the sorting rules in PEP440.
+        # - Alpha numeric segments sort before numeric segments
+        # - Alpha numeric segments sort lexicographically
+        # - Numeric segments sort numerically
+        # - Shorter versions sort before longer versions when the prefixes
+        #   match exactly
+        _local = tuple(
+            (i, "") if isinstance(i, int) else (NegativeInfinity, i) for i in local
+        )
+
+    return epoch, _release, _pre, _post, _dev, _local
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/pyproject.toml b/tests/wpt/web-platform-tests/tools/third_party/packaging/pyproject.toml
new file mode 100644
index 00000000000..e6cda6be501
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/pyproject.toml
@@ -0,0 +1,37 @@
+[build-system]
+requires = ["flit_core >=2,<4"]
+build-backend = "flit_core.buildapi"
+
+[tool.flit.metadata]
+module = "packaging"
+author = "Donald Stufft and individual contributors"
+author-email = "donald@stufft.io"
+home-page = "https://github.com/pypa/packaging"
+description-file = "README.rst"
+classifiers = [
+        "Development Status :: 5 - Production/Stable",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: Apache Software License",
+        "License :: OSI Approved :: BSD License",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 2",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: Implementation :: CPython",
+        "Programming Language :: Python :: Implementation :: PyPy",
+]
+requires-python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+requires = ["pyparsing>=2.0.2"]
+
+[tool.flit.metadata.urls]
+Documentation = "https://packaging.pypa.io/"
+Changelog = "https://packaging.pypa.io/en/latest/changelog.html"
+
+[tool.flit.sdist]
+include = ["LICENSE", "LICENSE.BSD", "LICENSE.APACHE"]
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tasks/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/packaging/tasks/__init__.py
new file mode 100644
index 00000000000..2ae24688b59
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/tasks/__init__.py
@@ -0,0 +1,10 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import invoke
+
+from . import check
+
+ns = invoke.Collection(check)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tasks/check.py b/tests/wpt/web-platform-tests/tools/third_party/packaging/tasks/check.py
new file mode 100644
index 00000000000..930ab490f3c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/tasks/check.py
@@ -0,0 +1,147 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+
+import json
+import itertools
+import os.path
+
+try:
+    import xmlrpc.client as xmlrpc_client
+except ImportError:
+    import xmlrpclib as xmlrpc_client
+
+import invoke
+import pkg_resources
+import progress.bar
+
+from packaging.version import Version
+
+from .paths import CACHE
+
+
+def _parse_version(value):
+    try:
+        return Version(value)
+    except ValueError:
+        return None
+
+
+@invoke.task
+def pep440(cached=False):
+    cache_path = os.path.join(CACHE, "pep440.json")
+
+    # If we were given --cached, then we want to attempt to use cached data if
+    # possible
+    if cached:
+        try:
+            with open(cache_path, "r") as fp:
+                data = json.load(fp)
+        except Exception:
+            data = None
+    else:
+        data = None
+
+    # If we don't have data, then let's go fetch it from PyPI
+    if data is None:
+        bar = progress.bar.ShadyBar("Fetching Versions")
+        client = xmlrpc_client.Server("https://pypi.python.org/pypi")
+
+        data = dict(
+            [
+                (project, client.package_releases(project, True))
+                for project in bar.iter(client.list_packages())
+            ]
+        )
+
+        os.makedirs(os.path.dirname(cache_path), exist_ok=True)
+        with open(cache_path, "w") as fp:
+            json.dump(data, fp)
+
+    # Get a list of all of the version numbers on PyPI
+    all_versions = list(itertools.chain.from_iterable(data.values()))
+
+    # Determine the total number of versions which are compatible with the
+    # current routine
+    parsed_versions = [
+        _parse_version(v) for v in all_versions if _parse_version(v) is not None
+    ]
+
+    # Determine a list of projects that sort exactly the same between
+    # pkg_resources and PEP 440
+    compatible_sorting = [
+        project
+        for project, versions in data.items()
+        if (
+            sorted(versions, key=pkg_resources.parse_version)
+            == sorted((x for x in versions if _parse_version(x)), key=Version)
+        )
+    ]
+
+    # Determine a list of projects that sort exactly the same between
+    # pkg_resources and PEP 440 when invalid versions are filtered out
+    filtered_compatible_sorting = [
+        project
+        for project, versions in (
+            (p, [v for v in vs if _parse_version(v) is not None])
+            for p, vs in data.items()
+        )
+        if (
+            sorted(versions, key=pkg_resources.parse_version)
+            == sorted(versions, key=Version)
+        )
+    ]
+
+    # Determine a list of projects which do not have any versions that are
+    # valid with PEP 440 and which have any versions registered
+    only_invalid_versions = [
+        project
+        for project, versions in data.items()
+        if (versions and not [v for v in versions if _parse_version(v) is not None])
+    ]
+
+    # Determine a list of projects which have matching latest versions between
+    # pkg_resources and PEP 440
+    differing_latest_versions = [
+        project
+        for project, versions in data.items()
+        if (
+            sorted(versions, key=pkg_resources.parse_version)[-1:]
+            != sorted((x for x in versions if _parse_version(x)), key=Version)[-1:]
+        )
+    ]
+
+    # Print out our findings
+    print(
+        "Total Version Compatibility:              {}/{} ({:.2%})".format(
+            len(parsed_versions),
+            len(all_versions),
+            len(parsed_versions) / len(all_versions),
+        )
+    )
+    print(
+        "Total Sorting Compatibility (Unfiltered): {}/{} ({:.2%})".format(
+            len(compatible_sorting), len(data), len(compatible_sorting) / len(data)
+        )
+    )
+    print(
+        "Total Sorting Compatibility (Filtered):   {}/{} ({:.2%})".format(
+            len(filtered_compatible_sorting),
+            len(data),
+            len(filtered_compatible_sorting) / len(data),
+        )
+    )
+    print(
+        "Projects with No Compatible Versions:     {}/{} ({:.2%})".format(
+            len(only_invalid_versions),
+            len(data),
+            len(only_invalid_versions) / len(data),
+        )
+    )
+    print(
+        "Projects with Differing Latest Version:   {}/{} ({:.2%})".format(
+            len(differing_latest_versions),
+            len(data),
+            len(differing_latest_versions) / len(data),
+        )
+    )
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tasks/paths.py b/tests/wpt/web-platform-tests/tools/third_party/packaging/tasks/paths.py
new file mode 100644
index 00000000000..13d49423bef
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/tasks/paths.py
@@ -0,0 +1,10 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+
+import os.path
+
+
+PROJECT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
+
+CACHE = os.path.join(PROJECT, ".cache")
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tasks/requirements.txt b/tests/wpt/web-platform-tests/tools/third_party/packaging/tasks/requirements.txt
new file mode 100644
index 00000000000..5677c0e89bd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/tasks/requirements.txt
@@ -0,0 +1,3 @@
+# The requirements required to invoke the tasks
+invoke
+progress
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/__init__.py
new file mode 100644
index 00000000000..0e11301413d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/__init__.py
@@ -0,0 +1,4 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/build-hello-world.sh b/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/build-hello-world.sh
new file mode 100755
index 00000000000..9c3e1e18190
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/build-hello-world.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+set -x
+set -e
+
+if [ $# -eq 0 ]; then
+	docker run --rm -v $(pwd):/home/hello-world arm32v5/debian /home/hello-world/build-hello-world.sh incontainer 52
+	docker run --rm -v $(pwd):/home/hello-world arm32v7/debian /home/hello-world/build-hello-world.sh incontainer 52
+	docker run --rm -v $(pwd):/home/hello-world i386/debian /home/hello-world/build-hello-world.sh incontainer 52
+	docker run --rm -v $(pwd):/home/hello-world s390x/debian /home/hello-world/build-hello-world.sh incontainer 64
+	docker run --rm -v $(pwd):/home/hello-world debian /home/hello-world/build-hello-world.sh incontainer 64
+	docker run --rm -v $(pwd):/home/hello-world debian /home/hello-world/build-hello-world.sh x32 52
+	cp -f hello-world-x86_64-i386 hello-world-invalid-magic
+	printf "\x00" | dd of=hello-world-invalid-magic bs=1 seek=0x00 count=1 conv=notrunc
+	cp -f hello-world-x86_64-i386 hello-world-invalid-class
+	printf "\x00" | dd of=hello-world-invalid-class bs=1 seek=0x04 count=1 conv=notrunc
+	cp -f hello-world-x86_64-i386 hello-world-invalid-data
+	printf "\x00" | dd of=hello-world-invalid-data bs=1 seek=0x05 count=1 conv=notrunc
+	head -c 40 hello-world-x86_64-i386 > hello-world-too-short
+	exit 0
+fi
+
+export DEBIAN_FRONTEND=noninteractive
+cd /home/hello-world/
+apt-get update
+apt-get install -y --no-install-recommends gcc libc6-dev
+if [ "$1" == "incontainer" ]; then
+	ARCH=$(dpkg --print-architecture)
+	CFLAGS=""
+else
+	ARCH=$1
+	dpkg --add-architecture ${ARCH}
+	apt-get install -y --no-install-recommends gcc-multilib libc6-dev-${ARCH}
+	CFLAGS="-mx32"
+fi
+NAME=hello-world-$(uname -m)-${ARCH}
+gcc -Os -s ${CFLAGS} -o ${NAME}-full hello-world.c
+head -c $2 ${NAME}-full > ${NAME}
+rm -f ${NAME}-full
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world-armv7l-armel b/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world-armv7l-armel
new file mode 100755
index 0000000000000000000000000000000000000000..1dfd23fa3c0eb944358b1eee0b7c241c79da3cd3
GIT binary patch
literal 52
ucmb<-^>JflWMqH=W(Exg5Kn-Gfx!ewHwXd=CI(g$1_cIApqw;=6axTaoC6>L

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world-armv7l-armhf b/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world-armv7l-armhf
new file mode 100755
index 0000000000000000000000000000000000000000..965ab3003af97dc37d31878feeff574b59dae17b
GIT binary patch
literal 52
ucmb<-^>JflWMqH=W(Exg5KoYWfx!ewcL)Lr76w)m1_cIApqw;=6axTbb^|K_

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world-invalid-class b/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world-invalid-class
new file mode 100755
index 0000000000000000000000000000000000000000..5e9899fc07609f37f5251f0da5a5af97d4d79234
GIT binary patch
literal 52
tcmb<-^>JfhWMqH=W(H;k5O0A11A_^WHZX+9m@p_Xa5HEy$S_DV003%T17iRH

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world-invalid-data b/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world-invalid-data
new file mode 100755
index 0000000000000000000000000000000000000000..2659b8ee25768ba38932177ae91d4f44a482917a
GIT binary patch
literal 52
scmb<-^>JflU}S&+W(H<3Z-D><g9%X3zz`y1!l1yw&7i>`!ywH70BT+XV*mgE

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world-invalid-magic b/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world-invalid-magic
new file mode 100755
index 0000000000000000000000000000000000000000..46066ad2ded1af7c68a4f5d4d3ccc66933b89f43
GIT binary patch
literal 52
tcmZQ@^>JflWMqH=W(H;k5O0A11A_^WHZX+9m@p_Xa5HEy$S_DV002<I0_6Yz

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world-s390x-s390x b/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world-s390x-s390x
new file mode 100644
index 0000000000000000000000000000000000000000..c4e9578889efc3eee73f12a0d8df70fe89ddd67e
GIT binary patch
literal 64
scmb<-^>JfjVq|~=W(F}J8!EsS02OzD(1HbE+JV7>fs?_3L5e{V0D5TyfdBvi

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world-too-short b/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world-too-short
new file mode 100644
index 0000000000000000000000000000000000000000..4e5c0396b94d8f3c6b5ef6fcd1cc67317edd3e85
GIT binary patch
literal 40
hcmb<-^>JflWMqH=W(H;k5O0A11A_^WHZX+9002cN0;T`}

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world-x86_64-amd64 b/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world-x86_64-amd64
new file mode 100644
index 0000000000000000000000000000000000000000..c7f5b0b5e5bb69550d594b8d181f6f881356e404
GIT binary patch
literal 64
tcmb<-^>JfjWMqH=W(GS35U)T0BH{p*@GyijfRqD+1p_yblwpu&0057p1JD2f

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world-x86_64-i386 b/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world-x86_64-i386
new file mode 100755
index 0000000000000000000000000000000000000000..ff1d540a30c6df244d013bf411ad8ea63eb3f16f
GIT binary patch
literal 52
tcmb<-^>JflWMqH=W(H;k5O0A11A_^WHZX+9m@p_Xa5HEy$S_DV003%@17rXI

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world-x86_64-x32 b/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world-x86_64-x32
new file mode 100755
index 0000000000000000000000000000000000000000..daf85d34737e237b7d1473929363340fb7402e3c
GIT binary patch
literal 52
scmb<-^>JflWMqH=W(GS35U)Uhfx!ew+ZaM*Oc)dxxEVAUWEi9w0B#cldjJ3c

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world.c b/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world.c
new file mode 100644
index 00000000000..5e591c3ec5d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world.c
@@ -0,0 +1,7 @@
+#include <stdio.h>
+
+int main(int argc, char* argv[])
+{
+	printf("Hello world");
+	return 0;
+}
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_markers.py b/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_markers.py
new file mode 100644
index 00000000000..01e4aa6b374
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_markers.py
@@ -0,0 +1,384 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import collections
+import itertools
+import os
+import platform
+import sys
+
+import pretend
+import pytest
+
+from packaging.markers import (
+    Node,
+    InvalidMarker,
+    UndefinedComparison,
+    UndefinedEnvironmentName,
+    Marker,
+    default_environment,
+    format_full_version,
+)
+
+
+VARIABLES = [
+    "extra",
+    "implementation_name",
+    "implementation_version",
+    "os_name",
+    "platform_machine",
+    "platform_release",
+    "platform_system",
+    "platform_version",
+    "python_full_version",
+    "python_version",
+    "platform_python_implementation",
+    "sys_platform",
+]
+
+PEP_345_VARIABLES = [
+    "os.name",
+    "sys.platform",
+    "platform.version",
+    "platform.machine",
+    "platform.python_implementation",
+]
+
+SETUPTOOLS_VARIABLES = ["python_implementation"]
+
+OPERATORS = ["===", "==", ">=", "<=", "!=", "~=", ">", "<", "in", "not in"]
+
+VALUES = [
+    "1.0",
+    "5.6a0",
+    "dog",
+    "freebsd",
+    "literally any string can go here",
+    "things @#4 dsfd (((",
+]
+
+
+class TestNode:
+    @pytest.mark.parametrize("value", ["one", "two", None, 3, 5, []])
+    def test_accepts_value(self, value):
+        assert Node(value).value == value
+
+    @pytest.mark.parametrize("value", ["one", "two", None, 3, 5, []])
+    def test_str(self, value):
+        assert str(Node(value)) == str(value)
+
+    @pytest.mark.parametrize("value", ["one", "two", None, 3, 5, []])
+    def test_repr(self, value):
+        assert repr(Node(value)) == "<Node({0!r})>".format(str(value))
+
+    def test_base_class(self):
+        with pytest.raises(NotImplementedError):
+            Node("cover all the code").serialize()
+
+
+class TestOperatorEvaluation:
+    def test_prefers_pep440(self):
+        assert Marker('"2.7.9" < "foo"').evaluate(dict(foo="2.7.10"))
+
+    def test_falls_back_to_python(self):
+        assert Marker('"b" > "a"').evaluate(dict(a="a"))
+
+    def test_fails_when_undefined(self):
+        with pytest.raises(UndefinedComparison):
+            Marker("'2.7.0' ~= os_name").evaluate()
+
+
+FakeVersionInfo = collections.namedtuple(
+    "FakeVersionInfo", ["major", "minor", "micro", "releaselevel", "serial"]
+)
+
+
+class TestDefaultEnvironment:
+    @pytest.mark.skipif(
+        hasattr(sys, "implementation"), reason="sys.implementation does exist"
+    )
+    def test_matches_expected_no_sys_implementation(self):
+        environment = default_environment()
+
+        assert environment == {
+            "implementation_name": "",
+            "implementation_version": "0",
+            "os_name": os.name,
+            "platform_machine": platform.machine(),
+            "platform_release": platform.release(),
+            "platform_system": platform.system(),
+            "platform_version": platform.version(),
+            "python_full_version": platform.python_version(),
+            "platform_python_implementation": platform.python_implementation(),
+            "python_version": ".".join(platform.python_version_tuple()[:2]),
+            "sys_platform": sys.platform,
+        }
+
+    @pytest.mark.skipif(
+        not hasattr(sys, "implementation"), reason="sys.implementation does not exist"
+    )
+    def test_matches_expected_deleted_sys_implementation(self, monkeypatch):
+        monkeypatch.delattr(sys, "implementation")
+
+        environment = default_environment()
+
+        assert environment == {
+            "implementation_name": "",
+            "implementation_version": "0",
+            "os_name": os.name,
+            "platform_machine": platform.machine(),
+            "platform_release": platform.release(),
+            "platform_system": platform.system(),
+            "platform_version": platform.version(),
+            "python_full_version": platform.python_version(),
+            "platform_python_implementation": platform.python_implementation(),
+            "python_version": ".".join(platform.python_version_tuple()[:2]),
+            "sys_platform": sys.platform,
+        }
+
+    @pytest.mark.skipif(
+        not hasattr(sys, "implementation"), reason="sys.implementation does not exist"
+    )
+    def test_matches_expected(self):
+        environment = default_environment()
+
+        iver = "{0.major}.{0.minor}.{0.micro}".format(sys.implementation.version)
+        if sys.implementation.version.releaselevel != "final":
+            iver = "{0}{1[0]}{2}".format(
+                iver,
+                sys.implementation.version.releaselevel,
+                sys.implementation.version.serial,
+            )
+
+        assert environment == {
+            "implementation_name": sys.implementation.name,
+            "implementation_version": iver,
+            "os_name": os.name,
+            "platform_machine": platform.machine(),
+            "platform_release": platform.release(),
+            "platform_system": platform.system(),
+            "platform_version": platform.version(),
+            "python_full_version": platform.python_version(),
+            "platform_python_implementation": platform.python_implementation(),
+            "python_version": ".".join(platform.python_version_tuple()[:2]),
+            "sys_platform": sys.platform,
+        }
+
+    @pytest.mark.skipif(
+        hasattr(sys, "implementation"), reason="sys.implementation does exist"
+    )
+    def test_monkeypatch_sys_implementation(self, monkeypatch):
+        monkeypatch.setattr(
+            sys,
+            "implementation",
+            pretend.stub(version=FakeVersionInfo(3, 4, 2, "final", 0), name="linux"),
+            raising=False,
+        )
+
+        environment = default_environment()
+        assert environment == {
+            "implementation_name": "linux",
+            "implementation_version": "3.4.2",
+            "os_name": os.name,
+            "platform_machine": platform.machine(),
+            "platform_release": platform.release(),
+            "platform_system": platform.system(),
+            "platform_version": platform.version(),
+            "python_full_version": platform.python_version(),
+            "platform_python_implementation": platform.python_implementation(),
+            "python_version": ".".join(platform.python_version_tuple()[:2]),
+            "sys_platform": sys.platform,
+        }
+
+    def test_multidigit_minor_version(self, monkeypatch):
+        version_info = (3, 10, 0, "final", 0)
+        monkeypatch.setattr(sys, "version_info", version_info, raising=False)
+
+        monkeypatch.setattr(platform, "python_version", lambda: "3.10.0", raising=False)
+        monkeypatch.setattr(
+            platform, "python_version_tuple", lambda: ("3", "10", "0"), raising=False
+        )
+
+        environment = default_environment()
+        assert environment["python_version"] == "3.10"
+
+    def tests_when_releaselevel_final(self):
+        v = FakeVersionInfo(3, 4, 2, "final", 0)
+        assert format_full_version(v) == "3.4.2"
+
+    def tests_when_releaselevel_not_final(self):
+        v = FakeVersionInfo(3, 4, 2, "beta", 4)
+        assert format_full_version(v) == "3.4.2b4"
+
+
+class TestMarker:
+    @pytest.mark.parametrize(
+        "marker_string",
+        [
+            "{0} {1} {2!r}".format(*i)
+            for i in itertools.product(VARIABLES, OPERATORS, VALUES)
+        ]
+        + [
+            "{2!r} {1} {0}".format(*i)
+            for i in itertools.product(VARIABLES, OPERATORS, VALUES)
+        ],
+    )
+    def test_parses_valid(self, marker_string):
+        Marker(marker_string)
+
+    @pytest.mark.parametrize(
+        "marker_string",
+        [
+            "this_isnt_a_real_variable >= '1.0'",
+            "python_version",
+            "(python_version)",
+            "python_version >= 1.0 and (python_version)",
+        ],
+    )
+    def test_parses_invalid(self, marker_string):
+        with pytest.raises(InvalidMarker):
+            Marker(marker_string)
+
+    @pytest.mark.parametrize(
+        ("marker_string", "expected"),
+        [
+            # Test the different quoting rules
+            ("python_version == '2.7'", 'python_version == "2.7"'),
+            ('python_version == "2.7"', 'python_version == "2.7"'),
+            # Test and/or expressions
+            (
+                'python_version == "2.7" and os_name == "linux"',
+                'python_version == "2.7" and os_name == "linux"',
+            ),
+            (
+                'python_version == "2.7" or os_name == "linux"',
+                'python_version == "2.7" or os_name == "linux"',
+            ),
+            (
+                'python_version == "2.7" and os_name == "linux" or '
+                'sys_platform == "win32"',
+                'python_version == "2.7" and os_name == "linux" or '
+                'sys_platform == "win32"',
+            ),
+            # Test nested expressions and grouping with ()
+            ('(python_version == "2.7")', 'python_version == "2.7"'),
+            (
+                '(python_version == "2.7" and sys_platform == "win32")',
+                'python_version == "2.7" and sys_platform == "win32"',
+            ),
+            (
+                'python_version == "2.7" and (sys_platform == "win32" or '
+                'sys_platform == "linux")',
+                'python_version == "2.7" and (sys_platform == "win32" or '
+                'sys_platform == "linux")',
+            ),
+        ],
+    )
+    def test_str_and_repr(self, marker_string, expected):
+        m = Marker(marker_string)
+        assert str(m) == expected
+        assert repr(m) == "<Marker({0!r})>".format(str(m))
+
+    def test_extra_with_no_extra_in_environment(self):
+        # We can't evaluate an extra if no extra is passed into the environment
+        m = Marker("extra == 'security'")
+        with pytest.raises(UndefinedEnvironmentName):
+            m.evaluate()
+
+    @pytest.mark.parametrize(
+        ("marker_string", "environment", "expected"),
+        [
+            ("os_name == '{0}'".format(os.name), None, True),
+            ("os_name == 'foo'", {"os_name": "foo"}, True),
+            ("os_name == 'foo'", {"os_name": "bar"}, False),
+            ("'2.7' in python_version", {"python_version": "2.7.5"}, True),
+            ("'2.7' not in python_version", {"python_version": "2.7"}, False),
+            (
+                "os_name == 'foo' and python_version ~= '2.7.0'",
+                {"os_name": "foo", "python_version": "2.7.6"},
+                True,
+            ),
+            (
+                "python_version ~= '2.7.0' and (os_name == 'foo' or "
+                "os_name == 'bar')",
+                {"os_name": "foo", "python_version": "2.7.4"},
+                True,
+            ),
+            (
+                "python_version ~= '2.7.0' and (os_name == 'foo' or "
+                "os_name == 'bar')",
+                {"os_name": "bar", "python_version": "2.7.4"},
+                True,
+            ),
+            (
+                "python_version ~= '2.7.0' and (os_name == 'foo' or "
+                "os_name == 'bar')",
+                {"os_name": "other", "python_version": "2.7.4"},
+                False,
+            ),
+            ("extra == 'security'", {"extra": "quux"}, False),
+            ("extra == 'security'", {"extra": "security"}, True),
+        ],
+    )
+    def test_evaluates(self, marker_string, environment, expected):
+        args = [] if environment is None else [environment]
+        assert Marker(marker_string).evaluate(*args) == expected
+
+    @pytest.mark.parametrize(
+        "marker_string",
+        [
+            "{0} {1} {2!r}".format(*i)
+            for i in itertools.product(PEP_345_VARIABLES, OPERATORS, VALUES)
+        ]
+        + [
+            "{2!r} {1} {0}".format(*i)
+            for i in itertools.product(PEP_345_VARIABLES, OPERATORS, VALUES)
+        ],
+    )
+    def test_parses_pep345_valid(self, marker_string):
+        Marker(marker_string)
+
+    @pytest.mark.parametrize(
+        ("marker_string", "environment", "expected"),
+        [
+            ("os.name == '{0}'".format(os.name), None, True),
+            ("sys.platform == 'win32'", {"sys_platform": "linux2"}, False),
+            ("platform.version in 'Ubuntu'", {"platform_version": "#39"}, False),
+            ("platform.machine=='x86_64'", {"platform_machine": "x86_64"}, True),
+            (
+                "platform.python_implementation=='Jython'",
+                {"platform_python_implementation": "CPython"},
+                False,
+            ),
+            (
+                "python_version == '2.5' and platform.python_implementation"
+                "!= 'Jython'",
+                {"python_version": "2.7"},
+                False,
+            ),
+        ],
+    )
+    def test_evaluate_pep345_markers(self, marker_string, environment, expected):
+        args = [] if environment is None else [environment]
+        assert Marker(marker_string).evaluate(*args) == expected
+
+    @pytest.mark.parametrize(
+        "marker_string",
+        [
+            "{0} {1} {2!r}".format(*i)
+            for i in itertools.product(SETUPTOOLS_VARIABLES, OPERATORS, VALUES)
+        ]
+        + [
+            "{2!r} {1} {0}".format(*i)
+            for i in itertools.product(SETUPTOOLS_VARIABLES, OPERATORS, VALUES)
+        ],
+    )
+    def test_parses_setuptools_legacy_valid(self, marker_string):
+        Marker(marker_string)
+
+    def test_evaluate_setuptools_legacy_markers(self):
+        marker_string = "python_implementation=='Jython'"
+        args = [{"platform_python_implementation": "CPython"}]
+        assert Marker(marker_string).evaluate(*args) is False
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_requirements.py b/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_requirements.py
new file mode 100644
index 00000000000..50e38d6adca
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_requirements.py
@@ -0,0 +1,197 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import pytest
+
+from packaging.markers import Marker
+from packaging.requirements import InvalidRequirement, Requirement, URL
+from packaging.requirements import URL_AND_MARKER
+from packaging.specifiers import SpecifierSet
+
+
+class TestRequirements:
+    def test_string_specifier_marker(self):
+        requirement = 'name[bar]>=3; python_version == "2.7"'
+        req = Requirement(requirement)
+        assert str(req) == requirement
+
+    def test_string_url(self):
+        requirement = "name@ http://foo.com"
+        req = Requirement(requirement)
+        assert str(req) == requirement
+
+    def test_string_url_with_marker(self):
+        requirement = 'name@ http://foo.com ; extra == "feature"'
+        req = Requirement(requirement)
+        assert str(req) == requirement
+
+    def test_repr(self):
+        req = Requirement("name")
+        assert repr(req) == "<Requirement('name')>"
+
+    def _assert_requirement(
+        self, req, name, url=None, extras=[], specifier="", marker=None
+    ):
+        assert req.name == name
+        assert req.url == url
+        assert sorted(req.extras) == sorted(extras)
+        assert str(req.specifier) == specifier
+        if marker:
+            assert str(req.marker) == marker
+        else:
+            assert req.marker is None
+
+    def test_simple_names(self):
+        for name in ("A", "aa", "name"):
+            req = Requirement(name)
+            self._assert_requirement(req, name)
+
+    def test_name_with_other_characters(self):
+        name = "foo-bar.quux_baz"
+        req = Requirement(name)
+        self._assert_requirement(req, name)
+
+    def test_invalid_name(self):
+        with pytest.raises(InvalidRequirement):
+            Requirement("foo!")
+
+    def test_name_with_version(self):
+        req = Requirement("name>=3")
+        self._assert_requirement(req, "name", specifier=">=3")
+
+    def test_with_legacy_version(self):
+        req = Requirement("name==1.0.org1")
+        self._assert_requirement(req, "name", specifier="==1.0.org1")
+
+    def test_with_legacy_version_and_marker(self):
+        req = Requirement("name>=1.x.y;python_version=='2.6'")
+        self._assert_requirement(
+            req, "name", specifier=">=1.x.y", marker='python_version == "2.6"'
+        )
+
+    def test_version_with_parens_and_whitespace(self):
+        req = Requirement("name (==4)")
+        self._assert_requirement(req, "name", specifier="==4")
+
+    def test_name_with_multiple_versions(self):
+        req = Requirement("name>=3,<2")
+        self._assert_requirement(req, "name", specifier="<2,>=3")
+
+    def test_name_with_multiple_versions_and_whitespace(self):
+        req = Requirement("name >=2, <3")
+        self._assert_requirement(req, "name", specifier="<3,>=2")
+
+    def test_extras(self):
+        req = Requirement("foobar [quux,bar]")
+        self._assert_requirement(req, "foobar", extras=["bar", "quux"])
+
+    def test_empty_extras(self):
+        req = Requirement("foo[]")
+        self._assert_requirement(req, "foo")
+
+    def test_url(self):
+        url_section = "@ http://example.com"
+        parsed = URL.parseString(url_section)
+        assert parsed.url == "http://example.com"
+
+    def test_url_and_marker(self):
+        instring = "@ http://example.com ; os_name=='a'"
+        parsed = URL_AND_MARKER.parseString(instring)
+        assert parsed.url == "http://example.com"
+        assert str(parsed.marker) == 'os_name == "a"'
+
+    def test_invalid_url(self):
+        with pytest.raises(InvalidRequirement) as e:
+            Requirement("name @ gopher:/foo/com")
+        assert "Invalid URL: " in str(e.value)
+        assert "gopher:/foo/com" in str(e.value)
+
+    def test_file_url(self):
+        req = Requirement("name @ file:///absolute/path")
+        self._assert_requirement(req, "name", "file:///absolute/path")
+        req = Requirement("name @ file://.")
+        self._assert_requirement(req, "name", "file://.")
+
+    def test_invalid_file_urls(self):
+        with pytest.raises(InvalidRequirement):
+            Requirement("name @ file:.")
+        with pytest.raises(InvalidRequirement):
+            Requirement("name @ file:/.")
+
+    def test_extras_and_url_and_marker(self):
+        req = Requirement("name [fred,bar] @ http://foo.com ; python_version=='2.7'")
+        self._assert_requirement(
+            req,
+            "name",
+            extras=["bar", "fred"],
+            url="http://foo.com",
+            marker='python_version == "2.7"',
+        )
+
+    def test_complex_url_and_marker(self):
+        url = "https://example.com/name;v=1.1/?query=foo&bar=baz#blah"
+        req = Requirement("foo @ %s ; python_version=='3.4'" % url)
+        self._assert_requirement(req, "foo", url=url, marker='python_version == "3.4"')
+
+    def test_multiple_markers(self):
+        req = Requirement(
+            "name[quux, strange];python_version<'2.7' and " "platform_version=='2'"
+        )
+        marker = 'python_version < "2.7" and platform_version == "2"'
+        self._assert_requirement(req, "name", extras=["strange", "quux"], marker=marker)
+
+    def test_multiple_comparsion_markers(self):
+        req = Requirement("name; os_name=='a' and os_name=='b' or os_name=='c'")
+        marker = 'os_name == "a" and os_name == "b" or os_name == "c"'
+        self._assert_requirement(req, "name", marker=marker)
+
+    def test_invalid_marker(self):
+        with pytest.raises(InvalidRequirement):
+            Requirement("name; foobar=='x'")
+
+    def test_types(self):
+        req = Requirement("foobar[quux]<2,>=3; os_name=='a'")
+        assert isinstance(req.name, str)
+        assert isinstance(req.extras, set)
+        assert req.url is None
+        assert isinstance(req.specifier, SpecifierSet)
+        assert isinstance(req.marker, Marker)
+
+    def test_types_with_nothing(self):
+        req = Requirement("foobar")
+        assert isinstance(req.name, str)
+        assert isinstance(req.extras, set)
+        assert req.url is None
+        assert isinstance(req.specifier, SpecifierSet)
+        assert req.marker is None
+
+    def test_types_with_url(self):
+        req = Requirement("foobar @ http://foo.com")
+        assert isinstance(req.name, str)
+        assert isinstance(req.extras, set)
+        assert isinstance(req.url, str)
+        assert isinstance(req.specifier, SpecifierSet)
+        assert req.marker is None
+
+    def test_sys_platform_linux_equal(self):
+        req = Requirement('something>=1.2.3; sys_platform == "foo"')
+
+        assert req.name == "something"
+        assert req.marker is not None
+        assert req.marker.evaluate(dict(sys_platform="foo")) is True
+        assert req.marker.evaluate(dict(sys_platform="bar")) is False
+
+    def test_sys_platform_linux_in(self):
+        req = Requirement("aviato>=1.2.3; 'f' in sys_platform")
+
+        assert req.name == "aviato"
+        assert req.marker is not None
+        assert req.marker.evaluate(dict(sys_platform="foo")) is True
+        assert req.marker.evaluate(dict(sys_platform="bar")) is False
+
+    def test_parseexception_error_msg(self):
+        with pytest.raises(InvalidRequirement) as e:
+            Requirement("toto 42")
+        assert "Expected stringEnd" in str(e.value)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_specifiers.py b/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_specifiers.py
new file mode 100644
index 00000000000..c9a44466f75
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_specifiers.py
@@ -0,0 +1,999 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import itertools
+import operator
+import warnings
+
+import pytest
+
+from packaging.specifiers import (
+    InvalidSpecifier,
+    LegacySpecifier,
+    Specifier,
+    SpecifierSet,
+)
+from packaging.version import LegacyVersion, Version, parse
+
+from .test_version import VERSIONS, LEGACY_VERSIONS
+
+
+LEGACY_SPECIFIERS = [
+    "==2.1.0.3",
+    "!=2.2.0.5",
+    "<=5",
+    ">=7.9a1",
+    "<1.0.dev1",
+    ">2.0.post1",
+]
+
+SPECIFIERS = [
+    "~=2.0",
+    "==2.1.*",
+    "==2.1.0.3",
+    "!=2.2.*",
+    "!=2.2.0.5",
+    "<=5",
+    ">=7.9a1",
+    "<1.0.dev1",
+    ">2.0.post1",
+    "===lolwat",
+]
+
+
+class TestSpecifier:
+    @pytest.mark.parametrize("specifier", SPECIFIERS)
+    def test_specifiers_valid(self, specifier):
+        Specifier(specifier)
+
+    @pytest.mark.parametrize(
+        "specifier",
+        [
+            # Operator-less specifier
+            "2.0",
+            # Invalid operator
+            "=>2.0",
+            # Version-less specifier
+            "==",
+            # Local segment on operators which don't support them
+            "~=1.0+5",
+            ">=1.0+deadbeef",
+            "<=1.0+abc123",
+            ">1.0+watwat",
+            "<1.0+1.0",
+            # Prefix matching on operators which don't support them
+            "~=1.0.*",
+            ">=1.0.*",
+            "<=1.0.*",
+            ">1.0.*",
+            "<1.0.*",
+            # Combination of local and prefix matching on operators which do
+            # support one or the other
+            "==1.0.*+5",
+            "!=1.0.*+deadbeef",
+            # Prefix matching cannot be used inside of a local version
+            "==1.0+5.*",
+            "!=1.0+deadbeef.*",
+            # Prefix matching must appear at the end
+            "==1.0.*.5",
+            # Compatible operator requires 2 digits in the release operator
+            "~=1",
+            # Cannot use a prefix matching after a .devN version
+            "==1.0.dev1.*",
+            "!=1.0.dev1.*",
+        ],
+    )
+    def test_specifiers_invalid(self, specifier):
+        with pytest.raises(InvalidSpecifier):
+            Specifier(specifier)
+
+    @pytest.mark.parametrize(
+        "version",
+        [
+            # Various development release incarnations
+            "1.0dev",
+            "1.0.dev",
+            "1.0dev1",
+            "1.0dev",
+            "1.0-dev",
+            "1.0-dev1",
+            "1.0DEV",
+            "1.0.DEV",
+            "1.0DEV1",
+            "1.0DEV",
+            "1.0.DEV1",
+            "1.0-DEV",
+            "1.0-DEV1",
+            # Various alpha incarnations
+            "1.0a",
+            "1.0.a",
+            "1.0.a1",
+            "1.0-a",
+            "1.0-a1",
+            "1.0alpha",
+            "1.0.alpha",
+            "1.0.alpha1",
+            "1.0-alpha",
+            "1.0-alpha1",
+            "1.0A",
+            "1.0.A",
+            "1.0.A1",
+            "1.0-A",
+            "1.0-A1",
+            "1.0ALPHA",
+            "1.0.ALPHA",
+            "1.0.ALPHA1",
+            "1.0-ALPHA",
+            "1.0-ALPHA1",
+            # Various beta incarnations
+            "1.0b",
+            "1.0.b",
+            "1.0.b1",
+            "1.0-b",
+            "1.0-b1",
+            "1.0beta",
+            "1.0.beta",
+            "1.0.beta1",
+            "1.0-beta",
+            "1.0-beta1",
+            "1.0B",
+            "1.0.B",
+            "1.0.B1",
+            "1.0-B",
+            "1.0-B1",
+            "1.0BETA",
+            "1.0.BETA",
+            "1.0.BETA1",
+            "1.0-BETA",
+            "1.0-BETA1",
+            # Various release candidate incarnations
+            "1.0c",
+            "1.0.c",
+            "1.0.c1",
+            "1.0-c",
+            "1.0-c1",
+            "1.0rc",
+            "1.0.rc",
+            "1.0.rc1",
+            "1.0-rc",
+            "1.0-rc1",
+            "1.0C",
+            "1.0.C",
+            "1.0.C1",
+            "1.0-C",
+            "1.0-C1",
+            "1.0RC",
+            "1.0.RC",
+            "1.0.RC1",
+            "1.0-RC",
+            "1.0-RC1",
+            # Various post release incarnations
+            "1.0post",
+            "1.0.post",
+            "1.0post1",
+            "1.0post",
+            "1.0-post",
+            "1.0-post1",
+            "1.0POST",
+            "1.0.POST",
+            "1.0POST1",
+            "1.0POST",
+            "1.0.POST1",
+            "1.0-POST",
+            "1.0-POST1",
+            "1.0-5",
+            # Local version case insensitivity
+            "1.0+AbC"
+            # Integer Normalization
+            "1.01",
+            "1.0a05",
+            "1.0b07",
+            "1.0c056",
+            "1.0rc09",
+            "1.0.post000",
+            "1.1.dev09000",
+            "00!1.2",
+            "0100!0.0",
+            # Various other normalizations
+            "v1.0",
+            "  \r \f \v v1.0\t\n",
+        ],
+    )
+    def test_specifiers_normalized(self, version):
+        if "+" not in version:
+            ops = ["~=", "==", "!=", "<=", ">=", "<", ">"]
+        else:
+            ops = ["==", "!="]
+
+        for op in ops:
+            Specifier(op + version)
+
+    @pytest.mark.parametrize(
+        ("specifier", "expected"),
+        [
+            # Single item specifiers should just be reflexive
+            ("!=2.0", "!=2.0"),
+            ("<2.0", "<2.0"),
+            ("<=2.0", "<=2.0"),
+            ("==2.0", "==2.0"),
+            (">2.0", ">2.0"),
+            (">=2.0", ">=2.0"),
+            ("~=2.0", "~=2.0"),
+            # Spaces should be removed
+            ("< 2", "<2"),
+        ],
+    )
+    def test_specifiers_str_and_repr(self, specifier, expected):
+        spec = Specifier(specifier)
+
+        assert str(spec) == expected
+        assert repr(spec) == "<Specifier({0})>".format(repr(expected))
+
+    @pytest.mark.parametrize("specifier", SPECIFIERS)
+    def test_specifiers_hash(self, specifier):
+        assert hash(Specifier(specifier)) == hash(Specifier(specifier))
+
+    @pytest.mark.parametrize(
+        ("left", "right", "op"),
+        itertools.chain(
+            *
+            # Verify that the equal (==) operator works correctly
+            [[(x, x, operator.eq) for x in SPECIFIERS]]
+            +
+            # Verify that the not equal (!=) operator works correctly
+            [
+                [(x, y, operator.ne) for j, y in enumerate(SPECIFIERS) if i != j]
+                for i, x in enumerate(SPECIFIERS)
+            ]
+        ),
+    )
+    def test_comparison_true(self, left, right, op):
+        assert op(Specifier(left), Specifier(right))
+        assert op(left, Specifier(right))
+        assert op(Specifier(left), right)
+
+    @pytest.mark.parametrize(("left", "right"), [("==2.8.0", "==2.8")])
+    def test_comparison_canonicalizes(self, left, right):
+        assert Specifier(left) == Specifier(right)
+        assert left == Specifier(right)
+        assert Specifier(left) == right
+
+    @pytest.mark.parametrize(
+        ("left", "right", "op"),
+        itertools.chain(
+            *
+            # Verify that the equal (==) operator works correctly
+            [[(x, x, operator.ne) for x in SPECIFIERS]]
+            +
+            # Verify that the not equal (!=) operator works correctly
+            [
+                [(x, y, operator.eq) for j, y in enumerate(SPECIFIERS) if i != j]
+                for i, x in enumerate(SPECIFIERS)
+            ]
+        ),
+    )
+    def test_comparison_false(self, left, right, op):
+        assert not op(Specifier(left), Specifier(right))
+        assert not op(left, Specifier(right))
+        assert not op(Specifier(left), right)
+
+    def test_comparison_non_specifier(self):
+        assert Specifier("==1.0") != 12
+        assert not Specifier("==1.0") == 12
+        assert Specifier("==1.0") != "12"
+        assert not Specifier("==1.0") == "12"
+
+    @pytest.mark.parametrize(
+        ("version", "spec", "expected"),
+        [
+            (v, s, True)
+            for v, s in [
+                # Test the equality operation
+                ("2.0", "==2"),
+                ("2.0", "==2.0"),
+                ("2.0", "==2.0.0"),
+                ("2.0+deadbeef", "==2"),
+                ("2.0+deadbeef", "==2.0"),
+                ("2.0+deadbeef", "==2.0.0"),
+                ("2.0+deadbeef", "==2+deadbeef"),
+                ("2.0+deadbeef", "==2.0+deadbeef"),
+                ("2.0+deadbeef", "==2.0.0+deadbeef"),
+                ("2.0+deadbeef.0", "==2.0.0+deadbeef.00"),
+                # Test the equality operation with a prefix
+                ("2.dev1", "==2.*"),
+                ("2a1", "==2.*"),
+                ("2a1.post1", "==2.*"),
+                ("2b1", "==2.*"),
+                ("2b1.dev1", "==2.*"),
+                ("2c1", "==2.*"),
+                ("2c1.post1.dev1", "==2.*"),
+                ("2rc1", "==2.*"),
+                ("2", "==2.*"),
+                ("2.0", "==2.*"),
+                ("2.0.0", "==2.*"),
+                ("2.0.post1", "==2.0.post1.*"),
+                ("2.0.post1.dev1", "==2.0.post1.*"),
+                ("2.1+local.version", "==2.1.*"),
+                # Test the in-equality operation
+                ("2.1", "!=2"),
+                ("2.1", "!=2.0"),
+                ("2.0.1", "!=2"),
+                ("2.0.1", "!=2.0"),
+                ("2.0.1", "!=2.0.0"),
+                ("2.0", "!=2.0+deadbeef"),
+                # Test the in-equality operation with a prefix
+                ("2.0", "!=3.*"),
+                ("2.1", "!=2.0.*"),
+                # Test the greater than equal operation
+                ("2.0", ">=2"),
+                ("2.0", ">=2.0"),
+                ("2.0", ">=2.0.0"),
+                ("2.0.post1", ">=2"),
+                ("2.0.post1.dev1", ">=2"),
+                ("3", ">=2"),
+                # Test the less than equal operation
+                ("2.0", "<=2"),
+                ("2.0", "<=2.0"),
+                ("2.0", "<=2.0.0"),
+                ("2.0.dev1", "<=2"),
+                ("2.0a1", "<=2"),
+                ("2.0a1.dev1", "<=2"),
+                ("2.0b1", "<=2"),
+                ("2.0b1.post1", "<=2"),
+                ("2.0c1", "<=2"),
+                ("2.0c1.post1.dev1", "<=2"),
+                ("2.0rc1", "<=2"),
+                ("1", "<=2"),
+                # Test the greater than operation
+                ("3", ">2"),
+                ("2.1", ">2.0"),
+                ("2.0.1", ">2"),
+                ("2.1.post1", ">2"),
+                ("2.1+local.version", ">2"),
+                # Test the less than operation
+                ("1", "<2"),
+                ("2.0", "<2.1"),
+                ("2.0.dev0", "<2.1"),
+                # Test the compatibility operation
+                ("1", "~=1.0"),
+                ("1.0.1", "~=1.0"),
+                ("1.1", "~=1.0"),
+                ("1.9999999", "~=1.0"),
+                # Test that epochs are handled sanely
+                ("2!1.0", "~=2!1.0"),
+                ("2!1.0", "==2!1.*"),
+                ("2!1.0", "==2!1.0"),
+                ("2!1.0", "!=1.0"),
+                ("1.0", "!=2!1.0"),
+                ("1.0", "<=2!0.1"),
+                ("2!1.0", ">=2.0"),
+                ("1.0", "<2!0.1"),
+                ("2!1.0", ">2.0"),
+                # Test some normalization rules
+                ("2.0.5", ">2.0dev"),
+            ]
+        ]
+        + [
+            (v, s, False)
+            for v, s in [
+                # Test the equality operation
+                ("2.1", "==2"),
+                ("2.1", "==2.0"),
+                ("2.1", "==2.0.0"),
+                ("2.0", "==2.0+deadbeef"),
+                # Test the equality operation with a prefix
+                ("2.0", "==3.*"),
+                ("2.1", "==2.0.*"),
+                # Test the in-equality operation
+                ("2.0", "!=2"),
+                ("2.0", "!=2.0"),
+                ("2.0", "!=2.0.0"),
+                ("2.0+deadbeef", "!=2"),
+                ("2.0+deadbeef", "!=2.0"),
+                ("2.0+deadbeef", "!=2.0.0"),
+                ("2.0+deadbeef", "!=2+deadbeef"),
+                ("2.0+deadbeef", "!=2.0+deadbeef"),
+                ("2.0+deadbeef", "!=2.0.0+deadbeef"),
+                ("2.0+deadbeef.0", "!=2.0.0+deadbeef.00"),
+                # Test the in-equality operation with a prefix
+                ("2.dev1", "!=2.*"),
+                ("2a1", "!=2.*"),
+                ("2a1.post1", "!=2.*"),
+                ("2b1", "!=2.*"),
+                ("2b1.dev1", "!=2.*"),
+                ("2c1", "!=2.*"),
+                ("2c1.post1.dev1", "!=2.*"),
+                ("2rc1", "!=2.*"),
+                ("2", "!=2.*"),
+                ("2.0", "!=2.*"),
+                ("2.0.0", "!=2.*"),
+                ("2.0.post1", "!=2.0.post1.*"),
+                ("2.0.post1.dev1", "!=2.0.post1.*"),
+                # Test the greater than equal operation
+                ("2.0.dev1", ">=2"),
+                ("2.0a1", ">=2"),
+                ("2.0a1.dev1", ">=2"),
+                ("2.0b1", ">=2"),
+                ("2.0b1.post1", ">=2"),
+                ("2.0c1", ">=2"),
+                ("2.0c1.post1.dev1", ">=2"),
+                ("2.0rc1", ">=2"),
+                ("1", ">=2"),
+                # Test the less than equal operation
+                ("2.0.post1", "<=2"),
+                ("2.0.post1.dev1", "<=2"),
+                ("3", "<=2"),
+                # Test the greater than operation
+                ("1", ">2"),
+                ("2.0.dev1", ">2"),
+                ("2.0a1", ">2"),
+                ("2.0a1.post1", ">2"),
+                ("2.0b1", ">2"),
+                ("2.0b1.dev1", ">2"),
+                ("2.0c1", ">2"),
+                ("2.0c1.post1.dev1", ">2"),
+                ("2.0rc1", ">2"),
+                ("2.0", ">2"),
+                ("2.0.post1", ">2"),
+                ("2.0.post1.dev1", ">2"),
+                ("2.0+local.version", ">2"),
+                # Test the less than operation
+                ("2.0.dev1", "<2"),
+                ("2.0a1", "<2"),
+                ("2.0a1.post1", "<2"),
+                ("2.0b1", "<2"),
+                ("2.0b2.dev1", "<2"),
+                ("2.0c1", "<2"),
+                ("2.0c1.post1.dev1", "<2"),
+                ("2.0rc1", "<2"),
+                ("2.0", "<2"),
+                ("2.post1", "<2"),
+                ("2.post1.dev1", "<2"),
+                ("3", "<2"),
+                # Test the compatibility operation
+                ("2.0", "~=1.0"),
+                ("1.1.0", "~=1.0.0"),
+                ("1.1.post1", "~=1.0.0"),
+                # Test that epochs are handled sanely
+                ("1.0", "~=2!1.0"),
+                ("2!1.0", "~=1.0"),
+                ("2!1.0", "==1.0"),
+                ("1.0", "==2!1.0"),
+                ("2!1.0", "==1.*"),
+                ("1.0", "==2!1.*"),
+                ("2!1.0", "!=2!1.0"),
+            ]
+        ],
+    )
+    def test_specifiers(self, version, spec, expected):
+        spec = Specifier(spec, prereleases=True)
+
+        if expected:
+            # Test that the plain string form works
+            assert version in spec
+            assert spec.contains(version)
+
+            # Test that the version instance form works
+            assert Version(version) in spec
+            assert spec.contains(Version(version))
+        else:
+            # Test that the plain string form works
+            assert version not in spec
+            assert not spec.contains(version)
+
+            # Test that the version instance form works
+            assert Version(version) not in spec
+            assert not spec.contains(Version(version))
+
+    @pytest.mark.parametrize(
+        ("version", "spec", "expected"),
+        [
+            # Test identity comparison by itself
+            ("lolwat", "===lolwat", True),
+            ("Lolwat", "===lolwat", True),
+            ("1.0", "===1.0", True),
+            ("nope", "===lolwat", False),
+            ("1.0.0", "===1.0", False),
+            ("1.0.dev0", "===1.0.dev0", True),
+        ],
+    )
+    def test_specifiers_identity(self, version, spec, expected):
+        spec = Specifier(spec)
+
+        if expected:
+            # Identity comparisons only support the plain string form
+            assert version in spec
+        else:
+            # Identity comparisons only support the plain string form
+            assert version not in spec
+
+    @pytest.mark.parametrize(
+        ("specifier", "expected"),
+        [
+            ("==1.0", False),
+            (">=1.0", False),
+            ("<=1.0", False),
+            ("~=1.0", False),
+            ("<1.0", False),
+            (">1.0", False),
+            ("<1.0.dev1", False),
+            (">1.0.dev1", False),
+            ("==1.0.*", False),
+            ("==1.0.dev1", True),
+            (">=1.0.dev1", True),
+            ("<=1.0.dev1", True),
+            ("~=1.0.dev1", True),
+        ],
+    )
+    def test_specifier_prereleases_detection(self, specifier, expected):
+        assert Specifier(specifier).prereleases == expected
+
+    @pytest.mark.parametrize(
+        ("specifier", "version", "expected"),
+        [
+            (">=1.0", "2.0.dev1", False),
+            (">=2.0.dev1", "2.0a1", True),
+            ("==2.0.*", "2.0a1.dev1", False),
+            ("==2.0a1.*", "2.0a1.dev1", True),
+            ("<=2.0", "1.0.dev1", False),
+            ("<=2.0.dev1", "1.0a1", True),
+        ],
+    )
+    def test_specifiers_prereleases(self, specifier, version, expected):
+        spec = Specifier(specifier)
+
+        if expected:
+            assert version in spec
+            spec.prereleases = False
+            assert version not in spec
+        else:
+            assert version not in spec
+            spec.prereleases = True
+            assert version in spec
+
+    @pytest.mark.parametrize(
+        ("specifier", "prereleases", "input", "expected"),
+        [
+            (">=1.0", None, ["2.0a1"], ["2.0a1"]),
+            (">=1.0.dev1", None, ["1.0", "2.0a1"], ["1.0", "2.0a1"]),
+            (">=1.0.dev1", False, ["1.0", "2.0a1"], ["1.0"]),
+        ],
+    )
+    def test_specifier_filter(self, specifier, prereleases, input, expected):
+        spec = Specifier(specifier)
+
+        kwargs = {"prereleases": prereleases} if prereleases is not None else {}
+
+        assert list(spec.filter(input, **kwargs)) == expected
+
+    @pytest.mark.xfail
+    def test_specifier_explicit_legacy(self):
+        assert Specifier("==1.0").contains(LegacyVersion("1.0"))
+
+    @pytest.mark.parametrize(
+        ("spec", "op"),
+        [
+            ("~=2.0", "~="),
+            ("==2.1.*", "=="),
+            ("==2.1.0.3", "=="),
+            ("!=2.2.*", "!="),
+            ("!=2.2.0.5", "!="),
+            ("<=5", "<="),
+            (">=7.9a1", ">="),
+            ("<1.0.dev1", "<"),
+            (">2.0.post1", ">"),
+            ("===lolwat", "==="),
+        ],
+    )
+    def test_specifier_operator_property(self, spec, op):
+        assert Specifier(spec).operator == op
+
+    @pytest.mark.parametrize(
+        ("spec", "version"),
+        [
+            ("~=2.0", "2.0"),
+            ("==2.1.*", "2.1.*"),
+            ("==2.1.0.3", "2.1.0.3"),
+            ("!=2.2.*", "2.2.*"),
+            ("!=2.2.0.5", "2.2.0.5"),
+            ("<=5", "5"),
+            (">=7.9a1", "7.9a1"),
+            ("<1.0.dev1", "1.0.dev1"),
+            (">2.0.post1", "2.0.post1"),
+            ("===lolwat", "lolwat"),
+        ],
+    )
+    def test_specifier_version_property(self, spec, version):
+        assert Specifier(spec).version == version
+
+    @pytest.mark.parametrize(
+        ("spec", "expected_length"),
+        [("", 0), ("==2.0", 1), (">=2.0", 1), (">=2.0,<3", 2), (">=2.0,<3,==2.4", 3)],
+    )
+    def test_length(self, spec, expected_length):
+        spec = SpecifierSet(spec)
+        assert len(spec) == expected_length
+
+    @pytest.mark.parametrize(
+        ("spec", "expected_items"),
+        [
+            ("", []),
+            ("==2.0", ["==2.0"]),
+            (">=2.0", [">=2.0"]),
+            (">=2.0,<3", [">=2.0", "<3"]),
+            (">=2.0,<3,==2.4", [">=2.0", "<3", "==2.4"]),
+        ],
+    )
+    def test_iteration(self, spec, expected_items):
+        spec = SpecifierSet(spec)
+        items = set(str(item) for item in spec)
+        assert items == set(expected_items)
+
+
+class TestLegacySpecifier:
+    def test_legacy_specifier_is_deprecated(self):
+        with warnings.catch_warnings(record=True) as w:
+            LegacySpecifier(">=some-legacy-version")
+            assert len(w) == 1
+            assert issubclass(w[0].category, DeprecationWarning)
+
+    @pytest.mark.parametrize(
+        ("version", "spec", "expected"),
+        [
+            (v, s, True)
+            for v, s in [
+                # Test the equality operation
+                ("2.0", "==2"),
+                ("2.0", "==2.0"),
+                ("2.0", "==2.0.0"),
+                # Test the in-equality operation
+                ("2.1", "!=2"),
+                ("2.1", "!=2.0"),
+                ("2.0.1", "!=2"),
+                ("2.0.1", "!=2.0"),
+                ("2.0.1", "!=2.0.0"),
+                # Test the greater than equal operation
+                ("2.0", ">=2"),
+                ("2.0", ">=2.0"),
+                ("2.0", ">=2.0.0"),
+                ("2.0.post1", ">=2"),
+                ("2.0.post1.dev1", ">=2"),
+                ("3", ">=2"),
+                # Test the less than equal operation
+                ("2.0", "<=2"),
+                ("2.0", "<=2.0"),
+                ("2.0", "<=2.0.0"),
+                ("2.0.dev1", "<=2"),
+                ("2.0a1", "<=2"),
+                ("2.0a1.dev1", "<=2"),
+                ("2.0b1", "<=2"),
+                ("2.0b1.post1", "<=2"),
+                ("2.0c1", "<=2"),
+                ("2.0c1.post1.dev1", "<=2"),
+                ("2.0rc1", "<=2"),
+                ("1", "<=2"),
+                # Test the greater than operation
+                ("3", ">2"),
+                ("2.1", ">2.0"),
+                # Test the less than operation
+                ("1", "<2"),
+                ("2.0", "<2.1"),
+            ]
+        ]
+        + [
+            (v, s, False)
+            for v, s in [
+                # Test the equality operation
+                ("2.1", "==2"),
+                ("2.1", "==2.0"),
+                ("2.1", "==2.0.0"),
+                # Test the in-equality operation
+                ("2.0", "!=2"),
+                ("2.0", "!=2.0"),
+                ("2.0", "!=2.0.0"),
+                # Test the greater than equal operation
+                ("2.0.dev1", ">=2"),
+                ("2.0a1", ">=2"),
+                ("2.0a1.dev1", ">=2"),
+                ("2.0b1", ">=2"),
+                ("2.0b1.post1", ">=2"),
+                ("2.0c1", ">=2"),
+                ("2.0c1.post1.dev1", ">=2"),
+                ("2.0rc1", ">=2"),
+                ("1", ">=2"),
+                # Test the less than equal operation
+                ("2.0.post1", "<=2"),
+                ("2.0.post1.dev1", "<=2"),
+                ("3", "<=2"),
+                # Test the greater than operation
+                ("1", ">2"),
+                ("2.0.dev1", ">2"),
+                ("2.0a1", ">2"),
+                ("2.0a1.post1", ">2"),
+                ("2.0b1", ">2"),
+                ("2.0b1.dev1", ">2"),
+                ("2.0c1", ">2"),
+                ("2.0c1.post1.dev1", ">2"),
+                ("2.0rc1", ">2"),
+                ("2.0", ">2"),
+                # Test the less than operation
+                ("3", "<2"),
+            ]
+        ],
+    )
+    def test_specifiers(self, version, spec, expected):
+        spec = LegacySpecifier(spec, prereleases=True)
+
+        if expected:
+            # Test that the plain string form works
+            assert version in spec
+            assert spec.contains(version)
+
+            # Test that the version instance form works
+            assert LegacyVersion(version) in spec
+            assert spec.contains(LegacyVersion(version))
+        else:
+            # Test that the plain string form works
+            assert version not in spec
+            assert not spec.contains(version)
+
+            # Test that the version instance form works
+            assert LegacyVersion(version) not in spec
+            assert not spec.contains(LegacyVersion(version))
+
+    def test_specifier_explicit_prereleases(self):
+        spec = LegacySpecifier(">=1.0")
+        assert not spec.prereleases
+        spec.prereleases = True
+        assert spec.prereleases
+
+        spec = LegacySpecifier(">=1.0", prereleases=False)
+        assert not spec.prereleases
+        spec.prereleases = True
+        assert spec.prereleases
+
+        spec = LegacySpecifier(">=1.0", prereleases=True)
+        assert spec.prereleases
+        spec.prereleases = False
+        assert not spec.prereleases
+
+        spec = LegacySpecifier(">=1.0", prereleases=True)
+        assert spec.prereleases
+        spec.prereleases = None
+        assert not spec.prereleases
+
+
+class TestSpecifierSet:
+    @pytest.mark.parametrize("version", VERSIONS + LEGACY_VERSIONS)
+    def test_empty_specifier(self, version):
+        spec = SpecifierSet(prereleases=True)
+
+        assert version in spec
+        assert spec.contains(version)
+        assert parse(version) in spec
+        assert spec.contains(parse(version))
+
+    def test_specifier_prereleases_explicit(self):
+        spec = SpecifierSet()
+        assert not spec.prereleases
+        assert "1.0.dev1" not in spec
+        assert not spec.contains("1.0.dev1")
+        spec.prereleases = True
+        assert spec.prereleases
+        assert "1.0.dev1" in spec
+        assert spec.contains("1.0.dev1")
+
+        spec = SpecifierSet(prereleases=True)
+        assert spec.prereleases
+        assert "1.0.dev1" in spec
+        assert spec.contains("1.0.dev1")
+        spec.prereleases = False
+        assert not spec.prereleases
+        assert "1.0.dev1" not in spec
+        assert not spec.contains("1.0.dev1")
+
+        spec = SpecifierSet(prereleases=True)
+        assert spec.prereleases
+        assert "1.0.dev1" in spec
+        assert spec.contains("1.0.dev1")
+        spec.prereleases = None
+        assert not spec.prereleases
+        assert "1.0.dev1" not in spec
+        assert not spec.contains("1.0.dev1")
+
+    def test_specifier_contains_prereleases(self):
+        spec = SpecifierSet()
+        assert spec.prereleases is None
+        assert not spec.contains("1.0.dev1")
+        assert spec.contains("1.0.dev1", prereleases=True)
+
+        spec = SpecifierSet(prereleases=True)
+        assert spec.prereleases
+        assert spec.contains("1.0.dev1")
+        assert not spec.contains("1.0.dev1", prereleases=False)
+
+    @pytest.mark.parametrize(
+        ("specifier", "specifier_prereleases", "prereleases", "input", "expected"),
+        [
+            # General test of the filter method
+            ("", None, None, ["1.0", "2.0a1"], ["1.0"]),
+            (">=1.0.dev1", None, None, ["1.0", "2.0a1"], ["1.0", "2.0a1"]),
+            ("", None, None, ["1.0a1"], ["1.0a1"]),
+            ("", None, None, ["1.0", Version("2.0")], ["1.0", Version("2.0")]),
+            ("", None, None, ["2.0dog", "1.0"], ["1.0"]),
+            # Test overriding with the prereleases parameter on filter
+            ("", None, False, ["1.0a1"], []),
+            (">=1.0.dev1", None, False, ["1.0", "2.0a1"], ["1.0"]),
+            ("", None, True, ["1.0", "2.0a1"], ["1.0", "2.0a1"]),
+            # Test overriding with the overall specifier
+            ("", True, None, ["1.0", "2.0a1"], ["1.0", "2.0a1"]),
+            ("", False, None, ["1.0", "2.0a1"], ["1.0"]),
+            (">=1.0.dev1", True, None, ["1.0", "2.0a1"], ["1.0", "2.0a1"]),
+            (">=1.0.dev1", False, None, ["1.0", "2.0a1"], ["1.0"]),
+            ("", True, None, ["1.0a1"], ["1.0a1"]),
+            ("", False, None, ["1.0a1"], []),
+        ],
+    )
+    def test_specifier_filter(
+        self, specifier_prereleases, specifier, prereleases, input, expected
+    ):
+        if specifier_prereleases is None:
+            spec = SpecifierSet(specifier)
+        else:
+            spec = SpecifierSet(specifier, prereleases=specifier_prereleases)
+
+        kwargs = {"prereleases": prereleases} if prereleases is not None else {}
+
+        assert list(spec.filter(input, **kwargs)) == expected
+
+    def test_legacy_specifiers_combined(self):
+        spec = SpecifierSet("<3,>1-1-1")
+        assert "2.0" in spec
+
+    @pytest.mark.parametrize(
+        ("specifier", "expected"),
+        [
+            # Single item specifiers should just be reflexive
+            ("!=2.0", "!=2.0"),
+            ("<2.0", "<2.0"),
+            ("<=2.0", "<=2.0"),
+            ("==2.0", "==2.0"),
+            (">2.0", ">2.0"),
+            (">=2.0", ">=2.0"),
+            ("~=2.0", "~=2.0"),
+            # Spaces should be removed
+            ("< 2", "<2"),
+            # Multiple item specifiers should work
+            ("!=2.0,>1.0", "!=2.0,>1.0"),
+            ("!=2.0 ,>1.0", "!=2.0,>1.0"),
+        ],
+    )
+    def test_specifiers_str_and_repr(self, specifier, expected):
+        spec = SpecifierSet(specifier)
+
+        assert str(spec) == expected
+        assert repr(spec) == "<SpecifierSet({0})>".format(repr(expected))
+
+    @pytest.mark.parametrize("specifier", SPECIFIERS + LEGACY_SPECIFIERS)
+    def test_specifiers_hash(self, specifier):
+        assert hash(SpecifierSet(specifier)) == hash(SpecifierSet(specifier))
+
+    @pytest.mark.parametrize(
+        ("left", "right", "expected"), [(">2.0", "<5.0", ">2.0,<5.0")]
+    )
+    def test_specifiers_combine(self, left, right, expected):
+        result = SpecifierSet(left) & SpecifierSet(right)
+        assert result == SpecifierSet(expected)
+
+        result = SpecifierSet(left) & right
+        assert result == SpecifierSet(expected)
+
+        result = SpecifierSet(left, prereleases=True) & SpecifierSet(right)
+        assert result == SpecifierSet(expected)
+        assert result.prereleases
+
+        result = SpecifierSet(left, prereleases=False) & SpecifierSet(right)
+        assert result == SpecifierSet(expected)
+        assert not result.prereleases
+
+        result = SpecifierSet(left) & SpecifierSet(right, prereleases=True)
+        assert result == SpecifierSet(expected)
+        assert result.prereleases
+
+        result = SpecifierSet(left) & SpecifierSet(right, prereleases=False)
+        assert result == SpecifierSet(expected)
+        assert not result.prereleases
+
+        result = SpecifierSet(left, prereleases=True) & SpecifierSet(
+            right, prereleases=True
+        )
+        assert result == SpecifierSet(expected)
+        assert result.prereleases
+
+        result = SpecifierSet(left, prereleases=False) & SpecifierSet(
+            right, prereleases=False
+        )
+        assert result == SpecifierSet(expected)
+        assert not result.prereleases
+
+        with pytest.raises(ValueError):
+            result = SpecifierSet(left, prereleases=True) & SpecifierSet(
+                right, prereleases=False
+            )
+
+        with pytest.raises(ValueError):
+            result = SpecifierSet(left, prereleases=False) & SpecifierSet(
+                right, prereleases=True
+            )
+
+    def test_specifiers_combine_not_implemented(self):
+        with pytest.raises(TypeError):
+            SpecifierSet() & 12
+
+    @pytest.mark.parametrize(
+        ("left", "right", "op"),
+        itertools.chain(
+            *
+            # Verify that the equal (==) operator works correctly
+            [[(x, x, operator.eq) for x in SPECIFIERS]]
+            +
+            # Verify that the not equal (!=) operator works correctly
+            [
+                [(x, y, operator.ne) for j, y in enumerate(SPECIFIERS) if i != j]
+                for i, x in enumerate(SPECIFIERS)
+            ]
+        ),
+    )
+    def test_comparison_true(self, left, right, op):
+        assert op(SpecifierSet(left), SpecifierSet(right))
+        assert op(SpecifierSet(left), Specifier(right))
+        assert op(Specifier(left), SpecifierSet(right))
+        assert op(left, SpecifierSet(right))
+        assert op(SpecifierSet(left), right)
+
+    @pytest.mark.parametrize(
+        ("left", "right", "op"),
+        itertools.chain(
+            *
+            # Verify that the equal (==) operator works correctly
+            [[(x, x, operator.ne) for x in SPECIFIERS]]
+            +
+            # Verify that the not equal (!=) operator works correctly
+            [
+                [(x, y, operator.eq) for j, y in enumerate(SPECIFIERS) if i != j]
+                for i, x in enumerate(SPECIFIERS)
+            ]
+        ),
+    )
+    def test_comparison_false(self, left, right, op):
+        assert not op(SpecifierSet(left), SpecifierSet(right))
+        assert not op(SpecifierSet(left), Specifier(right))
+        assert not op(Specifier(left), SpecifierSet(right))
+        assert not op(left, SpecifierSet(right))
+        assert not op(SpecifierSet(left), right)
+
+    @pytest.mark.parametrize(("left", "right"), [("==2.8.0", "==2.8")])
+    def test_comparison_canonicalizes(self, left, right):
+        assert SpecifierSet(left) == SpecifierSet(right)
+        assert left == SpecifierSet(right)
+        assert SpecifierSet(left) == right
+
+    def test_comparison_non_specifier(self):
+        assert SpecifierSet("==1.0") != 12
+        assert not SpecifierSet("==1.0") == 12
+
+    @pytest.mark.parametrize(
+        ("version", "specifier", "expected"),
+        [
+            ("1.0.0+local", "==1.0.0", True),
+            ("1.0.0+local", "!=1.0.0", False),
+            ("1.0.0+local", "<=1.0.0", True),
+            ("1.0.0+local", ">=1.0.0", True),
+            ("1.0.0+local", "<1.0.0", False),
+            ("1.0.0+local", ">1.0.0", False),
+        ],
+    )
+    def test_comparison_ignores_local(self, version, specifier, expected):
+        assert (Version(version) in SpecifierSet(specifier)) == expected
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_structures.py b/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_structures.py
new file mode 100644
index 00000000000..33b1896c797
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_structures.py
@@ -0,0 +1,60 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import pytest
+
+from packaging._structures import Infinity, NegativeInfinity
+
+
+def test_infinity_repr():
+    repr(Infinity) == "Infinity"
+
+
+def test_negative_infinity_repr():
+    repr(NegativeInfinity) == "-Infinity"
+
+
+def test_infinity_hash():
+    assert hash(Infinity) == hash(Infinity)
+
+
+def test_negative_infinity_hash():
+    assert hash(NegativeInfinity) == hash(NegativeInfinity)
+
+
+@pytest.mark.parametrize("left", [1, "a", ("b", 4)])
+def test_infinity_comparison(left):
+    assert left < Infinity
+    assert left <= Infinity
+    assert not left == Infinity
+    assert left != Infinity
+    assert not left > Infinity
+    assert not left >= Infinity
+
+
+@pytest.mark.parametrize("left", [1, "a", ("b", 4)])
+def test_negative_infinity_lesser(left):
+    assert not left < NegativeInfinity
+    assert not left <= NegativeInfinity
+    assert not left == NegativeInfinity
+    assert left != NegativeInfinity
+    assert left > NegativeInfinity
+    assert left >= NegativeInfinity
+
+
+def test_infinty_equal():
+    assert Infinity == Infinity
+
+
+def test_negative_infinity_equal():
+    assert NegativeInfinity == NegativeInfinity
+
+
+def test_negate_infinity():
+    assert isinstance(-Infinity, NegativeInfinity.__class__)
+
+
+def test_negate_negative_infinity():
+    assert isinstance(-NegativeInfinity, Infinity.__class__)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_tags.py b/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_tags.py
new file mode 100644
index 00000000000..68b109a89f3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_tags.py
@@ -0,0 +1,1364 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+
+try:
+    import collections.abc as collections_abc
+except ImportError:
+    import collections as collections_abc
+
+try:
+    import ctypes
+except ImportError:
+    ctypes = None
+import distutils.util
+
+import os
+import platform
+import re
+import sys
+import sysconfig
+import types
+import warnings
+
+import pretend
+import pytest
+
+from packaging import tags
+
+
+@pytest.fixture
+def example_tag():
+    return tags.Tag("py3", "none", "any")
+
+
+@pytest.fixture
+def is_x86():
+    return re.match(r"(i\d86|x86_64)", platform.machine()) is not None
+
+
+@pytest.fixture
+def manylinux_module(monkeypatch):
+    monkeypatch.setattr(tags, "_get_glibc_version", lambda *args: (2, 20))
+    module_name = "_manylinux"
+    module = types.ModuleType(module_name)
+    monkeypatch.setitem(sys.modules, module_name, module)
+    return module
+
+
+@pytest.fixture
+def mock_interpreter_name(monkeypatch):
+    def mock(name):
+        if hasattr(sys, "implementation") and sys.implementation.name != name.lower():
+            monkeypatch.setattr(sys.implementation, "name", name.lower())
+            return True
+        elif platform.python_implementation() != name:
+            monkeypatch.setattr(platform, "python_implementation", lambda: name)
+            return True
+        return False
+
+    return mock
+
+
+class TestTag:
+    def test_lowercasing(self):
+        tag = tags.Tag("PY3", "None", "ANY")
+        assert tag.interpreter == "py3"
+        assert tag.abi == "none"
+        assert tag.platform == "any"
+
+    def test_equality(self):
+        args = "py3", "none", "any"
+        assert tags.Tag(*args) == tags.Tag(*args)
+
+    def test_equality_fails_with_non_tag(self):
+        assert not tags.Tag("py3", "none", "any") == "non-tag"
+
+    def test_hashing(self, example_tag):
+        tags = {example_tag}  # Should not raise TypeError.
+        assert example_tag in tags
+
+    def test_hash_equality(self, example_tag):
+        equal_tag = tags.Tag("py3", "none", "any")
+        assert example_tag == equal_tag  # Sanity check.
+        assert example_tag.__hash__() == equal_tag.__hash__()
+
+    def test_str(self, example_tag):
+        assert str(example_tag) == "py3-none-any"
+
+    def test_repr(self, example_tag):
+        assert repr(example_tag) == "<py3-none-any @ {tag_id}>".format(
+            tag_id=id(example_tag)
+        )
+
+    def test_attribute_access(self, example_tag):
+        assert example_tag.interpreter == "py3"
+        assert example_tag.abi == "none"
+        assert example_tag.platform == "any"
+
+
+class TestWarnKeywordOnlyParameter:
+    def test_no_argument(self):
+        assert not tags._warn_keyword_parameter("test_warn_keyword_parameters", {})
+
+    def test_false(self):
+        assert not tags._warn_keyword_parameter(
+            "test_warn_keyword_parameters", {"warn": False}
+        )
+
+    def test_true(self):
+        assert tags._warn_keyword_parameter(
+            "test_warn_keyword_parameters", {"warn": True}
+        )
+
+    def test_too_many_arguments(self):
+        message_re = re.compile(r"too_many.+{!r}".format("whatever"))
+        with pytest.raises(TypeError, match=message_re):
+            tags._warn_keyword_parameter("too_many", {"warn": True, "whatever": True})
+
+    def test_wrong_argument(self):
+        message_re = re.compile(r"missing.+{!r}".format("unexpected"))
+        with pytest.raises(TypeError, match=message_re):
+            tags._warn_keyword_parameter("missing", {"unexpected": True})
+
+
+class TestParseTag:
+    def test_simple(self, example_tag):
+        parsed_tags = tags.parse_tag(str(example_tag))
+        assert parsed_tags == {example_tag}
+
+    def test_multi_interpreter(self, example_tag):
+        expected = {example_tag, tags.Tag("py2", "none", "any")}
+        given = tags.parse_tag("py2.py3-none-any")
+        assert given == expected
+
+    def test_multi_platform(self):
+        expected = {
+            tags.Tag("cp37", "cp37m", platform)
+            for platform in (
+                "macosx_10_6_intel",
+                "macosx_10_9_intel",
+                "macosx_10_9_x86_64",
+                "macosx_10_10_intel",
+                "macosx_10_10_x86_64",
+            )
+        }
+        given = tags.parse_tag(
+            "cp37-cp37m-macosx_10_6_intel.macosx_10_9_intel.macosx_10_9_x86_64."
+            "macosx_10_10_intel.macosx_10_10_x86_64"
+        )
+        assert given == expected
+
+
+class TestInterpreterName:
+    def test_sys_implementation_name(self, monkeypatch):
+        class MockImplementation(object):
+            pass
+
+        mock_implementation = MockImplementation()
+        mock_implementation.name = "sillywalk"
+        monkeypatch.setattr(sys, "implementation", mock_implementation, raising=False)
+        assert tags.interpreter_name() == "sillywalk"
+
+    def test_platform(self, monkeypatch):
+        monkeypatch.delattr(sys, "implementation", raising=False)
+        name = "SillyWalk"
+        monkeypatch.setattr(platform, "python_implementation", lambda: name)
+        assert tags.interpreter_name() == name.lower()
+
+    def test_interpreter_short_names(self, mock_interpreter_name, monkeypatch):
+        mock_interpreter_name("cpython")
+        assert tags.interpreter_name() == "cp"
+
+
+class TestInterpreterVersion:
+    def test_warn(self, monkeypatch):
+        class MockConfigVar(object):
+            def __init__(self, return_):
+                self.warn = None
+                self._return = return_
+
+            def __call__(self, name, warn):
+                self.warn = warn
+                return self._return
+
+        mock_config_var = MockConfigVar("38")
+        monkeypatch.setattr(tags, "_get_config_var", mock_config_var)
+        tags.interpreter_version(warn=True)
+        assert mock_config_var.warn
+
+    def test_python_version_nodot(self, monkeypatch):
+        monkeypatch.setattr(tags, "_get_config_var", lambda var, warn: "NN")
+        assert tags.interpreter_version() == "NN"
+
+    @pytest.mark.parametrize(
+        "version_info,version_str",
+        [
+            ((1, 2, 3), "12"),
+            ((1, 12, 3), "1_12"),
+            ((11, 2, 3), "11_2"),
+            ((11, 12, 3), "11_12"),
+            ((1, 2, 13), "12"),
+        ],
+    )
+    def test_sys_version_info(self, version_info, version_str, monkeypatch):
+        monkeypatch.setattr(tags, "_get_config_var", lambda *args, **kwargs: None)
+        monkeypatch.setattr(sys, "version_info", version_info)
+        assert tags.interpreter_version() == version_str
+
+
+class TestMacOSPlatforms:
+    @pytest.mark.parametrize(
+        "arch, is_32bit, expected",
+        [
+            ("i386", True, "i386"),
+            ("ppc", True, "ppc"),
+            ("x86_64", False, "x86_64"),
+            ("x86_64", True, "i386"),
+            ("ppc64", False, "ppc64"),
+            ("ppc64", True, "ppc"),
+        ],
+    )
+    def test_architectures(self, arch, is_32bit, expected):
+        assert tags._mac_arch(arch, is_32bit=is_32bit) == expected
+
+    @pytest.mark.parametrize(
+        "version,arch,expected",
+        [
+            (
+                (10, 15),
+                "x86_64",
+                ["x86_64", "intel", "fat64", "fat32", "universal2", "universal"],
+            ),
+            (
+                (10, 4),
+                "x86_64",
+                ["x86_64", "intel", "fat64", "fat32", "universal2", "universal"],
+            ),
+            ((10, 3), "x86_64", []),
+            ((10, 15), "i386", ["i386", "intel", "fat32", "fat", "universal"]),
+            ((10, 4), "i386", ["i386", "intel", "fat32", "fat", "universal"]),
+            ((10, 3), "i386", []),
+            ((10, 15), "ppc64", []),
+            ((10, 6), "ppc64", []),
+            ((10, 5), "ppc64", ["ppc64", "fat64", "universal"]),
+            ((10, 3), "ppc64", []),
+            ((10, 15), "ppc", []),
+            ((10, 7), "ppc", []),
+            ((10, 6), "ppc", ["ppc", "fat32", "fat", "universal"]),
+            ((10, 0), "ppc", ["ppc", "fat32", "fat", "universal"]),
+            ((11, 0), "riscv", ["riscv"]),
+            (
+                (11, 0),
+                "x86_64",
+                ["x86_64", "intel", "fat64", "fat32", "universal2", "universal"],
+            ),
+            ((11, 0), "arm64", ["arm64", "universal2"]),
+            ((11, 1), "arm64", ["arm64", "universal2"]),
+            ((12, 0), "arm64", ["arm64", "universal2"]),
+        ],
+    )
+    def test_binary_formats(self, version, arch, expected):
+        assert tags._mac_binary_formats(version, arch) == expected
+
+    def test_version_detection(self, monkeypatch):
+        if platform.system() != "Darwin":
+            monkeypatch.setattr(
+                platform, "mac_ver", lambda: ("10.14", ("", "", ""), "x86_64")
+            )
+        version = platform.mac_ver()[0].split(".")
+        expected = "macosx_{major}_{minor}".format(major=version[0], minor=version[1])
+        platforms = list(tags.mac_platforms(arch="x86_64"))
+        assert platforms[0].startswith(expected)
+
+    @pytest.mark.parametrize("arch", ["x86_64", "i386"])
+    def test_arch_detection(self, arch, monkeypatch):
+        if platform.system() != "Darwin" or platform.mac_ver()[2] != arch:
+            monkeypatch.setattr(
+                platform, "mac_ver", lambda: ("10.14", ("", "", ""), arch)
+            )
+            monkeypatch.setattr(tags, "_mac_arch", lambda *args: arch)
+        assert next(tags.mac_platforms((10, 14))).endswith(arch)
+
+    def test_mac_platforms(self):
+        platforms = list(tags.mac_platforms((10, 5), "x86_64"))
+        assert platforms == [
+            "macosx_10_5_x86_64",
+            "macosx_10_5_intel",
+            "macosx_10_5_fat64",
+            "macosx_10_5_fat32",
+            "macosx_10_5_universal2",
+            "macosx_10_5_universal",
+            "macosx_10_4_x86_64",
+            "macosx_10_4_intel",
+            "macosx_10_4_fat64",
+            "macosx_10_4_fat32",
+            "macosx_10_4_universal2",
+            "macosx_10_4_universal",
+        ]
+
+        assert len(list(tags.mac_platforms((10, 17), "x86_64"))) == 14 * 6
+
+        assert not list(tags.mac_platforms((10, 0), "x86_64"))
+
+    @pytest.mark.parametrize("major,minor", [(11, 0), (11, 3), (12, 0), (12, 3)])
+    def test_macos_11(self, major, minor):
+        platforms = list(tags.mac_platforms((major, minor), "x86_64"))
+        assert "macosx_11_0_arm64" not in platforms
+        assert "macosx_11_0_x86_64" in platforms
+        assert "macosx_11_3_x86_64" not in platforms
+        assert "macosx_11_0_universal" in platforms
+        assert "macosx_11_0_universal2" in platforms
+        # Mac OS "10.16" is the version number that binaries compiled against an old
+        # (pre 11.0) SDK will see.   It can also be enabled explicitly for a process
+        # with the environment variable SYSTEM_VERSION_COMPAT=1.
+        assert "macosx_10_16_x86_64" in platforms
+        assert "macosx_10_15_x86_64" in platforms
+        assert "macosx_10_4_x86_64" in platforms
+        assert "macosx_10_3_x86_64" not in platforms
+        if major >= 12:
+            assert "macosx_12_0_x86_64" in platforms
+            assert "macosx_12_0_universal" in platforms
+            assert "macosx_12_0_universal2" in platforms
+
+        platforms = list(tags.mac_platforms((major, minor), "arm64"))
+        assert "macosx_11_0_arm64" in platforms
+        assert "macosx_11_3_arm64" not in platforms
+        assert "macosx_11_0_universal" not in platforms
+        assert "macosx_11_0_universal2" in platforms
+        assert "macosx_10_15_x86_64" not in platforms
+        assert "macosx_10_4_x86_64" not in platforms
+        assert "macosx_10_3_x86_64" not in platforms
+        if major >= 12:
+            assert "macosx_12_0_arm64" in platforms
+            assert "macosx_12_0_universal2" in platforms
+
+
+class TestManylinuxPlatform:
+    def teardown_method(self):
+        # Clear the version cache
+        tags._glibc_version = []
+
+    @pytest.mark.parametrize("tf", (True, False))
+    @pytest.mark.parametrize(
+        "attribute,glibc", (("1", (2, 5)), ("2010", (2, 12)), ("2014", (2, 17)))
+    )
+    def test_module_declaration(
+        self, monkeypatch, manylinux_module, attribute, glibc, tf
+    ):
+        manylinux = "manylinux{}_compatible".format(attribute)
+        monkeypatch.setattr(manylinux_module, manylinux, tf, raising=False)
+        res = tags._is_manylinux_compatible(manylinux, "x86_64", glibc)
+        assert tf is res
+
+    @pytest.mark.parametrize(
+        "attribute,glibc", (("1", (2, 5)), ("2010", (2, 12)), ("2014", (2, 17)))
+    )
+    def test_module_declaration_missing_attribute(
+        self, monkeypatch, manylinux_module, attribute, glibc
+    ):
+        manylinux = "manylinux{}_compatible".format(attribute)
+        monkeypatch.delattr(manylinux_module, manylinux, raising=False)
+        assert tags._is_manylinux_compatible(manylinux, "x86_64", glibc)
+
+    @pytest.mark.parametrize(
+        "version,compatible", (((2, 0), True), ((2, 5), True), ((2, 10), False))
+    )
+    def test_is_manylinux_compatible_glibc_support(
+        self, version, compatible, monkeypatch
+    ):
+        monkeypatch.setitem(sys.modules, "_manylinux", None)
+        monkeypatch.setattr(tags, "_get_glibc_version", lambda: (2, 5))
+        assert (
+            bool(tags._is_manylinux_compatible("manylinux1", "any", version))
+            == compatible
+        )
+
+    @pytest.mark.parametrize("version_str", ["glibc-2.4.5", "2"])
+    def test_check_glibc_version_warning(self, version_str):
+        with warnings.catch_warnings(record=True) as w:
+            tags._parse_glibc_version(version_str)
+            assert len(w) == 1
+            assert issubclass(w[0].category, RuntimeWarning)
+
+    @pytest.mark.skipif(not ctypes, reason="requires ctypes")
+    @pytest.mark.parametrize(
+        "version_str,expected",
+        [
+            # Be very explicit about bytes and Unicode for Python 2 testing.
+            (b"2.4", "2.4"),
+            (u"2.4", "2.4"),
+        ],
+    )
+    def test_glibc_version_string(self, version_str, expected, monkeypatch):
+        class LibcVersion:
+            def __init__(self, version_str):
+                self.version_str = version_str
+
+            def __call__(self):
+                return version_str
+
+        class ProcessNamespace:
+            def __init__(self, libc_version):
+                self.gnu_get_libc_version = libc_version
+
+        process_namespace = ProcessNamespace(LibcVersion(version_str))
+        monkeypatch.setattr(ctypes, "CDLL", lambda _: process_namespace)
+        monkeypatch.setattr(tags, "_glibc_version_string_confstr", lambda: False)
+
+        assert tags._glibc_version_string() == expected
+
+        del process_namespace.gnu_get_libc_version
+        assert tags._glibc_version_string() is None
+
+    def test_glibc_version_string_confstr(self, monkeypatch):
+        monkeypatch.setattr(os, "confstr", lambda x: "glibc 2.20", raising=False)
+        assert tags._glibc_version_string_confstr() == "2.20"
+
+    def test_glibc_version_string_fail(self, monkeypatch):
+        monkeypatch.setattr(os, "confstr", lambda x: None, raising=False)
+        monkeypatch.setitem(sys.modules, "ctypes", None)
+        assert tags._glibc_version_string() is None
+        assert tags._get_glibc_version() == (-1, -1)
+
+    @pytest.mark.parametrize(
+        "failure",
+        [pretend.raiser(ValueError), pretend.raiser(OSError), lambda x: "XXX"],
+    )
+    def test_glibc_version_string_confstr_fail(self, monkeypatch, failure):
+        monkeypatch.setattr(os, "confstr", failure, raising=False)
+        assert tags._glibc_version_string_confstr() is None
+
+    def test_glibc_version_string_confstr_missing(self, monkeypatch):
+        monkeypatch.delattr(os, "confstr", raising=False)
+        assert tags._glibc_version_string_confstr() is None
+
+    def test_glibc_version_string_ctypes_missing(self, monkeypatch):
+        monkeypatch.setitem(sys.modules, "ctypes", None)
+        assert tags._glibc_version_string_ctypes() is None
+
+    def test_glibc_version_string_ctypes_raise_oserror(self, monkeypatch):
+        def patched_cdll(name):
+            raise OSError("Dynamic loading not supported")
+
+        monkeypatch.setattr(ctypes, "CDLL", patched_cdll)
+        assert tags._glibc_version_string_ctypes() is None
+
+    def test_get_config_var_does_not_log(self, monkeypatch):
+        debug = pretend.call_recorder(lambda *a: None)
+        monkeypatch.setattr(tags.logger, "debug", debug)
+        tags._get_config_var("missing")
+        assert debug.calls == []
+
+    def test_get_config_var_does_log(self, monkeypatch):
+        debug = pretend.call_recorder(lambda *a: None)
+        monkeypatch.setattr(tags.logger, "debug", debug)
+        tags._get_config_var("missing", warn=True)
+        assert debug.calls == [
+            pretend.call(
+                "Config variable '%s' is unset, Python ABI tag may be incorrect",
+                "missing",
+            )
+        ]
+
+    @pytest.mark.skipif(platform.system() != "Linux", reason="requires Linux")
+    def test_is_manylinux_compatible_old(self):
+        # Assuming no one is running this test with a version of glibc released in
+        # 1997.
+        assert tags._is_manylinux_compatible("any", "any", (2, 0))
+
+    def test_is_manylinux_compatible(self, monkeypatch):
+        monkeypatch.setattr(tags, "_glibc_version_string", lambda: "2.4")
+        assert tags._is_manylinux_compatible("", "any", (2, 4))
+
+    def test_glibc_version_string_none(self, monkeypatch):
+        monkeypatch.setattr(tags, "_glibc_version_string", lambda: None)
+        assert not tags._is_manylinux_compatible("any", "any", (2, 4))
+
+    @pytest.mark.parametrize(
+        "arch,is_32bit,expected",
+        [
+            ("linux-x86_64", False, "linux_x86_64"),
+            ("linux-x86_64", True, "linux_i686"),
+            ("linux-aarch64", False, "linux_aarch64"),
+            ("linux-aarch64", True, "linux_armv7l"),
+        ],
+    )
+    def test_linux_platforms_32_64bit_on_64bit_os(
+        self, arch, is_32bit, expected, monkeypatch
+    ):
+        monkeypatch.setattr(distutils.util, "get_platform", lambda: arch)
+        monkeypatch.setattr(os, "confstr", lambda x: "glibc 2.20", raising=False)
+        monkeypatch.setattr(tags, "_is_manylinux_compatible", lambda *args: False)
+        linux_platform = list(tags._linux_platforms(is_32bit=is_32bit))[-1]
+        assert linux_platform == expected
+
+    def test_linux_platforms_manylinux_unsupported(self, monkeypatch):
+        monkeypatch.setattr(distutils.util, "get_platform", lambda: "linux_x86_64")
+        monkeypatch.setattr(os, "confstr", lambda x: "glibc 2.20", raising=False)
+        monkeypatch.setattr(tags, "_is_manylinux_compatible", lambda *args: False)
+        linux_platform = list(tags._linux_platforms(is_32bit=False))
+        assert linux_platform == ["linux_x86_64"]
+
+    def test_linux_platforms_manylinux1(self, is_x86, monkeypatch):
+        monkeypatch.setattr(
+            tags, "_is_manylinux_compatible", lambda name, *args: name == "manylinux1"
+        )
+        monkeypatch.setattr(distutils.util, "get_platform", lambda: "linux_x86_64")
+        monkeypatch.setattr(platform, "machine", lambda: "x86_64")
+        monkeypatch.setattr(os, "confstr", lambda x: "glibc 2.20", raising=False)
+        platforms = list(tags._linux_platforms(is_32bit=False))
+        arch = platform.machine()
+        assert platforms == ["manylinux1_" + arch, "linux_" + arch]
+
+    def test_linux_platforms_manylinux2010(self, is_x86, monkeypatch):
+        monkeypatch.setattr(distutils.util, "get_platform", lambda: "linux_x86_64")
+        monkeypatch.setattr(platform, "machine", lambda: "x86_64")
+        monkeypatch.setattr(os, "confstr", lambda x: "glibc 2.12", raising=False)
+        platforms = list(tags._linux_platforms(is_32bit=False))
+        arch = platform.machine()
+        expected = [
+            "manylinux_2_12_" + arch,
+            "manylinux2010_" + arch,
+            "manylinux_2_11_" + arch,
+            "manylinux_2_10_" + arch,
+            "manylinux_2_9_" + arch,
+            "manylinux_2_8_" + arch,
+            "manylinux_2_7_" + arch,
+            "manylinux_2_6_" + arch,
+            "manylinux_2_5_" + arch,
+            "manylinux1_" + arch,
+            "linux_" + arch,
+        ]
+        assert platforms == expected
+
+    def test_linux_platforms_manylinux2014(self, is_x86, monkeypatch):
+        monkeypatch.setattr(distutils.util, "get_platform", lambda: "linux_x86_64")
+        monkeypatch.setattr(platform, "machine", lambda: "x86_64")
+        monkeypatch.setattr(os, "confstr", lambda x: "glibc 2.17", raising=False)
+        platforms = list(tags._linux_platforms(is_32bit=False))
+        arch = platform.machine()
+        expected = [
+            "manylinux_2_17_" + arch,
+            "manylinux2014_" + arch,
+            "manylinux_2_16_" + arch,
+            "manylinux_2_15_" + arch,
+            "manylinux_2_14_" + arch,
+            "manylinux_2_13_" + arch,
+            "manylinux_2_12_" + arch,
+            "manylinux2010_" + arch,
+            "manylinux_2_11_" + arch,
+            "manylinux_2_10_" + arch,
+            "manylinux_2_9_" + arch,
+            "manylinux_2_8_" + arch,
+            "manylinux_2_7_" + arch,
+            "manylinux_2_6_" + arch,
+            "manylinux_2_5_" + arch,
+            "manylinux1_" + arch,
+            "linux_" + arch,
+        ]
+        assert platforms == expected
+
+    def test_linux_platforms_manylinux2014_armhf_abi(self, monkeypatch):
+        monkeypatch.setattr(tags, "_glibc_version_string", lambda: "2.30")
+        monkeypatch.setattr(
+            tags,
+            "_is_manylinux_compatible",
+            lambda name, *args: name == "manylinux2014",
+        )
+        monkeypatch.setattr(distutils.util, "get_platform", lambda: "linux_armv7l")
+        monkeypatch.setattr(
+            sys,
+            "executable",
+            os.path.join(os.path.dirname(__file__), "hello-world-armv7l-armhf"),
+        )
+        platforms = list(tags._linux_platforms(is_32bit=True))
+        expected = ["manylinux2014_armv7l", "linux_armv7l"]
+        assert platforms == expected
+
+    def test_linux_platforms_manylinux2014_i386_abi(self, monkeypatch):
+        monkeypatch.setattr(tags, "_glibc_version_string", lambda: "2.17")
+        monkeypatch.setattr(distutils.util, "get_platform", lambda: "linux_x86_64")
+        monkeypatch.setattr(
+            sys,
+            "executable",
+            os.path.join(os.path.dirname(__file__), "hello-world-x86_64-i386"),
+        )
+        platforms = list(tags._linux_platforms(is_32bit=True))
+        expected = [
+            "manylinux_2_17_i686",
+            "manylinux2014_i686",
+            "manylinux_2_16_i686",
+            "manylinux_2_15_i686",
+            "manylinux_2_14_i686",
+            "manylinux_2_13_i686",
+            "manylinux_2_12_i686",
+            "manylinux2010_i686",
+            "manylinux_2_11_i686",
+            "manylinux_2_10_i686",
+            "manylinux_2_9_i686",
+            "manylinux_2_8_i686",
+            "manylinux_2_7_i686",
+            "manylinux_2_6_i686",
+            "manylinux_2_5_i686",
+            "manylinux1_i686",
+            "linux_i686",
+        ]
+        assert platforms == expected
+
+    def test_linux_platforms_manylinux_glibc3(self, monkeypatch):
+        # test for a future glic 3.x version
+        monkeypatch.setattr(tags, "_glibc_version_string", lambda: "3.2")
+        monkeypatch.setattr(tags, "_is_manylinux_compatible", lambda name, *args: True)
+        monkeypatch.setattr(distutils.util, "get_platform", lambda: "linux_aarch64")
+        monkeypatch.setattr(
+            sys,
+            "executable",
+            os.path.join(os.path.dirname(__file__), "hello-world-aarch64"),
+        )
+        platforms = list(tags._linux_platforms(is_32bit=False))
+        expected = (
+            ["manylinux_3_2_aarch64", "manylinux_3_1_aarch64", "manylinux_3_0_aarch64"]
+            + ["manylinux_2_{}_aarch64".format(i) for i in range(50, 16, -1)]
+            + ["manylinux2014_aarch64", "linux_aarch64"]
+        )
+        assert platforms == expected
+
+    def test_linux_platforms_manylinux2014_armv6l(self, monkeypatch):
+        monkeypatch.setattr(
+            tags, "_is_manylinux_compatible", lambda name, _: name == "manylinux2014"
+        )
+        monkeypatch.setattr(distutils.util, "get_platform", lambda: "linux_armv6l")
+        monkeypatch.setattr(os, "confstr", lambda x: "glibc 2.20", raising=False)
+        platforms = list(tags._linux_platforms(is_32bit=True))
+        expected = ["linux_armv6l"]
+        assert platforms == expected
+
+    @pytest.mark.parametrize(
+        "machine, abi, alt_machine",
+        [("x86_64", "x32", "i686"), ("armv7l", "armel", "armv7l")],
+    )
+    def test_linux_platforms_not_manylinux_abi(
+        self, monkeypatch, machine, abi, alt_machine
+    ):
+        monkeypatch.setattr(tags, "_is_manylinux_compatible", lambda name, _: False)
+        monkeypatch.setattr(
+            distutils.util, "get_platform", lambda: "linux_{}".format(machine)
+        )
+        monkeypatch.setattr(
+            sys,
+            "executable",
+            os.path.join(
+                os.path.dirname(__file__), "hello-world-{}-{}".format(machine, abi)
+            ),
+        )
+        platforms = list(tags._linux_platforms(is_32bit=True))
+        expected = ["linux_{}".format(alt_machine)]
+        assert platforms == expected
+
+    @pytest.mark.parametrize(
+        "machine, abi, elf_class, elf_data, elf_machine",
+        [
+            (
+                "x86_64",
+                "x32",
+                tags._ELFFileHeader.ELFCLASS32,
+                tags._ELFFileHeader.ELFDATA2LSB,
+                tags._ELFFileHeader.EM_X86_64,
+            ),
+            (
+                "x86_64",
+                "i386",
+                tags._ELFFileHeader.ELFCLASS32,
+                tags._ELFFileHeader.ELFDATA2LSB,
+                tags._ELFFileHeader.EM_386,
+            ),
+            (
+                "x86_64",
+                "amd64",
+                tags._ELFFileHeader.ELFCLASS64,
+                tags._ELFFileHeader.ELFDATA2LSB,
+                tags._ELFFileHeader.EM_X86_64,
+            ),
+            (
+                "armv7l",
+                "armel",
+                tags._ELFFileHeader.ELFCLASS32,
+                tags._ELFFileHeader.ELFDATA2LSB,
+                tags._ELFFileHeader.EM_ARM,
+            ),
+            (
+                "armv7l",
+                "armhf",
+                tags._ELFFileHeader.ELFCLASS32,
+                tags._ELFFileHeader.ELFDATA2LSB,
+                tags._ELFFileHeader.EM_ARM,
+            ),
+            (
+                "s390x",
+                "s390x",
+                tags._ELFFileHeader.ELFCLASS64,
+                tags._ELFFileHeader.ELFDATA2MSB,
+                tags._ELFFileHeader.EM_S390,
+            ),
+        ],
+    )
+    def test_get_elf_header(
+        self, monkeypatch, machine, abi, elf_class, elf_data, elf_machine
+    ):
+        path = os.path.join(
+            os.path.dirname(__file__), "hello-world-{}-{}".format(machine, abi)
+        )
+        monkeypatch.setattr(sys, "executable", path)
+        elf_header = tags._get_elf_header()
+        assert elf_header.e_ident_class == elf_class
+        assert elf_header.e_ident_data == elf_data
+        assert elf_header.e_machine == elf_machine
+
+    @pytest.mark.parametrize(
+        "content", [None, "invalid-magic", "invalid-class", "invalid-data", "too-short"]
+    )
+    def test_get_elf_header_bad_excutable(self, monkeypatch, content):
+        if content:
+            path = os.path.join(
+                os.path.dirname(__file__), "hello-world-{}".format(content)
+            )
+        else:
+            path = None
+        monkeypatch.setattr(sys, "executable", path)
+        assert tags._get_elf_header() is None
+
+    def test_is_linux_armhf_not_elf(self, monkeypatch):
+        monkeypatch.setattr(tags, "_get_elf_header", lambda: None)
+        assert not tags._is_linux_armhf()
+
+    def test_is_linux_i686_not_elf(self, monkeypatch):
+        monkeypatch.setattr(tags, "_get_elf_header", lambda: None)
+        assert not tags._is_linux_i686()
+
+
+@pytest.mark.parametrize(
+    "platform_name,dispatch_func",
+    [
+        ("Darwin", "mac_platforms"),
+        ("Linux", "_linux_platforms"),
+        ("Generic", "_generic_platforms"),
+    ],
+)
+def test__platform_tags(platform_name, dispatch_func, monkeypatch):
+    expected = ["sillywalk"]
+    monkeypatch.setattr(platform, "system", lambda: platform_name)
+    monkeypatch.setattr(tags, dispatch_func, lambda: expected)
+    assert tags._platform_tags() == expected
+
+
+class TestCPythonABI:
+    @pytest.mark.parametrize(
+        "py_debug,gettotalrefcount,result",
+        [(1, False, True), (0, False, False), (None, True, True)],
+    )
+    def test_debug(self, py_debug, gettotalrefcount, result, monkeypatch):
+        config = {"Py_DEBUG": py_debug, "WITH_PYMALLOC": 0, "Py_UNICODE_SIZE": 2}
+        monkeypatch.setattr(sysconfig, "get_config_var", config.__getitem__)
+        if gettotalrefcount:
+            monkeypatch.setattr(sys, "gettotalrefcount", 1, raising=False)
+        expected = ["cp37d" if result else "cp37"]
+        assert tags._cpython_abis((3, 7)) == expected
+
+    def test_debug_file_extension(self, monkeypatch):
+        config = {"Py_DEBUG": None}
+        monkeypatch.setattr(sysconfig, "get_config_var", config.__getitem__)
+        monkeypatch.delattr(sys, "gettotalrefcount", raising=False)
+        monkeypatch.setattr(tags, "EXTENSION_SUFFIXES", {"_d.pyd"})
+        assert tags._cpython_abis((3, 8)) == ["cp38d", "cp38"]
+
+    @pytest.mark.parametrize(
+        "debug,expected", [(True, ["cp38d", "cp38"]), (False, ["cp38"])]
+    )
+    def test__debug_cp38(self, debug, expected, monkeypatch):
+        config = {"Py_DEBUG": debug}
+        monkeypatch.setattr(sysconfig, "get_config_var", config.__getitem__)
+        assert tags._cpython_abis((3, 8)) == expected
+
+    @pytest.mark.parametrize(
+        "pymalloc,version,result",
+        [
+            (1, (3, 7), True),
+            (0, (3, 7), False),
+            (None, (3, 7), True),
+            (1, (3, 8), False),
+        ],
+    )
+    def test_pymalloc(self, pymalloc, version, result, monkeypatch):
+        config = {"Py_DEBUG": 0, "WITH_PYMALLOC": pymalloc, "Py_UNICODE_SIZE": 2}
+        monkeypatch.setattr(sysconfig, "get_config_var", config.__getitem__)
+        base_abi = "cp{}{}".format(version[0], version[1])
+        expected = [base_abi + "m" if result else base_abi]
+        assert tags._cpython_abis(version) == expected
+
+    @pytest.mark.parametrize(
+        "unicode_size,maxunicode,version,result",
+        [
+            (4, 0x10FFFF, (3, 2), True),
+            (2, 0xFFFF, (3, 2), False),
+            (None, 0x10FFFF, (3, 2), True),
+            (None, 0xFFFF, (3, 2), False),
+            (4, 0x10FFFF, (3, 3), False),
+        ],
+    )
+    def test_wide_unicode(self, unicode_size, maxunicode, version, result, monkeypatch):
+        config = {"Py_DEBUG": 0, "WITH_PYMALLOC": 0, "Py_UNICODE_SIZE": unicode_size}
+        monkeypatch.setattr(sysconfig, "get_config_var", config.__getitem__)
+        monkeypatch.setattr(sys, "maxunicode", maxunicode)
+        base_abi = "cp" + tags._version_nodot(version)
+        expected = [base_abi + "u" if result else base_abi]
+        assert tags._cpython_abis(version) == expected
+
+
+class TestCPythonTags:
+    def test_iterator_returned(self):
+        result_iterator = tags.cpython_tags(
+            (3, 8), ["cp38d", "cp38"], ["plat1", "plat2"]
+        )
+        assert isinstance(result_iterator, collections_abc.Iterator)
+
+    def test_all_args(self):
+        result_iterator = tags.cpython_tags(
+            (3, 11), ["cp3_11d", "cp3_11"], ["plat1", "plat2"]
+        )
+        result = list(result_iterator)
+        assert result == [
+            tags.Tag("cp3_11", "cp3_11d", "plat1"),
+            tags.Tag("cp3_11", "cp3_11d", "plat2"),
+            tags.Tag("cp3_11", "cp3_11", "plat1"),
+            tags.Tag("cp3_11", "cp3_11", "plat2"),
+            tags.Tag("cp3_11", "abi3", "plat1"),
+            tags.Tag("cp3_11", "abi3", "plat2"),
+            tags.Tag("cp3_11", "none", "plat1"),
+            tags.Tag("cp3_11", "none", "plat2"),
+            tags.Tag("cp3_10", "abi3", "plat1"),
+            tags.Tag("cp3_10", "abi3", "plat2"),
+            tags.Tag("cp39", "abi3", "plat1"),
+            tags.Tag("cp39", "abi3", "plat2"),
+            tags.Tag("cp38", "abi3", "plat1"),
+            tags.Tag("cp38", "abi3", "plat2"),
+            tags.Tag("cp37", "abi3", "plat1"),
+            tags.Tag("cp37", "abi3", "plat2"),
+            tags.Tag("cp36", "abi3", "plat1"),
+            tags.Tag("cp36", "abi3", "plat2"),
+            tags.Tag("cp35", "abi3", "plat1"),
+            tags.Tag("cp35", "abi3", "plat2"),
+            tags.Tag("cp34", "abi3", "plat1"),
+            tags.Tag("cp34", "abi3", "plat2"),
+            tags.Tag("cp33", "abi3", "plat1"),
+            tags.Tag("cp33", "abi3", "plat2"),
+            tags.Tag("cp32", "abi3", "plat1"),
+            tags.Tag("cp32", "abi3", "plat2"),
+        ]
+        result_iterator = tags.cpython_tags(
+            (3, 8), ["cp38d", "cp38"], ["plat1", "plat2"]
+        )
+        result = list(result_iterator)
+        assert result == [
+            tags.Tag("cp38", "cp38d", "plat1"),
+            tags.Tag("cp38", "cp38d", "plat2"),
+            tags.Tag("cp38", "cp38", "plat1"),
+            tags.Tag("cp38", "cp38", "plat2"),
+            tags.Tag("cp38", "abi3", "plat1"),
+            tags.Tag("cp38", "abi3", "plat2"),
+            tags.Tag("cp38", "none", "plat1"),
+            tags.Tag("cp38", "none", "plat2"),
+            tags.Tag("cp37", "abi3", "plat1"),
+            tags.Tag("cp37", "abi3", "plat2"),
+            tags.Tag("cp36", "abi3", "plat1"),
+            tags.Tag("cp36", "abi3", "plat2"),
+            tags.Tag("cp35", "abi3", "plat1"),
+            tags.Tag("cp35", "abi3", "plat2"),
+            tags.Tag("cp34", "abi3", "plat1"),
+            tags.Tag("cp34", "abi3", "plat2"),
+            tags.Tag("cp33", "abi3", "plat1"),
+            tags.Tag("cp33", "abi3", "plat2"),
+            tags.Tag("cp32", "abi3", "plat1"),
+            tags.Tag("cp32", "abi3", "plat2"),
+        ]
+
+        result = list(tags.cpython_tags((3, 3), ["cp33m"], ["plat1", "plat2"]))
+        assert result == [
+            tags.Tag("cp33", "cp33m", "plat1"),
+            tags.Tag("cp33", "cp33m", "plat2"),
+            tags.Tag("cp33", "abi3", "plat1"),
+            tags.Tag("cp33", "abi3", "plat2"),
+            tags.Tag("cp33", "none", "plat1"),
+            tags.Tag("cp33", "none", "plat2"),
+            tags.Tag("cp32", "abi3", "plat1"),
+            tags.Tag("cp32", "abi3", "plat2"),
+        ]
+
+    def test_python_version_defaults(self):
+        tag = next(tags.cpython_tags(abis=["abi3"], platforms=["any"]))
+        interpreter = "cp" + tags._version_nodot(sys.version_info[:2])
+        assert interpreter == tag.interpreter
+
+    def test_abi_defaults(self, monkeypatch):
+        monkeypatch.setattr(tags, "_cpython_abis", lambda _1, _2: ["cp38"])
+        result = list(tags.cpython_tags((3, 8), platforms=["any"]))
+        assert tags.Tag("cp38", "cp38", "any") in result
+        assert tags.Tag("cp38", "abi3", "any") in result
+        assert tags.Tag("cp38", "none", "any") in result
+
+    def test_abi_defaults_needs_underscore(self, monkeypatch):
+        monkeypatch.setattr(tags, "_cpython_abis", lambda _1, _2: ["cp3_11"])
+        result = list(tags.cpython_tags((3, 11), platforms=["any"]))
+        assert tags.Tag("cp3_11", "cp3_11", "any") in result
+        assert tags.Tag("cp3_11", "abi3", "any") in result
+        assert tags.Tag("cp3_11", "none", "any") in result
+
+    def test_platforms_defaults(self, monkeypatch):
+        monkeypatch.setattr(tags, "_platform_tags", lambda: ["plat1"])
+        result = list(tags.cpython_tags((3, 8), abis=["whatever"]))
+        assert tags.Tag("cp38", "whatever", "plat1") in result
+
+    def test_platforms_defaults_needs_underscore(self, monkeypatch):
+        monkeypatch.setattr(tags, "_platform_tags", lambda: ["plat1"])
+        result = list(tags.cpython_tags((3, 11), abis=["whatever"]))
+        assert tags.Tag("cp3_11", "whatever", "plat1") in result
+
+    def test_major_only_python_version(self):
+        result = list(tags.cpython_tags((3,), ["abi"], ["plat"]))
+        assert result == [
+            tags.Tag("cp3", "abi", "plat"),
+            tags.Tag("cp3", "none", "plat"),
+        ]
+
+    def test_major_only_python_version_with_default_abis(self):
+        result = list(tags.cpython_tags((3,), platforms=["plat"]))
+        assert result == [tags.Tag("cp3", "none", "plat")]
+
+    @pytest.mark.parametrize("abis", [[], ["abi3"], ["none"]])
+    def test_skip_redundant_abis(self, abis):
+        results = list(tags.cpython_tags((3, 0), abis=abis, platforms=["any"]))
+        assert results == [tags.Tag("cp30", "none", "any")]
+
+    def test_abi3_python33(self):
+        results = list(tags.cpython_tags((3, 3), abis=["cp33"], platforms=["plat"]))
+        assert results == [
+            tags.Tag("cp33", "cp33", "plat"),
+            tags.Tag("cp33", "abi3", "plat"),
+            tags.Tag("cp33", "none", "plat"),
+            tags.Tag("cp32", "abi3", "plat"),
+        ]
+
+    def test_no_excess_abi3_python32(self):
+        results = list(tags.cpython_tags((3, 2), abis=["cp32"], platforms=["plat"]))
+        assert results == [
+            tags.Tag("cp32", "cp32", "plat"),
+            tags.Tag("cp32", "abi3", "plat"),
+            tags.Tag("cp32", "none", "plat"),
+        ]
+
+    def test_no_abi3_python31(self):
+        results = list(tags.cpython_tags((3, 1), abis=["cp31"], platforms=["plat"]))
+        assert results == [
+            tags.Tag("cp31", "cp31", "plat"),
+            tags.Tag("cp31", "none", "plat"),
+        ]
+
+    def test_no_abi3_python27(self):
+        results = list(tags.cpython_tags((2, 7), abis=["cp27"], platforms=["plat"]))
+        assert results == [
+            tags.Tag("cp27", "cp27", "plat"),
+            tags.Tag("cp27", "none", "plat"),
+        ]
+
+
+class TestGenericTags:
+    @pytest.mark.skipif(
+        not sysconfig.get_config_var("SOABI"), reason="SOABI not defined"
+    )
+    def test__generic_abi_soabi_provided(self):
+        abi = sysconfig.get_config_var("SOABI").replace(".", "_").replace("-", "_")
+        assert [abi] == list(tags._generic_abi())
+
+    def test__generic_abi(self, monkeypatch):
+        monkeypatch.setattr(
+            sysconfig, "get_config_var", lambda key: "cpython-37m-darwin"
+        )
+        assert list(tags._generic_abi()) == ["cpython_37m_darwin"]
+
+    def test__generic_abi_no_soabi(self, monkeypatch):
+        monkeypatch.setattr(sysconfig, "get_config_var", lambda key: None)
+        assert not list(tags._generic_abi())
+
+    def test_generic_platforms(self):
+        platform = distutils.util.get_platform().replace("-", "_")
+        platform = platform.replace(".", "_")
+        assert list(tags._generic_platforms()) == [platform]
+
+    def test_iterator_returned(self):
+        result_iterator = tags.generic_tags("sillywalk33", ["abi"], ["plat1", "plat2"])
+        assert isinstance(result_iterator, collections_abc.Iterator)
+
+    def test_all_args(self):
+        result_iterator = tags.generic_tags("sillywalk33", ["abi"], ["plat1", "plat2"])
+        result = list(result_iterator)
+        assert result == [
+            tags.Tag("sillywalk33", "abi", "plat1"),
+            tags.Tag("sillywalk33", "abi", "plat2"),
+            tags.Tag("sillywalk33", "none", "plat1"),
+            tags.Tag("sillywalk33", "none", "plat2"),
+        ]
+
+    @pytest.mark.parametrize("abi", [[], ["none"]])
+    def test_abi_unspecified(self, abi):
+        no_abi = list(tags.generic_tags("sillywalk34", abi, ["plat1", "plat2"]))
+        assert no_abi == [
+            tags.Tag("sillywalk34", "none", "plat1"),
+            tags.Tag("sillywalk34", "none", "plat2"),
+        ]
+
+    def test_interpreter_default(self, monkeypatch):
+        monkeypatch.setattr(tags, "interpreter_name", lambda: "sillywalk")
+        monkeypatch.setattr(tags, "interpreter_version", lambda warn: "NN")
+        result = list(tags.generic_tags(abis=["none"], platforms=["any"]))
+        assert result == [tags.Tag("sillywalkNN", "none", "any")]
+
+    def test_abis_default(self, monkeypatch):
+        monkeypatch.setattr(tags, "_generic_abi", lambda: iter(["abi"]))
+        result = list(tags.generic_tags(interpreter="sillywalk", platforms=["any"]))
+        assert result == [
+            tags.Tag("sillywalk", "abi", "any"),
+            tags.Tag("sillywalk", "none", "any"),
+        ]
+
+    def test_platforms_default(self, monkeypatch):
+        monkeypatch.setattr(tags, "_platform_tags", lambda: ["plat"])
+        result = list(tags.generic_tags(interpreter="sillywalk", abis=["none"]))
+        assert result == [tags.Tag("sillywalk", "none", "plat")]
+
+
+class TestCompatibleTags:
+    def test_all_args(self):
+        result = list(tags.compatible_tags((3, 3), "cp33", ["plat1", "plat2"]))
+        assert result == [
+            tags.Tag("py33", "none", "plat1"),
+            tags.Tag("py33", "none", "plat2"),
+            tags.Tag("py3", "none", "plat1"),
+            tags.Tag("py3", "none", "plat2"),
+            tags.Tag("py32", "none", "plat1"),
+            tags.Tag("py32", "none", "plat2"),
+            tags.Tag("py31", "none", "plat1"),
+            tags.Tag("py31", "none", "plat2"),
+            tags.Tag("py30", "none", "plat1"),
+            tags.Tag("py30", "none", "plat2"),
+            tags.Tag("cp33", "none", "any"),
+            tags.Tag("py33", "none", "any"),
+            tags.Tag("py3", "none", "any"),
+            tags.Tag("py32", "none", "any"),
+            tags.Tag("py31", "none", "any"),
+            tags.Tag("py30", "none", "any"),
+        ]
+
+    def test_all_args_needs_underscore(self):
+        result = list(tags.compatible_tags((3, 11), "cp3_11", ["plat1", "plat2"]))
+        assert result == [
+            tags.Tag("py3_11", "none", "plat1"),
+            tags.Tag("py3_11", "none", "plat2"),
+            tags.Tag("py3", "none", "plat1"),
+            tags.Tag("py3", "none", "plat2"),
+            tags.Tag("py3_10", "none", "plat1"),
+            tags.Tag("py3_10", "none", "plat2"),
+            tags.Tag("py39", "none", "plat1"),
+            tags.Tag("py39", "none", "plat2"),
+            tags.Tag("py38", "none", "plat1"),
+            tags.Tag("py38", "none", "plat2"),
+            tags.Tag("py37", "none", "plat1"),
+            tags.Tag("py37", "none", "plat2"),
+            tags.Tag("py36", "none", "plat1"),
+            tags.Tag("py36", "none", "plat2"),
+            tags.Tag("py35", "none", "plat1"),
+            tags.Tag("py35", "none", "plat2"),
+            tags.Tag("py34", "none", "plat1"),
+            tags.Tag("py34", "none", "plat2"),
+            tags.Tag("py33", "none", "plat1"),
+            tags.Tag("py33", "none", "plat2"),
+            tags.Tag("py32", "none", "plat1"),
+            tags.Tag("py32", "none", "plat2"),
+            tags.Tag("py31", "none", "plat1"),
+            tags.Tag("py31", "none", "plat2"),
+            tags.Tag("py30", "none", "plat1"),
+            tags.Tag("py30", "none", "plat2"),
+            tags.Tag("cp3_11", "none", "any"),
+            tags.Tag("py3_11", "none", "any"),
+            tags.Tag("py3", "none", "any"),
+            tags.Tag("py3_10", "none", "any"),
+            tags.Tag("py39", "none", "any"),
+            tags.Tag("py38", "none", "any"),
+            tags.Tag("py37", "none", "any"),
+            tags.Tag("py36", "none", "any"),
+            tags.Tag("py35", "none", "any"),
+            tags.Tag("py34", "none", "any"),
+            tags.Tag("py33", "none", "any"),
+            tags.Tag("py32", "none", "any"),
+            tags.Tag("py31", "none", "any"),
+            tags.Tag("py30", "none", "any"),
+        ]
+
+    def test_major_only_python_version(self):
+        result = list(tags.compatible_tags((3,), "cp33", ["plat"]))
+        assert result == [
+            tags.Tag("py3", "none", "plat"),
+            tags.Tag("cp33", "none", "any"),
+            tags.Tag("py3", "none", "any"),
+        ]
+
+    def test_default_python_version(self, monkeypatch):
+        monkeypatch.setattr(sys, "version_info", (3, 1))
+        result = list(tags.compatible_tags(interpreter="cp31", platforms=["plat"]))
+        assert result == [
+            tags.Tag("py31", "none", "plat"),
+            tags.Tag("py3", "none", "plat"),
+            tags.Tag("py30", "none", "plat"),
+            tags.Tag("cp31", "none", "any"),
+            tags.Tag("py31", "none", "any"),
+            tags.Tag("py3", "none", "any"),
+            tags.Tag("py30", "none", "any"),
+        ]
+
+    def test_default_python_version_needs_underscore(self, monkeypatch):
+        monkeypatch.setattr(sys, "version_info", (3, 11))
+        result = list(tags.compatible_tags(interpreter="cp3_11", platforms=["plat"]))
+        assert result == [
+            tags.Tag("py3_11", "none", "plat"),
+            tags.Tag("py3", "none", "plat"),
+            tags.Tag("py3_10", "none", "plat"),
+            tags.Tag("py39", "none", "plat"),
+            tags.Tag("py38", "none", "plat"),
+            tags.Tag("py37", "none", "plat"),
+            tags.Tag("py36", "none", "plat"),
+            tags.Tag("py35", "none", "plat"),
+            tags.Tag("py34", "none", "plat"),
+            tags.Tag("py33", "none", "plat"),
+            tags.Tag("py32", "none", "plat"),
+            tags.Tag("py31", "none", "plat"),
+            tags.Tag("py30", "none", "plat"),
+            tags.Tag("cp3_11", "none", "any"),
+            tags.Tag("py3_11", "none", "any"),
+            tags.Tag("py3", "none", "any"),
+            tags.Tag("py3_10", "none", "any"),
+            tags.Tag("py39", "none", "any"),
+            tags.Tag("py38", "none", "any"),
+            tags.Tag("py37", "none", "any"),
+            tags.Tag("py36", "none", "any"),
+            tags.Tag("py35", "none", "any"),
+            tags.Tag("py34", "none", "any"),
+            tags.Tag("py33", "none", "any"),
+            tags.Tag("py32", "none", "any"),
+            tags.Tag("py31", "none", "any"),
+            tags.Tag("py30", "none", "any"),
+        ]
+
+    def test_default_interpreter(self):
+        result = list(tags.compatible_tags((3, 1), platforms=["plat"]))
+        assert result == [
+            tags.Tag("py31", "none", "plat"),
+            tags.Tag("py3", "none", "plat"),
+            tags.Tag("py30", "none", "plat"),
+            tags.Tag("py31", "none", "any"),
+            tags.Tag("py3", "none", "any"),
+            tags.Tag("py30", "none", "any"),
+        ]
+
+    def test_default_platforms(self, monkeypatch):
+        monkeypatch.setattr(tags, "_platform_tags", lambda: iter(["plat", "plat2"]))
+        result = list(tags.compatible_tags((3, 1), "cp31"))
+        assert result == [
+            tags.Tag("py31", "none", "plat"),
+            tags.Tag("py31", "none", "plat2"),
+            tags.Tag("py3", "none", "plat"),
+            tags.Tag("py3", "none", "plat2"),
+            tags.Tag("py30", "none", "plat"),
+            tags.Tag("py30", "none", "plat2"),
+            tags.Tag("cp31", "none", "any"),
+            tags.Tag("py31", "none", "any"),
+            tags.Tag("py3", "none", "any"),
+            tags.Tag("py30", "none", "any"),
+        ]
+
+
+class TestSysTags:
+    def teardown_method(self):
+        # Clear the version cache
+        tags._glibc_version = []
+
+    @pytest.mark.parametrize(
+        "name,expected",
+        [("CPython", "cp"), ("PyPy", "pp"), ("Jython", "jy"), ("IronPython", "ip")],
+    )
+    def test_interpreter_name(self, name, expected, mock_interpreter_name):
+        mock_interpreter_name(name)
+        assert tags.interpreter_name() == expected
+
+    def test_iterator(self):
+        assert isinstance(tags.sys_tags(), collections_abc.Iterator)
+
+    def test_mac_cpython(self, mock_interpreter_name, monkeypatch):
+        if mock_interpreter_name("CPython"):
+            monkeypatch.setattr(tags, "_cpython_abis", lambda *a: ["cp33m"])
+        if platform.system() != "Darwin":
+            monkeypatch.setattr(platform, "system", lambda: "Darwin")
+            monkeypatch.setattr(tags, "mac_platforms", lambda: ["macosx_10_5_x86_64"])
+        abis = tags._cpython_abis(sys.version_info[:2])
+        platforms = list(tags.mac_platforms())
+        result = list(tags.sys_tags())
+        assert len(abis) == 1
+        assert result[0] == tags.Tag(
+            "cp" + tags._version_nodot(sys.version_info[:2]), abis[0], platforms[0]
+        )
+        assert result[-1] == tags.Tag(
+            "py" + tags._version_nodot((sys.version_info[0], 0)), "none", "any"
+        )
+
+    def test_windows_cpython(self, mock_interpreter_name, monkeypatch):
+        if mock_interpreter_name("CPython"):
+            monkeypatch.setattr(tags, "_cpython_abis", lambda *a: ["cp33m"])
+        if platform.system() != "Windows":
+            monkeypatch.setattr(platform, "system", lambda: "Windows")
+            monkeypatch.setattr(tags, "_generic_platforms", lambda: ["win_amd64"])
+        abis = list(tags._cpython_abis(sys.version_info[:2]))
+        platforms = list(tags._generic_platforms())
+        result = list(tags.sys_tags())
+        interpreter = "cp" + tags._version_nodot(sys.version_info[:2])
+        assert len(abis) == 1
+        expected = tags.Tag(interpreter, abis[0], platforms[0])
+        assert result[0] == expected
+        expected = tags.Tag(
+            "py" + tags._version_nodot((sys.version_info[0], 0)), "none", "any"
+        )
+        assert result[-1] == expected
+
+    def test_linux_cpython(self, mock_interpreter_name, monkeypatch):
+        if mock_interpreter_name("CPython"):
+            monkeypatch.setattr(tags, "_cpython_abis", lambda *a: ["cp33m"])
+        if platform.system() != "Linux":
+            monkeypatch.setattr(platform, "system", lambda: "Linux")
+            monkeypatch.setattr(tags, "_linux_platforms", lambda: ["linux_x86_64"])
+        abis = list(tags._cpython_abis(sys.version_info[:2]))
+        platforms = list(tags._linux_platforms())
+        result = list(tags.sys_tags())
+        expected_interpreter = "cp" + tags._version_nodot(sys.version_info[:2])
+        assert len(abis) == 1
+        assert result[0] == tags.Tag(expected_interpreter, abis[0], platforms[0])
+        expected = tags.Tag(
+            "py" + tags._version_nodot((sys.version_info[0], 0)), "none", "any"
+        )
+        assert result[-1] == expected
+
+    def test_generic(self, monkeypatch):
+        monkeypatch.setattr(platform, "system", lambda: "Generic")
+        monkeypatch.setattr(tags, "interpreter_name", lambda: "generic")
+
+        result = list(tags.sys_tags())
+        expected = tags.Tag(
+            "py" + tags._version_nodot((sys.version_info[0], 0)), "none", "any"
+        )
+        assert result[-1] == expected
+
+    def test_linux_platforms_manylinux2014_armv6l(self, monkeypatch, manylinux_module):
+        monkeypatch.setattr(distutils.util, "get_platform", lambda: "linux_armv6l")
+        monkeypatch.setattr(os, "confstr", lambda x: "glibc 2.20", raising=False)
+        platforms = list(tags._linux_platforms(is_32bit=True))
+        expected = ["linux_armv6l"]
+        assert platforms == expected
+
+    def test_skip_manylinux_2014(self, monkeypatch, manylinux_module):
+        monkeypatch.setattr(distutils.util, "get_platform", lambda: "linux_ppc64")
+        monkeypatch.setattr(tags, "_get_glibc_version", lambda: (2, 20))
+        monkeypatch.setattr(
+            manylinux_module, "manylinux2014_compatible", False, raising=False
+        )
+        expected = [
+            "manylinux_2_20_ppc64",
+            "manylinux_2_19_ppc64",
+            "manylinux_2_18_ppc64",
+            # "manylinux2014_ppc64",  # this one is skipped
+            # "manylinux_2_17_ppc64", # this one is also skipped
+            "linux_ppc64",
+        ]
+        platforms = list(tags._linux_platforms())
+        assert platforms == expected
+
+    @pytest.mark.parametrize(
+        "machine, abi, alt_machine",
+        [("x86_64", "x32", "i686"), ("armv7l", "armel", "armv7l")],
+    )
+    def test_linux_platforms_not_manylinux_abi(
+        self, monkeypatch, manylinux_module, machine, abi, alt_machine
+    ):
+        monkeypatch.setattr(
+            distutils.util, "get_platform", lambda: "linux_{}".format(machine)
+        )
+        monkeypatch.setattr(
+            sys,
+            "executable",
+            os.path.join(
+                os.path.dirname(__file__), "hello-world-{}-{}".format(machine, abi)
+            ),
+        )
+        platforms = list(tags._linux_platforms(is_32bit=True))
+        expected = ["linux_{}".format(alt_machine)]
+        assert platforms == expected
+
+    @pytest.mark.parametrize(
+        "machine, major, minor, tf", [("x86_64", 2, 20, False), ("s390x", 2, 22, True)]
+    )
+    def test_linux_use_manylinux_compatible(
+        self, monkeypatch, manylinux_module, machine, major, minor, tf
+    ):
+        def manylinux_compatible(tag_major, tag_minor, tag_arch):
+            if tag_major == 2 and tag_minor == 22:
+                return tag_arch == "s390x"
+            return False
+
+        monkeypatch.setattr(tags, "_get_glibc_version", lambda: (major, minor))
+        monkeypatch.setattr(
+            distutils.util, "get_platform", lambda: "linux_{}".format(machine)
+        )
+        monkeypatch.setattr(
+            manylinux_module,
+            "manylinux_compatible",
+            manylinux_compatible,
+            raising=False,
+        )
+        platforms = list(tags._linux_platforms(is_32bit=False))
+        if tf:
+            expected = ["manylinux_2_22_{}".format(machine)]
+        else:
+            expected = []
+        expected.append("linux_{}".format(machine))
+        assert platforms == expected
+
+    def test_linux_use_manylinux_compatible_none(self, monkeypatch, manylinux_module):
+        def manylinux_compatible(tag_major, tag_minor, tag_arch):
+            if tag_major == 2 and tag_minor < 25:
+                return False
+            return None
+
+        monkeypatch.setattr(tags, "_get_glibc_version", lambda: (2, 30))
+        monkeypatch.setattr(distutils.util, "get_platform", lambda: "linux_x86_64")
+        monkeypatch.setattr(
+            manylinux_module,
+            "manylinux_compatible",
+            manylinux_compatible,
+            raising=False,
+        )
+        platforms = list(tags._linux_platforms(is_32bit=False))
+        expected = [
+            "manylinux_2_30_x86_64",
+            "manylinux_2_29_x86_64",
+            "manylinux_2_28_x86_64",
+            "manylinux_2_27_x86_64",
+            "manylinux_2_26_x86_64",
+            "manylinux_2_25_x86_64",
+            "linux_x86_64",
+        ]
+        assert platforms == expected
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_utils.py b/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_utils.py
new file mode 100644
index 00000000000..a8ea6bdb90a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_utils.py
@@ -0,0 +1,49 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import pytest
+
+from packaging.utils import canonicalize_name, canonicalize_version
+from packaging.version import Version
+
+
+@pytest.mark.parametrize(
+    ("name", "expected"),
+    [
+        ("foo", "foo"),
+        ("Foo", "foo"),
+        ("fOo", "foo"),
+        ("foo.bar", "foo-bar"),
+        ("Foo.Bar", "foo-bar"),
+        ("Foo.....Bar", "foo-bar"),
+        ("foo_bar", "foo-bar"),
+        ("foo___bar", "foo-bar"),
+        ("foo-bar", "foo-bar"),
+        ("foo----bar", "foo-bar"),
+    ],
+)
+def test_canonicalize_name(name, expected):
+    assert canonicalize_name(name) == expected
+
+
+@pytest.mark.parametrize(
+    ("version", "expected"),
+    [
+        (Version("1.4.0"), "1.4"),
+        ("1.4.0", "1.4"),
+        ("1.40.0", "1.40"),
+        ("1.4.0.0.00.000.0000", "1.4"),
+        ("1.0", "1"),
+        ("1.0+abc", "1+abc"),
+        ("1.0.dev0", "1.dev0"),
+        ("1.0.post0", "1.post0"),
+        ("1.0a0", "1a0"),
+        ("1.0rc0", "1rc0"),
+        ("100!0.0", "100!0"),
+        ("1.0.1-test7", "1.0.1-test7"),  # LegacyVersion is unchanged
+    ],
+)
+def test_canonicalize_version(version, expected):
+    assert canonicalize_version(version) == expected
diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_version.py b/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_version.py
new file mode 100644
index 00000000000..961fca201dd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_version.py
@@ -0,0 +1,905 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import itertools
+import operator
+import warnings
+
+import pretend
+import pytest
+
+from packaging.version import Version, LegacyVersion, InvalidVersion, parse
+
+
+@pytest.mark.parametrize(
+    ("version", "klass"), [("1.0", Version), ("1-1-1", LegacyVersion)]
+)
+def test_parse(version, klass):
+    assert isinstance(parse(version), klass)
+
+
+# This list must be in the correct sorting order
+VERSIONS = [
+    # Implicit epoch of 0
+    "1.0.dev456",
+    "1.0a1",
+    "1.0a2.dev456",
+    "1.0a12.dev456",
+    "1.0a12",
+    "1.0b1.dev456",
+    "1.0b2",
+    "1.0b2.post345.dev456",
+    "1.0b2.post345",
+    "1.0b2-346",
+    "1.0c1.dev456",
+    "1.0c1",
+    "1.0rc2",
+    "1.0c3",
+    "1.0",
+    "1.0.post456.dev34",
+    "1.0.post456",
+    "1.1.dev1",
+    "1.2+123abc",
+    "1.2+123abc456",
+    "1.2+abc",
+    "1.2+abc123",
+    "1.2+abc123def",
+    "1.2+1234.abc",
+    "1.2+123456",
+    "1.2.r32+123456",
+    "1.2.rev33+123456",
+    # Explicit epoch of 1
+    "1!1.0.dev456",
+    "1!1.0a1",
+    "1!1.0a2.dev456",
+    "1!1.0a12.dev456",
+    "1!1.0a12",
+    "1!1.0b1.dev456",
+    "1!1.0b2",
+    "1!1.0b2.post345.dev456",
+    "1!1.0b2.post345",
+    "1!1.0b2-346",
+    "1!1.0c1.dev456",
+    "1!1.0c1",
+    "1!1.0rc2",
+    "1!1.0c3",
+    "1!1.0",
+    "1!1.0.post456.dev34",
+    "1!1.0.post456",
+    "1!1.1.dev1",
+    "1!1.2+123abc",
+    "1!1.2+123abc456",
+    "1!1.2+abc",
+    "1!1.2+abc123",
+    "1!1.2+abc123def",
+    "1!1.2+1234.abc",
+    "1!1.2+123456",
+    "1!1.2.r32+123456",
+    "1!1.2.rev33+123456",
+]
+
+
+class TestVersion:
+    @pytest.mark.parametrize("version", VERSIONS)
+    def test_valid_versions(self, version):
+        Version(version)
+
+    @pytest.mark.parametrize(
+        "version",
+        [
+            # Non sensical versions should be invalid
+            "french toast",
+            # Versions with invalid local versions
+            "1.0+a+",
+            "1.0++",
+            "1.0+_foobar",
+            "1.0+foo&asd",
+            "1.0+1+1",
+        ],
+    )
+    def test_invalid_versions(self, version):
+        with pytest.raises(InvalidVersion):
+            Version(version)
+
+    @pytest.mark.parametrize(
+        ("version", "normalized"),
+        [
+            # Various development release incarnations
+            ("1.0dev", "1.0.dev0"),
+            ("1.0.dev", "1.0.dev0"),
+            ("1.0dev1", "1.0.dev1"),
+            ("1.0dev", "1.0.dev0"),
+            ("1.0-dev", "1.0.dev0"),
+            ("1.0-dev1", "1.0.dev1"),
+            ("1.0DEV", "1.0.dev0"),
+            ("1.0.DEV", "1.0.dev0"),
+            ("1.0DEV1", "1.0.dev1"),
+            ("1.0DEV", "1.0.dev0"),
+            ("1.0.DEV1", "1.0.dev1"),
+            ("1.0-DEV", "1.0.dev0"),
+            ("1.0-DEV1", "1.0.dev1"),
+            # Various alpha incarnations
+            ("1.0a", "1.0a0"),
+            ("1.0.a", "1.0a0"),
+            ("1.0.a1", "1.0a1"),
+            ("1.0-a", "1.0a0"),
+            ("1.0-a1", "1.0a1"),
+            ("1.0alpha", "1.0a0"),
+            ("1.0.alpha", "1.0a0"),
+            ("1.0.alpha1", "1.0a1"),
+            ("1.0-alpha", "1.0a0"),
+            ("1.0-alpha1", "1.0a1"),
+            ("1.0A", "1.0a0"),
+            ("1.0.A", "1.0a0"),
+            ("1.0.A1", "1.0a1"),
+            ("1.0-A", "1.0a0"),
+            ("1.0-A1", "1.0a1"),
+            ("1.0ALPHA", "1.0a0"),
+            ("1.0.ALPHA", "1.0a0"),
+            ("1.0.ALPHA1", "1.0a1"),
+            ("1.0-ALPHA", "1.0a0"),
+            ("1.0-ALPHA1", "1.0a1"),
+            # Various beta incarnations
+            ("1.0b", "1.0b0"),
+            ("1.0.b", "1.0b0"),
+            ("1.0.b1", "1.0b1"),
+            ("1.0-b", "1.0b0"),
+            ("1.0-b1", "1.0b1"),
+            ("1.0beta", "1.0b0"),
+            ("1.0.beta", "1.0b0"),
+            ("1.0.beta1", "1.0b1"),
+            ("1.0-beta", "1.0b0"),
+            ("1.0-beta1", "1.0b1"),
+            ("1.0B", "1.0b0"),
+            ("1.0.B", "1.0b0"),
+            ("1.0.B1", "1.0b1"),
+            ("1.0-B", "1.0b0"),
+            ("1.0-B1", "1.0b1"),
+            ("1.0BETA", "1.0b0"),
+            ("1.0.BETA", "1.0b0"),
+            ("1.0.BETA1", "1.0b1"),
+            ("1.0-BETA", "1.0b0"),
+            ("1.0-BETA1", "1.0b1"),
+            # Various release candidate incarnations
+            ("1.0c", "1.0rc0"),
+            ("1.0.c", "1.0rc0"),
+            ("1.0.c1", "1.0rc1"),
+            ("1.0-c", "1.0rc0"),
+            ("1.0-c1", "1.0rc1"),
+            ("1.0rc", "1.0rc0"),
+            ("1.0.rc", "1.0rc0"),
+            ("1.0.rc1", "1.0rc1"),
+            ("1.0-rc", "1.0rc0"),
+            ("1.0-rc1", "1.0rc1"),
+            ("1.0C", "1.0rc0"),
+            ("1.0.C", "1.0rc0"),
+            ("1.0.C1", "1.0rc1"),
+            ("1.0-C", "1.0rc0"),
+            ("1.0-C1", "1.0rc1"),
+            ("1.0RC", "1.0rc0"),
+            ("1.0.RC", "1.0rc0"),
+            ("1.0.RC1", "1.0rc1"),
+            ("1.0-RC", "1.0rc0"),
+            ("1.0-RC1", "1.0rc1"),
+            # Various post release incarnations
+            ("1.0post", "1.0.post0"),
+            ("1.0.post", "1.0.post0"),
+            ("1.0post1", "1.0.post1"),
+            ("1.0post", "1.0.post0"),
+            ("1.0-post", "1.0.post0"),
+            ("1.0-post1", "1.0.post1"),
+            ("1.0POST", "1.0.post0"),
+            ("1.0.POST", "1.0.post0"),
+            ("1.0POST1", "1.0.post1"),
+            ("1.0POST", "1.0.post0"),
+            ("1.0r", "1.0.post0"),
+            ("1.0rev", "1.0.post0"),
+            ("1.0.POST1", "1.0.post1"),
+            ("1.0.r1", "1.0.post1"),
+            ("1.0.rev1", "1.0.post1"),
+            ("1.0-POST", "1.0.post0"),
+            ("1.0-POST1", "1.0.post1"),
+            ("1.0-5", "1.0.post5"),
+            ("1.0-r5", "1.0.post5"),
+            ("1.0-rev5", "1.0.post5"),
+            # Local version case insensitivity
+            ("1.0+AbC", "1.0+abc"),
+            # Integer Normalization
+            ("1.01", "1.1"),
+            ("1.0a05", "1.0a5"),
+            ("1.0b07", "1.0b7"),
+            ("1.0c056", "1.0rc56"),
+            ("1.0rc09", "1.0rc9"),
+            ("1.0.post000", "1.0.post0"),
+            ("1.1.dev09000", "1.1.dev9000"),
+            ("00!1.2", "1.2"),
+            ("0100!0.0", "100!0.0"),
+            # Various other normalizations
+            ("v1.0", "1.0"),
+            ("   v1.0\t\n", "1.0"),
+        ],
+    )
+    def test_normalized_versions(self, version, normalized):
+        assert str(Version(version)) == normalized
+
+    @pytest.mark.parametrize(
+        ("version", "expected"),
+        [
+            ("1.0.dev456", "1.0.dev456"),
+            ("1.0a1", "1.0a1"),
+            ("1.0a2.dev456", "1.0a2.dev456"),
+            ("1.0a12.dev456", "1.0a12.dev456"),
+            ("1.0a12", "1.0a12"),
+            ("1.0b1.dev456", "1.0b1.dev456"),
+            ("1.0b2", "1.0b2"),
+            ("1.0b2.post345.dev456", "1.0b2.post345.dev456"),
+            ("1.0b2.post345", "1.0b2.post345"),
+            ("1.0rc1.dev456", "1.0rc1.dev456"),
+            ("1.0rc1", "1.0rc1"),
+            ("1.0", "1.0"),
+            ("1.0.post456.dev34", "1.0.post456.dev34"),
+            ("1.0.post456", "1.0.post456"),
+            ("1.0.1", "1.0.1"),
+            ("0!1.0.2", "1.0.2"),
+            ("1.0.3+7", "1.0.3+7"),
+            ("0!1.0.4+8.0", "1.0.4+8.0"),
+            ("1.0.5+9.5", "1.0.5+9.5"),
+            ("1.2+1234.abc", "1.2+1234.abc"),
+            ("1.2+123456", "1.2+123456"),
+            ("1.2+123abc", "1.2+123abc"),
+            ("1.2+123abc456", "1.2+123abc456"),
+            ("1.2+abc", "1.2+abc"),
+            ("1.2+abc123", "1.2+abc123"),
+            ("1.2+abc123def", "1.2+abc123def"),
+            ("1.1.dev1", "1.1.dev1"),
+            ("7!1.0.dev456", "7!1.0.dev456"),
+            ("7!1.0a1", "7!1.0a1"),
+            ("7!1.0a2.dev456", "7!1.0a2.dev456"),
+            ("7!1.0a12.dev456", "7!1.0a12.dev456"),
+            ("7!1.0a12", "7!1.0a12"),
+            ("7!1.0b1.dev456", "7!1.0b1.dev456"),
+            ("7!1.0b2", "7!1.0b2"),
+            ("7!1.0b2.post345.dev456", "7!1.0b2.post345.dev456"),
+            ("7!1.0b2.post345", "7!1.0b2.post345"),
+            ("7!1.0rc1.dev456", "7!1.0rc1.dev456"),
+            ("7!1.0rc1", "7!1.0rc1"),
+            ("7!1.0", "7!1.0"),
+            ("7!1.0.post456.dev34", "7!1.0.post456.dev34"),
+            ("7!1.0.post456", "7!1.0.post456"),
+            ("7!1.0.1", "7!1.0.1"),
+            ("7!1.0.2", "7!1.0.2"),
+            ("7!1.0.3+7", "7!1.0.3+7"),
+            ("7!1.0.4+8.0", "7!1.0.4+8.0"),
+            ("7!1.0.5+9.5", "7!1.0.5+9.5"),
+            ("7!1.1.dev1", "7!1.1.dev1"),
+        ],
+    )
+    def test_version_str_repr(self, version, expected):
+        assert str(Version(version)) == expected
+        assert repr(Version(version)) == "<Version({0})>".format(repr(expected))
+
+    def test_version_rc_and_c_equals(self):
+        assert Version("1.0rc1") == Version("1.0c1")
+
+    @pytest.mark.parametrize("version", VERSIONS)
+    def test_version_hash(self, version):
+        assert hash(Version(version)) == hash(Version(version))
+
+    @pytest.mark.parametrize(
+        ("version", "public"),
+        [
+            ("1.0", "1.0"),
+            ("1.0.dev0", "1.0.dev0"),
+            ("1.0.dev6", "1.0.dev6"),
+            ("1.0a1", "1.0a1"),
+            ("1.0a1.post5", "1.0a1.post5"),
+            ("1.0a1.post5.dev6", "1.0a1.post5.dev6"),
+            ("1.0rc4", "1.0rc4"),
+            ("1.0.post5", "1.0.post5"),
+            ("1!1.0", "1!1.0"),
+            ("1!1.0.dev6", "1!1.0.dev6"),
+            ("1!1.0a1", "1!1.0a1"),
+            ("1!1.0a1.post5", "1!1.0a1.post5"),
+            ("1!1.0a1.post5.dev6", "1!1.0a1.post5.dev6"),
+            ("1!1.0rc4", "1!1.0rc4"),
+            ("1!1.0.post5", "1!1.0.post5"),
+            ("1.0+deadbeef", "1.0"),
+            ("1.0.dev6+deadbeef", "1.0.dev6"),
+            ("1.0a1+deadbeef", "1.0a1"),
+            ("1.0a1.post5+deadbeef", "1.0a1.post5"),
+            ("1.0a1.post5.dev6+deadbeef", "1.0a1.post5.dev6"),
+            ("1.0rc4+deadbeef", "1.0rc4"),
+            ("1.0.post5+deadbeef", "1.0.post5"),
+            ("1!1.0+deadbeef", "1!1.0"),
+            ("1!1.0.dev6+deadbeef", "1!1.0.dev6"),
+            ("1!1.0a1+deadbeef", "1!1.0a1"),
+            ("1!1.0a1.post5+deadbeef", "1!1.0a1.post5"),
+            ("1!1.0a1.post5.dev6+deadbeef", "1!1.0a1.post5.dev6"),
+            ("1!1.0rc4+deadbeef", "1!1.0rc4"),
+            ("1!1.0.post5+deadbeef", "1!1.0.post5"),
+        ],
+    )
+    def test_version_public(self, version, public):
+        assert Version(version).public == public
+
+    @pytest.mark.parametrize(
+        ("version", "base_version"),
+        [
+            ("1.0", "1.0"),
+            ("1.0.dev0", "1.0"),
+            ("1.0.dev6", "1.0"),
+            ("1.0a1", "1.0"),
+            ("1.0a1.post5", "1.0"),
+            ("1.0a1.post5.dev6", "1.0"),
+            ("1.0rc4", "1.0"),
+            ("1.0.post5", "1.0"),
+            ("1!1.0", "1!1.0"),
+            ("1!1.0.dev6", "1!1.0"),
+            ("1!1.0a1", "1!1.0"),
+            ("1!1.0a1.post5", "1!1.0"),
+            ("1!1.0a1.post5.dev6", "1!1.0"),
+            ("1!1.0rc4", "1!1.0"),
+            ("1!1.0.post5", "1!1.0"),
+            ("1.0+deadbeef", "1.0"),
+            ("1.0.dev6+deadbeef", "1.0"),
+            ("1.0a1+deadbeef", "1.0"),
+            ("1.0a1.post5+deadbeef", "1.0"),
+            ("1.0a1.post5.dev6+deadbeef", "1.0"),
+            ("1.0rc4+deadbeef", "1.0"),
+            ("1.0.post5+deadbeef", "1.0"),
+            ("1!1.0+deadbeef", "1!1.0"),
+            ("1!1.0.dev6+deadbeef", "1!1.0"),
+            ("1!1.0a1+deadbeef", "1!1.0"),
+            ("1!1.0a1.post5+deadbeef", "1!1.0"),
+            ("1!1.0a1.post5.dev6+deadbeef", "1!1.0"),
+            ("1!1.0rc4+deadbeef", "1!1.0"),
+            ("1!1.0.post5+deadbeef", "1!1.0"),
+        ],
+    )
+    def test_version_base_version(self, version, base_version):
+        assert Version(version).base_version == base_version
+
+    @pytest.mark.parametrize(
+        ("version", "epoch"),
+        [
+            ("1.0", 0),
+            ("1.0.dev0", 0),
+            ("1.0.dev6", 0),
+            ("1.0a1", 0),
+            ("1.0a1.post5", 0),
+            ("1.0a1.post5.dev6", 0),
+            ("1.0rc4", 0),
+            ("1.0.post5", 0),
+            ("1!1.0", 1),
+            ("1!1.0.dev6", 1),
+            ("1!1.0a1", 1),
+            ("1!1.0a1.post5", 1),
+            ("1!1.0a1.post5.dev6", 1),
+            ("1!1.0rc4", 1),
+            ("1!1.0.post5", 1),
+            ("1.0+deadbeef", 0),
+            ("1.0.dev6+deadbeef", 0),
+            ("1.0a1+deadbeef", 0),
+            ("1.0a1.post5+deadbeef", 0),
+            ("1.0a1.post5.dev6+deadbeef", 0),
+            ("1.0rc4+deadbeef", 0),
+            ("1.0.post5+deadbeef", 0),
+            ("1!1.0+deadbeef", 1),
+            ("1!1.0.dev6+deadbeef", 1),
+            ("1!1.0a1+deadbeef", 1),
+            ("1!1.0a1.post5+deadbeef", 1),
+            ("1!1.0a1.post5.dev6+deadbeef", 1),
+            ("1!1.0rc4+deadbeef", 1),
+            ("1!1.0.post5+deadbeef", 1),
+        ],
+    )
+    def test_version_epoch(self, version, epoch):
+        assert Version(version).epoch == epoch
+
+    @pytest.mark.parametrize(
+        ("version", "release"),
+        [
+            ("1.0", (1, 0)),
+            ("1.0.dev0", (1, 0)),
+            ("1.0.dev6", (1, 0)),
+            ("1.0a1", (1, 0)),
+            ("1.0a1.post5", (1, 0)),
+            ("1.0a1.post5.dev6", (1, 0)),
+            ("1.0rc4", (1, 0)),
+            ("1.0.post5", (1, 0)),
+            ("1!1.0", (1, 0)),
+            ("1!1.0.dev6", (1, 0)),
+            ("1!1.0a1", (1, 0)),
+            ("1!1.0a1.post5", (1, 0)),
+            ("1!1.0a1.post5.dev6", (1, 0)),
+            ("1!1.0rc4", (1, 0)),
+            ("1!1.0.post5", (1, 0)),
+            ("1.0+deadbeef", (1, 0)),
+            ("1.0.dev6+deadbeef", (1, 0)),
+            ("1.0a1+deadbeef", (1, 0)),
+            ("1.0a1.post5+deadbeef", (1, 0)),
+            ("1.0a1.post5.dev6+deadbeef", (1, 0)),
+            ("1.0rc4+deadbeef", (1, 0)),
+            ("1.0.post5+deadbeef", (1, 0)),
+            ("1!1.0+deadbeef", (1, 0)),
+            ("1!1.0.dev6+deadbeef", (1, 0)),
+            ("1!1.0a1+deadbeef", (1, 0)),
+            ("1!1.0a1.post5+deadbeef", (1, 0)),
+            ("1!1.0a1.post5.dev6+deadbeef", (1, 0)),
+            ("1!1.0rc4+deadbeef", (1, 0)),
+            ("1!1.0.post5+deadbeef", (1, 0)),
+        ],
+    )
+    def test_version_release(self, version, release):
+        assert Version(version).release == release
+
+    @pytest.mark.parametrize(
+        ("version", "local"),
+        [
+            ("1.0", None),
+            ("1.0.dev0", None),
+            ("1.0.dev6", None),
+            ("1.0a1", None),
+            ("1.0a1.post5", None),
+            ("1.0a1.post5.dev6", None),
+            ("1.0rc4", None),
+            ("1.0.post5", None),
+            ("1!1.0", None),
+            ("1!1.0.dev6", None),
+            ("1!1.0a1", None),
+            ("1!1.0a1.post5", None),
+            ("1!1.0a1.post5.dev6", None),
+            ("1!1.0rc4", None),
+            ("1!1.0.post5", None),
+            ("1.0+deadbeef", "deadbeef"),
+            ("1.0.dev6+deadbeef", "deadbeef"),
+            ("1.0a1+deadbeef", "deadbeef"),
+            ("1.0a1.post5+deadbeef", "deadbeef"),
+            ("1.0a1.post5.dev6+deadbeef", "deadbeef"),
+            ("1.0rc4+deadbeef", "deadbeef"),
+            ("1.0.post5+deadbeef", "deadbeef"),
+            ("1!1.0+deadbeef", "deadbeef"),
+            ("1!1.0.dev6+deadbeef", "deadbeef"),
+            ("1!1.0a1+deadbeef", "deadbeef"),
+            ("1!1.0a1.post5+deadbeef", "deadbeef"),
+            ("1!1.0a1.post5.dev6+deadbeef", "deadbeef"),
+            ("1!1.0rc4+deadbeef", "deadbeef"),
+            ("1!1.0.post5+deadbeef", "deadbeef"),
+        ],
+    )
+    def test_version_local(self, version, local):
+        assert Version(version).local == local
+
+    @pytest.mark.parametrize(
+        ("version", "pre"),
+        [
+            ("1.0", None),
+            ("1.0.dev0", None),
+            ("1.0.dev6", None),
+            ("1.0a1", ("a", 1)),
+            ("1.0a1.post5", ("a", 1)),
+            ("1.0a1.post5.dev6", ("a", 1)),
+            ("1.0rc4", ("rc", 4)),
+            ("1.0.post5", None),
+            ("1!1.0", None),
+            ("1!1.0.dev6", None),
+            ("1!1.0a1", ("a", 1)),
+            ("1!1.0a1.post5", ("a", 1)),
+            ("1!1.0a1.post5.dev6", ("a", 1)),
+            ("1!1.0rc4", ("rc", 4)),
+            ("1!1.0.post5", None),
+            ("1.0+deadbeef", None),
+            ("1.0.dev6+deadbeef", None),
+            ("1.0a1+deadbeef", ("a", 1)),
+            ("1.0a1.post5+deadbeef", ("a", 1)),
+            ("1.0a1.post5.dev6+deadbeef", ("a", 1)),
+            ("1.0rc4+deadbeef", ("rc", 4)),
+            ("1.0.post5+deadbeef", None),
+            ("1!1.0+deadbeef", None),
+            ("1!1.0.dev6+deadbeef", None),
+            ("1!1.0a1+deadbeef", ("a", 1)),
+            ("1!1.0a1.post5+deadbeef", ("a", 1)),
+            ("1!1.0a1.post5.dev6+deadbeef", ("a", 1)),
+            ("1!1.0rc4+deadbeef", ("rc", 4)),
+            ("1!1.0.post5+deadbeef", None),
+        ],
+    )
+    def test_version_pre(self, version, pre):
+        assert Version(version).pre == pre
+
+    @pytest.mark.parametrize(
+        ("version", "expected"),
+        [
+            ("1.0.dev0", True),
+            ("1.0.dev1", True),
+            ("1.0a1.dev1", True),
+            ("1.0b1.dev1", True),
+            ("1.0c1.dev1", True),
+            ("1.0rc1.dev1", True),
+            ("1.0a1", True),
+            ("1.0b1", True),
+            ("1.0c1", True),
+            ("1.0rc1", True),
+            ("1.0a1.post1.dev1", True),
+            ("1.0b1.post1.dev1", True),
+            ("1.0c1.post1.dev1", True),
+            ("1.0rc1.post1.dev1", True),
+            ("1.0a1.post1", True),
+            ("1.0b1.post1", True),
+            ("1.0c1.post1", True),
+            ("1.0rc1.post1", True),
+            ("1.0", False),
+            ("1.0+dev", False),
+            ("1.0.post1", False),
+            ("1.0.post1+dev", False),
+        ],
+    )
+    def test_version_is_prerelease(self, version, expected):
+        assert Version(version).is_prerelease is expected
+
+    @pytest.mark.parametrize(
+        ("version", "dev"),
+        [
+            ("1.0", None),
+            ("1.0.dev0", 0),
+            ("1.0.dev6", 6),
+            ("1.0a1", None),
+            ("1.0a1.post5", None),
+            ("1.0a1.post5.dev6", 6),
+            ("1.0rc4", None),
+            ("1.0.post5", None),
+            ("1!1.0", None),
+            ("1!1.0.dev6", 6),
+            ("1!1.0a1", None),
+            ("1!1.0a1.post5", None),
+            ("1!1.0a1.post5.dev6", 6),
+            ("1!1.0rc4", None),
+            ("1!1.0.post5", None),
+            ("1.0+deadbeef", None),
+            ("1.0.dev6+deadbeef", 6),
+            ("1.0a1+deadbeef", None),
+            ("1.0a1.post5+deadbeef", None),
+            ("1.0a1.post5.dev6+deadbeef", 6),
+            ("1.0rc4+deadbeef", None),
+            ("1.0.post5+deadbeef", None),
+            ("1!1.0+deadbeef", None),
+            ("1!1.0.dev6+deadbeef", 6),
+            ("1!1.0a1+deadbeef", None),
+            ("1!1.0a1.post5+deadbeef", None),
+            ("1!1.0a1.post5.dev6+deadbeef", 6),
+            ("1!1.0rc4+deadbeef", None),
+            ("1!1.0.post5+deadbeef", None),
+        ],
+    )
+    def test_version_dev(self, version, dev):
+        assert Version(version).dev == dev
+
+    @pytest.mark.parametrize(
+        ("version", "expected"),
+        [
+            ("1.0", False),
+            ("1.0.dev0", True),
+            ("1.0.dev6", True),
+            ("1.0a1", False),
+            ("1.0a1.post5", False),
+            ("1.0a1.post5.dev6", True),
+            ("1.0rc4", False),
+            ("1.0.post5", False),
+            ("1!1.0", False),
+            ("1!1.0.dev6", True),
+            ("1!1.0a1", False),
+            ("1!1.0a1.post5", False),
+            ("1!1.0a1.post5.dev6", True),
+            ("1!1.0rc4", False),
+            ("1!1.0.post5", False),
+            ("1.0+deadbeef", False),
+            ("1.0.dev6+deadbeef", True),
+            ("1.0a1+deadbeef", False),
+            ("1.0a1.post5+deadbeef", False),
+            ("1.0a1.post5.dev6+deadbeef", True),
+            ("1.0rc4+deadbeef", False),
+            ("1.0.post5+deadbeef", False),
+            ("1!1.0+deadbeef", False),
+            ("1!1.0.dev6+deadbeef", True),
+            ("1!1.0a1+deadbeef", False),
+            ("1!1.0a1.post5+deadbeef", False),
+            ("1!1.0a1.post5.dev6+deadbeef", True),
+            ("1!1.0rc4+deadbeef", False),
+            ("1!1.0.post5+deadbeef", False),
+        ],
+    )
+    def test_version_is_devrelease(self, version, expected):
+        assert Version(version).is_devrelease is expected
+
+    @pytest.mark.parametrize(
+        ("version", "post"),
+        [
+            ("1.0", None),
+            ("1.0.dev0", None),
+            ("1.0.dev6", None),
+            ("1.0a1", None),
+            ("1.0a1.post5", 5),
+            ("1.0a1.post5.dev6", 5),
+            ("1.0rc4", None),
+            ("1.0.post5", 5),
+            ("1!1.0", None),
+            ("1!1.0.dev6", None),
+            ("1!1.0a1", None),
+            ("1!1.0a1.post5", 5),
+            ("1!1.0a1.post5.dev6", 5),
+            ("1!1.0rc4", None),
+            ("1!1.0.post5", 5),
+            ("1.0+deadbeef", None),
+            ("1.0.dev6+deadbeef", None),
+            ("1.0a1+deadbeef", None),
+            ("1.0a1.post5+deadbeef", 5),
+            ("1.0a1.post5.dev6+deadbeef", 5),
+            ("1.0rc4+deadbeef", None),
+            ("1.0.post5+deadbeef", 5),
+            ("1!1.0+deadbeef", None),
+            ("1!1.0.dev6+deadbeef", None),
+            ("1!1.0a1+deadbeef", None),
+            ("1!1.0a1.post5+deadbeef", 5),
+            ("1!1.0a1.post5.dev6+deadbeef", 5),
+            ("1!1.0rc4+deadbeef", None),
+            ("1!1.0.post5+deadbeef", 5),
+        ],
+    )
+    def test_version_post(self, version, post):
+        assert Version(version).post == post
+
+    @pytest.mark.parametrize(
+        ("version", "expected"),
+        [
+            ("1.0.dev1", False),
+            ("1.0", False),
+            ("1.0+foo", False),
+            ("1.0.post1.dev1", True),
+            ("1.0.post1", True),
+        ],
+    )
+    def test_version_is_postrelease(self, version, expected):
+        assert Version(version).is_postrelease is expected
+
+    @pytest.mark.parametrize(
+        ("left", "right", "op"),
+        # Below we'll generate every possible combination of VERSIONS that
+        # should be True for the given operator
+        itertools.chain(
+            *
+            # Verify that the less than (<) operator works correctly
+            [
+                [(x, y, operator.lt) for y in VERSIONS[i + 1 :]]
+                for i, x in enumerate(VERSIONS)
+            ]
+            +
+            # Verify that the less than equal (<=) operator works correctly
+            [
+                [(x, y, operator.le) for y in VERSIONS[i:]]
+                for i, x in enumerate(VERSIONS)
+            ]
+            +
+            # Verify that the equal (==) operator works correctly
+            [[(x, x, operator.eq) for x in VERSIONS]]
+            +
+            # Verify that the not equal (!=) operator works correctly
+            [
+                [(x, y, operator.ne) for j, y in enumerate(VERSIONS) if i != j]
+                for i, x in enumerate(VERSIONS)
+            ]
+            +
+            # Verify that the greater than equal (>=) operator works correctly
+            [
+                [(x, y, operator.ge) for y in VERSIONS[: i + 1]]
+                for i, x in enumerate(VERSIONS)
+            ]
+            +
+            # Verify that the greater than (>) operator works correctly
+            [
+                [(x, y, operator.gt) for y in VERSIONS[:i]]
+                for i, x in enumerate(VERSIONS)
+            ]
+        ),
+    )
+    def test_comparison_true(self, left, right, op):
+        assert op(Version(left), Version(right))
+
+    @pytest.mark.parametrize(
+        ("left", "right", "op"),
+        # Below we'll generate every possible combination of VERSIONS that
+        # should be False for the given operator
+        itertools.chain(
+            *
+            # Verify that the less than (<) operator works correctly
+            [
+                [(x, y, operator.lt) for y in VERSIONS[: i + 1]]
+                for i, x in enumerate(VERSIONS)
+            ]
+            +
+            # Verify that the less than equal (<=) operator works correctly
+            [
+                [(x, y, operator.le) for y in VERSIONS[:i]]
+                for i, x in enumerate(VERSIONS)
+            ]
+            +
+            # Verify that the equal (==) operator works correctly
+            [
+                [(x, y, operator.eq) for j, y in enumerate(VERSIONS) if i != j]
+                for i, x in enumerate(VERSIONS)
+            ]
+            +
+            # Verify that the not equal (!=) operator works correctly
+            [[(x, x, operator.ne) for x in VERSIONS]]
+            +
+            # Verify that the greater than equal (>=) operator works correctly
+            [
+                [(x, y, operator.ge) for y in VERSIONS[i + 1 :]]
+                for i, x in enumerate(VERSIONS)
+            ]
+            +
+            # Verify that the greater than (>) operator works correctly
+            [
+                [(x, y, operator.gt) for y in VERSIONS[i:]]
+                for i, x in enumerate(VERSIONS)
+            ]
+        ),
+    )
+    def test_comparison_false(self, left, right, op):
+        assert not op(Version(left), Version(right))
+
+    @pytest.mark.parametrize("op", ["lt", "le", "eq", "ge", "gt", "ne"])
+    def test_dunder_op_returns_notimplemented(self, op):
+        method = getattr(Version, "__{0}__".format(op))
+        assert method(Version("1"), 1) is NotImplemented
+
+    @pytest.mark.parametrize(("op", "expected"), [("eq", False), ("ne", True)])
+    def test_compare_other(self, op, expected):
+        other = pretend.stub(**{"__{0}__".format(op): lambda other: NotImplemented})
+
+        assert getattr(operator, op)(Version("1"), other) is expected
+
+    def test_compare_legacyversion_version(self):
+        result = sorted([Version("0"), LegacyVersion("1")])
+        assert result == [LegacyVersion("1"), Version("0")]
+
+    def test_major_version(self):
+        assert Version("2.1.0").major == 2
+
+    def test_minor_version(self):
+        assert Version("2.1.0").minor == 1
+        assert Version("2").minor == 0
+
+    def test_micro_version(self):
+        assert Version("2.1.3").micro == 3
+        assert Version("2.1").micro == 0
+        assert Version("2").micro == 0
+
+
+LEGACY_VERSIONS = ["foobar", "a cat is fine too", "lolwut", "1-0", "2.0-a1"]
+
+
+class TestLegacyVersion:
+    def test_legacy_version_is_deprecated(self):
+        with warnings.catch_warnings(record=True) as w:
+            LegacyVersion("some-legacy-version")
+            assert len(w) == 1
+            assert issubclass(w[0].category, DeprecationWarning)
+
+    @pytest.mark.parametrize("version", VERSIONS + LEGACY_VERSIONS)
+    def test_valid_legacy_versions(self, version):
+        LegacyVersion(version)
+
+    @pytest.mark.parametrize("version", VERSIONS + LEGACY_VERSIONS)
+    def test_legacy_version_str_repr(self, version):
+        assert str(LegacyVersion(version)) == version
+        assert repr(LegacyVersion(version)) == "<LegacyVersion({0})>".format(
+            repr(version)
+        )
+
+    @pytest.mark.parametrize("version", VERSIONS + LEGACY_VERSIONS)
+    def test_legacy_version_hash(self, version):
+        assert hash(LegacyVersion(version)) == hash(LegacyVersion(version))
+
+    @pytest.mark.parametrize("version", VERSIONS + LEGACY_VERSIONS)
+    def test_legacy_version_public(self, version):
+        assert LegacyVersion(version).public == version
+
+    @pytest.mark.parametrize("version", VERSIONS + LEGACY_VERSIONS)
+    def test_legacy_version_base_version(self, version):
+        assert LegacyVersion(version).base_version == version
+
+    @pytest.mark.parametrize("version", VERSIONS + LEGACY_VERSIONS)
+    def test_legacy_version_epoch(self, version):
+        assert LegacyVersion(version).epoch == -1
+
+    @pytest.mark.parametrize("version", VERSIONS + LEGACY_VERSIONS)
+    def test_legacy_version_release(self, version):
+        assert LegacyVersion(version).release is None
+
+    @pytest.mark.parametrize("version", VERSIONS + LEGACY_VERSIONS)
+    def test_legacy_version_local(self, version):
+        assert LegacyVersion(version).local is None
+
+    @pytest.mark.parametrize("version", VERSIONS + LEGACY_VERSIONS)
+    def test_legacy_version_pre(self, version):
+        assert LegacyVersion(version).pre is None
+
+    @pytest.mark.parametrize("version", VERSIONS + LEGACY_VERSIONS)
+    def test_legacy_version_is_prerelease(self, version):
+        assert not LegacyVersion(version).is_prerelease
+
+    @pytest.mark.parametrize("version", VERSIONS + LEGACY_VERSIONS)
+    def test_legacy_version_dev(self, version):
+        assert LegacyVersion(version).dev is None
+
+    @pytest.mark.parametrize("version", VERSIONS + LEGACY_VERSIONS)
+    def test_legacy_version_is_devrelease(self, version):
+        assert not LegacyVersion(version).is_devrelease
+
+    @pytest.mark.parametrize("version", VERSIONS + LEGACY_VERSIONS)
+    def test_legacy_version_post(self, version):
+        assert LegacyVersion(version).post is None
+
+    @pytest.mark.parametrize("version", VERSIONS + LEGACY_VERSIONS)
+    def test_legacy_version_is_postrelease(self, version):
+        assert not LegacyVersion(version).is_postrelease
+
+    @pytest.mark.parametrize(
+        ("left", "right", "op"),
+        # Below we'll generate every possible combination of
+        # VERSIONS + LEGACY_VERSIONS that should be True for the given operator
+        itertools.chain(
+            *
+            # Verify that the equal (==) operator works correctly
+            [[(x, x, operator.eq) for x in VERSIONS + LEGACY_VERSIONS]]
+            +
+            # Verify that the not equal (!=) operator works correctly
+            [
+                [
+                    (x, y, operator.ne)
+                    for j, y in enumerate(VERSIONS + LEGACY_VERSIONS)
+                    if i != j
+                ]
+                for i, x in enumerate(VERSIONS + LEGACY_VERSIONS)
+            ]
+        ),
+    )
+    def test_comparison_true(self, left, right, op):
+        assert op(LegacyVersion(left), LegacyVersion(right))
+
+    @pytest.mark.parametrize(
+        ("left", "right", "op"),
+        # Below we'll generate every possible combination of
+        # VERSIONS + LEGACY_VERSIONS that should be False for the given
+        # operator
+        itertools.chain(
+            *
+            # Verify that the equal (==) operator works correctly
+            [
+                [
+                    (x, y, operator.eq)
+                    for j, y in enumerate(VERSIONS + LEGACY_VERSIONS)
+                    if i != j
+                ]
+                for i, x in enumerate(VERSIONS + LEGACY_VERSIONS)
+            ]
+            +
+            # Verify that the not equal (!=) operator works correctly
+            [[(x, x, operator.ne) for x in VERSIONS + LEGACY_VERSIONS]]
+        ),
+    )
+    def test_comparison_false(self, left, right, op):
+        assert not op(LegacyVersion(left), LegacyVersion(right))
+
+    @pytest.mark.parametrize("op", ["lt", "le", "eq", "ge", "gt", "ne"])
+    def test_dunder_op_returns_notimplemented(self, op):
+        method = getattr(LegacyVersion, "__{0}__".format(op))
+        assert method(LegacyVersion("1"), 1) is NotImplemented
+
+    @pytest.mark.parametrize(("op", "expected"), [("eq", False), ("ne", True)])
+    def test_compare_other(self, op, expected):
+        other = pretend.stub(**{"__{0}__".format(op): lambda other: NotImplemented})
+
+        assert getattr(operator, op)(LegacyVersion("1"), other) is expected
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pathlib2/.gitignore b/tests/wpt/web-platform-tests/tools/third_party/pathlib2/.gitignore
new file mode 100644
index 00000000000..db4561eaa1d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pathlib2/.gitignore
@@ -0,0 +1,54 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.cache
+nosetests.xml
+coverage.xml
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pathlib2/.travis.yml b/tests/wpt/web-platform-tests/tools/third_party/pathlib2/.travis.yml
new file mode 100644
index 00000000000..31667412201
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pathlib2/.travis.yml
@@ -0,0 +1,47 @@
+language: python
+sudo: false
+matrix:
+  include:
+    - python: "3.7"
+      dist: xenial
+      env: LC_ALL="en_US.utf-8"
+    - python: "3.7"
+      dist: xenial
+      env: LC_ALL="en_US.ascii"
+    - python: "3.6"
+      dist: xenial
+    - python: "3.5"
+      dist: xenial
+    - python: "3.4"
+      dist: xenial
+    - python: "2.7"
+      dist: xenial
+    - python: "2.6"
+      dist: trusty
+    - python: "pypy"
+      dist: xenial
+    - python: "pypy3"
+      dist: xenial
+  allow_failures:
+  # pypy occasionally has some bugs
+  - python: "pypy"
+  - python: "pypy3"
+branches:
+  only:
+    - develop
+install:
+  - "python -c \"import sys; print(sys.getfilesystemencoding())\""
+  - "pip install --upgrade setuptools"
+  - "pip install --upgrade pytest"
+  - "pip install pytest-cov"
+  - "pip install -r requirements.txt"
+  - "if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2; fi"
+  - "if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then pip install check-manifest flake8; fi"
+  - "pip install ."
+script:
+  - "if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then check-manifest; fi"
+  - "if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then flake8; fi"
+  - cd tests
+  - "pytest --cov-report=xml --cov=pathlib2 ."
+after_success:
+  - bash <(curl -s https://codecov.io/bash)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pathlib2/CHANGELOG.rst b/tests/wpt/web-platform-tests/tools/third_party/pathlib2/CHANGELOG.rst
new file mode 100644
index 00000000000..867c1b38e9b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pathlib2/CHANGELOG.rst
@@ -0,0 +1,163 @@
+History
+-------
+
+Version 2.3.5
+^^^^^^^^^^^^^
+
+- Fall back to ascii when getfilesystemencoding returns None (see
+  issue #59).
+
+Version 2.3.4
+^^^^^^^^^^^^^
+
+- Do not raise windows error when calling resolve on a non-existing
+  path in Python 2.7, to match behaviour on Python 3.x (see issue #54).
+
+- Use the new collections.abc when possible (see issue #53).
+
+- Sync with upstream pathlib (see issues #47 and #51).
+
+Version 2.3.3
+^^^^^^^^^^^^^
+
+- Bring back old deprecated dependency syntax to ensure compatibility
+  with older systems (see issue #46).
+
+- Drop Python 3.3 support, as scandir no longer supports it.
+
+- Add Python 3.7 support.
+
+Version 2.3.2
+^^^^^^^^^^^^^
+
+- Hotfix for broken setup.py.
+
+Version 2.3.1
+^^^^^^^^^^^^^
+
+- Fix tests for systems where filesystem encoding only supports ascii
+  (reported by yurivict, fixed with help of honnibal, see issue #30).
+
+- Use modern setuptools syntax for specifying conditional scandir
+  dependency (see issue #31).
+
+- Remove legacy use of support module from old pathlib module (see
+  issue #39). This fixes the tests for Python 3.6.
+
+- Drop the "from __future__ import unicode_literals" and -Qnew tests
+  as it introduced subtle bugs in the tests, and maintaining separate
+  test modules for these legacy features seems not worth the effort.
+
+- Drop Python 3.2 support, as scandir no longer supports it.
+
+Version 2.3.0
+^^^^^^^^^^^^^
+
+- Sync with upstream pathlib from CPython 3.6.1 (7d1017d).
+
+Version 2.2.1
+^^^^^^^^^^^^^
+
+- Fix conditional scandir dependency in wheel (reported by AvdN, see
+  issue #20 and pull request #21).
+
+Version 2.2.0
+^^^^^^^^^^^^^
+
+- Sync with upstream pathlib from CPython 3.5.2 and 3.6.0: fix various
+  exceptions, empty glob pattern, scandir, __fspath__.
+
+- Support unicode strings to be used to construct paths in Python 2
+  (reported by native-api, see issue #13 and pull request #15).
+
+Version 2.1.0
+^^^^^^^^^^^^^
+
+- Sync with upstream pathlib from CPython 3.5.0: gethomedir, home,
+  expanduser.
+
+Version 2.0.1
+^^^^^^^^^^^^^
+
+- Fix TypeError exceptions in write_bytes and write_text (contributed
+  by Emanuele Gaifas, see pull request #2).
+
+Version 2.0
+^^^^^^^^^^^
+
+- Sync with upstream pathlib from CPython: read_text, write_text,
+  read_bytes, write_bytes, __enter__, __exit__, samefile.
+- Use travis and appveyor for continuous integration.
+- Fixed some bugs in test code.
+
+Version 1.0.1
+^^^^^^^^^^^^^
+
+- Pull request #4: Python 2.6 compatibility by eevee.
+
+Version 1.0
+^^^^^^^^^^^
+
+This version brings ``pathlib`` up to date with the official Python 3.4
+release, and also fixes a couple of 2.7-specific issues.
+
+- Python issue #20765: Add missing documentation for PurePath.with_name()
+  and PurePath.with_suffix().
+- Fix test_mkdir_parents when the working directory has additional bits
+  set (such as the setgid or sticky bits).
+- Python issue #20111: pathlib.Path.with_suffix() now sanity checks the
+  given suffix.
+- Python issue #19918: Fix PurePath.relative_to() under Windows.
+- Python issue #19921: When Path.mkdir() is called with parents=True, any
+  missing parent is created with the default permissions, ignoring the mode
+  argument (mimicking the POSIX "mkdir -p" command).
+- Python issue #19887: Improve the Path.resolve() algorithm to support
+  certain symlink chains.
+- Make pathlib usable under Python 2.7 with unicode pathnames (only pure
+  ASCII, though).
+- Issue #21: fix TypeError under Python 2.7 when using new division.
+- Add tox support for easier testing.
+
+Version 0.97
+^^^^^^^^^^^^
+
+This version brings ``pathlib`` up to date with the final API specified
+in :pep:`428`.  The changes are too long to list here, it is recommended
+to read the `documentation <https://pathlib.readthedocs.org/>`_.
+
+.. warning::
+   The API in this version is partially incompatible with pathlib 0.8 and
+   earlier.  Be sure to check your code for possible breakage!
+
+Version 0.8
+^^^^^^^^^^^
+
+- Add PurePath.name and PurePath.anchor.
+- Add Path.owner and Path.group.
+- Add Path.replace().
+- Add Path.as_uri().
+- Issue #10: when creating a file with Path.open(), don't set the executable
+  bit.
+- Issue #11: fix comparisons with non-Path objects.
+
+Version 0.7
+^^^^^^^^^^^
+
+- Add '**' (recursive) patterns to Path.glob().
+- Fix openat() support after the API refactoring in Python 3.3 beta1.
+- Add a *target_is_directory* argument to Path.symlink_to()
+
+Version 0.6
+^^^^^^^^^^^
+
+- Add Path.is_file() and Path.is_symlink()
+- Add Path.glob() and Path.rglob()
+- Add PurePath.match()
+
+Version 0.5
+^^^^^^^^^^^
+
+- Add Path.mkdir().
+- Add Python 2.7 compatibility by Michele Lacchia.
+- Make parent() raise ValueError when the level is greater than the path
+  length.
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pathlib2/LICENSE.rst b/tests/wpt/web-platform-tests/tools/third_party/pathlib2/LICENSE.rst
new file mode 100644
index 00000000000..1715d3d7a2c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pathlib2/LICENSE.rst
@@ -0,0 +1,23 @@
+The MIT License (MIT)
+
+Copyright (c) 2014-2017 Matthias C. M. Troffaes
+Copyright (c) 2012-2014 Antoine Pitrou and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pathlib2/MANIFEST.in b/tests/wpt/web-platform-tests/tools/third_party/pathlib2/MANIFEST.in
new file mode 100644
index 00000000000..2f03369dc68
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pathlib2/MANIFEST.in
@@ -0,0 +1,10 @@
+include *.py
+recursive-include pathlib2 *.py
+recursive-include tests *.py
+include *.rst
+include VERSION
+include requirements.txt
+exclude .travis.yml
+exclude appveyor.yml
+exclude codecov.yml
+prune appveyor
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pathlib2/README.rst b/tests/wpt/web-platform-tests/tools/third_party/pathlib2/README.rst
new file mode 100644
index 00000000000..6378f284dd1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pathlib2/README.rst
@@ -0,0 +1,66 @@
+pathlib2
+========
+
+|appveyor| |travis| |codecov|
+
+Fork of pathlib aiming to support the full stdlib Python API.
+
+The `old pathlib <https://bitbucket.org/pitrou/pathlib>`_
+module on bitbucket is in bugfix-only mode.
+The goal of pathlib2 is to provide a backport of
+`standard pathlib <http://docs.python.org/dev/library/pathlib.html>`_
+module which tracks the standard library module,
+so all the newest features of the standard pathlib can be
+used also on older Python versions.
+
+Download
+--------
+
+Standalone releases are available on PyPI:
+http://pypi.python.org/pypi/pathlib2/
+
+Development
+-----------
+
+The main development takes place in the Python standard library: see
+the `Python developer's guide <http://docs.python.org/devguide/>`_.
+In particular, new features should be submitted to the
+`Python bug tracker <http://bugs.python.org/>`_.
+
+Issues that occur in this backport, but that do not occur not in the
+standard Python pathlib module can be submitted on
+the `pathlib2 bug tracker <https://github.com/mcmtroffaes/pathlib2/issues>`_.
+
+Documentation
+-------------
+
+Refer to the
+`standard pathlib <http://docs.python.org/dev/library/pathlib.html>`_
+documentation.
+
+Known Issues
+------------
+
+For historic reasons, pathlib2 still uses bytes to represent file paths internally.
+Unfortunately, on Windows with Python 2.7, the file system encoder (``mcbs``)
+has only poor support for non-ascii characters,
+and can silently replace non-ascii characters without warning.
+For example, ``u'тест'.encode(sys.getfilesystemencoding())`` results in ``????``
+which is obviously completely useless.
+
+Therefore, on Windows with Python 2.7, until this problem is fixed upstream,
+unfortunately you cannot rely on pathlib2 to support the full unicode range for filenames.
+See `issue #56 <https://github.com/mcmtroffaes/pathlib2/issues/56>`_ for more details.
+
+.. |travis| image:: https://travis-ci.org/mcmtroffaes/pathlib2.png?branch=develop
+    :target: https://travis-ci.org/mcmtroffaes/pathlib2
+    :alt: travis-ci
+
+.. |appveyor| image:: https://ci.appveyor.com/api/projects/status/baddx3rpet2wyi2c?svg=true
+    :target: https://ci.appveyor.com/project/mcmtroffaes/pathlib2
+    :alt: appveyor
+
+.. |codecov| image:: https://codecov.io/gh/mcmtroffaes/pathlib2/branch/develop/graph/badge.svg
+    :target: https://codecov.io/gh/mcmtroffaes/pathlib2
+    :alt: codecov
+
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pathlib2/VERSION b/tests/wpt/web-platform-tests/tools/third_party/pathlib2/VERSION
new file mode 100644
index 00000000000..cc6c9a491e0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pathlib2/VERSION
@@ -0,0 +1 @@
+2.3.5
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pathlib2/appveyor.yml b/tests/wpt/web-platform-tests/tools/third_party/pathlib2/appveyor.yml
new file mode 100644
index 00000000000..aae7f25f34f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pathlib2/appveyor.yml
@@ -0,0 +1,30 @@
+environment:
+
+  matrix:
+    - PYTHON: "C:\\Python27"
+
+    - PYTHON: "C:\\Python34"
+
+    - PYTHON: "C:\\Python35"
+
+    - PYTHON: "C:\\Python36"
+
+    - PYTHON: "C:\\Python37"
+
+init:
+  - "%PYTHON%/python --version"
+
+install:
+  - "powershell appveyor\\install.ps1"
+
+build: off
+
+test_script:
+  - cd tests
+  - "%PYTHON%/Scripts/py.test --cov-report=xml --cov=pathlib2 ."
+
+after_test:
+  - ps: |
+      $env:PATH = 'C:\msys64\usr\bin;' + $env:PATH
+      Invoke-WebRequest -Uri 'https://codecov.io/bash' -OutFile codecov.sh
+      bash codecov.sh -f "coverage.xml"
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pathlib2/appveyor/install.ps1 b/tests/wpt/web-platform-tests/tools/third_party/pathlib2/appveyor/install.ps1
new file mode 100644
index 00000000000..ebfbb8db961
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pathlib2/appveyor/install.ps1
@@ -0,0 +1,44 @@
+# Sample script to install Python and pip under Windows
+# Authors: Olivier Grisel and Kyle Kastner
+# License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/
+
+$GET_PIP_URL = "https://bootstrap.pypa.io/get-pip.py"
+$GET_PIP_PATH = "C:\get-pip.py"
+
+
+function InstallPip ($python_home) {
+    $pip_path = $python_home + "/Scripts/pip.exe"
+    $python_path = $python_home + "/python.exe"
+    if (-not(Test-Path $pip_path)) {
+        Write-Host "Installing pip..."
+        $webclient = New-Object System.Net.WebClient
+        $webclient.DownloadFile($GET_PIP_URL, $GET_PIP_PATH)
+        Write-Host "Executing:" $python_path $GET_PIP_PATH
+        Start-Process -FilePath "$python_path" -ArgumentList "$GET_PIP_PATH" -Wait -Passthru
+    } else {
+        Write-Host "Upgrading pip..."
+        & $python_path -m pip install --upgrade pip
+    }
+    Write-Host "Upgrading setuptools..."
+    & $python_path -m pip install --upgrade setuptools
+}
+
+function InstallPackage ($python_home, $pkg) {
+    $pip_path = $python_home + "/Scripts/pip.exe"
+    & $pip_path install $pkg
+}
+
+function InstallRequirements ($python_home, $reqs) {
+    $pip_path = $python_home + "/Scripts/pip.exe"
+    & $pip_path install -r $reqs
+}
+
+function main () {
+    InstallPip $env:PYTHON
+    InstallRequirements $env:PYTHON -r requirements.txt
+    InstallPackage $env:PYTHON pytest-cov
+    InstallPackage $env:PYTHON unittest2
+    InstallPackage $env:PYTHON .
+}
+
+main
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pathlib2/codecov.yml b/tests/wpt/web-platform-tests/tools/third_party/pathlib2/codecov.yml
new file mode 100644
index 00000000000..db2472009c6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pathlib2/codecov.yml
@@ -0,0 +1 @@
+comment: off
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pathlib2/pathlib2/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/pathlib2/pathlib2/__init__.py
new file mode 100644
index 00000000000..d5a47a66c66
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pathlib2/pathlib2/__init__.py
@@ -0,0 +1,1809 @@
+# Copyright (c) 2014-2017 Matthias C. M. Troffaes
+# Copyright (c) 2012-2014 Antoine Pitrou and contributors
+# Distributed under the terms of the MIT License.
+
+import ctypes
+import fnmatch
+import functools
+import io
+import ntpath
+import os
+import posixpath
+import re
+import six
+import sys
+
+from errno import EINVAL, ENOENT, ENOTDIR, EBADF
+from errno import EEXIST, EPERM, EACCES
+from operator import attrgetter
+from stat import (
+    S_ISDIR, S_ISLNK, S_ISREG, S_ISSOCK, S_ISBLK, S_ISCHR, S_ISFIFO)
+
+try:
+    from collections.abc import Sequence
+except ImportError:
+    from collections import Sequence
+
+try:
+    from urllib import quote as urlquote_from_bytes
+except ImportError:
+    from urllib.parse import quote_from_bytes as urlquote_from_bytes
+
+
+try:
+    intern = intern
+except NameError:
+    intern = sys.intern
+
+supports_symlinks = True
+if os.name == 'nt':
+    import nt
+    if sys.getwindowsversion()[:2] >= (6, 0) and sys.version_info >= (3, 2):
+        from nt import _getfinalpathname
+    else:
+        supports_symlinks = False
+        _getfinalpathname = None
+else:
+    nt = None
+
+try:
+    from os import scandir as os_scandir
+except ImportError:
+    from scandir import scandir as os_scandir
+
+__all__ = [
+    "PurePath", "PurePosixPath", "PureWindowsPath",
+    "Path", "PosixPath", "WindowsPath",
+    ]
+
+#
+# Internals
+#
+
+# EBADF - guard agains macOS `stat` throwing EBADF
+_IGNORED_ERROS = (ENOENT, ENOTDIR, EBADF)
+
+_IGNORED_WINERRORS = (
+    21,  # ERROR_NOT_READY - drive exists but is not accessible
+)
+
+
+def _ignore_error(exception):
+    return (getattr(exception, 'errno', None) in _IGNORED_ERROS or
+            getattr(exception, 'winerror', None) in _IGNORED_WINERRORS)
+
+
+def _py2_fsencode(parts):
+    # py2 => minimal unicode support
+    assert six.PY2
+    return [part.encode('ascii') if isinstance(part, six.text_type)
+            else part for part in parts]
+
+
+def _try_except_fileexistserror(try_func, except_func, else_func=None):
+    if sys.version_info >= (3, 3):
+        try:
+            try_func()
+        except FileExistsError as exc:
+            except_func(exc)
+        else:
+            if else_func is not None:
+                else_func()
+    else:
+        try:
+            try_func()
+        except EnvironmentError as exc:
+            if exc.errno != EEXIST:
+                raise
+            else:
+                except_func(exc)
+        else:
+            if else_func is not None:
+                else_func()
+
+
+def _try_except_filenotfounderror(try_func, except_func):
+    if sys.version_info >= (3, 3):
+        try:
+            try_func()
+        except FileNotFoundError as exc:
+            except_func(exc)
+    elif os.name != 'nt':
+        try:
+            try_func()
+        except EnvironmentError as exc:
+            if exc.errno != ENOENT:
+                raise
+            else:
+                except_func(exc)
+    else:
+        try:
+            try_func()
+        except WindowsError as exc:
+            # errno contains winerror
+            # 2 = file not found
+            # 3 = path not found
+            if exc.errno not in (2, 3):
+                raise
+            else:
+                except_func(exc)
+        except EnvironmentError as exc:
+            if exc.errno != ENOENT:
+                raise
+            else:
+                except_func(exc)
+
+
+def _try_except_permissionerror_iter(try_iter, except_iter):
+    if sys.version_info >= (3, 3):
+        try:
+            for x in try_iter():
+                yield x
+        except PermissionError as exc:
+            for x in except_iter(exc):
+                yield x
+    else:
+        try:
+            for x in try_iter():
+                yield x
+        except EnvironmentError as exc:
+            if exc.errno not in (EPERM, EACCES):
+                raise
+            else:
+                for x in except_iter(exc):
+                    yield x
+
+
+def _win32_get_unique_path_id(path):
+    # get file information, needed for samefile on older Python versions
+    # see http://timgolden.me.uk/python/win32_how_do_i/
+    # see_if_two_files_are_the_same_file.html
+    from ctypes import POINTER, Structure, WinError
+    from ctypes.wintypes import DWORD, HANDLE, BOOL
+
+    class FILETIME(Structure):
+        _fields_ = [("datetime_lo", DWORD),
+                    ("datetime_hi", DWORD),
+                    ]
+
+    class BY_HANDLE_FILE_INFORMATION(Structure):
+        _fields_ = [("attributes", DWORD),
+                    ("created_at", FILETIME),
+                    ("accessed_at", FILETIME),
+                    ("written_at", FILETIME),
+                    ("volume", DWORD),
+                    ("file_hi", DWORD),
+                    ("file_lo", DWORD),
+                    ("n_links", DWORD),
+                    ("index_hi", DWORD),
+                    ("index_lo", DWORD),
+                    ]
+
+    CreateFile = ctypes.windll.kernel32.CreateFileW
+    CreateFile.argtypes = [ctypes.c_wchar_p, DWORD, DWORD, ctypes.c_void_p,
+                           DWORD, DWORD, HANDLE]
+    CreateFile.restype = HANDLE
+    GetFileInformationByHandle = (
+        ctypes.windll.kernel32.GetFileInformationByHandle)
+    GetFileInformationByHandle.argtypes = [
+        HANDLE, POINTER(BY_HANDLE_FILE_INFORMATION)]
+    GetFileInformationByHandle.restype = BOOL
+    CloseHandle = ctypes.windll.kernel32.CloseHandle
+    CloseHandle.argtypes = [HANDLE]
+    CloseHandle.restype = BOOL
+    GENERIC_READ = 0x80000000
+    FILE_SHARE_READ = 0x00000001
+    FILE_FLAG_BACKUP_SEMANTICS = 0x02000000
+    OPEN_EXISTING = 3
+    if os.path.isdir(path):
+        flags = FILE_FLAG_BACKUP_SEMANTICS
+    else:
+        flags = 0
+    hfile = CreateFile(path, GENERIC_READ, FILE_SHARE_READ,
+                       None, OPEN_EXISTING, flags, None)
+    if hfile == 0xffffffff:
+        if sys.version_info >= (3, 3):
+            raise FileNotFoundError(path)
+        else:
+            exc = OSError("file not found: path")
+            exc.errno = ENOENT
+            raise exc
+    info = BY_HANDLE_FILE_INFORMATION()
+    success = GetFileInformationByHandle(hfile, info)
+    CloseHandle(hfile)
+    if success == 0:
+        raise WinError()
+    return info.volume, info.index_hi, info.index_lo
+
+
+def _is_wildcard_pattern(pat):
+    # Whether this pattern needs actual matching using fnmatch, or can
+    # be looked up directly as a file.
+    return "*" in pat or "?" in pat or "[" in pat
+
+
+class _Flavour(object):
+
+    """A flavour implements a particular (platform-specific) set of path
+    semantics."""
+
+    def __init__(self):
+        self.join = self.sep.join
+
+    def parse_parts(self, parts):
+        if six.PY2:
+            parts = _py2_fsencode(parts)
+        parsed = []
+        sep = self.sep
+        altsep = self.altsep
+        drv = root = ''
+        it = reversed(parts)
+        for part in it:
+            if not part:
+                continue
+            if altsep:
+                part = part.replace(altsep, sep)
+            drv, root, rel = self.splitroot(part)
+            if sep in rel:
+                for x in reversed(rel.split(sep)):
+                    if x and x != '.':
+                        parsed.append(intern(x))
+            else:
+                if rel and rel != '.':
+                    parsed.append(intern(rel))
+            if drv or root:
+                if not drv:
+                    # If no drive is present, try to find one in the previous
+                    # parts. This makes the result of parsing e.g.
+                    # ("C:", "/", "a") reasonably intuitive.
+                    for part in it:
+                        if not part:
+                            continue
+                        if altsep:
+                            part = part.replace(altsep, sep)
+                        drv = self.splitroot(part)[0]
+                        if drv:
+                            break
+                break
+        if drv or root:
+            parsed.append(drv + root)
+        parsed.reverse()
+        return drv, root, parsed
+
+    def join_parsed_parts(self, drv, root, parts, drv2, root2, parts2):
+        """
+        Join the two paths represented by the respective
+        (drive, root, parts) tuples.  Return a new (drive, root, parts) tuple.
+        """
+        if root2:
+            if not drv2 and drv:
+                return drv, root2, [drv + root2] + parts2[1:]
+        elif drv2:
+            if drv2 == drv or self.casefold(drv2) == self.casefold(drv):
+                # Same drive => second path is relative to the first
+                return drv, root, parts + parts2[1:]
+        else:
+            # Second path is non-anchored (common case)
+            return drv, root, parts + parts2
+        return drv2, root2, parts2
+
+
+class _WindowsFlavour(_Flavour):
+    # Reference for Windows paths can be found at
+    # http://msdn.microsoft.com/en-us/library/aa365247%28v=vs.85%29.aspx
+
+    sep = '\\'
+    altsep = '/'
+    has_drv = True
+    pathmod = ntpath
+
+    is_supported = (os.name == 'nt')
+
+    drive_letters = set('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
+    ext_namespace_prefix = '\\\\?\\'
+
+    reserved_names = (
+        set(['CON', 'PRN', 'AUX', 'NUL']) |
+        set(['COM%d' % i for i in range(1, 10)]) |
+        set(['LPT%d' % i for i in range(1, 10)])
+        )
+
+    # Interesting findings about extended paths:
+    # - '\\?\c:\a', '//?/c:\a' and '//?/c:/a' are all supported
+    #   but '\\?\c:/a' is not
+    # - extended paths are always absolute; "relative" extended paths will
+    #   fail.
+
+    def splitroot(self, part, sep=sep):
+        first = part[0:1]
+        second = part[1:2]
+        if (second == sep and first == sep):
+            # XXX extended paths should also disable the collapsing of "."
+            # components (according to MSDN docs).
+            prefix, part = self._split_extended_path(part)
+            first = part[0:1]
+            second = part[1:2]
+        else:
+            prefix = ''
+        third = part[2:3]
+        if (second == sep and first == sep and third != sep):
+            # is a UNC path:
+            # vvvvvvvvvvvvvvvvvvvvv root
+            # \\machine\mountpoint\directory\etc\...
+            #            directory ^^^^^^^^^^^^^^
+            index = part.find(sep, 2)
+            if index != -1:
+                index2 = part.find(sep, index + 1)
+                # a UNC path can't have two slashes in a row
+                # (after the initial two)
+                if index2 != index + 1:
+                    if index2 == -1:
+                        index2 = len(part)
+                    if prefix:
+                        return prefix + part[1:index2], sep, part[index2 + 1:]
+                    else:
+                        return part[:index2], sep, part[index2 + 1:]
+        drv = root = ''
+        if second == ':' and first in self.drive_letters:
+            drv = part[:2]
+            part = part[2:]
+            first = third
+        if first == sep:
+            root = first
+            part = part.lstrip(sep)
+        return prefix + drv, root, part
+
+    def casefold(self, s):
+        return s.lower()
+
+    def casefold_parts(self, parts):
+        return [p.lower() for p in parts]
+
+    def resolve(self, path, strict=False):
+        s = str(path)
+        if not s:
+            return os.getcwd()
+        previous_s = None
+        if _getfinalpathname is not None:
+            if strict:
+                return self._ext_to_normal(_getfinalpathname(s))
+            else:
+                # End of the path after the first one not found
+                tail_parts = []
+
+                def _try_func():
+                    result[0] = self._ext_to_normal(_getfinalpathname(s))
+                    # if there was no exception, set flag to 0
+                    result[1] = 0
+
+                def _exc_func(exc):
+                    pass
+
+                while True:
+                    result = [None, 1]
+                    _try_except_filenotfounderror(_try_func, _exc_func)
+                    if result[1] == 1:  # file not found exception raised
+                        previous_s = s
+                        s, tail = os.path.split(s)
+                        tail_parts.append(tail)
+                        if previous_s == s:
+                            return path
+                    else:
+                        s = result[0]
+                        return os.path.join(s, *reversed(tail_parts))
+        # Means fallback on absolute
+        return None
+
+    def _split_extended_path(self, s, ext_prefix=ext_namespace_prefix):
+        prefix = ''
+        if s.startswith(ext_prefix):
+            prefix = s[:4]
+            s = s[4:]
+            if s.startswith('UNC\\'):
+                prefix += s[:3]
+                s = '\\' + s[3:]
+        return prefix, s
+
+    def _ext_to_normal(self, s):
+        # Turn back an extended path into a normal DOS-like path
+        return self._split_extended_path(s)[1]
+
+    def is_reserved(self, parts):
+        # NOTE: the rules for reserved names seem somewhat complicated
+        # (e.g. r"..\NUL" is reserved but not r"foo\NUL").
+        # We err on the side of caution and return True for paths which are
+        # not considered reserved by Windows.
+        if not parts:
+            return False
+        if parts[0].startswith('\\\\'):
+            # UNC paths are never reserved
+            return False
+        return parts[-1].partition('.')[0].upper() in self.reserved_names
+
+    def make_uri(self, path):
+        # Under Windows, file URIs use the UTF-8 encoding.
+        drive = path.drive
+        if len(drive) == 2 and drive[1] == ':':
+            # It's a path on a local drive => 'file:///c:/a/b'
+            rest = path.as_posix()[2:].lstrip('/')
+            return 'file:///%s/%s' % (
+                drive, urlquote_from_bytes(rest.encode('utf-8')))
+        else:
+            # It's a path on a network drive => 'file://host/share/a/b'
+            return 'file:' + urlquote_from_bytes(
+                path.as_posix().encode('utf-8'))
+
+    def gethomedir(self, username):
+        if 'HOME' in os.environ:
+            userhome = os.environ['HOME']
+        elif 'USERPROFILE' in os.environ:
+            userhome = os.environ['USERPROFILE']
+        elif 'HOMEPATH' in os.environ:
+            try:
+                drv = os.environ['HOMEDRIVE']
+            except KeyError:
+                drv = ''
+            userhome = drv + os.environ['HOMEPATH']
+        else:
+            raise RuntimeError("Can't determine home directory")
+
+        if username:
+            # Try to guess user home directory.  By default all users
+            # directories are located in the same place and are named by
+            # corresponding usernames.  If current user home directory points
+            # to nonstandard place, this guess is likely wrong.
+            if os.environ['USERNAME'] != username:
+                drv, root, parts = self.parse_parts((userhome,))
+                if parts[-1] != os.environ['USERNAME']:
+                    raise RuntimeError("Can't determine home directory "
+                                       "for %r" % username)
+                parts[-1] = username
+                if drv or root:
+                    userhome = drv + root + self.join(parts[1:])
+                else:
+                    userhome = self.join(parts)
+        return userhome
+
+
+class _PosixFlavour(_Flavour):
+    sep = '/'
+    altsep = ''
+    has_drv = False
+    pathmod = posixpath
+
+    is_supported = (os.name != 'nt')
+
+    def splitroot(self, part, sep=sep):
+        if part and part[0] == sep:
+            stripped_part = part.lstrip(sep)
+            # According to POSIX path resolution:
+            # http://pubs.opengroup.org/onlinepubs/009695399/basedefs/
+            # xbd_chap04.html#tag_04_11
+            # "A pathname that begins with two successive slashes may be
+            # interpreted in an implementation-defined manner, although more
+            # than two leading slashes shall be treated as a single slash".
+            if len(part) - len(stripped_part) == 2:
+                return '', sep * 2, stripped_part
+            else:
+                return '', sep, stripped_part
+        else:
+            return '', '', part
+
+    def casefold(self, s):
+        return s
+
+    def casefold_parts(self, parts):
+        return parts
+
+    def resolve(self, path, strict=False):
+        sep = self.sep
+        accessor = path._accessor
+        seen = {}
+
+        def _resolve(path, rest):
+            if rest.startswith(sep):
+                path = ''
+
+            for name in rest.split(sep):
+                if not name or name == '.':
+                    # current dir
+                    continue
+                if name == '..':
+                    # parent dir
+                    path, _, _ = path.rpartition(sep)
+                    continue
+                newpath = path + sep + name
+                if newpath in seen:
+                    # Already seen this path
+                    path = seen[newpath]
+                    if path is not None:
+                        # use cached value
+                        continue
+                    # The symlink is not resolved, so we must have a symlink
+                    # loop.
+                    raise RuntimeError("Symlink loop from %r" % newpath)
+                # Resolve the symbolic link
+                try:
+                    target = accessor.readlink(newpath)
+                except OSError as e:
+                    if e.errno != EINVAL and strict:
+                        raise
+                    # Not a symlink, or non-strict mode. We just leave the path
+                    # untouched.
+                    path = newpath
+                else:
+                    seen[newpath] = None  # not resolved symlink
+                    path = _resolve(path, target)
+                    seen[newpath] = path  # resolved symlink
+
+            return path
+        # NOTE: according to POSIX, getcwd() cannot contain path components
+        # which are symlinks.
+        base = '' if path.is_absolute() else os.getcwd()
+        return _resolve(base, str(path)) or sep
+
+    def is_reserved(self, parts):
+        return False
+
+    def make_uri(self, path):
+        # We represent the path using the local filesystem encoding,
+        # for portability to other applications.
+        bpath = bytes(path)
+        return 'file://' + urlquote_from_bytes(bpath)
+
+    def gethomedir(self, username):
+        if not username:
+            try:
+                return os.environ['HOME']
+            except KeyError:
+                import pwd
+                return pwd.getpwuid(os.getuid()).pw_dir
+        else:
+            import pwd
+            try:
+                return pwd.getpwnam(username).pw_dir
+            except KeyError:
+                raise RuntimeError("Can't determine home directory "
+                                   "for %r" % username)
+
+
+_windows_flavour = _WindowsFlavour()
+_posix_flavour = _PosixFlavour()
+
+
+class _Accessor:
+
+    """An accessor implements a particular (system-specific or not) way of
+    accessing paths on the filesystem."""
+
+
+class _NormalAccessor(_Accessor):
+
+    def _wrap_strfunc(strfunc):
+        @functools.wraps(strfunc)
+        def wrapped(pathobj, *args):
+            return strfunc(str(pathobj), *args)
+        return staticmethod(wrapped)
+
+    def _wrap_binary_strfunc(strfunc):
+        @functools.wraps(strfunc)
+        def wrapped(pathobjA, pathobjB, *args):
+            return strfunc(str(pathobjA), str(pathobjB), *args)
+        return staticmethod(wrapped)
+
+    stat = _wrap_strfunc(os.stat)
+
+    lstat = _wrap_strfunc(os.lstat)
+
+    open = _wrap_strfunc(os.open)
+
+    listdir = _wrap_strfunc(os.listdir)
+
+    scandir = _wrap_strfunc(os_scandir)
+
+    chmod = _wrap_strfunc(os.chmod)
+
+    if hasattr(os, "lchmod"):
+        lchmod = _wrap_strfunc(os.lchmod)
+    else:
+        def lchmod(self, pathobj, mode):
+            raise NotImplementedError("lchmod() not available on this system")
+
+    mkdir = _wrap_strfunc(os.mkdir)
+
+    unlink = _wrap_strfunc(os.unlink)
+
+    rmdir = _wrap_strfunc(os.rmdir)
+
+    rename = _wrap_binary_strfunc(os.rename)
+
+    if sys.version_info >= (3, 3):
+        replace = _wrap_binary_strfunc(os.replace)
+
+    if nt:
+        if supports_symlinks:
+            symlink = _wrap_binary_strfunc(os.symlink)
+        else:
+            def symlink(a, b, target_is_directory):
+                raise NotImplementedError(
+                    "symlink() not available on this system")
+    else:
+        # Under POSIX, os.symlink() takes two args
+        @staticmethod
+        def symlink(a, b, target_is_directory):
+            return os.symlink(str(a), str(b))
+
+    utime = _wrap_strfunc(os.utime)
+
+    # Helper for resolve()
+    def readlink(self, path):
+        return os.readlink(path)
+
+
+_normal_accessor = _NormalAccessor()
+
+
+#
+# Globbing helpers
+#
+
+def _make_selector(pattern_parts):
+    pat = pattern_parts[0]
+    child_parts = pattern_parts[1:]
+    if pat == '**':
+        cls = _RecursiveWildcardSelector
+    elif '**' in pat:
+        raise ValueError(
+            "Invalid pattern: '**' can only be an entire path component")
+    elif _is_wildcard_pattern(pat):
+        cls = _WildcardSelector
+    else:
+        cls = _PreciseSelector
+    return cls(pat, child_parts)
+
+
+if hasattr(functools, "lru_cache"):
+    _make_selector = functools.lru_cache()(_make_selector)
+
+
+class _Selector:
+
+    """A selector matches a specific glob pattern part against the children
+    of a given path."""
+
+    def __init__(self, child_parts):
+        self.child_parts = child_parts
+        if child_parts:
+            self.successor = _make_selector(child_parts)
+            self.dironly = True
+        else:
+            self.successor = _TerminatingSelector()
+            self.dironly = False
+
+    def select_from(self, parent_path):
+        """Iterate over all child paths of `parent_path` matched by this
+        selector.  This can contain parent_path itself."""
+        path_cls = type(parent_path)
+        is_dir = path_cls.is_dir
+        exists = path_cls.exists
+        scandir = parent_path._accessor.scandir
+        if not is_dir(parent_path):
+            return iter([])
+        return self._select_from(parent_path, is_dir, exists, scandir)
+
+
+class _TerminatingSelector:
+
+    def _select_from(self, parent_path, is_dir, exists, scandir):
+        yield parent_path
+
+
+class _PreciseSelector(_Selector):
+
+    def __init__(self, name, child_parts):
+        self.name = name
+        _Selector.__init__(self, child_parts)
+
+    def _select_from(self, parent_path, is_dir, exists, scandir):
+        def try_iter():
+            path = parent_path._make_child_relpath(self.name)
+            if (is_dir if self.dironly else exists)(path):
+                for p in self.successor._select_from(
+                        path, is_dir, exists, scandir):
+                    yield p
+
+        def except_iter(exc):
+            return
+            yield
+
+        for x in _try_except_permissionerror_iter(try_iter, except_iter):
+            yield x
+
+
+class _WildcardSelector(_Selector):
+
+    def __init__(self, pat, child_parts):
+        self.pat = re.compile(fnmatch.translate(pat))
+        _Selector.__init__(self, child_parts)
+
+    def _select_from(self, parent_path, is_dir, exists, scandir):
+        def try_iter():
+            cf = parent_path._flavour.casefold
+            entries = list(scandir(parent_path))
+            for entry in entries:
+                if not self.dironly or entry.is_dir():
+                    name = entry.name
+                    casefolded = cf(name)
+                    if self.pat.match(casefolded):
+                        path = parent_path._make_child_relpath(name)
+                        for p in self.successor._select_from(
+                                path, is_dir, exists, scandir):
+                            yield p
+
+        def except_iter(exc):
+            return
+            yield
+
+        for x in _try_except_permissionerror_iter(try_iter, except_iter):
+            yield x
+
+
+class _RecursiveWildcardSelector(_Selector):
+
+    def __init__(self, pat, child_parts):
+        _Selector.__init__(self, child_parts)
+
+    def _iterate_directories(self, parent_path, is_dir, scandir):
+        yield parent_path
+
+        def try_iter():
+            entries = list(scandir(parent_path))
+            for entry in entries:
+                entry_is_dir = False
+                try:
+                    entry_is_dir = entry.is_dir()
+                except OSError as e:
+                    if not _ignore_error(e):
+                        raise
+                if entry_is_dir and not entry.is_symlink():
+                    path = parent_path._make_child_relpath(entry.name)
+                    for p in self._iterate_directories(path, is_dir, scandir):
+                        yield p
+
+        def except_iter(exc):
+            return
+            yield
+
+        for x in _try_except_permissionerror_iter(try_iter, except_iter):
+            yield x
+
+    def _select_from(self, parent_path, is_dir, exists, scandir):
+        def try_iter():
+            yielded = set()
+            try:
+                successor_select = self.successor._select_from
+                for starting_point in self._iterate_directories(
+                        parent_path, is_dir, scandir):
+                    for p in successor_select(
+                            starting_point, is_dir, exists, scandir):
+                        if p not in yielded:
+                            yield p
+                            yielded.add(p)
+            finally:
+                yielded.clear()
+
+        def except_iter(exc):
+            return
+            yield
+
+        for x in _try_except_permissionerror_iter(try_iter, except_iter):
+            yield x
+
+
+#
+# Public API
+#
+
+class _PathParents(Sequence):
+
+    """This object provides sequence-like access to the logical ancestors
+    of a path.  Don't try to construct it yourself."""
+    __slots__ = ('_pathcls', '_drv', '_root', '_parts')
+
+    def __init__(self, path):
+        # We don't store the instance to avoid reference cycles
+        self._pathcls = type(path)
+        self._drv = path._drv
+        self._root = path._root
+        self._parts = path._parts
+
+    def __len__(self):
+        if self._drv or self._root:
+            return len(self._parts) - 1
+        else:
+            return len(self._parts)
+
+    def __getitem__(self, idx):
+        if idx < 0 or idx >= len(self):
+            raise IndexError(idx)
+        return self._pathcls._from_parsed_parts(self._drv, self._root,
+                                                self._parts[:-idx - 1])
+
+    def __repr__(self):
+        return "<{0}.parents>".format(self._pathcls.__name__)
+
+
+class PurePath(object):
+
+    """PurePath represents a filesystem path and offers operations which
+    don't imply any actual filesystem I/O.  Depending on your system,
+    instantiating a PurePath will return either a PurePosixPath or a
+    PureWindowsPath object.  You can also instantiate either of these classes
+    directly, regardless of your system.
+    """
+    __slots__ = (
+        '_drv', '_root', '_parts',
+        '_str', '_hash', '_pparts', '_cached_cparts',
+    )
+
+    def __new__(cls, *args):
+        """Construct a PurePath from one or several strings and or existing
+        PurePath objects.  The strings and path objects are combined so as
+        to yield a canonicalized path, which is incorporated into the
+        new PurePath object.
+        """
+        if cls is PurePath:
+            cls = PureWindowsPath if os.name == 'nt' else PurePosixPath
+        return cls._from_parts(args)
+
+    def __reduce__(self):
+        # Using the parts tuple helps share interned path parts
+        # when pickling related paths.
+        return (self.__class__, tuple(self._parts))
+
+    @classmethod
+    def _parse_args(cls, args):
+        # This is useful when you don't want to create an instance, just
+        # canonicalize some constructor arguments.
+        parts = []
+        for a in args:
+            if isinstance(a, PurePath):
+                parts += a._parts
+            else:
+                if sys.version_info >= (3, 6):
+                    a = os.fspath(a)
+                else:
+                    # duck typing for older Python versions
+                    if hasattr(a, "__fspath__"):
+                        a = a.__fspath__()
+                if isinstance(a, str):
+                    # Force-cast str subclasses to str (issue #21127)
+                    parts.append(str(a))
+                # also handle unicode for PY2 (six.text_type = unicode)
+                elif six.PY2 and isinstance(a, six.text_type):
+                    # cast to str using filesystem encoding
+                    # note: in rare circumstances, on Python < 3.2,
+                    # getfilesystemencoding can return None, in that
+                    # case fall back to ascii
+                    parts.append(a.encode(
+                        sys.getfilesystemencoding() or "ascii"))
+                else:
+                    raise TypeError(
+                        "argument should be a str object or an os.PathLike "
+                        "object returning str, not %r"
+                        % type(a))
+        return cls._flavour.parse_parts(parts)
+
+    @classmethod
+    def _from_parts(cls, args, init=True):
+        # We need to call _parse_args on the instance, so as to get the
+        # right flavour.
+        self = object.__new__(cls)
+        drv, root, parts = self._parse_args(args)
+        self._drv = drv
+        self._root = root
+        self._parts = parts
+        if init:
+            self._init()
+        return self
+
+    @classmethod
+    def _from_parsed_parts(cls, drv, root, parts, init=True):
+        self = object.__new__(cls)
+        self._drv = drv
+        self._root = root
+        self._parts = parts
+        if init:
+            self._init()
+        return self
+
+    @classmethod
+    def _format_parsed_parts(cls, drv, root, parts):
+        if drv or root:
+            return drv + root + cls._flavour.join(parts[1:])
+        else:
+            return cls._flavour.join(parts)
+
+    def _init(self):
+        # Overridden in concrete Path
+        pass
+
+    def _make_child(self, args):
+        drv, root, parts = self._parse_args(args)
+        drv, root, parts = self._flavour.join_parsed_parts(
+            self._drv, self._root, self._parts, drv, root, parts)
+        return self._from_parsed_parts(drv, root, parts)
+
+    def __str__(self):
+        """Return the string representation of the path, suitable for
+        passing to system calls."""
+        try:
+            return self._str
+        except AttributeError:
+            self._str = self._format_parsed_parts(self._drv, self._root,
+                                                  self._parts) or '.'
+            return self._str
+
+    def __fspath__(self):
+        return str(self)
+
+    def as_posix(self):
+        """Return the string representation of the path with forward (/)
+        slashes."""
+        f = self._flavour
+        return str(self).replace(f.sep, '/')
+
+    def __bytes__(self):
+        """Return the bytes representation of the path.  This is only
+        recommended to use under Unix."""
+        if sys.version_info < (3, 2):
+            raise NotImplementedError("needs Python 3.2 or later")
+        return os.fsencode(str(self))
+
+    def __repr__(self):
+        return "{0}({1!r})".format(self.__class__.__name__, self.as_posix())
+
+    def as_uri(self):
+        """Return the path as a 'file' URI."""
+        if not self.is_absolute():
+            raise ValueError("relative path can't be expressed as a file URI")
+        return self._flavour.make_uri(self)
+
+    @property
+    def _cparts(self):
+        # Cached casefolded parts, for hashing and comparison
+        try:
+            return self._cached_cparts
+        except AttributeError:
+            self._cached_cparts = self._flavour.casefold_parts(self._parts)
+            return self._cached_cparts
+
+    def __eq__(self, other):
+        if not isinstance(other, PurePath):
+            return NotImplemented
+        return (
+            self._cparts == other._cparts
+            and self._flavour is other._flavour)
+
+    def __ne__(self, other):
+        return not self == other
+
+    def __hash__(self):
+        try:
+            return self._hash
+        except AttributeError:
+            self._hash = hash(tuple(self._cparts))
+            return self._hash
+
+    def __lt__(self, other):
+        if (not isinstance(other, PurePath)
+                or self._flavour is not other._flavour):
+            return NotImplemented
+        return self._cparts < other._cparts
+
+    def __le__(self, other):
+        if (not isinstance(other, PurePath)
+                or self._flavour is not other._flavour):
+            return NotImplemented
+        return self._cparts <= other._cparts
+
+    def __gt__(self, other):
+        if (not isinstance(other, PurePath)
+                or self._flavour is not other._flavour):
+            return NotImplemented
+        return self._cparts > other._cparts
+
+    def __ge__(self, other):
+        if (not isinstance(other, PurePath)
+                or self._flavour is not other._flavour):
+            return NotImplemented
+        return self._cparts >= other._cparts
+
+    drive = property(attrgetter('_drv'),
+                     doc="""The drive prefix (letter or UNC path), if any.""")
+
+    root = property(attrgetter('_root'),
+                    doc="""The root of the path, if any.""")
+
+    @property
+    def anchor(self):
+        """The concatenation of the drive and root, or ''."""
+        anchor = self._drv + self._root
+        return anchor
+
+    @property
+    def name(self):
+        """The final path component, if any."""
+        parts = self._parts
+        if len(parts) == (1 if (self._drv or self._root) else 0):
+            return ''
+        return parts[-1]
+
+    @property
+    def suffix(self):
+        """The final component's last suffix, if any."""
+        name = self.name
+        i = name.rfind('.')
+        if 0 < i < len(name) - 1:
+            return name[i:]
+        else:
+            return ''
+
+    @property
+    def suffixes(self):
+        """A list of the final component's suffixes, if any."""
+        name = self.name
+        if name.endswith('.'):
+            return []
+        name = name.lstrip('.')
+        return ['.' + suffix for suffix in name.split('.')[1:]]
+
+    @property
+    def stem(self):
+        """The final path component, minus its last suffix."""
+        name = self.name
+        i = name.rfind('.')
+        if 0 < i < len(name) - 1:
+            return name[:i]
+        else:
+            return name
+
+    def with_name(self, name):
+        """Return a new path with the file name changed."""
+        if not self.name:
+            raise ValueError("%r has an empty name" % (self,))
+        drv, root, parts = self._flavour.parse_parts((name,))
+        if (not name or name[-1] in [self._flavour.sep, self._flavour.altsep]
+                or drv or root or len(parts) != 1):
+            raise ValueError("Invalid name %r" % (name))
+        return self._from_parsed_parts(self._drv, self._root,
+                                       self._parts[:-1] + [name])
+
+    def with_suffix(self, suffix):
+        """Return a new path with the file suffix changed.  If the path
+        has no suffix, add given suffix.  If the given suffix is an empty
+        string, remove the suffix from the path.
+        """
+        # XXX if suffix is None, should the current suffix be removed?
+        f = self._flavour
+        if f.sep in suffix or f.altsep and f.altsep in suffix:
+            raise ValueError("Invalid suffix %r" % (suffix))
+        if suffix and not suffix.startswith('.') or suffix == '.':
+            raise ValueError("Invalid suffix %r" % (suffix))
+        name = self.name
+        if not name:
+            raise ValueError("%r has an empty name" % (self,))
+        old_suffix = self.suffix
+        if not old_suffix:
+            name = name + suffix
+        else:
+            name = name[:-len(old_suffix)] + suffix
+        return self._from_parsed_parts(self._drv, self._root,
+                                       self._parts[:-1] + [name])
+
+    def relative_to(self, *other):
+        """Return the relative path to another path identified by the passed
+        arguments.  If the operation is not possible (because this is not
+        a subpath of the other path), raise ValueError.
+        """
+        # For the purpose of this method, drive and root are considered
+        # separate parts, i.e.:
+        #   Path('c:/').relative_to('c:')  gives Path('/')
+        #   Path('c:/').relative_to('/')   raise ValueError
+        if not other:
+            raise TypeError("need at least one argument")
+        parts = self._parts
+        drv = self._drv
+        root = self._root
+        if root:
+            abs_parts = [drv, root] + parts[1:]
+        else:
+            abs_parts = parts
+        to_drv, to_root, to_parts = self._parse_args(other)
+        if to_root:
+            to_abs_parts = [to_drv, to_root] + to_parts[1:]
+        else:
+            to_abs_parts = to_parts
+        n = len(to_abs_parts)
+        cf = self._flavour.casefold_parts
+        if (root or drv) if n == 0 else cf(abs_parts[:n]) != cf(to_abs_parts):
+            formatted = self._format_parsed_parts(to_drv, to_root, to_parts)
+            raise ValueError("{0!r} does not start with {1!r}"
+                             .format(str(self), str(formatted)))
+        return self._from_parsed_parts('', root if n == 1 else '',
+                                       abs_parts[n:])
+
+    @property
+    def parts(self):
+        """An object providing sequence-like access to the
+        components in the filesystem path."""
+        # We cache the tuple to avoid building a new one each time .parts
+        # is accessed.  XXX is this necessary?
+        try:
+            return self._pparts
+        except AttributeError:
+            self._pparts = tuple(self._parts)
+            return self._pparts
+
+    def joinpath(self, *args):
+        """Combine this path with one or several arguments, and return a
+        new path representing either a subpath (if all arguments are relative
+        paths) or a totally different path (if one of the arguments is
+        anchored).
+        """
+        return self._make_child(args)
+
+    def __truediv__(self, key):
+        return self._make_child((key,))
+
+    def __rtruediv__(self, key):
+        return self._from_parts([key] + self._parts)
+
+    if six.PY2:
+        __div__ = __truediv__
+        __rdiv__ = __rtruediv__
+
+    @property
+    def parent(self):
+        """The logical parent of the path."""
+        drv = self._drv
+        root = self._root
+        parts = self._parts
+        if len(parts) == 1 and (drv or root):
+            return self
+        return self._from_parsed_parts(drv, root, parts[:-1])
+
+    @property
+    def parents(self):
+        """A sequence of this path's logical parents."""
+        return _PathParents(self)
+
+    def is_absolute(self):
+        """True if the path is absolute (has both a root and, if applicable,
+        a drive)."""
+        if not self._root:
+            return False
+        return not self._flavour.has_drv or bool(self._drv)
+
+    def is_reserved(self):
+        """Return True if the path contains one of the special names reserved
+        by the system, if any."""
+        return self._flavour.is_reserved(self._parts)
+
+    def match(self, path_pattern):
+        """
+        Return True if this path matches the given pattern.
+        """
+        cf = self._flavour.casefold
+        path_pattern = cf(path_pattern)
+        drv, root, pat_parts = self._flavour.parse_parts((path_pattern,))
+        if not pat_parts:
+            raise ValueError("empty pattern")
+        if drv and drv != cf(self._drv):
+            return False
+        if root and root != cf(self._root):
+            return False
+        parts = self._cparts
+        if drv or root:
+            if len(pat_parts) != len(parts):
+                return False
+            pat_parts = pat_parts[1:]
+        elif len(pat_parts) > len(parts):
+            return False
+        for part, pat in zip(reversed(parts), reversed(pat_parts)):
+            if not fnmatch.fnmatchcase(part, pat):
+                return False
+        return True
+
+
+# Can't subclass os.PathLike from PurePath and keep the constructor
+# optimizations in PurePath._parse_args().
+if sys.version_info >= (3, 6):
+    os.PathLike.register(PurePath)
+
+
+class PurePosixPath(PurePath):
+    _flavour = _posix_flavour
+    __slots__ = ()
+
+
+class PureWindowsPath(PurePath):
+    """PurePath subclass for Windows systems.
+
+    On a Windows system, instantiating a PurePath should return this object.
+    However, you can also instantiate it directly on any system.
+    """
+    _flavour = _windows_flavour
+    __slots__ = ()
+
+
+# Filesystem-accessing classes
+
+
+class Path(PurePath):
+    """PurePath subclass that can make system calls.
+
+    Path represents a filesystem path but unlike PurePath, also offers
+    methods to do system calls on path objects. Depending on your system,
+    instantiating a Path will return either a PosixPath or a WindowsPath
+    object. You can also instantiate a PosixPath or WindowsPath directly,
+    but cannot instantiate a WindowsPath on a POSIX system or vice versa.
+    """
+    __slots__ = (
+        '_accessor',
+        '_closed',
+    )
+
+    def __new__(cls, *args, **kwargs):
+        if cls is Path:
+            cls = WindowsPath if os.name == 'nt' else PosixPath
+        self = cls._from_parts(args, init=False)
+        if not self._flavour.is_supported:
+            raise NotImplementedError("cannot instantiate %r on your system"
+                                      % (cls.__name__,))
+        self._init()
+        return self
+
+    def _init(self,
+              # Private non-constructor arguments
+              template=None,
+              ):
+        self._closed = False
+        if template is not None:
+            self._accessor = template._accessor
+        else:
+            self._accessor = _normal_accessor
+
+    def _make_child_relpath(self, part):
+        # This is an optimization used for dir walking.  `part` must be
+        # a single part relative to this path.
+        parts = self._parts + [part]
+        return self._from_parsed_parts(self._drv, self._root, parts)
+
+    def __enter__(self):
+        if self._closed:
+            self._raise_closed()
+        return self
+
+    def __exit__(self, t, v, tb):
+        self._closed = True
+
+    def _raise_closed(self):
+        raise ValueError("I/O operation on closed path")
+
+    def _opener(self, name, flags, mode=0o666):
+        # A stub for the opener argument to built-in open()
+        return self._accessor.open(self, flags, mode)
+
+    def _raw_open(self, flags, mode=0o777):
+        """
+        Open the file pointed by this path and return a file descriptor,
+        as os.open() does.
+        """
+        if self._closed:
+            self._raise_closed()
+        return self._accessor.open(self, flags, mode)
+
+    # Public API
+
+    @classmethod
+    def cwd(cls):
+        """Return a new path pointing to the current working directory
+        (as returned by os.getcwd()).
+        """
+        return cls(os.getcwd())
+
+    @classmethod
+    def home(cls):
+        """Return a new path pointing to the user's home directory (as
+        returned by os.path.expanduser('~')).
+        """
+        return cls(cls()._flavour.gethomedir(None))
+
+    def samefile(self, other_path):
+        """Return whether other_path is the same or not as this file
+        (as returned by os.path.samefile()).
+        """
+        if hasattr(os.path, "samestat"):
+            st = self.stat()
+            try:
+                other_st = other_path.stat()
+            except AttributeError:
+                other_st = os.stat(other_path)
+            return os.path.samestat(st, other_st)
+        else:
+            filename1 = six.text_type(self)
+            filename2 = six.text_type(other_path)
+            st1 = _win32_get_unique_path_id(filename1)
+            st2 = _win32_get_unique_path_id(filename2)
+            return st1 == st2
+
+    def iterdir(self):
+        """Iterate over the files in this directory.  Does not yield any
+        result for the special paths '.' and '..'.
+        """
+        if self._closed:
+            self._raise_closed()
+        for name in self._accessor.listdir(self):
+            if name in ('.', '..'):
+                # Yielding a path object for these makes little sense
+                continue
+            yield self._make_child_relpath(name)
+            if self._closed:
+                self._raise_closed()
+
+    def glob(self, pattern):
+        """Iterate over this subtree and yield all existing files (of any
+        kind, including directories) matching the given relative pattern.
+        """
+        if not pattern:
+            raise ValueError("Unacceptable pattern: {0!r}".format(pattern))
+        pattern = self._flavour.casefold(pattern)
+        drv, root, pattern_parts = self._flavour.parse_parts((pattern,))
+        if drv or root:
+            raise NotImplementedError("Non-relative patterns are unsupported")
+        selector = _make_selector(tuple(pattern_parts))
+        for p in selector.select_from(self):
+            yield p
+
+    def rglob(self, pattern):
+        """Recursively yield all existing files (of any kind, including
+        directories) matching the given relative pattern, anywhere in
+        this subtree.
+        """
+        pattern = self._flavour.casefold(pattern)
+        drv, root, pattern_parts = self._flavour.parse_parts((pattern,))
+        if drv or root:
+            raise NotImplementedError("Non-relative patterns are unsupported")
+        selector = _make_selector(("**",) + tuple(pattern_parts))
+        for p in selector.select_from(self):
+            yield p
+
+    def absolute(self):
+        """Return an absolute version of this path.  This function works
+        even if the path doesn't point to anything.
+
+        No normalization is done, i.e. all '.' and '..' will be kept along.
+        Use resolve() to get the canonical path to a file.
+        """
+        # XXX untested yet!
+        if self._closed:
+            self._raise_closed()
+        if self.is_absolute():
+            return self
+        # FIXME this must defer to the specific flavour (and, under Windows,
+        # use nt._getfullpathname())
+        obj = self._from_parts([os.getcwd()] + self._parts, init=False)
+        obj._init(template=self)
+        return obj
+
+    def resolve(self, strict=False):
+        """
+        Make the path absolute, resolving all symlinks on the way and also
+        normalizing it (for example turning slashes into backslashes under
+        Windows).
+        """
+        if self._closed:
+            self._raise_closed()
+        s = self._flavour.resolve(self, strict=strict)
+        if s is None:
+            # No symlink resolution => for consistency, raise an error if
+            # the path is forbidden
+            # but not raise error if file does not exist (see issue #54).
+
+            def _try_func():
+                self.stat()
+
+            def _exc_func(exc):
+                pass
+
+            _try_except_filenotfounderror(_try_func, _exc_func)
+            s = str(self.absolute())
+        else:
+            # ensure s is a string (normpath requires this on older python)
+            s = str(s)
+        # Now we have no symlinks in the path, it's safe to normalize it.
+        normed = self._flavour.pathmod.normpath(s)
+        obj = self._from_parts((normed,), init=False)
+        obj._init(template=self)
+        return obj
+
+    def stat(self):
+        """
+        Return the result of the stat() system call on this path, like
+        os.stat() does.
+        """
+        return self._accessor.stat(self)
+
+    def owner(self):
+        """
+        Return the login name of the file owner.
+        """
+        import pwd
+        return pwd.getpwuid(self.stat().st_uid).pw_name
+
+    def group(self):
+        """
+        Return the group name of the file gid.
+        """
+        import grp
+        return grp.getgrgid(self.stat().st_gid).gr_name
+
+    def open(self, mode='r', buffering=-1, encoding=None,
+             errors=None, newline=None):
+        """
+        Open the file pointed by this path and return a file object, as
+        the built-in open() function does.
+        """
+        if self._closed:
+            self._raise_closed()
+        if sys.version_info >= (3, 3):
+            return io.open(
+                str(self), mode, buffering, encoding, errors, newline,
+                opener=self._opener)
+        else:
+            return io.open(str(self), mode, buffering,
+                           encoding, errors, newline)
+
+    def read_bytes(self):
+        """
+        Open the file in bytes mode, read it, and close the file.
+        """
+        with self.open(mode='rb') as f:
+            return f.read()
+
+    def read_text(self, encoding=None, errors=None):
+        """
+        Open the file in text mode, read it, and close the file.
+        """
+        with self.open(mode='r', encoding=encoding, errors=errors) as f:
+            return f.read()
+
+    def write_bytes(self, data):
+        """
+        Open the file in bytes mode, write to it, and close the file.
+        """
+        if not isinstance(data, six.binary_type):
+            raise TypeError(
+                'data must be %s, not %s' %
+                (six.binary_type.__name__, data.__class__.__name__))
+        with self.open(mode='wb') as f:
+            return f.write(data)
+
+    def write_text(self, data, encoding=None, errors=None):
+        """
+        Open the file in text mode, write to it, and close the file.
+        """
+        if not isinstance(data, six.text_type):
+            raise TypeError(
+                'data must be %s, not %s' %
+                (six.text_type.__name__, data.__class__.__name__))
+        with self.open(mode='w', encoding=encoding, errors=errors) as f:
+            return f.write(data)
+
+    def touch(self, mode=0o666, exist_ok=True):
+        """
+        Create this file with the given access mode, if it doesn't exist.
+        """
+        if self._closed:
+            self._raise_closed()
+        if exist_ok:
+            # First try to bump modification time
+            # Implementation note: GNU touch uses the UTIME_NOW option of
+            # the utimensat() / futimens() functions.
+            try:
+                self._accessor.utime(self, None)
+            except OSError:
+                # Avoid exception chaining
+                pass
+            else:
+                return
+        flags = os.O_CREAT | os.O_WRONLY
+        if not exist_ok:
+            flags |= os.O_EXCL
+        fd = self._raw_open(flags, mode)
+        os.close(fd)
+
+    def mkdir(self, mode=0o777, parents=False, exist_ok=False):
+        """
+        Create a new directory at this given path.
+        """
+        if self._closed:
+            self._raise_closed()
+
+        def _try_func():
+            self._accessor.mkdir(self, mode)
+
+        def _exc_func(exc):
+            if not parents or self.parent == self:
+                raise exc
+            self.parent.mkdir(parents=True, exist_ok=True)
+            self.mkdir(mode, parents=False, exist_ok=exist_ok)
+
+        try:
+            _try_except_filenotfounderror(_try_func, _exc_func)
+        except OSError:
+            # Cannot rely on checking for EEXIST, since the operating system
+            # could give priority to other errors like EACCES or EROFS
+            if not exist_ok or not self.is_dir():
+                raise
+
+    def chmod(self, mode):
+        """
+        Change the permissions of the path, like os.chmod().
+        """
+        if self._closed:
+            self._raise_closed()
+        self._accessor.chmod(self, mode)
+
+    def lchmod(self, mode):
+        """
+        Like chmod(), except if the path points to a symlink, the symlink's
+        permissions are changed, rather than its target's.
+        """
+        if self._closed:
+            self._raise_closed()
+        self._accessor.lchmod(self, mode)
+
+    def unlink(self):
+        """
+        Remove this file or link.
+        If the path is a directory, use rmdir() instead.
+        """
+        if self._closed:
+            self._raise_closed()
+        self._accessor.unlink(self)
+
+    def rmdir(self):
+        """
+        Remove this directory.  The directory must be empty.
+        """
+        if self._closed:
+            self._raise_closed()
+        self._accessor.rmdir(self)
+
+    def lstat(self):
+        """
+        Like stat(), except if the path points to a symlink, the symlink's
+        status information is returned, rather than its target's.
+        """
+        if self._closed:
+            self._raise_closed()
+        return self._accessor.lstat(self)
+
+    def rename(self, target):
+        """
+        Rename this path to the given path.
+        """
+        if self._closed:
+            self._raise_closed()
+        self._accessor.rename(self, target)
+
+    def replace(self, target):
+        """
+        Rename this path to the given path, clobbering the existing
+        destination if it exists.
+        """
+        if sys.version_info < (3, 3):
+            raise NotImplementedError("replace() is only available "
+                                      "with Python 3.3 and later")
+        if self._closed:
+            self._raise_closed()
+        self._accessor.replace(self, target)
+
+    def symlink_to(self, target, target_is_directory=False):
+        """
+        Make this path a symlink pointing to the given path.
+        Note the order of arguments (self, target) is the reverse of
+        os.symlink's.
+        """
+        if self._closed:
+            self._raise_closed()
+        self._accessor.symlink(target, self, target_is_directory)
+
+    # Convenience functions for querying the stat results
+
+    def exists(self):
+        """
+        Whether this path exists.
+        """
+        try:
+            self.stat()
+        except OSError as e:
+            if not _ignore_error(e):
+                raise
+            return False
+        except ValueError:
+            # Non-encodable path
+            return False
+        return True
+
+    def is_dir(self):
+        """
+        Whether this path is a directory.
+        """
+        try:
+            return S_ISDIR(self.stat().st_mode)
+        except OSError as e:
+            if not _ignore_error(e):
+                raise
+            # Path doesn't exist or is a broken symlink
+            # (see https://bitbucket.org/pitrou/pathlib/issue/12/)
+            return False
+        except ValueError:
+            # Non-encodable path
+            return False
+
+    def is_file(self):
+        """
+        Whether this path is a regular file (also True for symlinks pointing
+        to regular files).
+        """
+        try:
+            return S_ISREG(self.stat().st_mode)
+        except OSError as e:
+            if not _ignore_error(e):
+                raise
+            # Path doesn't exist or is a broken symlink
+            # (see https://bitbucket.org/pitrou/pathlib/issue/12/)
+            return False
+        except ValueError:
+            # Non-encodable path
+            return False
+
+    def is_mount(self):
+        """
+        Check if this path is a POSIX mount point
+        """
+        # Need to exist and be a dir
+        if not self.exists() or not self.is_dir():
+            return False
+
+        parent = Path(self.parent)
+        try:
+            parent_dev = parent.stat().st_dev
+        except OSError:
+            return False
+
+        dev = self.stat().st_dev
+        if dev != parent_dev:
+            return True
+        ino = self.stat().st_ino
+        parent_ino = parent.stat().st_ino
+        return ino == parent_ino
+
+    def is_symlink(self):
+        """
+        Whether this path is a symbolic link.
+        """
+        try:
+            return S_ISLNK(self.lstat().st_mode)
+        except OSError as e:
+            if not _ignore_error(e):
+                raise
+            # Path doesn't exist
+            return False
+        except ValueError:
+            # Non-encodable path
+            return False
+
+    def is_block_device(self):
+        """
+        Whether this path is a block device.
+        """
+        try:
+            return S_ISBLK(self.stat().st_mode)
+        except OSError as e:
+            if not _ignore_error(e):
+                raise
+            # Path doesn't exist or is a broken symlink
+            # (see https://bitbucket.org/pitrou/pathlib/issue/12/)
+            return False
+        except ValueError:
+            # Non-encodable path
+            return False
+
+    def is_char_device(self):
+        """
+        Whether this path is a character device.
+        """
+        try:
+            return S_ISCHR(self.stat().st_mode)
+        except OSError as e:
+            if not _ignore_error(e):
+                raise
+            # Path doesn't exist or is a broken symlink
+            # (see https://bitbucket.org/pitrou/pathlib/issue/12/)
+            return False
+        except ValueError:
+            # Non-encodable path
+            return False
+
+    def is_fifo(self):
+        """
+        Whether this path is a FIFO.
+        """
+        try:
+            return S_ISFIFO(self.stat().st_mode)
+        except OSError as e:
+            if not _ignore_error(e):
+                raise
+            # Path doesn't exist or is a broken symlink
+            # (see https://bitbucket.org/pitrou/pathlib/issue/12/)
+            return False
+        except ValueError:
+            # Non-encodable path
+            return False
+
+    def is_socket(self):
+        """
+        Whether this path is a socket.
+        """
+        try:
+            return S_ISSOCK(self.stat().st_mode)
+        except OSError as e:
+            if not _ignore_error(e):
+                raise
+            # Path doesn't exist or is a broken symlink
+            # (see https://bitbucket.org/pitrou/pathlib/issue/12/)
+            return False
+        except ValueError:
+            # Non-encodable path
+            return False
+
+    def expanduser(self):
+        """ Return a new path with expanded ~ and ~user constructs
+        (as returned by os.path.expanduser)
+        """
+        if (not (self._drv or self._root)
+                and self._parts and self._parts[0][:1] == '~'):
+            homedir = self._flavour.gethomedir(self._parts[0][1:])
+            return self._from_parts([homedir] + self._parts[1:])
+
+        return self
+
+
+class PosixPath(Path, PurePosixPath):
+    """Path subclass for non-Windows systems.
+
+    On a POSIX system, instantiating a Path should return this object.
+    """
+    __slots__ = ()
+
+
+class WindowsPath(Path, PureWindowsPath):
+    """Path subclass for Windows systems.
+
+    On a Windows system, instantiating a Path should return this object.
+    """
+    __slots__ = ()
+
+    def owner(self):
+        raise NotImplementedError("Path.owner() is unsupported on this system")
+
+    def group(self):
+        raise NotImplementedError("Path.group() is unsupported on this system")
+
+    def is_mount(self):
+        raise NotImplementedError(
+            "Path.is_mount() is unsupported on this system")
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pathlib2/requirements.txt b/tests/wpt/web-platform-tests/tools/third_party/pathlib2/requirements.txt
new file mode 100644
index 00000000000..9d432127900
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pathlib2/requirements.txt
@@ -0,0 +1,3 @@
+six
+scandir; python_version < '3.5'
+mock; python_version < '3.3'
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pathlib2/setup.cfg b/tests/wpt/web-platform-tests/tools/third_party/pathlib2/setup.cfg
new file mode 100644
index 00000000000..32afc861d31
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pathlib2/setup.cfg
@@ -0,0 +1,8 @@
+[nosetests]
+with-coverage=1
+cover-package=pathlib2
+cover-branches=1
+cover-html=1
+
+[wheel]
+universal = 1
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pathlib2/setup.py b/tests/wpt/web-platform-tests/tools/third_party/pathlib2/setup.py
new file mode 100644
index 00000000000..cbb6aaa0dfa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pathlib2/setup.py
@@ -0,0 +1,48 @@
+# Copyright (c) 2014-2017 Matthias C. M. Troffaes
+# Copyright (c) 2012-2014 Antoine Pitrou and contributors
+# Distributed under the terms of the MIT License.
+
+import io
+from setuptools import setup, find_packages
+
+
+def readfile(filename):
+    with io.open(filename, encoding="utf-8") as stream:
+        return stream.read().split("\n")
+
+
+readme = readfile("README.rst")[5:]  # skip title and badges
+version = readfile("VERSION")[0].strip()
+
+setup(
+    name='pathlib2',
+    version=version,
+    packages=find_packages(),
+    license='MIT',
+    description='Object-oriented filesystem paths',
+    long_description="\n".join(readme[2:]),
+    author='Matthias C. M. Troffaes',
+    author_email='matthias.troffaes@gmail.com',
+    classifiers=[
+        'Development Status :: 5 - Production/Stable',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: MIT License',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Topic :: Software Development :: Libraries',
+        'Topic :: System :: Filesystems',
+        ],
+    url='https://github.com/mcmtroffaes/pathlib2',
+    install_requires=['six'],
+    extras_require={
+        ':python_version<"3.5"': ['scandir'],
+        },
+)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pathlib2/tests/test_pathlib2.py b/tests/wpt/web-platform-tests/tools/third_party/pathlib2/tests/test_pathlib2.py
new file mode 100644
index 00000000000..65a5281a9d7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pathlib2/tests/test_pathlib2.py
@@ -0,0 +1,2406 @@
+# Copyright (c) 2014-2017 Matthias C. M. Troffaes
+# Copyright (c) 2012-2014 Antoine Pitrou and contributors
+# Distributed under the terms of the MIT License.
+
+
+import io
+import os
+import errno
+import pathlib2 as pathlib
+import pickle
+import six
+import socket
+import stat
+import sys
+import tempfile
+
+if sys.version_info >= (3, 3):
+    import collections.abc as collections_abc
+else:
+    import collections as collections_abc
+
+if sys.version_info < (2, 7):
+    try:
+        import unittest2 as unittest
+    except ImportError:
+        raise ImportError("unittest2 is required for tests on pre-2.7")
+else:
+    import unittest
+
+if sys.version_info < (3, 3):
+    try:
+        import mock
+    except ImportError:
+        raise ImportError("mock is required for tests on pre-3.3")
+else:
+    from unittest import mock
+
+# assertRaisesRegex is missing prior to Python 3.2
+if sys.version_info < (3, 2):
+    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
+
+try:
+    from test import support
+except ImportError:
+    from test import test_support as support
+
+android_not_root = getattr(support, "android_not_root", False)
+
+TESTFN = support.TESTFN
+
+# work around broken support.rmtree on Python 3.3 on Windows
+if (os.name == 'nt'
+        and sys.version_info >= (3, 0) and sys.version_info < (3, 4)):
+    import shutil
+    support.rmtree = shutil.rmtree
+
+try:
+    import grp
+    import pwd
+except ImportError:
+    grp = pwd = None
+
+# support.can_symlink is missing prior to Python 3
+if six.PY2:
+
+    def support_can_symlink():
+        return pathlib.supports_symlinks
+
+    support_skip_unless_symlink = unittest.skipIf(
+        not pathlib.supports_symlinks,
+        "symlinks not supported on this platform")
+else:
+    support_can_symlink = support.can_symlink
+    support_skip_unless_symlink = support.skip_unless_symlink
+
+
+# Backported from 3.4
+def fs_is_case_insensitive(directory):
+    """Detects if the file system for the specified directory is
+    case-insensitive.
+    """
+    base_fp, base_path = tempfile.mkstemp(dir=directory)
+    case_path = base_path.upper()
+    if case_path == base_path:
+        case_path = base_path.lower()
+    try:
+        return os.path.samefile(base_path, case_path)
+    except OSError as e:
+        if e.errno != errno.ENOENT:
+            raise
+        return False
+    finally:
+        os.unlink(base_path)
+
+
+support.fs_is_case_insensitive = fs_is_case_insensitive
+
+
+class _BaseFlavourTest(object):
+
+    def _check_parse_parts(self, arg, expected):
+        f = self.flavour.parse_parts
+        sep = self.flavour.sep
+        altsep = self.flavour.altsep
+        actual = f([x.replace('/', sep) for x in arg])
+        self.assertEqual(actual, expected)
+        if altsep:
+            actual = f([x.replace('/', altsep) for x in arg])
+            self.assertEqual(actual, expected)
+        drv, root, parts = actual
+        # neither bytes (py3) nor unicode (py2)
+        self.assertIsInstance(drv, str)
+        self.assertIsInstance(root, str)
+        for p in parts:
+            self.assertIsInstance(p, str)
+
+    def test_parse_parts_common(self):
+        check = self._check_parse_parts
+        sep = self.flavour.sep
+        # Unanchored parts
+        check([],                   ('', '', []))
+        check(['a'],                ('', '', ['a']))
+        check(['a/'],               ('', '', ['a']))
+        check(['a', 'b'],           ('', '', ['a', 'b']))
+        # Expansion
+        check(['a/b'],              ('', '', ['a', 'b']))
+        check(['a/b/'],             ('', '', ['a', 'b']))
+        check(['a', 'b/c', 'd'],    ('', '', ['a', 'b', 'c', 'd']))
+        # Collapsing and stripping excess slashes
+        check(['a', 'b//c', 'd'],   ('', '', ['a', 'b', 'c', 'd']))
+        check(['a', 'b/c/', 'd'],   ('', '', ['a', 'b', 'c', 'd']))
+        # Eliminating standalone dots
+        check(['.'],                ('', '', []))
+        check(['.', '.', 'b'],      ('', '', ['b']))
+        check(['a', '.', 'b'],      ('', '', ['a', 'b']))
+        check(['a', '.', '.'],      ('', '', ['a']))
+        # The first part is anchored
+        check(['/a/b'],             ('', sep, [sep, 'a', 'b']))
+        check(['/a', 'b'],          ('', sep, [sep, 'a', 'b']))
+        check(['/a/', 'b'],         ('', sep, [sep, 'a', 'b']))
+        # Ignoring parts before an anchored part
+        check(['a', '/b', 'c'],     ('', sep, [sep, 'b', 'c']))
+        check(['a', '/b', '/c'],    ('', sep, [sep, 'c']))
+
+
+class PosixFlavourTest(_BaseFlavourTest, unittest.TestCase):
+    flavour = pathlib._posix_flavour
+
+    def test_parse_parts(self):
+        check = self._check_parse_parts
+        # Collapsing of excess leading slashes, except for the double-slash
+        # special case.
+        check(['//a', 'b'],             ('', '//', ['//', 'a', 'b']))
+        check(['///a', 'b'],            ('', '/', ['/', 'a', 'b']))
+        check(['////a', 'b'],           ('', '/', ['/', 'a', 'b']))
+        # Paths which look like NT paths aren't treated specially
+        check(['c:a'],                  ('', '', ['c:a']))
+        check(['c:\\a'],                ('', '', ['c:\\a']))
+        check(['\\a'],                  ('', '', ['\\a']))
+
+    def test_splitroot(self):
+        f = self.flavour.splitroot
+        self.assertEqual(f(''), ('', '', ''))
+        self.assertEqual(f('a'), ('', '', 'a'))
+        self.assertEqual(f('a/b'), ('', '', 'a/b'))
+        self.assertEqual(f('a/b/'), ('', '', 'a/b/'))
+        self.assertEqual(f('/a'), ('', '/', 'a'))
+        self.assertEqual(f('/a/b'), ('', '/', 'a/b'))
+        self.assertEqual(f('/a/b/'), ('', '/', 'a/b/'))
+        # The root is collapsed when there are redundant slashes
+        # except when there are exactly two leading slashes, which
+        # is a special case in POSIX.
+        self.assertEqual(f('//a'), ('', '//', 'a'))
+        self.assertEqual(f('///a'), ('', '/', 'a'))
+        self.assertEqual(f('///a/b'), ('', '/', 'a/b'))
+        # Paths which look like NT paths aren't treated specially
+        self.assertEqual(f('c:/a/b'), ('', '', 'c:/a/b'))
+        self.assertEqual(f('\\/a/b'), ('', '', '\\/a/b'))
+        self.assertEqual(f('\\a\\b'), ('', '', '\\a\\b'))
+
+
+class NTFlavourTest(_BaseFlavourTest, unittest.TestCase):
+    flavour = pathlib._windows_flavour
+
+    def test_parse_parts(self):
+        check = self._check_parse_parts
+        # First part is anchored
+        check(['c:'],                ('c:', '', ['c:']))
+        check(['c:/'],               ('c:', '\\', ['c:\\']))
+        check(['/'],                 ('', '\\', ['\\']))
+        check(['c:a'],               ('c:', '', ['c:', 'a']))
+        check(['c:/a'],              ('c:', '\\', ['c:\\', 'a']))
+        check(['/a'],                ('', '\\', ['\\', 'a']))
+        # UNC paths
+        check(['//a/b'],             ('\\\\a\\b', '\\', ['\\\\a\\b\\']))
+        check(['//a/b/'],            ('\\\\a\\b', '\\', ['\\\\a\\b\\']))
+        check(['//a/b/c'],           ('\\\\a\\b', '\\', ['\\\\a\\b\\', 'c']))
+        # Second part is anchored, so that the first part is ignored
+        check(['a', 'Z:b', 'c'],     ('Z:', '', ['Z:', 'b', 'c']))
+        check(['a', 'Z:/b', 'c'],    ('Z:', '\\', ['Z:\\', 'b', 'c']))
+        # UNC paths
+        check(['a', '//b/c', 'd'],   ('\\\\b\\c', '\\', ['\\\\b\\c\\', 'd']))
+        # Collapsing and stripping excess slashes
+        check(['a', 'Z://b//c/', 'd/'], ('Z:', '\\', ['Z:\\', 'b', 'c', 'd']))
+        # UNC paths
+        check(['a', '//b/c//', 'd'], ('\\\\b\\c', '\\', ['\\\\b\\c\\', 'd']))
+        # Extended paths
+        check(['//?/c:/'],           ('\\\\?\\c:', '\\', ['\\\\?\\c:\\']))
+        check(['//?/c:/a'],          ('\\\\?\\c:', '\\', ['\\\\?\\c:\\', 'a']))
+        check(['//?/c:/a', '/b'],    ('\\\\?\\c:', '\\', ['\\\\?\\c:\\', 'b']))
+        # Extended UNC paths (format is "\\?\UNC\server\share")
+        check(['//?/UNC/b/c'],
+              ('\\\\?\\UNC\\b\\c', '\\', ['\\\\?\\UNC\\b\\c\\']))
+        check(['//?/UNC/b/c/d'],
+              ('\\\\?\\UNC\\b\\c', '\\', ['\\\\?\\UNC\\b\\c\\', 'd']))
+        # Second part has a root but not drive
+        check(['a', '/b', 'c'],      ('', '\\', ['\\', 'b', 'c']))
+        check(['Z:/a', '/b', 'c'],   ('Z:', '\\', ['Z:\\', 'b', 'c']))
+        check(['//?/Z:/a', '/b', 'c'],
+              ('\\\\?\\Z:', '\\', ['\\\\?\\Z:\\', 'b', 'c']))
+
+    def test_splitroot(self):
+        f = self.flavour.splitroot
+        self.assertEqual(f(''), ('', '', ''))
+        self.assertEqual(f('a'), ('', '', 'a'))
+        self.assertEqual(f('a\\b'), ('', '', 'a\\b'))
+        self.assertEqual(f('\\a'), ('', '\\', 'a'))
+        self.assertEqual(f('\\a\\b'), ('', '\\', 'a\\b'))
+        self.assertEqual(f('c:a\\b'), ('c:', '', 'a\\b'))
+        self.assertEqual(f('c:\\a\\b'), ('c:', '\\', 'a\\b'))
+        # Redundant slashes in the root are collapsed
+        self.assertEqual(f('\\\\a'), ('', '\\', 'a'))
+        self.assertEqual(f('\\\\\\a/b'), ('', '\\', 'a/b'))
+        self.assertEqual(f('c:\\\\a'), ('c:', '\\', 'a'))
+        self.assertEqual(f('c:\\\\\\a/b'), ('c:', '\\', 'a/b'))
+        # Valid UNC paths
+        self.assertEqual(f('\\\\a\\b'), ('\\\\a\\b', '\\', ''))
+        self.assertEqual(f('\\\\a\\b\\'), ('\\\\a\\b', '\\', ''))
+        self.assertEqual(f('\\\\a\\b\\c\\d'), ('\\\\a\\b', '\\', 'c\\d'))
+        # These are non-UNC paths (according to ntpath.py and test_ntpath)
+        # However, command.com says such paths are invalid, so it's
+        # difficult to know what the right semantics are
+        self.assertEqual(f('\\\\\\a\\b'), ('', '\\', 'a\\b'))
+        self.assertEqual(f('\\\\a'), ('', '\\', 'a'))
+
+
+#
+# Tests for the pure classes
+#
+
+with_fsencode = unittest.skipIf(
+    sys.version_info < (3, 2),
+    'os.fsencode has been introduced in version 3.2')
+
+
+class _BasePurePathTest(object):
+
+    # keys are canonical paths, values are list of tuples of arguments
+    # supposed to produce equal paths
+    equivalences = {
+        'a/b': [
+            ('a', 'b'), ('a/', 'b'), ('a', 'b/'), ('a/', 'b/'),
+            ('a/b/',), ('a//b',), ('a//b//',),
+            # empty components get removed
+            ('', 'a', 'b'), ('a', '', 'b'), ('a', 'b', ''),
+            ],
+        '/b/c/d': [
+            ('a', '/b/c', 'd'), ('a', '///b//c', 'd/'),
+            ('/a', '/b/c', 'd'),
+            # empty components get removed
+            ('/', 'b', '', 'c/d'), ('/', '', 'b/c/d'), ('', '/b/c/d'),
+            ],
+    }
+
+    def setUp(self):
+        p = self.cls('a')
+        self.flavour = p._flavour
+        self.sep = self.flavour.sep
+        self.altsep = self.flavour.altsep
+
+    def test_constructor_common(self):
+        P = self.cls
+        p = P('a')
+        self.assertIsInstance(p, P)
+
+        class PathLike:
+            def __fspath__(self):
+                return "a/b/c"
+
+        P('a', 'b', 'c')
+        P('/a', 'b', 'c')
+        P('a/b/c')
+        P('/a/b/c')
+        P(PathLike())
+        self.assertEqual(P(P('a')), P('a'))
+        self.assertEqual(P(P('a'), 'b'), P('a/b'))
+        self.assertEqual(P(P('a'), P('b')), P('a/b'))
+        self.assertEqual(P(P('a'), P('b'), P('c')), P(PathLike()))
+
+    def _check_str_subclass(self, *args):
+        # Issue #21127: it should be possible to construct a PurePath object
+        # from a str subclass instance, and it then gets converted to
+        # a pure str object.
+        class StrSubclass(str):
+            pass
+        P = self.cls
+        p = P(*(StrSubclass(x) for x in args))
+        self.assertEqual(p, P(*args))
+        for part in p.parts:
+            self.assertIs(type(part), str)
+
+    def test_str_subclass_common(self):
+        self._check_str_subclass('')
+        self._check_str_subclass('.')
+        self._check_str_subclass('a')
+        self._check_str_subclass('a/b.txt')
+        self._check_str_subclass('/a/b.txt')
+
+    def test_join_common(self):
+        P = self.cls
+        p = P('a/b')
+        pp = p.joinpath('c')
+        self.assertEqual(pp, P('a/b/c'))
+        self.assertIs(type(pp), type(p))
+        pp = p.joinpath('c', 'd')
+        self.assertEqual(pp, P('a/b/c/d'))
+        pp = p.joinpath(P('c'))
+        self.assertEqual(pp, P('a/b/c'))
+        pp = p.joinpath('/c')
+        self.assertEqual(pp, P('/c'))
+
+    def test_div_common(self):
+        # Basically the same as joinpath()
+        P = self.cls
+        p = P('a/b')
+        pp = p / 'c'
+        self.assertEqual(pp, P('a/b/c'))
+        self.assertIs(type(pp), type(p))
+        pp = p / 'c/d'
+        self.assertEqual(pp, P('a/b/c/d'))
+        pp = p / 'c' / 'd'
+        self.assertEqual(pp, P('a/b/c/d'))
+        pp = 'c' / p / 'd'
+        self.assertEqual(pp, P('c/a/b/d'))
+        pp = p / P('c')
+        self.assertEqual(pp, P('a/b/c'))
+        pp = p / '/c'
+        self.assertEqual(pp, P('/c'))
+
+    def _check_str(self, expected, args):
+        p = self.cls(*args)
+        self.assertEqual(str(p), expected.replace('/', self.sep))
+
+    def test_str_common(self):
+        # Canonicalized paths roundtrip
+        for pathstr in ('a', 'a/b', 'a/b/c', '/', '/a/b', '/a/b/c'):
+            self._check_str(pathstr, (pathstr,))
+        # Special case for the empty path
+        self._check_str('.', ('',))
+        # Other tests for str() are in test_equivalences()
+
+    def test_as_posix_common(self):
+        P = self.cls
+        for pathstr in ('a', 'a/b', 'a/b/c', '/', '/a/b', '/a/b/c'):
+            self.assertEqual(P(pathstr).as_posix(), pathstr)
+        # Other tests for as_posix() are in test_equivalences()
+
+    @with_fsencode
+    def test_as_bytes_common(self):
+        sep = os.fsencode(self.sep)
+        P = self.cls
+        self.assertEqual(bytes(P('a/b')), b'a' + sep + b'b')
+
+    def test_as_uri_common(self):
+        P = self.cls
+        with self.assertRaises(ValueError):
+            P('a').as_uri()
+        with self.assertRaises(ValueError):
+            P().as_uri()
+
+    def test_repr_common(self):
+        for pathstr in ('a', 'a/b', 'a/b/c', '/', '/a/b', '/a/b/c'):
+            p = self.cls(pathstr)
+            clsname = p.__class__.__name__
+            r = repr(p)
+            # The repr() is in the form ClassName("forward-slashes path")
+            self.assertTrue(r.startswith(clsname + '('), r)
+            self.assertTrue(r.endswith(')'), r)
+            inner = r[len(clsname) + 1: -1]
+            self.assertEqual(eval(inner), p.as_posix())
+            # The repr() roundtrips
+            q = eval(r, pathlib.__dict__)
+            self.assertIs(q.__class__, p.__class__)
+            self.assertEqual(q, p)
+            self.assertEqual(repr(q), r)
+
+    def test_eq_common(self):
+        P = self.cls
+        self.assertEqual(P('a/b'), P('a/b'))
+        self.assertEqual(P('a/b'), P('a', 'b'))
+        self.assertNotEqual(P('a/b'), P('a'))
+        self.assertNotEqual(P('a/b'), P('/a/b'))
+        self.assertNotEqual(P('a/b'), P())
+        self.assertNotEqual(P('/a/b'), P('/'))
+        self.assertNotEqual(P(), P('/'))
+        self.assertNotEqual(P(), "")
+        self.assertNotEqual(P(), {})
+        self.assertNotEqual(P(), int)
+
+    def test_match_common(self):
+        P = self.cls
+        self.assertRaises(ValueError, P('a').match, '')
+        self.assertRaises(ValueError, P('a').match, '.')
+        # Simple relative pattern
+        self.assertTrue(P('b.py').match('b.py'))
+        self.assertTrue(P('a/b.py').match('b.py'))
+        self.assertTrue(P('/a/b.py').match('b.py'))
+        self.assertFalse(P('a.py').match('b.py'))
+        self.assertFalse(P('b/py').match('b.py'))
+        self.assertFalse(P('/a.py').match('b.py'))
+        self.assertFalse(P('b.py/c').match('b.py'))
+        # Wilcard relative pattern
+        self.assertTrue(P('b.py').match('*.py'))
+        self.assertTrue(P('a/b.py').match('*.py'))
+        self.assertTrue(P('/a/b.py').match('*.py'))
+        self.assertFalse(P('b.pyc').match('*.py'))
+        self.assertFalse(P('b./py').match('*.py'))
+        self.assertFalse(P('b.py/c').match('*.py'))
+        # Multi-part relative pattern
+        self.assertTrue(P('ab/c.py').match('a*/*.py'))
+        self.assertTrue(P('/d/ab/c.py').match('a*/*.py'))
+        self.assertFalse(P('a.py').match('a*/*.py'))
+        self.assertFalse(P('/dab/c.py').match('a*/*.py'))
+        self.assertFalse(P('ab/c.py/d').match('a*/*.py'))
+        # Absolute pattern
+        self.assertTrue(P('/b.py').match('/*.py'))
+        self.assertFalse(P('b.py').match('/*.py'))
+        self.assertFalse(P('a/b.py').match('/*.py'))
+        self.assertFalse(P('/a/b.py').match('/*.py'))
+        # Multi-part absolute pattern
+        self.assertTrue(P('/a/b.py').match('/a/*.py'))
+        self.assertFalse(P('/ab.py').match('/a/*.py'))
+        self.assertFalse(P('/a/b/c.py').match('/a/*.py'))
+
+    def test_ordering_common(self):
+        # Ordering is tuple-alike
+        def assertLess(a, b):
+            self.assertLess(a, b)
+            self.assertGreater(b, a)
+        P = self.cls
+        a = P('a')
+        b = P('a/b')
+        c = P('abc')
+        d = P('b')
+        assertLess(a, b)
+        assertLess(a, c)
+        assertLess(a, d)
+        assertLess(b, c)
+        assertLess(c, d)
+        P = self.cls
+        a = P('/a')
+        b = P('/a/b')
+        c = P('/abc')
+        d = P('/b')
+        assertLess(a, b)
+        assertLess(a, c)
+        assertLess(a, d)
+        assertLess(b, c)
+        assertLess(c, d)
+        if sys.version_info > (3,):
+            with self.assertRaises(TypeError):
+                P() < {}
+        else:
+            P() < {}
+
+    def test_parts_common(self):
+        # `parts` returns a tuple
+        sep = self.sep
+        P = self.cls
+        p = P('a/b')
+        parts = p.parts
+        self.assertEqual(parts, ('a', 'b'))
+        # The object gets reused
+        self.assertIs(parts, p.parts)
+        # When the path is absolute, the anchor is a separate part
+        p = P('/a/b')
+        parts = p.parts
+        self.assertEqual(parts, (sep, 'a', 'b'))
+
+    def test_fspath_common(self):
+        P = self.cls
+        p = P('a/b')
+        self._check_str(p.__fspath__(), ('a/b',))
+        if sys.version_info >= (3, 6):
+            self._check_str(os.fspath(p), ('a/b',))
+
+    def test_equivalences(self):
+        for k, tuples in self.equivalences.items():
+            canon = k.replace('/', self.sep)
+            posix = k.replace(self.sep, '/')
+            if canon != posix:
+                tuples = tuples + [
+                    tuple(part.replace('/', self.sep) for part in t)
+                    for t in tuples
+                    ]
+                tuples.append((posix, ))
+            pcanon = self.cls(canon)
+            for t in tuples:
+                p = self.cls(*t)
+                self.assertEqual(p, pcanon, "failed with args {0}".format(t))
+                self.assertEqual(hash(p), hash(pcanon))
+                self.assertEqual(str(p), canon)
+                self.assertEqual(p.as_posix(), posix)
+
+    def test_parent_common(self):
+        # Relative
+        P = self.cls
+        p = P('a/b/c')
+        self.assertEqual(p.parent, P('a/b'))
+        self.assertEqual(p.parent.parent, P('a'))
+        self.assertEqual(p.parent.parent.parent, P())
+        self.assertEqual(p.parent.parent.parent.parent, P())
+        # Anchored
+        p = P('/a/b/c')
+        self.assertEqual(p.parent, P('/a/b'))
+        self.assertEqual(p.parent.parent, P('/a'))
+        self.assertEqual(p.parent.parent.parent, P('/'))
+        self.assertEqual(p.parent.parent.parent.parent, P('/'))
+
+    def test_parents_common(self):
+        # Relative
+        P = self.cls
+        p = P('a/b/c')
+        par = p.parents
+        self.assertEqual(len(par), 3)
+        self.assertEqual(par[0], P('a/b'))
+        self.assertEqual(par[1], P('a'))
+        self.assertEqual(par[2], P('.'))
+        self.assertEqual(list(par), [P('a/b'), P('a'), P('.')])
+        with self.assertRaises(IndexError):
+            par[-1]
+        with self.assertRaises(IndexError):
+            par[3]
+        with self.assertRaises(TypeError):
+            par[0] = p
+        # Anchored
+        p = P('/a/b/c')
+        par = p.parents
+        self.assertEqual(len(par), 3)
+        self.assertEqual(par[0], P('/a/b'))
+        self.assertEqual(par[1], P('/a'))
+        self.assertEqual(par[2], P('/'))
+        self.assertEqual(list(par), [P('/a/b'), P('/a'), P('/')])
+        with self.assertRaises(IndexError):
+            par[3]
+
+    def test_drive_common(self):
+        P = self.cls
+        self.assertEqual(P('a/b').drive, '')
+        self.assertEqual(P('/a/b').drive, '')
+        self.assertEqual(P('').drive, '')
+
+    def test_root_common(self):
+        P = self.cls
+        sep = self.sep
+        self.assertEqual(P('').root, '')
+        self.assertEqual(P('a/b').root, '')
+        self.assertEqual(P('/').root, sep)
+        self.assertEqual(P('/a/b').root, sep)
+
+    def test_anchor_common(self):
+        P = self.cls
+        sep = self.sep
+        self.assertEqual(P('').anchor, '')
+        self.assertEqual(P('a/b').anchor, '')
+        self.assertEqual(P('/').anchor, sep)
+        self.assertEqual(P('/a/b').anchor, sep)
+
+    def test_name_common(self):
+        P = self.cls
+        self.assertEqual(P('').name, '')
+        self.assertEqual(P('.').name, '')
+        self.assertEqual(P('/').name, '')
+        self.assertEqual(P('a/b').name, 'b')
+        self.assertEqual(P('/a/b').name, 'b')
+        self.assertEqual(P('/a/b/.').name, 'b')
+        self.assertEqual(P('a/b.py').name, 'b.py')
+        self.assertEqual(P('/a/b.py').name, 'b.py')
+
+    def test_suffix_common(self):
+        P = self.cls
+        self.assertEqual(P('').suffix, '')
+        self.assertEqual(P('.').suffix, '')
+        self.assertEqual(P('..').suffix, '')
+        self.assertEqual(P('/').suffix, '')
+        self.assertEqual(P('a/b').suffix, '')
+        self.assertEqual(P('/a/b').suffix, '')
+        self.assertEqual(P('/a/b/.').suffix, '')
+        self.assertEqual(P('a/b.py').suffix, '.py')
+        self.assertEqual(P('/a/b.py').suffix, '.py')
+        self.assertEqual(P('a/.hgrc').suffix, '')
+        self.assertEqual(P('/a/.hgrc').suffix, '')
+        self.assertEqual(P('a/.hg.rc').suffix, '.rc')
+        self.assertEqual(P('/a/.hg.rc').suffix, '.rc')
+        self.assertEqual(P('a/b.tar.gz').suffix, '.gz')
+        self.assertEqual(P('/a/b.tar.gz').suffix, '.gz')
+        self.assertEqual(P('a/Some name. Ending with a dot.').suffix, '')
+        self.assertEqual(P('/a/Some name. Ending with a dot.').suffix, '')
+
+    def test_suffixes_common(self):
+        P = self.cls
+        self.assertEqual(P('').suffixes, [])
+        self.assertEqual(P('.').suffixes, [])
+        self.assertEqual(P('/').suffixes, [])
+        self.assertEqual(P('a/b').suffixes, [])
+        self.assertEqual(P('/a/b').suffixes, [])
+        self.assertEqual(P('/a/b/.').suffixes, [])
+        self.assertEqual(P('a/b.py').suffixes, ['.py'])
+        self.assertEqual(P('/a/b.py').suffixes, ['.py'])
+        self.assertEqual(P('a/.hgrc').suffixes, [])
+        self.assertEqual(P('/a/.hgrc').suffixes, [])
+        self.assertEqual(P('a/.hg.rc').suffixes, ['.rc'])
+        self.assertEqual(P('/a/.hg.rc').suffixes, ['.rc'])
+        self.assertEqual(P('a/b.tar.gz').suffixes, ['.tar', '.gz'])
+        self.assertEqual(P('/a/b.tar.gz').suffixes, ['.tar', '.gz'])
+        self.assertEqual(P('a/Some name. Ending with a dot.').suffixes, [])
+        self.assertEqual(P('/a/Some name. Ending with a dot.').suffixes, [])
+
+    def test_stem_common(self):
+        P = self.cls
+        self.assertEqual(P('').stem, '')
+        self.assertEqual(P('.').stem, '')
+        self.assertEqual(P('..').stem, '..')
+        self.assertEqual(P('/').stem, '')
+        self.assertEqual(P('a/b').stem, 'b')
+        self.assertEqual(P('a/b.py').stem, 'b')
+        self.assertEqual(P('a/.hgrc').stem, '.hgrc')
+        self.assertEqual(P('a/.hg.rc').stem, '.hg')
+        self.assertEqual(P('a/b.tar.gz').stem, 'b.tar')
+        self.assertEqual(P('a/Some name. Ending with a dot.').stem,
+                         'Some name. Ending with a dot.')
+
+    def test_with_name_common(self):
+        P = self.cls
+        self.assertEqual(P('a/b').with_name('d.xml'), P('a/d.xml'))
+        self.assertEqual(P('/a/b').with_name('d.xml'), P('/a/d.xml'))
+        self.assertEqual(P('a/b.py').with_name('d.xml'), P('a/d.xml'))
+        self.assertEqual(P('/a/b.py').with_name('d.xml'), P('/a/d.xml'))
+        self.assertEqual(P('a/Dot ending.').with_name('d.xml'), P('a/d.xml'))
+        self.assertEqual(P('/a/Dot ending.').with_name('d.xml'), P('/a/d.xml'))
+        self.assertRaises(ValueError, P('').with_name, 'd.xml')
+        self.assertRaises(ValueError, P('.').with_name, 'd.xml')
+        self.assertRaises(ValueError, P('/').with_name, 'd.xml')
+        self.assertRaises(ValueError, P('a/b').with_name, '')
+        self.assertRaises(ValueError, P('a/b').with_name, '/c')
+        self.assertRaises(ValueError, P('a/b').with_name, 'c/')
+        self.assertRaises(ValueError, P('a/b').with_name, 'c/d')
+
+    def test_with_suffix_common(self):
+        P = self.cls
+        self.assertEqual(P('a/b').with_suffix('.gz'), P('a/b.gz'))
+        self.assertEqual(P('/a/b').with_suffix('.gz'), P('/a/b.gz'))
+        self.assertEqual(P('a/b.py').with_suffix('.gz'), P('a/b.gz'))
+        self.assertEqual(P('/a/b.py').with_suffix('.gz'), P('/a/b.gz'))
+        # Stripping suffix
+        self.assertEqual(P('a/b.py').with_suffix(''), P('a/b'))
+        self.assertEqual(P('/a/b').with_suffix(''), P('/a/b'))
+        # Path doesn't have a "filename" component
+        self.assertRaises(ValueError, P('').with_suffix, '.gz')
+        self.assertRaises(ValueError, P('.').with_suffix, '.gz')
+        self.assertRaises(ValueError, P('/').with_suffix, '.gz')
+        # Invalid suffix
+        self.assertRaises(ValueError, P('a/b').with_suffix, 'gz')
+        self.assertRaises(ValueError, P('a/b').with_suffix, '/')
+        self.assertRaises(ValueError, P('a/b').with_suffix, '.')
+        self.assertRaises(ValueError, P('a/b').with_suffix, '/.gz')
+        self.assertRaises(ValueError, P('a/b').with_suffix, 'c/d')
+        self.assertRaises(ValueError, P('a/b').with_suffix, '.c/.d')
+        self.assertRaises(ValueError, P('a/b').with_suffix, './.d')
+        self.assertRaises(ValueError, P('a/b').with_suffix, '.d/.')
+
+    def test_relative_to_common(self):
+        P = self.cls
+        p = P('a/b')
+        self.assertRaises(TypeError, p.relative_to)
+        if six.PY3:
+            self.assertRaises(TypeError, p.relative_to, b'a')
+        self.assertEqual(p.relative_to(P()), P('a/b'))
+        self.assertEqual(p.relative_to(''), P('a/b'))
+        self.assertEqual(p.relative_to(P('a')), P('b'))
+        self.assertEqual(p.relative_to('a'), P('b'))
+        self.assertEqual(p.relative_to('a/'), P('b'))
+        self.assertEqual(p.relative_to(P('a/b')), P())
+        self.assertEqual(p.relative_to('a/b'), P())
+        # With several args
+        self.assertEqual(p.relative_to('a', 'b'), P())
+        # Unrelated paths
+        self.assertRaises(ValueError, p.relative_to, P('c'))
+        self.assertRaises(ValueError, p.relative_to, P('a/b/c'))
+        self.assertRaises(ValueError, p.relative_to, P('a/c'))
+        self.assertRaises(ValueError, p.relative_to, P('/a'))
+        p = P('/a/b')
+        self.assertEqual(p.relative_to(P('/')), P('a/b'))
+        self.assertEqual(p.relative_to('/'), P('a/b'))
+        self.assertEqual(p.relative_to(P('/a')), P('b'))
+        self.assertEqual(p.relative_to('/a'), P('b'))
+        self.assertEqual(p.relative_to('/a/'), P('b'))
+        self.assertEqual(p.relative_to(P('/a/b')), P())
+        self.assertEqual(p.relative_to('/a/b'), P())
+        # Unrelated paths
+        self.assertRaises(ValueError, p.relative_to, P('/c'))
+        self.assertRaises(ValueError, p.relative_to, P('/a/b/c'))
+        self.assertRaises(ValueError, p.relative_to, P('/a/c'))
+        self.assertRaises(ValueError, p.relative_to, P())
+        self.assertRaises(ValueError, p.relative_to, '')
+        self.assertRaises(ValueError, p.relative_to, P('a'))
+
+    def test_pickling_common(self):
+        P = self.cls
+        p = P('/a/b')
+        for proto in range(0, pickle.HIGHEST_PROTOCOL + 1):
+            dumped = pickle.dumps(p, proto)
+            pp = pickle.loads(dumped)
+            self.assertIs(pp.__class__, p.__class__)
+            self.assertEqual(pp, p)
+            self.assertEqual(hash(pp), hash(p))
+            self.assertEqual(str(pp), str(p))
+
+    # note: this is a new test not part of upstream
+    # test that unicode works on Python 2
+    @unittest.skipIf(
+        six.unichr(0x0100).encode(
+            sys.getfilesystemencoding(), "replace") == b"?",
+        "file system encoding only supports ascii")
+    def test_unicode(self):
+        self.cls(six.unichr(0x0100))
+
+
+class PurePosixPathTest(_BasePurePathTest, unittest.TestCase):
+    cls = pathlib.PurePosixPath
+
+    def test_root(self):
+        P = self.cls
+        self.assertEqual(P('/a/b').root, '/')
+        self.assertEqual(P('///a/b').root, '/')
+        # POSIX special case for two leading slashes
+        self.assertEqual(P('//a/b').root, '//')
+
+    def test_eq(self):
+        P = self.cls
+        self.assertNotEqual(P('a/b'), P('A/b'))
+        self.assertEqual(P('/a'), P('///a'))
+        self.assertNotEqual(P('/a'), P('//a'))
+
+    def test_as_uri(self):
+        P = self.cls
+        self.assertEqual(P('/').as_uri(), 'file:///')
+        self.assertEqual(P('/a/b.c').as_uri(), 'file:///a/b.c')
+        self.assertEqual(P('/a/b%#c').as_uri(), 'file:///a/b%25%23c')
+
+    @with_fsencode
+    def test_as_uri_non_ascii(self):
+        from urllib.parse import quote_from_bytes
+        P = self.cls
+        try:
+            os.fsencode('\xe9')
+        except UnicodeEncodeError:
+            self.skipTest("\\xe9 cannot be encoded to the filesystem encoding")
+        self.assertEqual(P('/a/b\xe9').as_uri(),
+                         'file:///a/b' + quote_from_bytes(os.fsencode('\xe9')))
+
+    def test_match(self):
+        P = self.cls
+        self.assertFalse(P('A.py').match('a.PY'))
+
+    def test_is_absolute(self):
+        P = self.cls
+        self.assertFalse(P().is_absolute())
+        self.assertFalse(P('a').is_absolute())
+        self.assertFalse(P('a/b/').is_absolute())
+        self.assertTrue(P('/').is_absolute())
+        self.assertTrue(P('/a').is_absolute())
+        self.assertTrue(P('/a/b/').is_absolute())
+        self.assertTrue(P('//a').is_absolute())
+        self.assertTrue(P('//a/b').is_absolute())
+
+    def test_is_reserved(self):
+        P = self.cls
+        self.assertIs(False, P('').is_reserved())
+        self.assertIs(False, P('/').is_reserved())
+        self.assertIs(False, P('/foo/bar').is_reserved())
+        self.assertIs(False, P('/dev/con/PRN/NUL').is_reserved())
+
+    def test_join(self):
+        P = self.cls
+        p = P('//a')
+        pp = p.joinpath('b')
+        self.assertEqual(pp, P('//a/b'))
+        pp = P('/a').joinpath('//c')
+        self.assertEqual(pp, P('//c'))
+        pp = P('//a').joinpath('/c')
+        self.assertEqual(pp, P('/c'))
+
+    def test_div(self):
+        # Basically the same as joinpath()
+        P = self.cls
+        p = P('//a')
+        pp = p / 'b'
+        self.assertEqual(pp, P('//a/b'))
+        pp = P('/a') / '//c'
+        self.assertEqual(pp, P('//c'))
+        pp = P('//a') / '/c'
+        self.assertEqual(pp, P('/c'))
+
+
+class PureWindowsPathTest(_BasePurePathTest, unittest.TestCase):
+    cls = pathlib.PureWindowsPath
+
+    equivalences = _BasePurePathTest.equivalences.copy()
+    equivalences.update({
+        'c:a': [('c:', 'a'), ('c:', 'a/'), ('/', 'c:', 'a')],
+        'c:/a': [
+            ('c:/', 'a'), ('c:', '/', 'a'), ('c:', '/a'),
+            ('/z', 'c:/', 'a'), ('//x/y', 'c:/', 'a'),
+            ],
+        '//a/b/': [('//a/b',)],
+        '//a/b/c': [
+            ('//a/b', 'c'), ('//a/b/', 'c'),
+            ],
+    })
+
+    def test_str(self):
+        p = self.cls('a/b/c')
+        self.assertEqual(str(p), 'a\\b\\c')
+        p = self.cls('c:/a/b/c')
+        self.assertEqual(str(p), 'c:\\a\\b\\c')
+        p = self.cls('//a/b')
+        self.assertEqual(str(p), '\\\\a\\b\\')
+        p = self.cls('//a/b/c')
+        self.assertEqual(str(p), '\\\\a\\b\\c')
+        p = self.cls('//a/b/c/d')
+        self.assertEqual(str(p), '\\\\a\\b\\c\\d')
+
+    def test_str_subclass(self):
+        self._check_str_subclass('c:')
+        self._check_str_subclass('c:a')
+        self._check_str_subclass('c:a\\b.txt')
+        self._check_str_subclass('c:\\')
+        self._check_str_subclass('c:\\a')
+        self._check_str_subclass('c:\\a\\b.txt')
+        self._check_str_subclass('\\\\some\\share')
+        self._check_str_subclass('\\\\some\\share\\a')
+        self._check_str_subclass('\\\\some\\share\\a\\b.txt')
+
+    def test_eq(self):
+        P = self.cls
+        self.assertEqual(P('c:a/b'), P('c:a/b'))
+        self.assertEqual(P('c:a/b'), P('c:', 'a', 'b'))
+        self.assertNotEqual(P('c:a/b'), P('d:a/b'))
+        self.assertNotEqual(P('c:a/b'), P('c:/a/b'))
+        self.assertNotEqual(P('/a/b'), P('c:/a/b'))
+        # Case-insensitivity
+        self.assertEqual(P('a/B'), P('A/b'))
+        self.assertEqual(P('C:a/B'), P('c:A/b'))
+        self.assertEqual(P('//Some/SHARE/a/B'), P('//somE/share/A/b'))
+
+    @with_fsencode
+    def test_as_uri(self):
+        P = self.cls
+        with self.assertRaises(ValueError):
+            P('/a/b').as_uri()
+        with self.assertRaises(ValueError):
+            P('c:a/b').as_uri()
+        self.assertEqual(P('c:/').as_uri(), 'file:///c:/')
+        self.assertEqual(P('c:/a/b.c').as_uri(), 'file:///c:/a/b.c')
+        self.assertEqual(P('c:/a/b%#c').as_uri(), 'file:///c:/a/b%25%23c')
+        self.assertEqual(P('c:/a/b\xe9').as_uri(), 'file:///c:/a/b%C3%A9')
+        self.assertEqual(P('//some/share/').as_uri(), 'file://some/share/')
+        self.assertEqual(P('//some/share/a/b.c').as_uri(),
+                         'file://some/share/a/b.c')
+        self.assertEqual(P('//some/share/a/b%#c\xe9').as_uri(),
+                         'file://some/share/a/b%25%23c%C3%A9')
+
+    def test_match_common(self):
+        P = self.cls
+        # Absolute patterns
+        self.assertTrue(P('c:/b.py').match('/*.py'))
+        self.assertTrue(P('c:/b.py').match('c:*.py'))
+        self.assertTrue(P('c:/b.py').match('c:/*.py'))
+        self.assertFalse(P('d:/b.py').match('c:/*.py'))  # wrong drive
+        self.assertFalse(P('b.py').match('/*.py'))
+        self.assertFalse(P('b.py').match('c:*.py'))
+        self.assertFalse(P('b.py').match('c:/*.py'))
+        self.assertFalse(P('c:b.py').match('/*.py'))
+        self.assertFalse(P('c:b.py').match('c:/*.py'))
+        self.assertFalse(P('/b.py').match('c:*.py'))
+        self.assertFalse(P('/b.py').match('c:/*.py'))
+        # UNC patterns
+        self.assertTrue(P('//some/share/a.py').match('/*.py'))
+        self.assertTrue(P('//some/share/a.py').match('//some/share/*.py'))
+        self.assertFalse(P('//other/share/a.py').match('//some/share/*.py'))
+        self.assertFalse(P('//some/share/a/b.py').match('//some/share/*.py'))
+        # Case-insensitivity
+        self.assertTrue(P('B.py').match('b.PY'))
+        self.assertTrue(P('c:/a/B.Py').match('C:/A/*.pY'))
+        self.assertTrue(P('//Some/Share/B.Py').match('//somE/sharE/*.pY'))
+
+    def test_ordering_common(self):
+        # Case-insensitivity
+        def assertOrderedEqual(a, b):
+            self.assertLessEqual(a, b)
+            self.assertGreaterEqual(b, a)
+        P = self.cls
+        p = P('c:A/b')
+        q = P('C:a/B')
+        assertOrderedEqual(p, q)
+        self.assertFalse(p < q)
+        self.assertFalse(p > q)
+        p = P('//some/Share/A/b')
+        q = P('//Some/SHARE/a/B')
+        assertOrderedEqual(p, q)
+        self.assertFalse(p < q)
+        self.assertFalse(p > q)
+
+    def test_parts(self):
+        P = self.cls
+        p = P('c:a/b')
+        parts = p.parts
+        self.assertEqual(parts, ('c:', 'a', 'b'))
+        p = P('c:/a/b')
+        parts = p.parts
+        self.assertEqual(parts, ('c:\\', 'a', 'b'))
+        p = P('//a/b/c/d')
+        parts = p.parts
+        self.assertEqual(parts, ('\\\\a\\b\\', 'c', 'd'))
+
+    def test_parent(self):
+        # Anchored
+        P = self.cls
+        p = P('z:a/b/c')
+        self.assertEqual(p.parent, P('z:a/b'))
+        self.assertEqual(p.parent.parent, P('z:a'))
+        self.assertEqual(p.parent.parent.parent, P('z:'))
+        self.assertEqual(p.parent.parent.parent.parent, P('z:'))
+        p = P('z:/a/b/c')
+        self.assertEqual(p.parent, P('z:/a/b'))
+        self.assertEqual(p.parent.parent, P('z:/a'))
+        self.assertEqual(p.parent.parent.parent, P('z:/'))
+        self.assertEqual(p.parent.parent.parent.parent, P('z:/'))
+        p = P('//a/b/c/d')
+        self.assertEqual(p.parent, P('//a/b/c'))
+        self.assertEqual(p.parent.parent, P('//a/b'))
+        self.assertEqual(p.parent.parent.parent, P('//a/b'))
+
+    def test_parents(self):
+        # Anchored
+        P = self.cls
+        p = P('z:a/b/')
+        par = p.parents
+        self.assertEqual(len(par), 2)
+        self.assertEqual(par[0], P('z:a'))
+        self.assertEqual(par[1], P('z:'))
+        self.assertEqual(list(par), [P('z:a'), P('z:')])
+        with self.assertRaises(IndexError):
+            par[2]
+        p = P('z:/a/b/')
+        par = p.parents
+        self.assertEqual(len(par), 2)
+        self.assertEqual(par[0], P('z:/a'))
+        self.assertEqual(par[1], P('z:/'))
+        self.assertEqual(list(par), [P('z:/a'), P('z:/')])
+        with self.assertRaises(IndexError):
+            par[2]
+        p = P('//a/b/c/d')
+        par = p.parents
+        self.assertEqual(len(par), 2)
+        self.assertEqual(par[0], P('//a/b/c'))
+        self.assertEqual(par[1], P('//a/b'))
+        self.assertEqual(list(par), [P('//a/b/c'), P('//a/b')])
+        with self.assertRaises(IndexError):
+            par[2]
+
+    def test_drive(self):
+        P = self.cls
+        self.assertEqual(P('c:').drive, 'c:')
+        self.assertEqual(P('c:a/b').drive, 'c:')
+        self.assertEqual(P('c:/').drive, 'c:')
+        self.assertEqual(P('c:/a/b/').drive, 'c:')
+        self.assertEqual(P('//a/b').drive, '\\\\a\\b')
+        self.assertEqual(P('//a/b/').drive, '\\\\a\\b')
+        self.assertEqual(P('//a/b/c/d').drive, '\\\\a\\b')
+
+    def test_root(self):
+        P = self.cls
+        self.assertEqual(P('c:').root, '')
+        self.assertEqual(P('c:a/b').root, '')
+        self.assertEqual(P('c:/').root, '\\')
+        self.assertEqual(P('c:/a/b/').root, '\\')
+        self.assertEqual(P('//a/b').root, '\\')
+        self.assertEqual(P('//a/b/').root, '\\')
+        self.assertEqual(P('//a/b/c/d').root, '\\')
+
+    def test_anchor(self):
+        P = self.cls
+        self.assertEqual(P('c:').anchor, 'c:')
+        self.assertEqual(P('c:a/b').anchor, 'c:')
+        self.assertEqual(P('c:/').anchor, 'c:\\')
+        self.assertEqual(P('c:/a/b/').anchor, 'c:\\')
+        self.assertEqual(P('//a/b').anchor, '\\\\a\\b\\')
+        self.assertEqual(P('//a/b/').anchor, '\\\\a\\b\\')
+        self.assertEqual(P('//a/b/c/d').anchor, '\\\\a\\b\\')
+
+    def test_name(self):
+        P = self.cls
+        self.assertEqual(P('c:').name, '')
+        self.assertEqual(P('c:/').name, '')
+        self.assertEqual(P('c:a/b').name, 'b')
+        self.assertEqual(P('c:/a/b').name, 'b')
+        self.assertEqual(P('c:a/b.py').name, 'b.py')
+        self.assertEqual(P('c:/a/b.py').name, 'b.py')
+        self.assertEqual(P('//My.py/Share.php').name, '')
+        self.assertEqual(P('//My.py/Share.php/a/b').name, 'b')
+
+    def test_suffix(self):
+        P = self.cls
+        self.assertEqual(P('c:').suffix, '')
+        self.assertEqual(P('c:/').suffix, '')
+        self.assertEqual(P('c:a/b').suffix, '')
+        self.assertEqual(P('c:/a/b').suffix, '')
+        self.assertEqual(P('c:a/b.py').suffix, '.py')
+        self.assertEqual(P('c:/a/b.py').suffix, '.py')
+        self.assertEqual(P('c:a/.hgrc').suffix, '')
+        self.assertEqual(P('c:/a/.hgrc').suffix, '')
+        self.assertEqual(P('c:a/.hg.rc').suffix, '.rc')
+        self.assertEqual(P('c:/a/.hg.rc').suffix, '.rc')
+        self.assertEqual(P('c:a/b.tar.gz').suffix, '.gz')
+        self.assertEqual(P('c:/a/b.tar.gz').suffix, '.gz')
+        self.assertEqual(P('c:a/Some name. Ending with a dot.').suffix, '')
+        self.assertEqual(P('c:/a/Some name. Ending with a dot.').suffix, '')
+        self.assertEqual(P('//My.py/Share.php').suffix, '')
+        self.assertEqual(P('//My.py/Share.php/a/b').suffix, '')
+
+    def test_suffixes(self):
+        P = self.cls
+        self.assertEqual(P('c:').suffixes, [])
+        self.assertEqual(P('c:/').suffixes, [])
+        self.assertEqual(P('c:a/b').suffixes, [])
+        self.assertEqual(P('c:/a/b').suffixes, [])
+        self.assertEqual(P('c:a/b.py').suffixes, ['.py'])
+        self.assertEqual(P('c:/a/b.py').suffixes, ['.py'])
+        self.assertEqual(P('c:a/.hgrc').suffixes, [])
+        self.assertEqual(P('c:/a/.hgrc').suffixes, [])
+        self.assertEqual(P('c:a/.hg.rc').suffixes, ['.rc'])
+        self.assertEqual(P('c:/a/.hg.rc').suffixes, ['.rc'])
+        self.assertEqual(P('c:a/b.tar.gz').suffixes, ['.tar', '.gz'])
+        self.assertEqual(P('c:/a/b.tar.gz').suffixes, ['.tar', '.gz'])
+        self.assertEqual(P('//My.py/Share.php').suffixes, [])
+        self.assertEqual(P('//My.py/Share.php/a/b').suffixes, [])
+        self.assertEqual(P('c:a/Some name. Ending with a dot.').suffixes, [])
+        self.assertEqual(P('c:/a/Some name. Ending with a dot.').suffixes, [])
+
+    def test_stem(self):
+        P = self.cls
+        self.assertEqual(P('c:').stem, '')
+        self.assertEqual(P('c:.').stem, '')
+        self.assertEqual(P('c:..').stem, '..')
+        self.assertEqual(P('c:/').stem, '')
+        self.assertEqual(P('c:a/b').stem, 'b')
+        self.assertEqual(P('c:a/b.py').stem, 'b')
+        self.assertEqual(P('c:a/.hgrc').stem, '.hgrc')
+        self.assertEqual(P('c:a/.hg.rc').stem, '.hg')
+        self.assertEqual(P('c:a/b.tar.gz').stem, 'b.tar')
+        self.assertEqual(P('c:a/Some name. Ending with a dot.').stem,
+                         'Some name. Ending with a dot.')
+
+    def test_with_name(self):
+        P = self.cls
+        self.assertEqual(P('c:a/b').with_name('d.xml'), P('c:a/d.xml'))
+        self.assertEqual(P('c:/a/b').with_name('d.xml'), P('c:/a/d.xml'))
+        self.assertEqual(
+            P('c:a/Dot ending.').with_name('d.xml'), P('c:a/d.xml'))
+        self.assertEqual(
+            P('c:/a/Dot ending.').with_name('d.xml'), P('c:/a/d.xml'))
+        self.assertRaises(ValueError, P('c:').with_name, 'd.xml')
+        self.assertRaises(ValueError, P('c:/').with_name, 'd.xml')
+        self.assertRaises(ValueError, P('//My/Share').with_name, 'd.xml')
+        self.assertRaises(ValueError, P('c:a/b').with_name, 'd:')
+        self.assertRaises(ValueError, P('c:a/b').with_name, 'd:e')
+        self.assertRaises(ValueError, P('c:a/b').with_name, 'd:/e')
+        self.assertRaises(ValueError, P('c:a/b').with_name, '//My/Share')
+
+    def test_with_suffix(self):
+        P = self.cls
+        self.assertEqual(P('c:a/b').with_suffix('.gz'), P('c:a/b.gz'))
+        self.assertEqual(P('c:/a/b').with_suffix('.gz'), P('c:/a/b.gz'))
+        self.assertEqual(P('c:a/b.py').with_suffix('.gz'), P('c:a/b.gz'))
+        self.assertEqual(P('c:/a/b.py').with_suffix('.gz'), P('c:/a/b.gz'))
+        # Path doesn't have a "filename" component
+        self.assertRaises(ValueError, P('').with_suffix, '.gz')
+        self.assertRaises(ValueError, P('.').with_suffix, '.gz')
+        self.assertRaises(ValueError, P('/').with_suffix, '.gz')
+        self.assertRaises(ValueError, P('//My/Share').with_suffix, '.gz')
+        # Invalid suffix
+        self.assertRaises(ValueError, P('c:a/b').with_suffix, 'gz')
+        self.assertRaises(ValueError, P('c:a/b').with_suffix, '/')
+        self.assertRaises(ValueError, P('c:a/b').with_suffix, '\\')
+        self.assertRaises(ValueError, P('c:a/b').with_suffix, 'c:')
+        self.assertRaises(ValueError, P('c:a/b').with_suffix, '/.gz')
+        self.assertRaises(ValueError, P('c:a/b').with_suffix, '\\.gz')
+        self.assertRaises(ValueError, P('c:a/b').with_suffix, 'c:.gz')
+        self.assertRaises(ValueError, P('c:a/b').with_suffix, 'c/d')
+        self.assertRaises(ValueError, P('c:a/b').with_suffix, 'c\\d')
+        self.assertRaises(ValueError, P('c:a/b').with_suffix, '.c/d')
+        self.assertRaises(ValueError, P('c:a/b').with_suffix, '.c\\d')
+
+    def test_relative_to(self):
+        P = self.cls
+        p = P('C:Foo/Bar')
+        self.assertEqual(p.relative_to(P('c:')), P('Foo/Bar'))
+        self.assertEqual(p.relative_to('c:'), P('Foo/Bar'))
+        self.assertEqual(p.relative_to(P('c:foO')), P('Bar'))
+        self.assertEqual(p.relative_to('c:foO'), P('Bar'))
+        self.assertEqual(p.relative_to('c:foO/'), P('Bar'))
+        self.assertEqual(p.relative_to(P('c:foO/baR')), P())
+        self.assertEqual(p.relative_to('c:foO/baR'), P())
+        # Unrelated paths
+        self.assertRaises(ValueError, p.relative_to, P())
+        self.assertRaises(ValueError, p.relative_to, '')
+        self.assertRaises(ValueError, p.relative_to, P('d:'))
+        self.assertRaises(ValueError, p.relative_to, P('/'))
+        self.assertRaises(ValueError, p.relative_to, P('Foo'))
+        self.assertRaises(ValueError, p.relative_to, P('/Foo'))
+        self.assertRaises(ValueError, p.relative_to, P('C:/Foo'))
+        self.assertRaises(ValueError, p.relative_to, P('C:Foo/Bar/Baz'))
+        self.assertRaises(ValueError, p.relative_to, P('C:Foo/Baz'))
+        p = P('C:/Foo/Bar')
+        self.assertEqual(p.relative_to(P('c:')), P('/Foo/Bar'))
+        self.assertEqual(p.relative_to('c:'), P('/Foo/Bar'))
+        self.assertEqual(str(p.relative_to(P('c:'))), '\\Foo\\Bar')
+        self.assertEqual(str(p.relative_to('c:')), '\\Foo\\Bar')
+        self.assertEqual(p.relative_to(P('c:/')), P('Foo/Bar'))
+        self.assertEqual(p.relative_to('c:/'), P('Foo/Bar'))
+        self.assertEqual(p.relative_to(P('c:/foO')), P('Bar'))
+        self.assertEqual(p.relative_to('c:/foO'), P('Bar'))
+        self.assertEqual(p.relative_to('c:/foO/'), P('Bar'))
+        self.assertEqual(p.relative_to(P('c:/foO/baR')), P())
+        self.assertEqual(p.relative_to('c:/foO/baR'), P())
+        # Unrelated paths
+        self.assertRaises(ValueError, p.relative_to, P('C:/Baz'))
+        self.assertRaises(ValueError, p.relative_to, P('C:/Foo/Bar/Baz'))
+        self.assertRaises(ValueError, p.relative_to, P('C:/Foo/Baz'))
+        self.assertRaises(ValueError, p.relative_to, P('C:Foo'))
+        self.assertRaises(ValueError, p.relative_to, P('d:'))
+        self.assertRaises(ValueError, p.relative_to, P('d:/'))
+        self.assertRaises(ValueError, p.relative_to, P('/'))
+        self.assertRaises(ValueError, p.relative_to, P('/Foo'))
+        self.assertRaises(ValueError, p.relative_to, P('//C/Foo'))
+        # UNC paths
+        p = P('//Server/Share/Foo/Bar')
+        self.assertEqual(p.relative_to(P('//sErver/sHare')), P('Foo/Bar'))
+        self.assertEqual(p.relative_to('//sErver/sHare'), P('Foo/Bar'))
+        self.assertEqual(p.relative_to('//sErver/sHare/'), P('Foo/Bar'))
+        self.assertEqual(p.relative_to(P('//sErver/sHare/Foo')), P('Bar'))
+        self.assertEqual(p.relative_to('//sErver/sHare/Foo'), P('Bar'))
+        self.assertEqual(p.relative_to('//sErver/sHare/Foo/'), P('Bar'))
+        self.assertEqual(p.relative_to(P('//sErver/sHare/Foo/Bar')), P())
+        self.assertEqual(p.relative_to('//sErver/sHare/Foo/Bar'), P())
+        # Unrelated paths
+        self.assertRaises(ValueError, p.relative_to, P('/Server/Share/Foo'))
+        self.assertRaises(ValueError, p.relative_to, P('c:/Server/Share/Foo'))
+        self.assertRaises(ValueError, p.relative_to, P('//z/Share/Foo'))
+        self.assertRaises(ValueError, p.relative_to, P('//Server/z/Foo'))
+
+    def test_is_absolute(self):
+        P = self.cls
+        # Under NT, only paths with both a drive and a root are absolute
+        self.assertFalse(P().is_absolute())
+        self.assertFalse(P('a').is_absolute())
+        self.assertFalse(P('a/b/').is_absolute())
+        self.assertFalse(P('/').is_absolute())
+        self.assertFalse(P('/a').is_absolute())
+        self.assertFalse(P('/a/b/').is_absolute())
+        self.assertFalse(P('c:').is_absolute())
+        self.assertFalse(P('c:a').is_absolute())
+        self.assertFalse(P('c:a/b/').is_absolute())
+        self.assertTrue(P('c:/').is_absolute())
+        self.assertTrue(P('c:/a').is_absolute())
+        self.assertTrue(P('c:/a/b/').is_absolute())
+        # UNC paths are absolute by definition
+        self.assertTrue(P('//a/b').is_absolute())
+        self.assertTrue(P('//a/b/').is_absolute())
+        self.assertTrue(P('//a/b/c').is_absolute())
+        self.assertTrue(P('//a/b/c/d').is_absolute())
+
+    def test_join(self):
+        P = self.cls
+        p = P('C:/a/b')
+        pp = p.joinpath('x/y')
+        self.assertEqual(pp, P('C:/a/b/x/y'))
+        pp = p.joinpath('/x/y')
+        self.assertEqual(pp, P('C:/x/y'))
+        # Joining with a different drive => the first path is ignored, even
+        # if the second path is relative.
+        pp = p.joinpath('D:x/y')
+        self.assertEqual(pp, P('D:x/y'))
+        pp = p.joinpath('D:/x/y')
+        self.assertEqual(pp, P('D:/x/y'))
+        pp = p.joinpath('//host/share/x/y')
+        self.assertEqual(pp, P('//host/share/x/y'))
+        # Joining with the same drive => the first path is appended to if
+        # the second path is relative.
+        pp = p.joinpath('c:x/y')
+        self.assertEqual(pp, P('C:/a/b/x/y'))
+        pp = p.joinpath('c:/x/y')
+        self.assertEqual(pp, P('C:/x/y'))
+
+    def test_div(self):
+        # Basically the same as joinpath()
+        P = self.cls
+        p = P('C:/a/b')
+        self.assertEqual(p / 'x/y', P('C:/a/b/x/y'))
+        self.assertEqual(p / 'x' / 'y', P('C:/a/b/x/y'))
+        self.assertEqual(p / '/x/y', P('C:/x/y'))
+        self.assertEqual(p / '/x' / 'y', P('C:/x/y'))
+        # Joining with a different drive => the first path is ignored, even
+        # if the second path is relative.
+        self.assertEqual(p / 'D:x/y', P('D:x/y'))
+        self.assertEqual(p / 'D:' / 'x/y', P('D:x/y'))
+        self.assertEqual(p / 'D:/x/y', P('D:/x/y'))
+        self.assertEqual(p / 'D:' / '/x/y', P('D:/x/y'))
+        self.assertEqual(p / '//host/share/x/y', P('//host/share/x/y'))
+        # Joining with the same drive => the first path is appended to if
+        # the second path is relative.
+        self.assertEqual(p / 'c:x/y', P('C:/a/b/x/y'))
+        self.assertEqual(p / 'c:/x/y', P('C:/x/y'))
+
+    def test_is_reserved(self):
+        P = self.cls
+        self.assertIs(False, P('').is_reserved())
+        self.assertIs(False, P('/').is_reserved())
+        self.assertIs(False, P('/foo/bar').is_reserved())
+        self.assertIs(True, P('con').is_reserved())
+        self.assertIs(True, P('NUL').is_reserved())
+        self.assertIs(True, P('NUL.txt').is_reserved())
+        self.assertIs(True, P('com1').is_reserved())
+        self.assertIs(True, P('com9.bar').is_reserved())
+        self.assertIs(False, P('bar.com9').is_reserved())
+        self.assertIs(True, P('lpt1').is_reserved())
+        self.assertIs(True, P('lpt9.bar').is_reserved())
+        self.assertIs(False, P('bar.lpt9').is_reserved())
+        # Only the last component matters
+        self.assertIs(False, P('c:/NUL/con/baz').is_reserved())
+        # UNC paths are never reserved
+        self.assertIs(False, P('//my/share/nul/con/aux').is_reserved())
+
+
+class PurePathTest(_BasePurePathTest, unittest.TestCase):
+    cls = pathlib.PurePath
+
+    def test_concrete_class(self):
+        p = self.cls('a')
+        self.assertIs(
+            type(p),
+            pathlib.PureWindowsPath
+            if os.name == 'nt' else pathlib.PurePosixPath)
+
+    def test_different_flavours_unequal(self):
+        p = pathlib.PurePosixPath('a')
+        q = pathlib.PureWindowsPath('a')
+        self.assertNotEqual(p, q)
+
+    @unittest.skipIf(sys.version_info < (3, 0),
+                     'Most types are orderable in Python 2')
+    def test_different_flavours_unordered(self):
+        p = pathlib.PurePosixPath('a')
+        q = pathlib.PureWindowsPath('a')
+        with self.assertRaises(TypeError):
+            p < q
+        with self.assertRaises(TypeError):
+            p <= q
+        with self.assertRaises(TypeError):
+            p > q
+        with self.assertRaises(TypeError):
+            p >= q
+
+
+#
+# Tests for the concrete classes
+#
+
+# Make sure any symbolic links in the base test path are resolved
+BASE = os.path.realpath(TESTFN)
+
+
+def join(*x):
+    return os.path.join(BASE, *x)
+
+
+def rel_join(*x):
+    return os.path.join(TESTFN, *x)
+
+
+only_nt = unittest.skipIf(os.name != 'nt',
+                          'test requires a Windows-compatible system')
+only_posix = unittest.skipIf(os.name == 'nt',
+                             'test requires a POSIX-compatible system')
+
+
+@only_posix
+class PosixPathAsPureTest(PurePosixPathTest):
+    cls = pathlib.PosixPath
+
+
+@only_nt
+class WindowsPathAsPureTest(PureWindowsPathTest):
+    cls = pathlib.WindowsPath
+
+    def test_owner(self):
+        P = self.cls
+        with self.assertRaises(NotImplementedError):
+            P('c:/').owner()
+
+    def test_group(self):
+        P = self.cls
+        with self.assertRaises(NotImplementedError):
+            P('c:/').group()
+
+
+class _BasePathTest(object):
+    """Tests for the FS-accessing functionalities of the Path classes."""
+
+    # (BASE)
+    #  |
+    #  |-- brokenLink -> non-existing
+    #  |-- dirA
+    #  |   `-- linkC -> ../dirB
+    #  |-- dirB
+    #  |   |-- fileB
+    #  |   `-- linkD -> ../dirB
+    #  |-- dirC
+    #  |   |-- dirD
+    #  |   |   `-- fileD
+    #  |   `-- fileC
+    #  |-- dirE  # No permissions
+    #  |-- fileA
+    #  |-- linkA -> fileA
+    #  `-- linkB -> dirB
+    #
+
+    def setUp(self):
+        def cleanup():
+            os.chmod(join('dirE'), 0o777)
+            support.rmtree(BASE)
+        self.addCleanup(cleanup)
+        os.mkdir(BASE)
+        os.mkdir(join('dirA'))
+        os.mkdir(join('dirB'))
+        os.mkdir(join('dirC'))
+        os.mkdir(join('dirC', 'dirD'))
+        os.mkdir(join('dirE'))
+        with open(join('fileA'), 'wb') as f:
+            f.write(b"this is file A\n")
+        with open(join('dirB', 'fileB'), 'wb') as f:
+            f.write(b"this is file B\n")
+        with open(join('dirC', 'fileC'), 'wb') as f:
+            f.write(b"this is file C\n")
+        with open(join('dirC', 'dirD', 'fileD'), 'wb') as f:
+            f.write(b"this is file D\n")
+        os.chmod(join('dirE'), 0)
+        if support_can_symlink():
+            # Relative symlinks
+            os.symlink('fileA', join('linkA'))
+            os.symlink('non-existing', join('brokenLink'))
+            self.dirlink('dirB', join('linkB'))
+            self.dirlink(os.path.join('..', 'dirB'), join('dirA', 'linkC'))
+            # This one goes upwards, creating a loop
+            self.dirlink(os.path.join('..', 'dirB'), join('dirB', 'linkD'))
+
+    if os.name == 'nt':
+        # Workaround for http://bugs.python.org/issue13772
+        def dirlink(self, src, dest):
+            os.symlink(src, dest, target_is_directory=True)
+    else:
+        def dirlink(self, src, dest):
+            os.symlink(src, dest)
+
+    def assertSame(self, path_a, path_b):
+        self.assertTrue(os.path.samefile(str(path_a), str(path_b)),
+                        "%r and %r don't point to the same file" %
+                        (path_a, path_b))
+
+    def assertFileNotFound(self, func, *args, **kwargs):
+        if sys.version_info >= (3, 3):
+            with self.assertRaises(FileNotFoundError) as cm:
+                func(*args, **kwargs)
+        else:
+            with self.assertRaises(OSError) as cm:
+                # Python 2.6 kludge for http://bugs.python.org/issue7853
+                try:
+                    func(*args, **kwargs)
+                except:  # noqa: E722
+                    raise
+            self.assertEqual(cm.exception.errno, errno.ENOENT)
+
+    def assertFileExists(self, func, *args, **kwargs):
+        if sys.version_info >= (3, 3):
+            with self.assertRaises(FileExistsError) as cm:
+                func(*args, **kwargs)
+        else:
+            with self.assertRaises(OSError) as cm:
+                # Python 2.6 kludge for http://bugs.python.org/issue7853
+                try:
+                    func(*args, **kwargs)
+                except:  # noqa: E722
+                    raise
+            self.assertEqual(cm.exception.errno, errno.EEXIST)
+
+    def _test_cwd(self, p):
+        q = self.cls(os.getcwd())
+        self.assertEqual(p, q)
+        self.assertEqual(str(p), str(q))
+        self.assertIs(type(p), type(q))
+        self.assertTrue(p.is_absolute())
+
+    def test_cwd(self):
+        p = self.cls.cwd()
+        self._test_cwd(p)
+
+    def _test_home(self, p):
+        q = self.cls(os.path.expanduser('~'))
+        self.assertEqual(p, q)
+        self.assertEqual(str(p), str(q))
+        self.assertIs(type(p), type(q))
+        self.assertTrue(p.is_absolute())
+
+    def test_home(self):
+        p = self.cls.home()
+        self._test_home(p)
+
+    def test_samefile(self):
+        fileA_path = os.path.join(BASE, 'fileA')
+        fileB_path = os.path.join(BASE, 'dirB', 'fileB')
+        p = self.cls(fileA_path)
+        pp = self.cls(fileA_path)
+        q = self.cls(fileB_path)
+        self.assertTrue(p.samefile(fileA_path))
+        self.assertTrue(p.samefile(pp))
+        self.assertFalse(p.samefile(fileB_path))
+        self.assertFalse(p.samefile(q))
+        # Test the non-existent file case
+        non_existent = os.path.join(BASE, 'foo')
+        r = self.cls(non_existent)
+        self.assertFileNotFound(p.samefile, r)
+        self.assertFileNotFound(p.samefile, non_existent)
+        self.assertFileNotFound(r.samefile, p)
+        self.assertFileNotFound(r.samefile, non_existent)
+        self.assertFileNotFound(r.samefile, r)
+        self.assertFileNotFound(r.samefile, non_existent)
+
+    def test_empty_path(self):
+        # The empty path points to '.'
+        p = self.cls('')
+        self.assertEqual(p.stat(), os.stat('.'))
+
+    def test_expanduser_common(self):
+        P = self.cls
+        p = P('~')
+        self.assertEqual(p.expanduser(), P(os.path.expanduser('~')))
+        p = P('foo')
+        self.assertEqual(p.expanduser(), p)
+        p = P('/~')
+        self.assertEqual(p.expanduser(), p)
+        p = P('../~')
+        self.assertEqual(p.expanduser(), p)
+        p = P(P('').absolute().anchor) / '~'
+        self.assertEqual(p.expanduser(), p)
+
+    def test_exists(self):
+        P = self.cls
+        p = P(BASE)
+        self.assertIs(True, p.exists())
+        self.assertIs(True, (p / 'dirA').exists())
+        self.assertIs(True, (p / 'fileA').exists())
+        self.assertIs(False, (p / 'fileA' / 'bah').exists())
+        if support_can_symlink():
+            self.assertIs(True, (p / 'linkA').exists())
+            self.assertIs(True, (p / 'linkB').exists())
+            self.assertIs(True, (p / 'linkB' / 'fileB').exists())
+            self.assertIs(False, (p / 'linkA' / 'bah').exists())
+        self.assertIs(False, (p / 'foo').exists())
+        self.assertIs(False, P('/xyzzy').exists())
+
+    def test_open_common(self):
+        p = self.cls(BASE)
+        with (p / 'fileA').open('r') as f:
+            self.assertIsInstance(f, io.TextIOBase)
+            self.assertEqual(f.read(), "this is file A\n")
+        with (p / 'fileA').open('rb') as f:
+            self.assertIsInstance(f, io.BufferedIOBase)
+            self.assertEqual(f.read().strip(), b"this is file A")
+        with (p / 'fileA').open('rb', buffering=0) as f:
+            self.assertIsInstance(f, io.RawIOBase)
+            self.assertEqual(f.read().strip(), b"this is file A")
+
+    def test_read_write_bytes(self):
+        p = self.cls(BASE)
+        (p / 'fileA').write_bytes(b'abcdefg')
+        self.assertEqual((p / 'fileA').read_bytes(), b'abcdefg')
+        # check that trying to write str does not truncate the file
+        with self.assertRaises(TypeError) as cm:
+            (p / 'fileA').write_bytes(six.u('somestr'))
+        self.assertTrue(str(cm.exception).startswith('data must be'))
+        self.assertEqual((p / 'fileA').read_bytes(), b'abcdefg')
+
+    def test_read_write_text(self):
+        p = self.cls(BASE)
+        (p / 'fileA').write_text(six.u('\u00e4bcdefg'), encoding='latin-1')
+        self.assertEqual((p / 'fileA').read_text(
+            encoding='utf-8', errors='ignore'), six.u('bcdefg'))
+        # check that trying to write bytes does not truncate the file
+        with self.assertRaises(TypeError) as cm:
+            (p / 'fileA').write_text(b'somebytes')
+        self.assertTrue(str(cm.exception).startswith('data must be'))
+        self.assertEqual((p / 'fileA').read_text(encoding='latin-1'),
+                         six.u('\u00e4bcdefg'))
+
+    def test_iterdir(self):
+        P = self.cls
+        p = P(BASE)
+        it = p.iterdir()
+        paths = set(it)
+        expected = ['dirA', 'dirB', 'dirC', 'dirE', 'fileA']
+        if support_can_symlink():
+            expected += ['linkA', 'linkB', 'brokenLink']
+        self.assertEqual(paths, set(P(BASE, q) for q in expected))
+
+    @support_skip_unless_symlink
+    def test_iterdir_symlink(self):
+        # __iter__ on a symlink to a directory
+        P = self.cls
+        p = P(BASE, 'linkB')
+        paths = set(p.iterdir())
+        expected = set(P(BASE, 'linkB', q) for q in ['fileB', 'linkD'])
+        self.assertEqual(paths, expected)
+
+    def test_iterdir_nodir(self):
+        # __iter__ on something that is not a directory
+        p = self.cls(BASE, 'fileA')
+        with self.assertRaises(OSError) as cm:
+            # Python 2.6 kludge for http://bugs.python.org/issue7853
+            try:
+                next(p.iterdir())
+            except:  # noqa: E722s
+                raise
+        # ENOENT or EINVAL under Windows, ENOTDIR otherwise
+        # (see issue #12802)
+        self.assertIn(cm.exception.errno, (errno.ENOTDIR,
+                                           errno.ENOENT, errno.EINVAL))
+
+    def test_glob_common(self):
+        def _check(glob, expected):
+            self.assertEqual(set(glob), set(P(BASE, q) for q in expected))
+        P = self.cls
+        p = P(BASE)
+        it = p.glob("fileA")
+        self.assertIsInstance(it, collections_abc.Iterator)
+        _check(it, ["fileA"])
+        _check(p.glob("fileB"), [])
+        _check(p.glob("dir*/file*"), ["dirB/fileB", "dirC/fileC"])
+        if not support_can_symlink():
+            _check(p.glob("*A"), ['dirA', 'fileA'])
+        else:
+            _check(p.glob("*A"), ['dirA', 'fileA', 'linkA'])
+        if not support_can_symlink():
+            _check(p.glob("*B/*"), ['dirB/fileB'])
+        else:
+            _check(p.glob("*B/*"), ['dirB/fileB', 'dirB/linkD',
+                                    'linkB/fileB', 'linkB/linkD'])
+        if not support_can_symlink():
+            _check(p.glob("*/fileB"), ['dirB/fileB'])
+        else:
+            _check(p.glob("*/fileB"), ['dirB/fileB', 'linkB/fileB'])
+
+    def test_rglob_common(self):
+        def _check(glob, expected):
+            self.assertEqual(set(glob), set(P(BASE, q) for q in expected))
+        P = self.cls
+        p = P(BASE)
+        it = p.rglob("fileA")
+        self.assertIsInstance(it, collections_abc.Iterator)
+        _check(it, ["fileA"])
+        _check(p.rglob("fileB"), ["dirB/fileB"])
+        _check(p.rglob("*/fileA"), [])
+        if not support_can_symlink():
+            _check(p.rglob("*/fileB"), ["dirB/fileB"])
+        else:
+            _check(p.rglob("*/fileB"), ["dirB/fileB", "dirB/linkD/fileB",
+                                        "linkB/fileB", "dirA/linkC/fileB"])
+        _check(p.rglob("file*"), ["fileA", "dirB/fileB",
+                                  "dirC/fileC", "dirC/dirD/fileD"])
+        p = P(BASE, "dirC")
+        _check(p.rglob("file*"), ["dirC/fileC", "dirC/dirD/fileD"])
+        _check(p.rglob("*/*"), ["dirC/dirD/fileD"])
+
+    @support_skip_unless_symlink
+    def test_rglob_symlink_loop(self):
+        # Don't get fooled by symlink loops (Issue #26012)
+        P = self.cls
+        p = P(BASE)
+        given = set(p.rglob('*'))
+        expect = set([
+                  'brokenLink',
+                  'dirA', 'dirA/linkC',
+                  'dirB', 'dirB/fileB', 'dirB/linkD',
+                  'dirC', 'dirC/dirD', 'dirC/dirD/fileD', 'dirC/fileC',
+                  'dirE',
+                  'fileA',
+                  'linkA',
+                  'linkB',
+                  ])
+        self.assertEqual(given, set([p / x for x in expect]))
+
+    def test_glob_dotdot(self):
+        # ".." is not special in globs
+        P = self.cls
+        p = P(BASE)
+        self.assertEqual(set(p.glob("..")), set([P(BASE, "..")]))
+        self.assertEqual(set(p.glob("dirA/../file*")),
+                         set([P(BASE, "dirA/../fileA")]))
+        self.assertEqual(set(p.glob("../xyzzy")), set())
+
+    def _check_resolve(self, p, expected, strict=True):
+        q = p.resolve(strict)
+        self.assertEqual(q, expected)
+
+    # this can be used to check both relative and absolute resolutions
+    _check_resolve_relative = _check_resolve_absolute = _check_resolve
+
+    @support_skip_unless_symlink
+    def test_resolve_common(self):
+        P = self.cls
+        p = P(BASE, 'foo')
+        with self.assertRaises(OSError) as cm:
+            p.resolve(strict=True)
+        self.assertEqual(cm.exception.errno, errno.ENOENT)
+        # Non-strict
+        self.assertEqual(str(p.resolve(strict=False)),
+                         os.path.join(BASE, 'foo'))
+        p = P(BASE, 'foo', 'in', 'spam')
+        self.assertEqual(str(p.resolve(strict=False)),
+                         os.path.join(BASE, 'foo', 'in', 'spam'))
+        p = P(BASE, '..', 'foo', 'in', 'spam')
+        self.assertEqual(str(p.resolve(strict=False)),
+                         os.path.abspath(os.path.join('foo', 'in', 'spam')))
+        # These are all relative symlinks
+        p = P(BASE, 'dirB', 'fileB')
+        self._check_resolve_relative(p, p)
+        p = P(BASE, 'linkA')
+        self._check_resolve_relative(p, P(BASE, 'fileA'))
+        p = P(BASE, 'dirA', 'linkC', 'fileB')
+        self._check_resolve_relative(p, P(BASE, 'dirB', 'fileB'))
+        p = P(BASE, 'dirB', 'linkD', 'fileB')
+        self._check_resolve_relative(p, P(BASE, 'dirB', 'fileB'))
+        # Non-strict
+        p = P(BASE, 'dirA', 'linkC', 'fileB', 'foo', 'in', 'spam')
+        self._check_resolve_relative(p, P(BASE, 'dirB', 'fileB', 'foo', 'in',
+                                          'spam'), False)
+        p = P(BASE, 'dirA', 'linkC', '..', 'foo', 'in', 'spam')
+        if os.name == 'nt':
+            # In Windows, if linkY points to dirB, 'dirA\linkY\..'
+            # resolves to 'dirA' without resolving linkY first.
+            self._check_resolve_relative(p, P(BASE, 'dirA', 'foo', 'in',
+                                              'spam'), False)
+        else:
+            # In Posix, if linkY points to dirB, 'dirA/linkY/..'
+            # resolves to 'dirB/..' first before resolving to parent of dirB.
+            self._check_resolve_relative(
+                p, P(BASE, 'foo', 'in', 'spam'), False)
+        # Now create absolute symlinks
+        d = tempfile.mkdtemp(suffix='-dirD')
+        self.addCleanup(support.rmtree, d)
+        os.symlink(os.path.join(d), join('dirA', 'linkX'))
+        os.symlink(join('dirB'), os.path.join(d, 'linkY'))
+        p = P(BASE, 'dirA', 'linkX', 'linkY', 'fileB')
+        self._check_resolve_absolute(p, P(BASE, 'dirB', 'fileB'))
+        # Non-strict
+        p = P(BASE, 'dirA', 'linkX', 'linkY', 'foo', 'in', 'spam')
+        self._check_resolve_relative(p, P(BASE, 'dirB', 'foo', 'in', 'spam'),
+                                     False)
+        p = P(BASE, 'dirA', 'linkX', 'linkY', '..', 'foo', 'in', 'spam')
+        if os.name == 'nt':
+            # In Windows, if linkY points to dirB, 'dirA\linkY\..'
+            # resolves to 'dirA' without resolving linkY first.
+            self._check_resolve_relative(p, P(d, 'foo', 'in', 'spam'), False)
+        else:
+            # In Posix, if linkY points to dirB, 'dirA/linkY/..'
+            # resolves to 'dirB/..' first before resolving to parent of dirB.
+            self._check_resolve_relative(
+                p, P(BASE, 'foo', 'in', 'spam'), False)
+
+    @support_skip_unless_symlink
+    def test_resolve_dot(self):
+        # See https://bitbucket.org/pitrou/pathlib/issue/9/
+        # pathresolve-fails-on-complex-symlinks
+        p = self.cls(BASE)
+        self.dirlink('.', join('0'))
+        self.dirlink(os.path.join('0', '0'), join('1'))
+        self.dirlink(os.path.join('1', '1'), join('2'))
+        q = p / '2'
+        self.assertEqual(q.resolve(strict=True), p)
+        r = q / '3' / '4'
+        self.assertFileNotFound(r.resolve, strict=True)
+        # Non-strict
+        self.assertEqual(r.resolve(strict=False), p / '3' / '4')
+
+    def test_with(self):
+        p = self.cls(BASE)
+        it = p.iterdir()
+        it2 = p.iterdir()
+        next(it2)
+        with p:
+            pass
+        # I/O operation on closed path
+        self.assertRaises(ValueError, next, it)
+        self.assertRaises(ValueError, next, it2)
+        self.assertRaises(ValueError, p.open)
+        self.assertRaises(ValueError, p.resolve)
+        self.assertRaises(ValueError, p.absolute)
+        self.assertRaises(ValueError, p.__enter__)
+
+    def test_chmod(self):
+        p = self.cls(BASE) / 'fileA'
+        mode = p.stat().st_mode
+        # Clear writable bit
+        new_mode = mode & ~0o222
+        p.chmod(new_mode)
+        self.assertEqual(p.stat().st_mode, new_mode)
+        # Set writable bit
+        new_mode = mode | 0o222
+        p.chmod(new_mode)
+        self.assertEqual(p.stat().st_mode, new_mode)
+
+    # XXX also need a test for lchmod
+
+    def test_stat(self):
+        p = self.cls(BASE) / 'fileA'
+        st = p.stat()
+        self.assertEqual(p.stat(), st)
+        # Change file mode by flipping write bit
+        p.chmod(st.st_mode ^ 0o222)
+        self.addCleanup(p.chmod, st.st_mode)
+        self.assertNotEqual(p.stat(), st)
+
+    @support_skip_unless_symlink
+    def test_lstat(self):
+        p = self.cls(BASE) / 'linkA'
+        st = p.stat()
+        self.assertNotEqual(st, p.lstat())
+
+    def test_lstat_nosymlink(self):
+        p = self.cls(BASE) / 'fileA'
+        st = p.stat()
+        self.assertEqual(st, p.lstat())
+
+    @unittest.skipUnless(pwd, "the pwd module is needed for this test")
+    def test_owner(self):
+        p = self.cls(BASE) / 'fileA'
+        uid = p.stat().st_uid
+        try:
+            name = pwd.getpwuid(uid).pw_name
+        except KeyError:
+            self.skipTest(
+                "user %d doesn't have an entry in the system database" % uid)
+        self.assertEqual(name, p.owner())
+
+    @unittest.skipUnless(grp, "the grp module is needed for this test")
+    def test_group(self):
+        p = self.cls(BASE) / 'fileA'
+        gid = p.stat().st_gid
+        try:
+            name = grp.getgrgid(gid).gr_name
+        except KeyError:
+            self.skipTest(
+                "group %d doesn't have an entry in the system database" % gid)
+        self.assertEqual(name, p.group())
+
+    def test_unlink(self):
+        p = self.cls(BASE) / 'fileA'
+        p.unlink()
+        self.assertFileNotFound(p.stat)
+        self.assertFileNotFound(p.unlink)
+
+    def test_rmdir(self):
+        p = self.cls(BASE) / 'dirA'
+        for q in p.iterdir():
+            q.unlink()
+        p.rmdir()
+        self.assertFileNotFound(p.stat)
+        self.assertFileNotFound(p.unlink)
+
+    def test_rename(self):
+        P = self.cls(BASE)
+        p = P / 'fileA'
+        size = p.stat().st_size
+        # Renaming to another path
+        q = P / 'dirA' / 'fileAA'
+        p.rename(q)
+        self.assertEqual(q.stat().st_size, size)
+        self.assertFileNotFound(p.stat)
+        # Renaming to a str of a relative path
+        r = rel_join('fileAAA')
+        q.rename(r)
+        self.assertEqual(os.stat(r).st_size, size)
+        self.assertFileNotFound(q.stat)
+
+    def test_replace(self):
+        P = self.cls(BASE)
+        p = P / 'fileA'
+        if sys.version_info < (3, 3):
+            self.assertRaises(NotImplementedError, p.replace, p)
+            return
+        size = p.stat().st_size
+        # Replacing a non-existing path
+        q = P / 'dirA' / 'fileAA'
+        p.replace(q)
+        self.assertEqual(q.stat().st_size, size)
+        self.assertFileNotFound(p.stat)
+        # Replacing another (existing) path
+        r = rel_join('dirB', 'fileB')
+        q.replace(r)
+        self.assertEqual(os.stat(r).st_size, size)
+        self.assertFileNotFound(q.stat)
+
+    def test_touch_common(self):
+        P = self.cls(BASE)
+        p = P / 'newfileA'
+        self.assertFalse(p.exists())
+        p.touch()
+        self.assertTrue(p.exists())
+        # Rewind the mtime sufficiently far in the past to work around
+        # filesystem-specific timestamp granularity.
+        old_mtime = p.stat().st_mtime - 10
+        os.utime(str(p), (old_mtime, old_mtime))
+        # The file mtime should be refreshed by calling touch() again
+        p.touch()
+        self.assertGreaterEqual(p.stat().st_mtime, old_mtime)
+        # Now with exist_ok=False
+        p = P / 'newfileB'
+        self.assertFalse(p.exists())
+        p.touch(mode=0o700, exist_ok=False)
+        self.assertTrue(p.exists())
+        self.assertRaises(OSError, p.touch, exist_ok=False)
+
+    def test_touch_nochange(self):
+        P = self.cls(BASE)
+        p = P / 'fileA'
+        p.touch()
+        with p.open('rb') as f:
+            self.assertEqual(f.read().strip(), b"this is file A")
+
+    def test_mkdir(self):
+        P = self.cls(BASE)
+        p = P / 'newdirA'
+        self.assertFalse(p.exists())
+        p.mkdir()
+        self.assertTrue(p.exists())
+        self.assertTrue(p.is_dir())
+        with self.assertRaises(OSError) as cm:
+            # Python 2.6 kludge for http://bugs.python.org/issue7853
+            try:
+                p.mkdir()
+            except:  # noqa: E722
+                raise
+        self.assertEqual(cm.exception.errno, errno.EEXIST)
+
+    def test_mkdir_parents(self):
+        # Creating a chain of directories
+        p = self.cls(BASE, 'newdirB', 'newdirC')
+        self.assertFalse(p.exists())
+        with self.assertRaises(OSError) as cm:
+            p.mkdir()
+        self.assertEqual(cm.exception.errno, errno.ENOENT)
+        p.mkdir(parents=True)
+        self.assertTrue(p.exists())
+        self.assertTrue(p.is_dir())
+        with self.assertRaises(OSError) as cm:
+            p.mkdir(parents=True)
+        self.assertEqual(cm.exception.errno, errno.EEXIST)
+        # test `mode` arg
+        mode = stat.S_IMODE(p.stat().st_mode)  # default mode
+        p = self.cls(BASE, 'newdirD', 'newdirE')
+        p.mkdir(0o555, parents=True)
+        self.assertTrue(p.exists())
+        self.assertTrue(p.is_dir())
+        if os.name != 'nt':
+            # the directory's permissions follow the mode argument
+            self.assertEqual(stat.S_IMODE(p.stat().st_mode), 0o7555 & mode)
+        # the parent's permissions follow the default process settings
+        self.assertEqual(stat.S_IMODE(p.parent.stat().st_mode), mode)
+
+    def test_mkdir_exist_ok(self):
+        p = self.cls(BASE, 'dirB')
+        st_ctime_first = p.stat().st_ctime
+        self.assertTrue(p.exists())
+        self.assertTrue(p.is_dir())
+        self.assertFileExists(p.mkdir)
+        p.mkdir(exist_ok=True)
+        self.assertTrue(p.exists())
+        self.assertEqual(p.stat().st_ctime, st_ctime_first)
+
+    def test_mkdir_exist_ok_with_parent(self):
+        p = self.cls(BASE, 'dirC')
+        self.assertTrue(p.exists())
+        self.assertFileExists(p.mkdir)
+        p = p / 'newdirC'
+        p.mkdir(parents=True)
+        st_ctime_first = p.stat().st_ctime
+        self.assertTrue(p.exists())
+        self.assertFileExists(p.mkdir, parents=True)
+        p.mkdir(parents=True, exist_ok=True)
+        self.assertTrue(p.exists())
+        self.assertEqual(p.stat().st_ctime, st_ctime_first)
+
+    def test_mkdir_exist_ok_root(self):
+        # Issue #25803: A drive root could raise PermissionError on Windows
+        self.cls('/').resolve().mkdir(exist_ok=True)
+        self.cls('/').resolve().mkdir(parents=True, exist_ok=True)
+
+    @only_nt    # XXX: not sure how to test this on POSIX
+    def test_mkdir_with_unknown_drive(self):
+        for d in 'ZYXWVUTSRQPONMLKJIHGFEDCBA':
+            p = self.cls(d + ':\\')
+            if not p.is_dir():
+                break
+        else:
+            self.skipTest("cannot find a drive that doesn't exist")
+        with self.assertRaises(OSError):
+            (p / 'child' / 'path').mkdir(parents=True)
+
+    def test_mkdir_with_child_file(self):
+        p = self.cls(BASE, 'dirB', 'fileB')
+        self.assertTrue(p.exists())
+        # An exception is raised when the last path component is an existing
+        # regular file, regardless of whether exist_ok is true or not.
+        self.assertFileExists(p.mkdir, parents=True)
+        self.assertFileExists(p.mkdir, parents=True, exist_ok=True)
+
+    def test_mkdir_no_parents_file(self):
+        p = self.cls(BASE, 'fileA')
+        self.assertTrue(p.exists())
+        # An exception is raised when the last path component is an existing
+        # regular file, regardless of whether exist_ok is true or not.
+        self.assertFileExists(p.mkdir)
+        self.assertFileExists(p.mkdir, exist_ok=True)
+
+    def test_mkdir_concurrent_parent_creation(self):
+        for pattern_num in range(32):
+            p = self.cls(BASE, 'dirCPC%d' % pattern_num)
+            self.assertFalse(p.exists())
+
+            def my_mkdir(path, mode=0o777):
+                path = str(path)
+                # Emulate another process that would create the directory
+                # just before we try to create it ourselves.  We do it
+                # in all possible pattern combinations, assuming that this
+                # function is called at most 5 times (dirCPC/dir1/dir2,
+                # dirCPC/dir1, dirCPC, dirCPC/dir1, dirCPC/dir1/dir2).
+                if pattern.pop():
+                    os.mkdir(path, mode)      # from another process
+                    concurrently_created.add(path)
+                os.mkdir(path, mode)          # our real call
+
+            pattern = [bool(pattern_num & (1 << n)) for n in range(5)]
+            concurrently_created = set()
+            p12 = p / 'dir1' / 'dir2'
+
+            def _try_func():
+                with mock.patch("pathlib2._normal_accessor.mkdir", my_mkdir):
+                    p12.mkdir(parents=True, exist_ok=False)
+
+            def _exc_func(exc):
+                self.assertIn(str(p12), concurrently_created)
+
+            def _else_func():
+                self.assertNotIn(str(p12), concurrently_created)
+
+            pathlib._try_except_fileexistserror(
+                _try_func, _exc_func, _else_func)
+            self.assertTrue(p.exists())
+
+    @support_skip_unless_symlink
+    def test_symlink_to(self):
+        P = self.cls(BASE)
+        target = P / 'fileA'
+        # Symlinking a path target
+        link = P / 'dirA' / 'linkAA'
+        link.symlink_to(target)
+        self.assertEqual(link.stat(), target.stat())
+        self.assertNotEqual(link.lstat(), target.stat())
+        # Symlinking a str target
+        link = P / 'dirA' / 'linkAAA'
+        link.symlink_to(str(target))
+        self.assertEqual(link.stat(), target.stat())
+        self.assertNotEqual(link.lstat(), target.stat())
+        self.assertFalse(link.is_dir())
+        # Symlinking to a directory
+        target = P / 'dirB'
+        link = P / 'dirA' / 'linkAAAA'
+        link.symlink_to(target, target_is_directory=True)
+        self.assertEqual(link.stat(), target.stat())
+        self.assertNotEqual(link.lstat(), target.stat())
+        self.assertTrue(link.is_dir())
+        self.assertTrue(list(link.iterdir()))
+
+    def test_is_dir(self):
+        P = self.cls(BASE)
+        self.assertTrue((P / 'dirA').is_dir())
+        self.assertFalse((P / 'fileA').is_dir())
+        self.assertFalse((P / 'non-existing').is_dir())
+        self.assertFalse((P / 'fileA' / 'bah').is_dir())
+        if support_can_symlink():
+            self.assertFalse((P / 'linkA').is_dir())
+            self.assertTrue((P / 'linkB').is_dir())
+            self.assertFalse((P / 'brokenLink').is_dir())
+
+    def test_is_file(self):
+        P = self.cls(BASE)
+        self.assertTrue((P / 'fileA').is_file())
+        self.assertFalse((P / 'dirA').is_file())
+        self.assertFalse((P / 'non-existing').is_file())
+        self.assertFalse((P / 'fileA' / 'bah').is_file())
+        if support_can_symlink():
+            self.assertTrue((P / 'linkA').is_file())
+            self.assertFalse((P / 'linkB').is_file())
+            self.assertFalse((P / 'brokenLink').is_file())
+
+    def test_is_symlink(self):
+        P = self.cls(BASE)
+        self.assertFalse((P / 'fileA').is_symlink())
+        self.assertFalse((P / 'dirA').is_symlink())
+        self.assertFalse((P / 'non-existing').is_symlink())
+        self.assertFalse((P / 'fileA' / 'bah').is_symlink())
+        if support_can_symlink():
+            self.assertTrue((P / 'linkA').is_symlink())
+            self.assertTrue((P / 'linkB').is_symlink())
+            self.assertTrue((P / 'brokenLink').is_symlink())
+
+    def test_is_fifo_false(self):
+        P = self.cls(BASE)
+        self.assertFalse((P / 'fileA').is_fifo())
+        self.assertFalse((P / 'dirA').is_fifo())
+        self.assertFalse((P / 'non-existing').is_fifo())
+        self.assertFalse((P / 'fileA' / 'bah').is_fifo())
+
+    @unittest.skipUnless(hasattr(os, "mkfifo"), "os.mkfifo() required")
+    @unittest.skipIf(android_not_root, "mkfifo not allowed, non root user")
+    def test_is_fifo_true(self):
+        P = self.cls(BASE, 'myfifo')
+        os.mkfifo(str(P))
+        self.assertTrue(P.is_fifo())
+        self.assertFalse(P.is_socket())
+        self.assertFalse(P.is_file())
+
+    def test_is_socket_false(self):
+        P = self.cls(BASE)
+        self.assertFalse((P / 'fileA').is_socket())
+        self.assertFalse((P / 'dirA').is_socket())
+        self.assertFalse((P / 'non-existing').is_socket())
+        self.assertFalse((P / 'fileA' / 'bah').is_socket())
+
+    @unittest.skipUnless(hasattr(socket, "AF_UNIX"), "Unix sockets required")
+    def test_is_socket_true(self):
+        P = self.cls(BASE, 'mysock')
+        sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+        self.addCleanup(sock.close)
+        try:
+            sock.bind(str(P))
+        except OSError as e:
+            if "AF_UNIX path too long" in str(e):
+                self.skipTest("cannot bind Unix socket: " + str(e))
+        self.assertTrue(P.is_socket())
+        self.assertFalse(P.is_fifo())
+        self.assertFalse(P.is_file())
+
+    def test_is_block_device_false(self):
+        P = self.cls(BASE)
+        self.assertFalse((P / 'fileA').is_block_device())
+        self.assertFalse((P / 'dirA').is_block_device())
+        self.assertFalse((P / 'non-existing').is_block_device())
+        self.assertFalse((P / 'fileA' / 'bah').is_block_device())
+
+    def test_is_char_device_false(self):
+        P = self.cls(BASE)
+        self.assertFalse((P / 'fileA').is_char_device())
+        self.assertFalse((P / 'dirA').is_char_device())
+        self.assertFalse((P / 'non-existing').is_char_device())
+        self.assertFalse((P / 'fileA' / 'bah').is_char_device())
+
+    @only_posix
+    def test_is_char_device_true(self):
+        # Under Unix, /dev/null should generally be a char device
+        P = self.cls('/dev/null')
+        if not P.exists():
+            self.skipTest("/dev/null required")
+        self.assertTrue(P.is_char_device())
+        self.assertFalse(P.is_block_device())
+        self.assertFalse(P.is_file())
+
+    def test_pickling_common(self):
+        p = self.cls(BASE, 'fileA')
+        for proto in range(0, pickle.HIGHEST_PROTOCOL + 1):
+            dumped = pickle.dumps(p, proto)
+            pp = pickle.loads(dumped)
+            self.assertEqual(pp.stat(), p.stat())
+
+    def test_parts_interning(self):
+        P = self.cls
+        p = P('/usr/bin/foo')
+        q = P('/usr/local/bin')
+        # 'usr'
+        self.assertIs(p.parts[1], q.parts[1])
+        # 'bin'
+        self.assertIs(p.parts[2], q.parts[3])
+
+    def _check_complex_symlinks(self, link0_target):
+        # Test solving a non-looping chain of symlinks (issue #19887)
+        P = self.cls(BASE)
+        self.dirlink(os.path.join('link0', 'link0'), join('link1'))
+        self.dirlink(os.path.join('link1', 'link1'), join('link2'))
+        self.dirlink(os.path.join('link2', 'link2'), join('link3'))
+        self.dirlink(link0_target, join('link0'))
+
+        # Resolve absolute paths
+        p = (P / 'link0').resolve()
+        self.assertEqual(p, P)
+        self.assertEqual(str(p), BASE)
+        p = (P / 'link1').resolve()
+        self.assertEqual(p, P)
+        self.assertEqual(str(p), BASE)
+        p = (P / 'link2').resolve()
+        self.assertEqual(p, P)
+        self.assertEqual(str(p), BASE)
+        p = (P / 'link3').resolve()
+        self.assertEqual(p, P)
+        self.assertEqual(str(p), BASE)
+
+        # Resolve relative paths
+        old_path = os.getcwd()
+        os.chdir(BASE)
+        try:
+            p = self.cls('link0').resolve()
+            self.assertEqual(p, P)
+            self.assertEqual(str(p), BASE)
+            p = self.cls('link1').resolve()
+            self.assertEqual(p, P)
+            self.assertEqual(str(p), BASE)
+            p = self.cls('link2').resolve()
+            self.assertEqual(p, P)
+            self.assertEqual(str(p), BASE)
+            p = self.cls('link3').resolve()
+            self.assertEqual(p, P)
+            self.assertEqual(str(p), BASE)
+        finally:
+            os.chdir(old_path)
+
+    @support_skip_unless_symlink
+    def test_complex_symlinks_absolute(self):
+        self._check_complex_symlinks(BASE)
+
+    @support_skip_unless_symlink
+    def test_complex_symlinks_relative(self):
+        self._check_complex_symlinks('.')
+
+    @support_skip_unless_symlink
+    def test_complex_symlinks_relative_dot_dot(self):
+        self._check_complex_symlinks(os.path.join('dirA', '..'))
+
+
+class PathTest(_BasePathTest, unittest.TestCase):
+    cls = pathlib.Path
+
+    def test_concrete_class(self):
+        p = self.cls('a')
+        self.assertIs(
+            type(p),
+            pathlib.WindowsPath if os.name == 'nt' else pathlib.PosixPath)
+
+    def test_unsupported_flavour(self):
+        if os.name == 'nt':
+            self.assertRaises(NotImplementedError, pathlib.PosixPath)
+        else:
+            self.assertRaises(NotImplementedError, pathlib.WindowsPath)
+
+    def test_glob_empty_pattern(self):
+        p = self.cls()
+        with self.assertRaisesRegex(ValueError, 'Unacceptable pattern'):
+            list(p.glob(''))
+
+
+@only_posix
+class PosixPathTest(_BasePathTest, unittest.TestCase):
+    cls = pathlib.PosixPath
+
+    def _check_symlink_loop(self, *args):
+        path = self.cls(*args)
+        with self.assertRaises(RuntimeError):
+            print(path.resolve(strict=True))
+
+    def _check_symlink_loop_nonstrict(self, *args):
+        path = self.cls(*args)
+        with self.assertRaises(RuntimeError):
+            print(path.resolve(strict=False))
+
+    def test_open_mode(self):
+        old_mask = os.umask(0)
+        self.addCleanup(os.umask, old_mask)
+        p = self.cls(BASE)
+        with (p / 'new_file').open('wb'):
+            pass
+        st = os.stat(join('new_file'))
+        self.assertEqual(stat.S_IMODE(st.st_mode), 0o666)
+        os.umask(0o022)
+        with (p / 'other_new_file').open('wb'):
+            pass
+        st = os.stat(join('other_new_file'))
+        self.assertEqual(stat.S_IMODE(st.st_mode), 0o644)
+
+    def test_touch_mode(self):
+        old_mask = os.umask(0)
+        self.addCleanup(os.umask, old_mask)
+        p = self.cls(BASE)
+        (p / 'new_file').touch()
+        st = os.stat(join('new_file'))
+        self.assertEqual(stat.S_IMODE(st.st_mode), 0o666)
+        os.umask(0o022)
+        (p / 'other_new_file').touch()
+        st = os.stat(join('other_new_file'))
+        self.assertEqual(stat.S_IMODE(st.st_mode), 0o644)
+        (p / 'masked_new_file').touch(mode=0o750)
+        st = os.stat(join('masked_new_file'))
+        self.assertEqual(stat.S_IMODE(st.st_mode), 0o750)
+
+    @support_skip_unless_symlink
+    def test_resolve_loop(self):
+        # Loops with relative symlinks
+        os.symlink('linkX/inside', join('linkX'))
+        self._check_symlink_loop(BASE, 'linkX')
+        os.symlink('linkY', join('linkY'))
+        self._check_symlink_loop(BASE, 'linkY')
+        os.symlink('linkZ/../linkZ', join('linkZ'))
+        self._check_symlink_loop(BASE, 'linkZ')
+        # Non-strict
+        self._check_symlink_loop_nonstrict(BASE, 'linkZ', 'foo')
+        # Loops with absolute symlinks
+        os.symlink(join('linkU/inside'), join('linkU'))
+        self._check_symlink_loop(BASE, 'linkU')
+        os.symlink(join('linkV'), join('linkV'))
+        self._check_symlink_loop(BASE, 'linkV')
+        os.symlink(join('linkW/../linkW'), join('linkW'))
+        self._check_symlink_loop(BASE, 'linkW')
+        # Non-strict
+        self._check_symlink_loop_nonstrict(BASE, 'linkW', 'foo')
+
+    def test_glob(self):
+        P = self.cls
+        p = P(BASE)
+        given = set(p.glob("FILEa"))
+        expect = set() if not support.fs_is_case_insensitive(BASE) else given
+        self.assertEqual(given, expect)
+        self.assertEqual(set(p.glob("FILEa*")), set())
+
+    def test_rglob(self):
+        P = self.cls
+        p = P(BASE, "dirC")
+        given = set(p.rglob("FILEd"))
+        expect = set() if not support.fs_is_case_insensitive(BASE) else given
+        self.assertEqual(given, expect)
+        self.assertEqual(set(p.rglob("FILEd*")), set())
+
+    @unittest.skipUnless(hasattr(pwd, 'getpwall'),
+                         'pwd module does not expose getpwall()')
+    def test_expanduser(self):
+        P = self.cls
+        support.import_module('pwd')
+        import pwd
+        pwdent = pwd.getpwuid(os.getuid())
+        username = pwdent.pw_name
+        userhome = pwdent.pw_dir.rstrip('/') or '/'
+        # find arbitrary different user (if exists)
+        for pwdent in pwd.getpwall():
+            othername = pwdent.pw_name
+            otherhome = pwdent.pw_dir.rstrip('/')
+            if othername != username and otherhome:
+                break
+
+        p1 = P('~/Documents')
+        p2 = P('~' + username + '/Documents')
+        p3 = P('~' + othername + '/Documents')
+        p4 = P('../~' + username + '/Documents')
+        p5 = P('/~' + username + '/Documents')
+        p6 = P('')
+        p7 = P('~fakeuser/Documents')
+
+        with support.EnvironmentVarGuard() as env:
+            env.unset('HOME')
+
+            self.assertEqual(p1.expanduser(), P(userhome) / 'Documents')
+            self.assertEqual(p2.expanduser(), P(userhome) / 'Documents')
+            self.assertEqual(p3.expanduser(), P(otherhome) / 'Documents')
+            self.assertEqual(p4.expanduser(), p4)
+            self.assertEqual(p5.expanduser(), p5)
+            self.assertEqual(p6.expanduser(), p6)
+            self.assertRaises(RuntimeError, p7.expanduser)
+
+            env.set('HOME', '/tmp')
+            self.assertEqual(p1.expanduser(), P('/tmp/Documents'))
+            self.assertEqual(p2.expanduser(), P(userhome) / 'Documents')
+            self.assertEqual(p3.expanduser(), P(otherhome) / 'Documents')
+            self.assertEqual(p4.expanduser(), p4)
+            self.assertEqual(p5.expanduser(), p5)
+            self.assertEqual(p6.expanduser(), p6)
+            self.assertRaises(RuntimeError, p7.expanduser)
+
+
+@only_nt
+class WindowsPathTest(_BasePathTest, unittest.TestCase):
+    cls = pathlib.WindowsPath
+
+    def test_glob(self):
+        P = self.cls
+        p = P(BASE)
+        self.assertEqual(set(p.glob("FILEa")), set([P(BASE, "fileA")]))
+
+    def test_rglob(self):
+        P = self.cls
+        p = P(BASE, "dirC")
+        self.assertEqual(set(p.rglob("FILEd")),
+                         set([P(BASE, "dirC/dirD/fileD")]))
+
+    def test_expanduser(self):
+        P = self.cls
+        with support.EnvironmentVarGuard() as env:
+            env.unset('HOME')
+            env.unset('USERPROFILE')
+            env.unset('HOMEPATH')
+            env.unset('HOMEDRIVE')
+            env.set('USERNAME', 'alice')
+
+            # test that the path returns unchanged
+            p1 = P('~/My Documents')
+            p2 = P('~alice/My Documents')
+            p3 = P('~bob/My Documents')
+            p4 = P('/~/My Documents')
+            p5 = P('d:~/My Documents')
+            p6 = P('')
+            self.assertRaises(RuntimeError, p1.expanduser)
+            self.assertRaises(RuntimeError, p2.expanduser)
+            self.assertRaises(RuntimeError, p3.expanduser)
+            self.assertEqual(p4.expanduser(), p4)
+            self.assertEqual(p5.expanduser(), p5)
+            self.assertEqual(p6.expanduser(), p6)
+
+            def check():
+                env.unset('USERNAME')
+                self.assertEqual(p1.expanduser(),
+                                 P('C:/Users/alice/My Documents'))
+                self.assertRaises(KeyError, p2.expanduser)
+                env.set('USERNAME', 'alice')
+                self.assertEqual(p2.expanduser(),
+                                 P('C:/Users/alice/My Documents'))
+                self.assertEqual(p3.expanduser(),
+                                 P('C:/Users/bob/My Documents'))
+                self.assertEqual(p4.expanduser(), p4)
+                self.assertEqual(p5.expanduser(), p5)
+                self.assertEqual(p6.expanduser(), p6)
+
+            # test the first lookup key in the env vars
+            env.set('HOME', 'C:\\Users\\alice')
+            check()
+
+            # test that HOMEPATH is available instead
+            env.unset('HOME')
+            env.set('HOMEPATH', 'C:\\Users\\alice')
+            check()
+
+            env.set('HOMEDRIVE', 'C:\\')
+            env.set('HOMEPATH', 'Users\\alice')
+            check()
+
+            env.unset('HOMEDRIVE')
+            env.unset('HOMEPATH')
+            env.set('USERPROFILE', 'C:\\Users\\alice')
+            check()
+
+
+# extra test to ensure coverage of issue #54
+def test_resolve_extra():
+    pathlib.Path("~/does_not_exist").resolve()
+
+
+def main():
+    unittest.main(__name__)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/.coveragerc b/tests/wpt/web-platform-tests/tools/third_party/pluggy/.coveragerc
new file mode 100644
index 00000000000..1b1de1cd247
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/.coveragerc
@@ -0,0 +1,14 @@
+[run]
+include =
+  pluggy/*
+  testing/*
+  */lib/python*/site-packages/pluggy/*
+  */pypy*/site-packages/pluggy/*
+  *\Lib\site-packages\pluggy\*
+branch = 1
+
+[paths]
+source = pluggy/
+  */lib/python*/site-packages/pluggy/
+  */pypy*/site-packages/pluggy/
+  *\Lib\site-packages\pluggy\
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/.gitignore b/tests/wpt/web-platform-tests/tools/third_party/pluggy/.gitignore
index e5c7e98041c..4580536c7ad 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pluggy/.gitignore
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/.gitignore
@@ -56,3 +56,9 @@ docs/_build/
 # PyBuilder
 target/
 *.swp
+
+# generated by setuptools_scm
+src/pluggy/_version.py
+
+# generated by pip
+pip-wheel-metadata/
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/.pre-commit-config.yaml b/tests/wpt/web-platform-tests/tools/third_party/pluggy/.pre-commit-config.yaml
new file mode 100644
index 00000000000..5c08d983777
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/.pre-commit-config.yaml
@@ -0,0 +1,32 @@
+repos:
+-   repo: https://github.com/ambv/black
+    rev: 19.3b0
+    hooks:
+    -   id: black
+        args: [--safe, --quiet]
+        language_version: python3.6
+-   repo: https://github.com/asottile/blacken-docs
+    rev: v0.5.0
+    hooks:
+    -   id: blacken-docs
+        additional_dependencies: [black==19.3b0]
+        language_version: python3.6
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.1.0
+    hooks:
+    -   id: trailing-whitespace
+    -   id: end-of-file-fixer
+    -   id: flake8
+-   repo: local
+    hooks:
+    -   id: rst
+        name: rst
+        entry: rst-lint --encoding utf-8
+        files: ^(CHANGELOG.rst|HOWTORELEASE.rst|README.rst|changelog/.*)$
+        language: python
+        additional_dependencies: [pygments, restructuredtext_lint]
+        language_version: python3.6
+-   repo: https://github.com/pre-commit/pygrep-hooks
+    rev: v1.3.0
+    hooks:
+    -   id: rst-backticks
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/.travis.yml b/tests/wpt/web-platform-tests/tools/third_party/pluggy/.travis.yml
index 6fd136baf37..8ba5966e5d5 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pluggy/.travis.yml
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/.travis.yml
@@ -1,42 +1,77 @@
-sudo: false
+dist: xenial
 language: python
 
-matrix:
+stages:
+- name: test
+  if: tag IS NOT present
+- name: deploy
+  if: repo = pytest-dev/pluggy AND tag IS present
+
+jobs:
   include:
     - python: '3.6'
-      env: TOXENV=check
+      env: TOXENV=linting
+      cache:
+        directories:
+          - $HOME/.cache/pre-commit
     - python: '3.6'
       env: TOXENV=docs
     - python: '2.7'
-      env: TOXENV=py27-pytestrelease
+      env: TOXENV=py27-coverage
     - python: '3.4'
-      env: TOXENV=py34-pytestrelease
+      env: TOXENV=py34-coverage
     - python: '3.5'
-      env: TOXENV=py35-pytestrelease
+      env: TOXENV=py35-coverage
     - python: '3.6'
-      env: TOXENV=py36-pytestrelease
-    - python: 'pypy'
-      env: TOXENV=pypy-pytestrelease
-    - python: 'nightly'
-      env: TOXENV=py37-pytestrelease
-    - python: '2.7'
-      env: TOXENV=py27-pytestmaster
-    - python: '2.7'
-      env: TOXENV=py27-pytestfeatures
+      env: TOXENV=py36-coverage
+    - python: 'pypy2.7-6.0'
+      env: TOXENV=pypy-coverage
+    - python: 'pypy3.5-6.0'
+      env: TOXENV=pypy3-coverage
+    - python: '3.7'
+      env: TOXENV=py37-coverage
+    - python: '3.8-dev'
+      env: TOXENV=py38-coverage
     - python: '3.6'
-      env: TOXENV=py36-pytestmaster
+      env: TOXENV=py36-pytestmaster-coverage
     - python: '3.6'
-      env: TOXENV=py36-pytestfeatures
+      env: TOXENV=py36-pytestfeatures-coverage
     - python: '3.6'
       env: TOXENV=benchmark
+    - python: '3.7'
+      env: TOXENV=py37-pytestmaster-coverage
+    - python: '3.7'
+      env: TOXENV=py37-pytestfeatures-coverage
+
+    - stage: deploy
+      python: '3.6'
+      env:
+      install: pip install -U setuptools setuptools_scm
+      script: skip
+      deploy:
+        provider: pypi
+        user: nicoddemus
+        distributions: sdist bdist_wheel
+        skip_upload_docs: true
+        password:
+          secure: PDvQCKfXrF1V/tdwEOfeDEjDs6vJ9gKWo4yrMUmBx1JL5plHZaqfHLftlGMoHekaQTHcfyYYbxignFw5IGsn97/nFKKWDPNBfZA+3RJJmeJfz2NQunYkSnoqtBtfEtWHzFPdkCm0w/CN9C8IpRjhvLnFTUQzil6iMy6wZG276gU=
+        on:
+          tags: true
+          repo: pytest-dev/pluggy
 
 install:
-  - pip install -U setuptools pip
-  - pip install -U tox
+  - pip install -U pip
+  - pip install -U --force-reinstall setuptools tox
 
 script:
   - tox
 
+after_script:
+  - |
+    if [[ "${TOXENV%-coverage}" != "$TOXENV" ]]; then
+      bash <(curl -s https://codecov.io/bash) -Z -X gcov -X coveragepy -X search -X xcode -X gcovout -X fix -f coverage.xml -n $TOXENV
+    fi
+
 notifications:
   irc:
     channels:
@@ -44,5 +79,3 @@ notifications:
     on_success: change
     on_failure: change
     skip_join: true
-#  email:
-#    - pytest-commit@python.org
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/CHANGELOG.rst b/tests/wpt/web-platform-tests/tools/third_party/pluggy/CHANGELOG.rst
index 91bf53fdccb..0536dda03a8 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pluggy/CHANGELOG.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/CHANGELOG.rst
@@ -1,5 +1,180 @@
-0.6.0
------
+=========
+Changelog
+=========
+
+.. towncrier release notes start
+
+pluggy 0.13.1 (2019-11-21)
+==========================
+
+Trivial/Internal Changes
+------------------------
+
+- `#236 <https://github.com/pytest-dev/pluggy/pull/236>`_: Improved documentation, especially with regard to references.
+
+
+pluggy 0.13.0 (2019-09-10)
+==========================
+
+Trivial/Internal Changes
+------------------------
+
+- `#222 <https://github.com/pytest-dev/pluggy/issues/222>`_: Replace ``importlib_metadata`` backport with ``importlib.metadata`` from the
+  standard library on Python 3.8+.
+
+
+pluggy 0.12.0 (2019-05-27)
+==========================
+
+Features
+--------
+
+- `#215 <https://github.com/pytest-dev/pluggy/issues/215>`_: Switch from ``pkg_resources`` to ``importlib-metadata`` for entrypoint detection for improved performance and import time.  This time with ``.egg`` support.
+
+
+pluggy 0.11.0 (2019-05-07)
+==========================
+
+Bug Fixes
+---------
+
+- `#205 <https://github.com/pytest-dev/pluggy/issues/205>`_: Revert changes made in 0.10.0 release breaking ``.egg`` installs.
+
+
+pluggy 0.10.0 (2019-05-07)
+==========================
+
+Features
+--------
+
+- `#199 <https://github.com/pytest-dev/pluggy/issues/199>`_: Switch from ``pkg_resources`` to ``importlib-metadata`` for entrypoint detection for improved performance and import time.
+
+
+pluggy 0.9.0 (2019-02-21)
+=========================
+
+Features
+--------
+
+- `#189 <https://github.com/pytest-dev/pluggy/issues/189>`_: ``PluginManager.load_setuptools_entrypoints`` now accepts a ``name`` parameter that when given will
+  load only entry points with that name.
+
+  ``PluginManager.load_setuptools_entrypoints`` also now returns the number of plugins loaded by the
+  call, as opposed to the number of all plugins loaded by all calls to this method.
+
+
+
+Bug Fixes
+---------
+
+- `#187 <https://github.com/pytest-dev/pluggy/issues/187>`_: Fix internal ``varnames`` function for PyPy3.
+
+
+pluggy 0.8.1 (2018-11-09)
+=========================
+
+Trivial/Internal Changes
+------------------------
+
+- `#166 <https://github.com/pytest-dev/pluggy/issues/166>`_: Add ``stacklevel=2`` to implprefix warning so that the reported location of warning is the caller of PluginManager.
+
+
+pluggy 0.8.0 (2018-10-15)
+=========================
+
+Features
+--------
+
+- `#177 <https://github.com/pytest-dev/pluggy/issues/177>`_: Add ``get_hookimpls()`` method to hook callers.
+
+
+
+Trivial/Internal Changes
+------------------------
+
+- `#165 <https://github.com/pytest-dev/pluggy/issues/165>`_: Add changelog in long package description and documentation.
+
+
+- `#172 <https://github.com/pytest-dev/pluggy/issues/172>`_: Add a test exemplifying the opt-in nature of spec defined args.
+
+
+- `#57 <https://github.com/pytest-dev/pluggy/issues/57>`_: Encapsulate hook specifications in a type for easier introspection.
+
+
+pluggy 0.7.1 (2018-07-28)
+=========================
+
+Deprecations and Removals
+-------------------------
+
+- `#116 <https://github.com/pytest-dev/pluggy/issues/116>`_: Deprecate the ``implprefix`` kwarg to ``PluginManager`` and instead
+  expect users to start using explicit ``HookimplMarker`` everywhere.
+
+
+
+Features
+--------
+
+- `#122 <https://github.com/pytest-dev/pluggy/issues/122>`_: Add ``.plugin`` member to ``PluginValidationError`` to access failing plugin during post-mortem.
+
+
+- `#138 <https://github.com/pytest-dev/pluggy/issues/138>`_: Add per implementation warnings support for hookspecs allowing for both
+  deprecation and future warnings of legacy and (future) experimental hooks
+  respectively.
+
+
+
+Bug Fixes
+---------
+
+- `#110 <https://github.com/pytest-dev/pluggy/issues/110>`_: Fix a bug where ``_HookCaller.call_historic()`` would call the ``proc``
+  arg even when the default is ``None`` resulting in a ``TypeError``.
+
+- `#160 <https://github.com/pytest-dev/pluggy/issues/160>`_: Fix problem when handling ``VersionConflict`` errors when loading setuptools plugins.
+
+
+
+Improved Documentation
+----------------------
+
+- `#123 <https://github.com/pytest-dev/pluggy/issues/123>`_: Document how exceptions are handled and how the hook call loop
+  terminates immediately on the first error which is then delivered
+  to any surrounding wrappers.
+
+
+- `#136 <https://github.com/pytest-dev/pluggy/issues/136>`_: Docs rework including a much better introduction and comprehensive example
+  set for new users. A big thanks goes out to @obestwalter for the great work!
+
+
+
+Trivial/Internal Changes
+------------------------
+
+- `#117 <https://github.com/pytest-dev/pluggy/issues/117>`_: Break up the main monolithic package modules into separate modules by concern
+
+
+- `#131 <https://github.com/pytest-dev/pluggy/issues/131>`_: Automate ``setuptools`` wheels building and PyPi upload using TravisCI.
+
+
+- `#153 <https://github.com/pytest-dev/pluggy/issues/153>`_: Reorganize tests more appropriately by modules relating to each
+  internal component/feature. This is in an effort to avoid (future)
+  duplication and better separation of concerns in the test set.
+
+
+- `#156 <https://github.com/pytest-dev/pluggy/issues/156>`_: Add ``HookImpl.__repr__()`` for better debugging.
+
+
+- `#66 <https://github.com/pytest-dev/pluggy/issues/66>`_: Start using ``towncrier`` and a custom ``tox`` environment to prepare releases!
+
+
+pluggy 0.7.0 (Unreleased)
+=========================
+
+* `#160 <https://github.com/pytest-dev/pluggy/issues/160>`_: We discovered a deployment issue so this version was never released to PyPI, only the tag exists.
+
+pluggy 0.6.0 (2017-11-24)
+=========================
+
 - Add CI testing for the features, release, and master
   branches of ``pytest`` (PR `#79`_).
 - Document public API for ``_Result`` objects passed to wrappers
@@ -27,8 +202,9 @@
 .. _#103: https://github.com/pytest-dev/pluggy/pull/103
 
 
-0.5.2
------
+pluggy 0.5.2 (2017-09-06)
+=========================
+
 - fix bug where ``firstresult`` wrappers were being sent an incorrectly configured
   ``_Result`` (a list was set instead of a single value). Add tests to check for
   this as well as ``_Result.force_result()`` behaviour. Thanks to `@tgoodlet`_
@@ -45,18 +221,20 @@
 .. _#80: https://github.com/pytest-dev/pluggy/pull/80
 
 
-0.5.1
------
+pluggy 0.5.1 (2017-08-29)
+=========================
+
 - fix a bug and add tests for case where ``firstresult`` hooks return
   ``None`` results. Thanks to `@RonnyPfannschmidt`_ and `@tgoodlet`_
   for the issue (`#68`_) and PR (`#69`_) respectively.
 
 .. _#69: https://github.com/pytest-dev/pluggy/pull/69
-.. _#68: https://github.com/pytest-dev/pluggy/issuses/68
+.. _#68: https://github.com/pytest-dev/pluggy/issues/68
 
 
-0.5.0
------
+pluggy 0.5.0 (2017-08-28)
+=========================
+
 - fix bug where callbacks for historic hooks would not be called for
   already registered plugins.  Thanks `@vodik`_ for the PR
   and `@hpk42`_ for further fixes.
@@ -114,8 +292,9 @@
 .. _#14: https://github.com/pytest-dev/pluggy/issues/14
 
 
-0.4.0
------
+pluggy 0.4.0 (2016-09-25)
+=========================
+
 - add ``has_plugin(name)`` method to pluginmanager.  thanks `@nicoddemus`_.
 
 - fix `#11`_: make plugin parsing more resilient against exceptions
@@ -131,19 +310,21 @@
 .. _#4: https://github.com/pytest-dev/pluggy/issues/4
 
 
-0.3.1
------
+pluggy 0.3.1 (2015-09-17)
+=========================
+
 - avoid using deprecated-in-python3.5 getargspec method. Thanks
   `@mdboom`_.
 
 
-0.3.0
------
+pluggy 0.3.0 (2015-05-07)
+=========================
+
 initial release
 
 .. contributors
 .. _@hpk42: https://github.com/hpk42
-.. _@tgoodlet: https://github.com/tgoodlet
+.. _@tgoodlet: https://github.com/goodboy
 .. _@MichalTHEDUDE: https://github.com/MichalTHEDUDE
 .. _@vodik: https://github.com/vodik
 .. _@RonnyPfannschmidt: https://github.com/RonnyPfannschmidt
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/HOWTORELEASE.rst b/tests/wpt/web-platform-tests/tools/third_party/pluggy/HOWTORELEASE.rst
new file mode 100644
index 00000000000..a0cc4fdeec0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/HOWTORELEASE.rst
@@ -0,0 +1,23 @@
+Release Procedure
+-----------------
+
+#. From a clean work tree, execute::
+
+    tox -e release -- VERSION
+
+   This will create the branch ready to be pushed.
+
+#. Open a PR targeting ``master``.
+
+#. All tests must pass and the PR must be approved by at least another maintainer.
+
+#. Publish to PyPI by pushing a tag::
+
+     git tag X.Y.Z release-X.Y.Z
+     git push git@github.com:pytest-dev/pluggy.git X.Y.Z
+
+   The tag will trigger a new build, which will deploy to PyPI.
+
+#. Make sure it is `available on PyPI <https://pypi.org/project/pluggy>`_.
+
+#. Merge the PR into ``master``, either manually or using GitHub's web interface.
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/LICENSE b/tests/wpt/web-platform-tests/tools/third_party/pluggy/LICENSE
index 121017d0866..85f4dd63d2d 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pluggy/LICENSE
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 holger krekel (rather uses bitbucket/hpk42) 
+Copyright (c) 2015 holger krekel (rather uses bitbucket/hpk42)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/README.rst b/tests/wpt/web-platform-tests/tools/third_party/pluggy/README.rst
index 3636b6ec642..b79ef024601 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pluggy/README.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/README.rst
@@ -1,14 +1,15 @@
+====================================================
 pluggy - A minimalist production ready plugin system
 ====================================================
-|pypi| |anaconda| |versions| |travis| |appveyor|
 
+|pypi| |conda-forge| |versions| |travis| |appveyor| |gitter| |black| |codecov|
 
 This is the core framework used by the `pytest`_, `tox`_, and `devpi`_ projects.
 
 Please `read the docs`_ to learn more!
 
 A definitive example
-********************
+====================
 .. code-block:: python
 
     import pluggy
@@ -20,6 +21,7 @@ A definitive example
     class MySpec(object):
         """A hook specification namespace.
         """
+
         @hookspec
         def myhook(self, arg1, arg2):
             """My special little hook that you can customize.
@@ -29,6 +31,7 @@ A definitive example
     class Plugin_1(object):
         """A hook implementation namespace.
         """
+
         @hookimpl
         def myhook(self, arg1, arg2):
             print("inside Plugin_1.myhook()")
@@ -38,6 +41,7 @@ A definitive example
     class Plugin_2(object):
         """A 2nd hook implementation namespace.
         """
+
         @hookimpl
         def myhook(self, arg1, arg2):
             print("inside Plugin_2.myhook()")
@@ -52,22 +56,46 @@ A definitive example
     pm.register(Plugin_1())
     pm.register(Plugin_2())
 
-    # call our `myhook` hook
+    # call our ``myhook`` hook
     results = pm.hook.myhook(arg1=1, arg2=2)
     print(results)
 
 
+Running this directly gets us::
+
+    $ python docs/examples/toy-example.py
+    inside Plugin_2.myhook()
+    inside Plugin_1.myhook()
+    [-1, 3]
+
+
 .. badges
+
 .. |pypi| image:: https://img.shields.io/pypi/v/pluggy.svg
-    :target: https://pypi.python.org/pypi/pluggy
+    :target: https://pypi.org/pypi/pluggy
+
 .. |versions| image:: https://img.shields.io/pypi/pyversions/pluggy.svg
-    :target: https://pypi.python.org/pypi/pluggy
+    :target: https://pypi.org/pypi/pluggy
+
 .. |travis| image:: https://img.shields.io/travis/pytest-dev/pluggy/master.svg
     :target: https://travis-ci.org/pytest-dev/pluggy
+
 .. |appveyor| image:: https://img.shields.io/appveyor/ci/pytestbot/pluggy/master.svg
     :target: https://ci.appveyor.com/project/pytestbot/pluggy
-.. |anaconda| image:: https://anaconda.org/conda-forge/pluggy/badges/version.svg
-    :target: https://anaconda.org/conda-forge/pluggy
+
+.. |conda-forge| image:: https://img.shields.io/conda/vn/conda-forge/pluggy.svg
+    :target: https://anaconda.org/conda-forge/pytest
+
+.. |gitter| image:: https://badges.gitter.im/pytest-dev/pluggy.svg
+    :alt: Join the chat at https://gitter.im/pytest-dev/pluggy
+    :target: https://gitter.im/pytest-dev/pluggy?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+
+.. |black| image:: https://img.shields.io/badge/code%20style-black-000000.svg
+    :target: https://github.com/ambv/black
+
+.. |codecov| image:: https://codecov.io/gh/pytest-dev/pluggy/branch/master/graph/badge.svg
+    :target: https://codecov.io/gh/pytest-dev/pluggy
+    :alt: Code coverage Status
 
 .. links
 .. _pytest:
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/appveyor.yml b/tests/wpt/web-platform-tests/tools/third_party/pluggy/appveyor.yml
index c3903f8bfcc..1fc12fff397 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pluggy/appveyor.yml
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/appveyor.yml
@@ -1,15 +1,14 @@
 environment:
   matrix:
   # note: please use "tox --listenvs" to populate the build matrix below
-  - TOXENV: "check"
+  - TOXENV: "linting"
   - TOXENV: "docs"
-  - TOXENV: "py27-pytestrelease"
-  - TOXENV: "py34-pytestrelease"
-  - TOXENV: "py35-pytestrelease"
-  - TOXENV: "py36-pytestrelease"
-  - TOXENV: "pypy-pytestrelease"
-  - TOXENV: "py27-pytestmaster"
-  - TOXENV: "py27-pytestfeatures"
+  - TOXENV: "py27"
+  - TOXENV: "py34"
+  - TOXENV: "py35"
+  - TOXENV: "py36"
+  - TOXENV: "py37"
+  - TOXENV: "pypy"
   - TOXENV: "py36-pytestmaster"
   - TOXENV: "py36-pytestfeatures"
 
@@ -26,9 +25,14 @@ install:
   - echo PyPy installed
   - pypy --version
 
-  - C:\Python35\python -m pip install tox
+  - C:\Python35\python -m pip install -U pip
+  - C:\Python35\python -m pip install -U --force-reinstall setuptools tox
 
 build: false  # Not a C# project, build stuff at the test step instead.
 
 test_script:
-  - C:\Python35\python -m tox
+  - C:\Python35\Scripts\tox
+
+# We don't deploy anything on tags with AppVeyor, we use Travis instead, so we
+# might as well save resources
+skip_tags: true
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/changelog/README.rst b/tests/wpt/web-platform-tests/tools/third_party/pluggy/changelog/README.rst
new file mode 100644
index 00000000000..47e21fb33fb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/changelog/README.rst
@@ -0,0 +1,32 @@
+This directory contains "newsfragments" which are short files that contain a small **ReST**-formatted
+text that will be added to the next ``CHANGELOG``.
+
+The ``CHANGELOG`` will be read by users, so this description should be aimed to pytest users
+instead of describing internal changes which are only relevant to the developers.
+
+Make sure to use full sentences with correct case and punctuation, for example::
+
+    Fix issue with non-ascii messages from the ``warnings`` module.
+
+Each file should be named like ``<ISSUE>.<TYPE>.rst``, where
+``<ISSUE>`` is an issue number, and ``<TYPE>`` is one of:
+
+* ``feature``: new user facing features, like new command-line options and new behavior.
+* ``bugfix``: fixes a reported bug.
+* ``doc``: documentation improvement, like rewording an entire session or adding missing docs.
+* ``removal``: feature deprecation or removal.
+* ``vendor``: changes in packages vendored in pytest.
+* ``trivial``: fixing a small typo or internal change that might be noteworthy.
+
+So for example: ``123.feature.rst``, ``456.bugfix.rst``.
+
+If your PR fixes an issue, use that number here. If there is no issue,
+then after you submit the PR and get the PR number you can add a
+changelog using that instead.
+
+If you are not sure what issue type to use, don't hesitate to ask in your PR.
+
+``towncrier`` preserves multiple paragraphs and formatting (code blocks, lists, and so on), but for entries
+other than ``features`` it is usually better to stick to a single paragraph to keep it concise. You can install
+``towncrier`` and then run ``towncrier --draft``
+if you want to get a preview of how your change will look in the final release notes.
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/changelog/_template.rst b/tests/wpt/web-platform-tests/tools/third_party/pluggy/changelog/_template.rst
new file mode 100644
index 00000000000..974e5c1b2de
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/changelog/_template.rst
@@ -0,0 +1,40 @@
+{% for section in sections %}
+{% set underline = "-" %}
+{% if section %}
+{{section}}
+{{ underline * section|length }}{% set underline = "~" %}
+
+{% endif %}
+{% if sections[section] %}
+{% for category, val in definitions.items() if category in sections[section] %}
+
+{{ definitions[category]['name'] }}
+{{ underline * definitions[category]['name']|length }}
+
+{% if definitions[category]['showcontent'] %}
+{% for text, values in sections[section][category]|dictsort(by='value') %}
+{% set issue_joiner = joiner(', ') %}
+- {% for value in values|sort %}{{ issue_joiner() }}`{{ value }} <https://github.com/pytest-dev/pluggy/issues/{{ value[1:] }}>`_{% endfor %}: {{ text }}
+
+
+{% endfor %}
+{% else %}
+- {{ sections[section][category]['']|sort|join(', ') }}
+
+
+{% endif %}
+{% if sections[section][category]|length == 0 %}
+
+No significant changes.
+
+
+{% else %}
+{% endif %}
+{% endfor %}
+{% else %}
+
+No significant changes.
+
+
+{% endif %}
+{% endfor %}
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/api_reference.rst b/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/api_reference.rst
index aa15135ad3d..393d0aebea0 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/api_reference.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/api_reference.rst
@@ -1,3 +1,5 @@
+:orphan:
+
 Api Reference
 =============
 
@@ -6,9 +8,12 @@ Api Reference
     :undoc-members:
     :show-inheritance:
 
+.. autoclass:: pluggy.callers._Result
+.. automethod:: pluggy.callers._Result.get_result
+.. automethod:: pluggy.callers._Result.force_result
 
-.. automethod:: pluggy._Result.get_result
+.. autoclass:: pluggy.hooks._HookCaller
+.. automethod:: pluggy.hooks._HookCaller.call_extra
+.. automethod:: pluggy.hooks._HookCaller.call_historic
 
-.. automethod:: pluggy._Result.force_result
-
-.. automethod:: pluggy._HookCaller.call_extra
+.. autoclass:: pluggy.hooks._HookRelay
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/changelog.rst b/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/changelog.rst
new file mode 100644
index 00000000000..565b0521d0c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/changelog.rst
@@ -0,0 +1 @@
+.. include:: ../CHANGELOG.rst
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/conf.py b/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/conf.py
index 04065218fda..42829850d89 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/conf.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/conf.py
@@ -1,59 +1,65 @@
 # -*- coding: utf-8 -*-
-import pkg_resources
+import sys
+
+if sys.version_info >= (3, 8):
+    from importlib import metadata
+else:
+    import importlib_metadata as metadata
 
 
 extensions = [
-    'sphinx.ext.autodoc',
-    'sphinx.ext.doctest',
-    'sphinx.ext.intersphinx',
-    'sphinx.ext.coverage',
-    'sphinx.ext.viewcode',
+    "sphinx.ext.autodoc",
+    "sphinx.ext.doctest",
+    "sphinx.ext.intersphinx",
+    "sphinx.ext.coverage",
+    "sphinx.ext.viewcode",
 ]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
-source_suffix = '.rst'
+source_suffix = ".rst"
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # General information about the project.
 
-dist = pkg_resources.get_distribution('pluggy')
-project = dist.project_name
-copyright = u'2016, Holger Krekel'
-author = 'Holger Krekel'
+project = "pluggy"
+copyright = u"2016, Holger Krekel"
+author = "Holger Krekel"
 
-release = dist.version
+release = metadata.version(project)
 # The short X.Y version.
-version = u'.'.join(dist.version.split('.')[:2])
+version = u".".join(release.split(".")[:2])
 
 
 language = None
 
-pygments_style = 'sphinx'
-html_logo = '_static/img/plug.png'
-html_theme = 'alabaster'
+pygments_style = "sphinx"
+# html_logo = "_static/img/plug.png"
+html_theme = "alabaster"
 html_theme_options = {
-    # 'logo': 'img/plug.png',
-    # 'logo_name': 'true',
-    'description': 'The `pytest` plugin system',
-    'github_user': 'pytest-dev',
-    'github_repo': 'pluggy',
-    'github_button': 'true',
-    'github_banner': 'true',
-    'page_width': '1080px',
-    'fixed_sidebar': 'false',
+    "logo": "img/plug.png",
+    "description": "The pytest plugin system",
+    "github_user": "pytest-dev",
+    "github_repo": "pluggy",
+    "github_button": "true",
+    "github_banner": "true",
+    "github_type": "star",
+    "travis_button": "true",
+    "badge_branch": "master",
+    "page_width": "1080px",
+    "fixed_sidebar": "false",
 }
-html_static_path = ['_static']
+html_sidebars = {
+    "**": ["about.html", "localtoc.html", "relations.html", "searchbox.html"]
+}
+html_static_path = ["_static"]
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [
-    (master_doc, 'pluggy', u'pluggy Documentation',
-     [author], 1)
-]
+man_pages = [(master_doc, "pluggy", u"pluggy Documentation", [author], 1)]
 
 
 # -- Options for Texinfo output -------------------------------------------
@@ -62,10 +68,22 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'pluggy', u'pluggy Documentation',
-     author, 'pluggy', 'One line description of project.',
-     'Miscellaneous'),
+    (
+        master_doc,
+        "pluggy",
+        u"pluggy Documentation",
+        author,
+        "pluggy",
+        "One line description of project.",
+        "Miscellaneous",
+    )
 ]
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'https://docs.python.org/': None}
+intersphinx_mapping = {
+    "python": ("https://docs.python.org/3", None),
+    "pytest": ("https://docs.pytest.org/en/latest", None),
+    "setuptools": ("https://setuptools.readthedocs.io/en/latest", None),
+    "tox": ("https://tox.readthedocs.io/en/latest", None),
+    "devpi": ("https://devpi.net/docs/devpi/devpi/stable/+doc/", None),
+}
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample-spam/eggsample_spam.py b/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample-spam/eggsample_spam.py
new file mode 100644
index 00000000000..8d71b138d00
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample-spam/eggsample_spam.py
@@ -0,0 +1,22 @@
+import eggsample
+
+
+@eggsample.hookimpl
+def eggsample_add_ingredients(ingredients):
+    """Here the caller expects us to return a list."""
+    if "egg" in ingredients:
+        spam = ["lovely spam", "wonderous spam"]
+    else:
+        spam = ["splendiferous spam", "magnificent spam"]
+    return spam
+
+
+@eggsample.hookimpl
+def eggsample_prep_condiments(condiments):
+    """Here the caller passes a mutable object, so we mess with it directly."""
+    try:
+        del condiments["steak sauce"]
+    except KeyError:
+        pass
+    condiments["spam sauce"] = 42
+    return f"Now this is what I call a condiments tray!"
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample-spam/setup.py b/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample-spam/setup.py
new file mode 100644
index 00000000000..f81a8eb4038
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample-spam/setup.py
@@ -0,0 +1,8 @@
+from setuptools import setup
+
+setup(
+    name="eggsample-spam",
+    install_requires="eggsample",
+    entry_points={"eggsample": ["spam = eggsample_spam"]},
+    py_modules=["eggsample_spam"],
+)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/__init__.py
new file mode 100644
index 00000000000..4dc4b36dec3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/__init__.py
@@ -0,0 +1,4 @@
+import pluggy
+
+hookimpl = pluggy.HookimplMarker("eggsample")
+"""Marker to be imported and used in plugins (and for own implementations)"""
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/hookspecs.py b/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/hookspecs.py
new file mode 100644
index 00000000000..48866b24912
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/hookspecs.py
@@ -0,0 +1,21 @@
+import pluggy
+
+hookspec = pluggy.HookspecMarker("eggsample")
+
+
+@hookspec
+def eggsample_add_ingredients(ingredients: tuple):
+    """Have a look at the ingredients and offer your own.
+
+    :param ingredients: the ingredients, don't touch them!
+    :return: a list of ingredients
+    """
+
+
+@hookspec
+def eggsample_prep_condiments(condiments: dict):
+    """Reorganize the condiments tray to your heart's content.
+
+    :param condiments: some sauces and stuff
+    :return: a witty comment about your activity
+    """
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/host.py b/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/host.py
new file mode 100644
index 00000000000..ac1d33b4539
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/host.py
@@ -0,0 +1,57 @@
+import itertools
+import random
+
+import pluggy
+
+from eggsample import hookspecs, lib
+
+condiments_tray = {"pickled walnuts": 13, "steak sauce": 4, "mushy peas": 2}
+
+
+def main():
+    pm = get_plugin_manager()
+    cook = EggsellentCook(pm.hook)
+    cook.add_ingredients()
+    cook.prepare_the_food()
+    cook.serve_the_food()
+
+
+def get_plugin_manager():
+    pm = pluggy.PluginManager("eggsample")
+    pm.add_hookspecs(hookspecs)
+    pm.load_setuptools_entrypoints("eggsample")
+    pm.register(lib)
+    return pm
+
+
+class EggsellentCook:
+    FAVORITE_INGREDIENTS = ("egg", "egg", "egg")
+
+    def __init__(self, hook):
+        self.hook = hook
+        self.ingredients = None
+
+    def add_ingredients(self):
+        results = self.hook.eggsample_add_ingredients(
+            ingredients=self.FAVORITE_INGREDIENTS
+        )
+        my_ingredients = list(self.FAVORITE_INGREDIENTS)
+        # Each hook returns a list - so we chain this list of lists
+        other_ingredients = list(itertools.chain(*results))
+        self.ingredients = my_ingredients + other_ingredients
+
+    def prepare_the_food(self):
+        random.shuffle(self.ingredients)
+
+    def serve_the_food(self):
+        condiment_comments = self.hook.eggsample_prep_condiments(
+            condiments=condiments_tray
+        )
+        print(f"Your food. Enjoy some {', '.join(self.ingredients)}")
+        print(f"Some condiments? We have {', '.join(condiments_tray.keys())}")
+        if any(condiment_comments):
+            print("\n".join(condiment_comments))
+
+
+if __name__ == "__main__":
+    main()
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/lib.py b/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/lib.py
new file mode 100644
index 00000000000..62cea7458ea
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/lib.py
@@ -0,0 +1,14 @@
+import eggsample
+
+
+@eggsample.hookimpl
+def eggsample_add_ingredients():
+    spices = ["salt", "pepper"]
+    you_can_never_have_enough_eggs = ["egg", "egg"]
+    ingredients = spices + you_can_never_have_enough_eggs
+    return ingredients
+
+
+@eggsample.hookimpl
+def eggsample_prep_condiments(condiments):
+    condiments["mint sauce"] = 1
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample/setup.py b/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample/setup.py
new file mode 100644
index 00000000000..8b3facb3b67
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample/setup.py
@@ -0,0 +1,8 @@
+from setuptools import setup, find_packages
+
+setup(
+    name="eggsample",
+    install_requires="pluggy>=0.3,<1.0",
+    entry_points={"console_scripts": ["eggsample=eggsample.host:main"]},
+    packages=find_packages(),
+)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/firstexample.py b/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/toy-example.py
similarity index 76%
rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/firstexample.py
rename to tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/toy-example.py
index 3cec7cd2144..dfdc7e9228d 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/firstexample.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/toy-example.py
@@ -5,17 +5,16 @@ hookimpl = pluggy.HookimplMarker("myproject")
 
 
 class MySpec(object):
-    """A hook specification namespace.
-    """
+    """A hook specification namespace."""
+
     @hookspec
     def myhook(self, arg1, arg2):
-        """My special little hook that you can customize.
-        """
+        """My special little hook that you can customize."""
 
 
 class Plugin_1(object):
-    """A hook implementation namespace.
-    """
+    """A hook implementation namespace."""
+
     @hookimpl
     def myhook(self, arg1, arg2):
         print("inside Plugin_1.myhook()")
@@ -23,8 +22,8 @@ class Plugin_1(object):
 
 
 class Plugin_2(object):
-    """A 2nd hook implementation namespace.
-    """
+    """A 2nd hook implementation namespace."""
+
     @hookimpl
     def myhook(self, arg1, arg2):
         print("inside Plugin_2.myhook()")
@@ -34,11 +33,9 @@ class Plugin_2(object):
 # create a manager and add the spec
 pm = pluggy.PluginManager("myproject")
 pm.add_hookspecs(MySpec)
-
 # register plugins
 pm.register(Plugin_1())
 pm.register(Plugin_2())
-
 # call our `myhook` hook
 results = pm.hook.myhook(arg1=1, arg2=2)
 print(results)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/index.rst b/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/index.rst
index db65a1023fd..72546dc243c 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/index.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/index.rst
@@ -1,67 +1,182 @@
 ``pluggy``
 ==========
+**The pytest plugin system**
 
-The ``pytest`` plugin system
-****************************
-``pluggy`` is the crystallized core of `plugin management and hook
-calling`_ for `pytest`_.
-
-In fact, ``pytest`` is itself composed as a set of ``pluggy`` plugins
+What is it?
+***********
+``pluggy`` is the crystallized core of :ref:`plugin management and hook
+calling <pytest:writing-plugins>` for :std:doc:`pytest <pytest:index>`.
+It enables `500+ plugins`_ to extend and customize ``pytest``'s default
+behaviour. Even ``pytest`` itself is composed as a set of ``pluggy`` plugins
 which are invoked in sequence according to a well defined set of protocols.
-Some `200+ plugins`_ use ``pluggy`` to extend and customize ``pytest``'s default behaviour.
 
-In essence, ``pluggy`` enables function `hooking`_ so you can build "pluggable" systems.
+It gives users the ability to extend or modify the behaviour of a
+``host program`` by installing a ``plugin`` for that program.
+The plugin code will run as part of normal program execution, changing or
+enhancing certain aspects of it.
 
-How's it work?
---------------
-A `plugin` is a `namespace`_ which defines hook functions.
+In essence, ``pluggy`` enables function `hooking`_ so you can build
+"pluggable" systems.
 
-``pluggy`` manages *plugins* by relying on:
+Why is it useful?
+*****************
+There are some established mechanisms for modifying the behavior of other
+programs/libraries in Python like
+`method overriding <https://en.wikipedia.org/wiki/Method_overriding>`_
+(e.g. Jinja2) or
+`monkey patching <https://en.wikipedia.org/wiki/Monkey_patch>`_ (e.g. gevent
+or for :std:doc:`writing tests <pytest:monkeypatch>`).
+These strategies become problematic though when several parties want to
+participate in the modification of the same program. Therefore ``pluggy``
+does not rely on these mechanisms to enable a more structured approach and
+avoid unnecessary exposure of state and behaviour. This leads to a more
+`loosely coupled <https://en.wikipedia.org/wiki/Loose_coupling>`_ relationship
+between ``host`` and ``plugins``.
 
-- a hook *specification* - defines a call signature
-- a set of hook *implementations* - aka `callbacks`_
-- the hook *caller* - a call loop which collects results
+The ``pluggy`` approach puts the burden on the designer of the
+``host program`` to think carefully about which objects are really
+needed in a hook implementation. This gives ``plugin`` creators a clear
+framework for how to extend the ``host`` via a well defined set of functions
+and objects to work with.
 
-where for each registered hook *specification*, a hook *call* will invoke up to ``N``
-registered hook *implementations*.
+How does it work?
+*****************
+Let us start with a short overview of what is involved:
 
-``pluggy`` accomplishes all this by implementing a `request-response pattern`_ using *function*
-subscriptions and can be thought of and used as a rudimentary busless `publish-subscribe`_
-event system.
+* ``host`` or ``host program``: the program offering extensibility
+  by specifying ``hook functions`` and invoking their implementation(s) as
+  part of program execution
+* ``plugin``: the program implementing (a subset of) the specified hooks and
+  participating in program execution when the implementations are invoked
+  by the ``host``
+* ``pluggy``: connects ``host`` and ``plugins`` by using ...
 
-``pluggy``'s approach is meant to let a designer think carefuly about which objects are
-explicitly needed by an extension writer. This is in contrast to subclass-based extension
-systems which may expose unecessary state and behaviour or encourage `tight coupling`_
-in overlying frameworks.
+    - the hook :ref:`specifications <specs>` defining call signatures
+      provided by the ``host`` (a.k.a ``hookspecs`` - see :ref:`marking_hooks`)
+    - the hook :ref:`implementations <impls>` provided by registered
+      ``plugins`` (a.k.a ``hookimpl`` - see `callbacks`_)
+    - the hook :ref:`caller <calling>` - a call loop triggered at appropriate
+      program positions in the ``host`` invoking the implementations and
+      collecting the results
 
+    ... where for each registered hook *specification*, a hook *call* will
+    invoke up to ``N`` registered hook *implementations*.
+* ``user``: the person who installed the ``host program`` and wants to
+  extend its functionality with ``plugins``. In the simplest case they install
+  the ``plugin`` in the same environment as the ``host`` and the magic will
+  happen when the ``host program`` is run the next time. Depending on
+  the ``plugin``, there might be other things they need to do. For example,
+  they might have to call the host with an additional commandline parameter
+  to the host that the ``plugin`` added.
 
-A first example
----------------
+A toy example
+-------------
+Let us demonstrate the core functionality in one module and show how you can
+start experimenting with pluggy functionality.
 
-.. literalinclude:: examples/firstexample.py
+.. literalinclude:: examples/toy-example.py
 
 Running this directly gets us::
 
-    $ python docs/examples/firstexample.py
+    $ python docs/examples/toy-example.py
 
     inside Plugin_2.myhook()
     inside Plugin_1.myhook()
     [-1, 3]
 
+A complete example
+------------------
+Now let us demonstrate how this plays together in a vaguely real world scenario.
+
+Let's assume our ``host program`` is called **eggsample** where some eggs will
+be prepared and served with a tray containing condiments. As everybody knows:
+the more cooks are involved the better the food, so let us make the process
+pluggable and write a plugin that improves the meal with some spam and replaces
+the steak sauce (nobody likes that anyway) with spam sauce (it's a thing - trust me).
+
+.. note::
+
+    **naming markers**: ``HookSpecMarker`` and ``HookImplMarker`` must be
+    initialized with the name of the ``host`` project (the ``name``
+    parameter in ``setup()``) - so **eggsample** in our case.
+
+    **naming plugin projects**: they should be named in the form of
+    ``<host>-<plugin>`` (e.g. ``pytest-xdist``), therefore we call our
+    plugin *eggsample-spam*.
+
+The host
+^^^^^^^^
+``eggsample/eggsample/__init__.py``
+
+.. literalinclude:: examples/eggsample/eggsample/__init__.py
+
+``eggsample/eggsample/hookspecs.py``
+
+.. literalinclude:: examples/eggsample/eggsample/hookspecs.py
+
+``eggsample/eggsample/lib.py``
+
+.. literalinclude:: examples/eggsample/eggsample/lib.py
+
+``eggsample/eggsample/host.py``
+
+.. literalinclude:: examples/eggsample/eggsample/host.py
+
+``eggsample/setup.py``
+
+.. literalinclude:: examples/eggsample/setup.py
+
+Let's get cooking - we install the host and see what a program run looks like::
+
+    $ pip install --editable pluggy/docs/examples/eggsample
+    $ eggsample
+
+    Your food. Enjoy some egg, egg, salt, egg, egg, pepper, egg
+    Some condiments? We have pickled walnuts, steak sauce, mushy peas, mint sauce
+
+The plugin
+^^^^^^^^^^
+``eggsample-spam/eggsample_spam.py``
+
+.. literalinclude:: examples/eggsample-spam/eggsample_spam.py
+
+``eggsample-spam/setup.py``
+
+.. literalinclude:: examples/eggsample-spam/setup.py
+
+Let's get cooking with more cooks - we install the plugin and and see what
+we get::
+
+    $ pip install --editable pluggy/docs/examples/eggsample-spam
+    $ eggsample
+
+    Your food. Enjoy some egg, lovely spam, salt, egg, egg, egg, wonderous spam, egg, pepper
+    Some condiments? We have pickled walnuts, mushy peas, mint sauce, spam sauce
+    Now this is what I call a condiments tray!
+
+More real world examples
+------------------------
+To see how ``pluggy`` is used in the real world, have a look at these projects
+documentation and source code:
+
+* :ref:`pytest <pytest:writing-plugins>`
+* :std:doc:`tox <tox:plugins>`
+* :std:doc:`devpi <devpi:devguide/index>`
+
 For more details and advanced usage please read on.
 
 .. _define:
 
-Defining and Collecting Hooks
-*****************************
-A *plugin* is a namespace type (currently one of a ``class`` or module)
-which defines a set of *hook* functions.
+Define and collect hooks
+************************
+A *plugin* is a :ref:`namespace <python:tut-scopes>` type (currently one of a
+``class`` or module) which defines a set of *hook* functions.
 
-As mentioned in :ref:`manage`, all *plugins* which define *hooks*
+As mentioned in :ref:`manage`, all *plugins* which specify *hooks*
 are managed by an instance of a :py:class:`pluggy.PluginManager` which
 defines the primary ``pluggy`` API.
 
-In order for a ``PluginManager`` to detect functions in a namespace
+In order for a :py:class:`~pluggy.PluginManager` to detect functions in a namespace
 intended to be *hooks*, they must be decorated using special ``pluggy`` *marks*.
 
 .. _marking_hooks:
@@ -69,24 +184,25 @@ intended to be *hooks*, they must be decorated using special ``pluggy`` *marks*.
 Marking hooks
 -------------
 The :py:class:`~pluggy.HookspecMarker` and :py:class:`~pluggy.HookimplMarker`
-decorators are used to *mark* functions for detection by a ``PluginManager``:
+decorators are used to *mark* functions for detection by a
+:py:class:`~pluggy.PluginManager`:
 
 .. code-block:: python
 
     from pluggy import HookspecMarker, HookimplMarker
 
-    hookspec = HookspecMarker('project_name')
-    hookimpl = HookimplMarker('project_name')
+    hookspec = HookspecMarker("project_name")
+    hookimpl = HookimplMarker("project_name")
 
 
 Each decorator type takes a single ``project_name`` string as its
 lone argument the value of which is used to mark hooks for detection by
-by a similarly configured ``PluginManager`` instance.
+a similarly configured :py:class:`~pluggy.PluginManager` instance.
 
 That is, a *mark* type called with ``project_name`` returns an object which
 can be used to decorate functions which will then be detected by a
-``PluginManager`` which was instantiated with the the same ``project_name``
-value.
+:py:class:`~pluggy.PluginManager` which was instantiated with the same
+``project_name`` value.
 
 Furthermore, each *hookimpl* or *hookspec* decorator can configure the
 underlying call-time behavior of each *hook* object by providing special
@@ -95,8 +211,8 @@ underlying call-time behavior of each *hook* object by providing special
 
 .. note::
     The following sections correspond to similar documentation in
-    ``pytest`` for `Writing hook functions`_ and can be used
-    as a supplementary resource.
+    ``pytest`` for :ref:`pytest:writinghooks` and can be used as
+    a supplementary resource.
 
 .. _impls:
 
@@ -113,7 +229,8 @@ which has been appropriately marked.
     import sys
     from pluggy import PluginManager, HookimplMarker
 
-    hookimpl = HookimplMarker('myproject')
+    hookimpl = HookimplMarker("myproject")
+
 
     @hookimpl
     def setup_project(config, args):
@@ -125,7 +242,8 @@ which has been appropriately marked.
 
         return config
 
-    pm = PluginManager('myproject')
+
+    pm = PluginManager("myproject")
 
     # load all hookimpls from the local module's namespace
     plugin_name = pm.register(sys.modules[__name__])
@@ -134,7 +252,7 @@ which has been appropriately marked.
 
 Optional validation
 ^^^^^^^^^^^^^^^^^^^
-Normally each *hookimpl* should be validated a against a corresponding
+Normally each *hookimpl* should be validated against a corresponding
 hook :ref:`specification <specs>`. If you want to make an exception
 then the *hookimpl* should be marked with the ``"optionalhook"`` option:
 
@@ -162,7 +280,8 @@ will be executed *first* or *last* respectively in the hook call loop:
     import sys
     from pluggy import PluginManager, HookimplMarker
 
-    hookimpl = HookimplMarker('myproject')
+    hookimpl = HookimplMarker("myproject")
+
 
     @hookimpl(trylast=True)
     def setup_project(config, args):
@@ -177,8 +296,9 @@ will be executed *first* or *last* respectively in the hook call loop:
     class SomeOtherPlugin(object):
         """Some other plugin defining the same hook.
         """
+
         @hookimpl(tryfirst=True)
-        def setup_project(config, args):
+        def setup_project(self, config, args):
             """Report what args were passed before calling
             downstream hooks.
             """
@@ -187,12 +307,13 @@ will be executed *first* or *last* respectively in the hook call loop:
 
             return config
 
-    pm = PluginManager('myproject')
+
+    pm = PluginManager("myproject")
 
     # load from the local module's namespace
     pm.register(sys.modules[__name__])
     # load a plugin defined on a class
-    pm.register(SomePlugin())
+    pm.register(SomeOtherPlugin())
 
 For another example see the `hook function ordering`_ section of the
 ``pytest`` docs.
@@ -201,6 +322,9 @@ For another example see the `hook function ordering`_ section of the
     ``tryfirst`` and ``trylast`` hooks are still invoked in LIFO order within
     each category.
 
+
+.. _hookwrappers:
+
 Wrappers
 ^^^^^^^^
 A *hookimpl* can be marked with a ``"hookwrapper"`` option which indicates that
@@ -208,7 +332,7 @@ the function will be called to *wrap* (or surround) all other normal *hookimpl*
 calls. A *hookwrapper* can thus execute some code ahead and after the execution
 of all corresponding non-wrappper *hookimpls*.
 
-Much in the same way as a `@contextlib.contextmanager`_, *hookwrappers* must
+Much in the same way as a :py:func:`@contextlib.contextmanager <python:contextlib.contextmanager>`, *hookwrappers* must
 be implemented as generator function with a single ``yield`` in its body:
 
 
@@ -220,8 +344,7 @@ be implemented as generator function with a single ``yield`` in its body:
         should return json encoded config options.
         """
         if config.debug:
-            print("Pre-hook config is {}".format(
-                config.tojson()))
+            print("Pre-hook config is {}".format(config.tojson()))
 
         # get initial default config
         defaults = config.tojson()
@@ -233,17 +356,16 @@ be implemented as generator function with a single ``yield`` in its body:
             print("JSON config override is {}".format(item))
 
         if config.debug:
-            print("Post-hook config is {}".format(
-                config.tojson()))
+            print("Post-hook config is {}".format(config.tojson()))
 
         if config.use_defaults:
             outcome.force_result(defaults)
 
-The generator is `sent`_ a :py:class:`pluggy._Result` object which can
+The generator is :py:meth:`sent <python:generator.send>` a :py:class:`pluggy.callers._Result` object which can
 be assigned in the ``yield`` expression and used to override or inspect
 the final result(s) returned back to the caller using the
-:py:meth:`~pluggy._Result.force_result` or
-:py:meth:`~pluggy._Result.get_result` methods.
+:py:meth:`~pluggy.callers._Result.force_result` or
+:py:meth:`~pluggy.callers._Result.get_result` methods.
 
 .. note::
     Hook wrappers can **not** return results (as per generator function
@@ -273,15 +395,17 @@ should be added before registering corresponding *hookimpls*:
     import sys
     from pluggy import PluginManager, HookspecMarker
 
-    hookspec = HookspecMarker('myproject')
+    hookspec = HookspecMarker("myproject")
+
 
     @hookspec
     def setup_project(config, args):
-        """This hook is used to process the inital config and input
+        """This hook is used to process the initial config and input
         arguments.
         """
 
-    pm = PluginManager('myproject')
+
+    pm = PluginManager("myproject")
 
     # load from the local module's namespace
     pm.add_hookspecs(sys.modules[__name__])
@@ -323,6 +447,7 @@ In other words this is ok:
     def myhook(config, args):
         pass
 
+
     @hookimpl
     def myhook(args):
         print(args)
@@ -336,10 +461,16 @@ whereas this is not:
     def myhook(config, args):
         pass
 
+
     @hookimpl
     def myhook(config, args, extra_arg):
         print(args)
 
+.. note::
+    The one exception to this rule (that a *hookspec* must have as least as
+    many arguments as its *hookimpls*) is the conventional :ref:`self <python:tut-remarks>` arg; this
+    is always ignored when *hookimpls* are defined as :ref:`methods <python:tut-methodobjects>`.
+
 .. _firstresult:
 
 First result only
@@ -357,15 +488,16 @@ then ``None``.
 This can be useful for optimizing a call loop for which you are only
 interested in a single core *hookimpl*. An example is the
 `pytest_cmdline_main`_ central routine of ``pytest``.
+Note that all ``hookwrappers`` are still invoked with the first result.
 
-Also see the `first result`_ section in the ``pytest`` docs.
+Also see the :ref:`pytest:firstresult` section in the ``pytest`` docs.
 
 .. _historic:
 
 Historic hooks
 ^^^^^^^^^^^^^^
 You can mark a *hookspec* as being *historic* meaning that the hook
-can be called with :py:meth:`~pluggy.PluginManager.call_historic()` **before**
+can be called with :py:meth:`~pluggy.hooks._HookCaller.call_historic()` **before**
 having been registered:
 
 .. code-block:: python
@@ -375,7 +507,7 @@ having been registered:
         pass
 
 The implication is that late registered *hookimpls* will be called back
-immediately at register time and **can not** return a result to the caller.**
+immediately at register time and **can not** return a result to the caller.
 
 This turns out to be particularly useful when dealing with lazy or
 dynamically loaded plugins.
@@ -383,57 +515,56 @@ dynamically loaded plugins.
 For more info see :ref:`call_historic`.
 
 
-.. links
-.. _@contextlib.contextmanager:
-    https://docs.python.org/3.6/library/contextlib.html#contextlib.contextmanager
-.. _pytest_cmdline_main:
-    https://github.com/pytest-dev/pytest/blob/master/_pytest/hookspec.py#L80
-.. _hookspec module:
-    https://github.com/pytest-dev/pytest/blob/master/_pytest/hookspec.py
-.. _Writing hook functions:
-    http://doc.pytest.org/en/latest/writing_plugins.html#writing-hook-functions
-.. _hookwrapper:
-    http://doc.pytest.org/en/latest/writing_plugins.html#hookwrapper-executing-around-other-hooks
-.. _hook function ordering:
-    http://doc.pytest.org/en/latest/writing_plugins.html#hook-function-ordering-call-example
-.. _first result:
-    http://doc.pytest.org/en/latest/writing_plugins.html#firstresult-stop-at-first-non-none-result
-.. _sent:
-    https://docs.python.org/3/reference/expressions.html#generator.send
+Warnings on hook implementation
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+As projects evolve new hooks may be introduced and/or deprecated.
+
+if a hookspec specifies a ``warn_on_impl``, pluggy will trigger it for any plugin implementing the hook.
+
+
+.. code-block:: python
+
+    @hookspec(
+        warn_on_impl=DeprecationWarning("oldhook is deprecated and will be removed soon")
+    )
+    def oldhook():
+        pass
 
 .. _manage:
 
-The Plugin Registry
+The Plugin registry
 *******************
 ``pluggy`` manages plugins using instances of the
 :py:class:`pluggy.PluginManager`.
 
-A ``PluginManager`` is instantiated with a single
+A :py:class:`~pluggy.PluginManager` is instantiated with a single
 ``str`` argument, the ``project_name``:
 
 .. code-block:: python
 
     import pluggy
-    pm = pluggy.PluginManager('my_project_name')
+
+    pm = pluggy.PluginManager("my_project_name")
 
 
-The ``project_name`` value is used when a ``PluginManager`` scans for *hook*
-functions :ref:`defined on a plugin <define>`.
-This allows for multiple
-plugin managers from multiple projects to define hooks alongside each other.
+The ``project_name`` value is used when a :py:class:`~pluggy.PluginManager`
+scans for *hook* functions :ref:`defined on a plugin <define>`.
+This allows for multiple plugin managers from multiple projects
+to define hooks alongside each other.
 
 
 Registration
 ------------
-Each ``PluginManager`` maintains a *plugin* registry where each *plugin*
+Each :py:class:`~pluggy.PluginManager` maintains a *plugin* registry where each *plugin*
 contains a set of *hookimpl* definitions. Loading *hookimpl* and *hookspec*
 definitions to populate the registry is described in detail in the section on
 :ref:`define`.
 
 In summary, you pass a plugin namespace object to the
 :py:meth:`~pluggy.PluginManager.register()` and
-:py:meth:`~pluggy.PluginManager.add_hookspec()` methods to collect
-hook *implementations* and *specfications* from *plugin* namespaces respectively.
+:py:meth:`~pluggy.PluginManager.add_hookspecs()` methods to collect
+hook *implementations* and *specifications* from *plugin* namespaces respectively.
 
 You can unregister any *plugin*'s hooks using
 :py:meth:`~pluggy.PluginManager.unregister()` and check if a plugin is
@@ -442,11 +573,12 @@ registered by passing its name to the
 
 Loading ``setuptools`` entry points
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-You can automatically load plugins registered through `setuptools entry points`_
+You can automatically load plugins registered through
+:ref:`setuptools entry points <setuptools:entry points>`
 with the :py:meth:`~pluggy.PluginManager.load_setuptools_entrypoints()`
 method.
 
-An example use of this is the `pytest entry point`_.
+An example use of this is the :ref:`pytest entry point <pytest:pip-installable plugins>`.
 
 
 Blocking
@@ -458,7 +590,7 @@ You can block any plugin from being registered using
 
 Inspection
 ----------
-You can use a variety of methods to inspect the both the registry
+You can use a variety of methods to inspect both the registry
 and particular plugins in it:
 
 - :py:meth:`~pluggy.PluginManager.list_name_plugin()` -
@@ -477,28 +609,22 @@ You can retrieve the *options* applied to a particular
 :py:meth:`~pluggy.PluginManager.parse_hookspec_opts()` and
 :py:meth:`~pluggy.PluginManager.parse_hookimpl_opts()` respectively.
 
-.. links
-.. _setuptools entry points:
-    http://setuptools.readthedocs.io/en/latest/setuptools.html#dynamic-discovery-of-services-and-plugins
-.. _pytest entry point:
-    http://doc.pytest.org/en/latest/writing_plugins.html#setuptools-entry-points
-
 
 .. _calling:
 
-Calling Hooks
+Calling hooks
 *************
 The core functionality of ``pluggy`` enables an extension provider
 to override function calls made at certain points throughout a program.
 
 A particular *hook* is invoked by calling an instance of
-a :py:class:`pluggy._HookCaller` which in turn *loops* through the
+a :py:class:`pluggy.hooks._HookCaller` which in turn *loops* through the
 ``1:N`` registered *hookimpls* and calls them in sequence.
 
-Every :py:class:`pluggy.PluginManager` has a ``hook`` attribute
-which is an instance of this :py:class:`pluggy._HookRelay`.
-The ``_HookRelay`` itself contains references (by hook name) to each
-registered *hookimpl*'s ``_HookCaller`` instance.
+Every :py:class:`~pluggy.PluginManager` has a ``hook`` attribute
+which is an instance of this :py:class:`pluggy.hooks._HookRelay`.
+The :py:class:`~pluggy.hooks._HookRelay` itself contains references
+(by hook name) to each registered *hookimpl*'s :py:class:`~pluggy.hooks._HookCaller` instance.
 
 More practically you call a *hook* like so:
 
@@ -517,7 +643,7 @@ More practically you call a *hook* like so:
     # we invoke the _HookCaller and thus all underlying hookimpls
     result_list = pm.hook.myhook(config=config, args=sys.argv)
 
-Note that you **must** call hooks using keyword `arguments`_ syntax!
+Note that you **must** call hooks using keyword :std:term:`python:argument` syntax!
 
 Hook implementations are called in LIFO registered order: *the last
 registered plugin's hooks are called first*. As an example, the below
@@ -527,27 +653,34 @@ assertion should not error:
 
     from pluggy import PluginManager, HookimplMarker
 
-    hookimpl = HookimplMarker('myproject')
+    hookimpl = HookimplMarker("myproject")
+
 
     class Plugin1(object):
+        @hookimpl
         def myhook(self, args):
             """Default implementation.
             """
             return 1
 
+
     class Plugin2(object):
+        @hookimpl
         def myhook(self, args):
             """Default implementation.
             """
             return 2
 
+
     class Plugin3(object):
+        @hookimpl
         def myhook(self, args):
             """Default implementation.
             """
             return 3
 
-    pm = PluginManager('myproject')
+
+    pm = PluginManager("myproject")
     pm.register(Plugin1())
     pm.register(Plugin2())
     pm.register(Plugin3())
@@ -562,11 +695,67 @@ which returns a value other then a ``None`` result will have that result
 appended to a :py:class:`list` which is returned by the call.
 
 The only exception to this behaviour is if the hook has been marked to return
-its :ref:`firstresult` in which case only the first single value (which is not
-``None``) will be returned.
+its :ref:`first result only <firstresult>` in which case only the first
+single value (which is not ``None``) will be returned.
 
 .. _call_historic:
 
+Exception handling
+------------------
+If any *hookimpl* errors with an exception no further callbacks
+are invoked and the exception is packaged up and delivered to
+any :ref:`wrappers <hookwrappers>` before being re-raised at the
+hook invocation point:
+
+.. code-block:: python
+
+    from pluggy import PluginManager, HookimplMarker
+
+    hookimpl = HookimplMarker("myproject")
+
+
+    class Plugin1(object):
+        @hookimpl
+        def myhook(self, args):
+            return 1
+
+
+    class Plugin2(object):
+        @hookimpl
+        def myhook(self, args):
+            raise RuntimeError
+
+
+    class Plugin3(object):
+        @hookimpl
+        def myhook(self, args):
+            return 3
+
+
+    @hookimpl(hookwrapper=True)
+    def myhook(self, args):
+        outcome = yield
+
+        try:
+            outcome.get_result()
+        except RuntimeError:
+            # log the error details
+            print(outcome.excinfo)
+
+
+    pm = PluginManager("myproject")
+
+    # register plugins
+    pm.register(Plugin1())
+    pm.register(Plugin2())
+    pm.register(Plugin3())
+
+    # register wrapper
+    pm.register(sys.modules[__name__])
+
+    # this raises RuntimeError due to Plugin2
+    pm.hook.myhook(args=())
+
 Historic calls
 --------------
 A *historic call* allows for all newly registered functions to receive all hook
@@ -575,46 +764,56 @@ only useful if you expect that some *hookimpls* may be registered **after** the
 hook is initially invoked.
 
 Historic hooks must be :ref:`specially marked <historic>` and called
-using the :py:meth:`pluggy._HookCaller.call_historic()` method:
+using the :py:meth:`~pluggy.hooks._HookCaller.call_historic()` method:
 
 .. code-block:: python
 
+    def callback(result):
+        print("historic call result is {result}".format(result=result))
+
+
     # call with history; no results returned
-    pm.hook.myhook.call_historic(config=config, args=sys.argv)
+    pm.hook.myhook.call_historic(
+        kwargs={"config": config, "args": sys.argv}, result_callback=callback
+    )
 
     # ... more of our program ...
 
     # late loading of some plugin
     import mylateplugin
 
-    # historic call back is done here
+    # historic callback is invoked here
     pm.register(mylateplugin)
 
-Note that if you ``call_historic()`` the ``_HookCaller`` (and thus your
-calling code) can not receive results back from the underlying *hookimpl*
-functions.
+Note that if you :py:meth:`~pluggy.hooks._HookCaller.call_historic()`
+the :py:class:`~pluggy.hooks._HookCaller` (and thus your calling code)
+can not receive results back from the underlying *hookimpl* functions.
+Instead you can provide a *callback* for processing results (like the
+``callback`` function above) which will be called as each new plugin
+is registered.
+
+.. note::
+    *historic* calls are incompatible with :ref:`firstresult` marked
+    hooks since only the first registered plugin's hook(s) would
+    ever be called.
 
 Calling with extras
 -------------------
 You can call a hook with temporarily participating *implementation* functions
 (that aren't in the registry) using the
-:py:meth:`pluggy._HookCaller.call_extra()` method.
+:py:meth:`pluggy.hooks._HookCaller.call_extra()` method.
 
 
 Calling with a subset of registered plugins
 -------------------------------------------
 You can make a call using a subset of plugins by asking the
-``PluginManager`` first for a ``_HookCaller`` with those plugins removed
+:py:class:`~pluggy.PluginManager` first for a
+:py:class:`~pluggy.hooks._HookCaller` with those plugins removed
 using the :py:meth:`pluggy.PluginManager.subset_hook_caller()` method.
 
-You then can use that ``_HookCaller`` to make normal, ``call_historic()``,
-or ``call_extra()`` calls as necessary.
-
-
-.. links
-.. _arguments:
-    https://docs.python.org/3/glossary.html#term-argument
-
+You then can use that :py:class:`_HookCaller <pluggy.hooks._HookCaller>`
+to make normal, :py:meth:`~pluggy.hooks._HookCaller.call_historic`, or
+:py:meth:`~pluggy.hooks._HookCaller.call_extra` calls as necessary.
 
 Built-in tracing
 ****************
@@ -630,7 +829,7 @@ undo function to disable the behaviour.
 
 .. code-block:: python
 
-    pm = PluginManager('myproject')
+    pm = PluginManager("myproject")
     # magic line to set a writer function
     pm.trace.root.setwriter(print)
     undo = pm.enable_tracing()
@@ -649,6 +848,7 @@ The expected signature and default implementations for these functions is:
     def before(hook_name, methods, kwargs):
         pass
 
+
     def after(outcome, hook_name, methods, kwargs):
         pass
 
@@ -663,6 +863,19 @@ projects rely on it. Our Github integrated CI process runs the full
 `tox test suite`_ on each commit so be sure your changes can run on
 all required `Python interpreters`_ and ``pytest`` versions.
 
+For development, we suggest to create a virtual environment and install ``pluggy`` in
+editable mode and ``dev`` dependencies::
+
+    $ python3 -m venv .env
+    $ source .env/bin/activate
+    $ pip install -e .[dev]
+
+To make sure you follow the code style used in the project, install pre-commit_ which
+will run style checks before each commit::
+
+    $ pre-commit install
+
+
 Release Policy
 **************
 Pluggy uses `Semantic Versioning`_. Breaking changes are only foreseen for
@@ -671,31 +884,44 @@ in your project you should thus use a dependency restriction like
 ``"pluggy>=0.1.0,<1.0"`` to avoid surprises.
 
 
+Table of contents
+*****************
+
+.. toctree::
+    :maxdepth: 2
+
+    api_reference
+    changelog
+
+
+
 .. hyperlinks
-.. _pytest:
-    http://pytest.org
+.. _pytest_cmdline_main:
+    https://docs.pytest.org/en/latest/_modules/_pytest/hookspec.html#pytest_cmdline_main
+.. _hookspec module:
+    https://docs.pytest.org/en/latest/_modules/_pytest/hookspec.html
+.. _hookwrapper:
+    http://doc.pytest.org/en/latest/writing_plugins.html#hookwrapper-executing-around-other-hooks
+.. _hook function ordering:
+    http://doc.pytest.org/en/latest/writing_plugins.html#hook-function-ordering-call-example
 .. _request-response pattern:
     https://en.wikipedia.org/wiki/Request%E2%80%93response
 .. _publish-subscribe:
     https://en.wikipedia.org/wiki/Publish%E2%80%93subscribe_pattern
 .. _hooking:
     https://en.wikipedia.org/wiki/Hooking
-.. _plugin management and hook calling:
-    http://doc.pytest.org/en/latest/writing_plugins.html
-.. _namespace:
-    https://docs.python.org/3.6/tutorial/classes.html#python-scopes-and-namespaces
 .. _callbacks:
     https://en.wikipedia.org/wiki/Callback_(computer_programming)
 .. _tox test suite:
     https://github.com/pytest-dev/pluggy/blob/master/tox.ini
 .. _Semantic Versioning:
-    http://semver.org/
-.. _tight coupling:
-    https://en.wikipedia.org/wiki/Coupling_%28computer_programming%29#Types_of_coupling
+    https://semver.org/
 .. _Python interpreters:
     https://github.com/pytest-dev/pluggy/blob/master/tox.ini#L2
-.. _200+ plugins:
+.. _500+ plugins:
     http://plugincompat.herokuapp.com/
+.. _pre-commit:
+    https://pre-commit.com/
 
 
 .. Indices and tables
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/pluggy/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/pluggy/pluggy/__init__.py
deleted file mode 100644
index ab5175d9566..00000000000
--- a/tests/wpt/web-platform-tests/tools/third_party/pluggy/pluggy/__init__.py
+++ /dev/null
@@ -1,684 +0,0 @@
-import inspect
-import warnings
-from .callers import _multicall, HookCallError, _Result, _legacymulticall
-
-__version__ = '0.5.3.dev'
-
-__all__ = ["PluginManager", "PluginValidationError", "HookCallError",
-           "HookspecMarker", "HookimplMarker"]
-
-
-class PluginValidationError(Exception):
-    """ plugin failed validation. """
-
-
-class HookspecMarker(object):
-    """ Decorator helper class for marking functions as hook specifications.
-
-    You can instantiate it with a project_name to get a decorator.
-    Calling PluginManager.add_hookspecs later will discover all marked functions
-    if the PluginManager uses the same project_name.
-    """
-
-    def __init__(self, project_name):
-        self.project_name = project_name
-
-    def __call__(self, function=None, firstresult=False, historic=False):
-        """ if passed a function, directly sets attributes on the function
-        which will make it discoverable to add_hookspecs().  If passed no
-        function, returns a decorator which can be applied to a function
-        later using the attributes supplied.
-
-        If firstresult is True the 1:N hook call (N being the number of registered
-        hook implementation functions) will stop at I<=N when the I'th function
-        returns a non-None result.
-
-        If historic is True calls to a hook will be memorized and replayed
-        on later registered plugins.
-
-        """
-        def setattr_hookspec_opts(func):
-            if historic and firstresult:
-                raise ValueError("cannot have a historic firstresult hook")
-            setattr(func, self.project_name + "_spec",
-                    dict(firstresult=firstresult, historic=historic))
-            return func
-
-        if function is not None:
-            return setattr_hookspec_opts(function)
-        else:
-            return setattr_hookspec_opts
-
-
-class HookimplMarker(object):
-    """ Decorator helper class for marking functions as hook implementations.
-
-    You can instantiate with a project_name to get a decorator.
-    Calling PluginManager.register later will discover all marked functions
-    if the PluginManager uses the same project_name.
-    """
-    def __init__(self, project_name):
-        self.project_name = project_name
-
-    def __call__(self, function=None, hookwrapper=False, optionalhook=False,
-                 tryfirst=False, trylast=False):
-
-        """ if passed a function, directly sets attributes on the function
-        which will make it discoverable to register().  If passed no function,
-        returns a decorator which can be applied to a function later using
-        the attributes supplied.
-
-        If optionalhook is True a missing matching hook specification will not result
-        in an error (by default it is an error if no matching spec is found).
-
-        If tryfirst is True this hook implementation will run as early as possible
-        in the chain of N hook implementations for a specfication.
-
-        If trylast is True this hook implementation will run as late as possible
-        in the chain of N hook implementations.
-
-        If hookwrapper is True the hook implementations needs to execute exactly
-        one "yield".  The code before the yield is run early before any non-hookwrapper
-        function is run.  The code after the yield is run after all non-hookwrapper
-        function have run.  The yield receives a ``_Result`` object representing
-        the exception or result outcome of the inner calls (including other hookwrapper
-        calls).
-
-        """
-        def setattr_hookimpl_opts(func):
-            setattr(func, self.project_name + "_impl",
-                    dict(hookwrapper=hookwrapper, optionalhook=optionalhook,
-                         tryfirst=tryfirst, trylast=trylast))
-            return func
-
-        if function is None:
-            return setattr_hookimpl_opts
-        else:
-            return setattr_hookimpl_opts(function)
-
-
-def normalize_hookimpl_opts(opts):
-    opts.setdefault("tryfirst", False)
-    opts.setdefault("trylast", False)
-    opts.setdefault("hookwrapper", False)
-    opts.setdefault("optionalhook", False)
-
-
-class _TagTracer(object):
-    def __init__(self):
-        self._tag2proc = {}
-        self.writer = None
-        self.indent = 0
-
-    def get(self, name):
-        return _TagTracerSub(self, (name,))
-
-    def format_message(self, tags, args):
-        if isinstance(args[-1], dict):
-            extra = args[-1]
-            args = args[:-1]
-        else:
-            extra = {}
-
-        content = " ".join(map(str, args))
-        indent = "  " * self.indent
-
-        lines = [
-            "%s%s [%s]\n" % (indent, content, ":".join(tags))
-        ]
-
-        for name, value in extra.items():
-            lines.append("%s    %s: %s\n" % (indent, name, value))
-        return lines
-
-    def processmessage(self, tags, args):
-        if self.writer is not None and args:
-            lines = self.format_message(tags, args)
-            self.writer(''.join(lines))
-        try:
-            self._tag2proc[tags](tags, args)
-        except KeyError:
-            pass
-
-    def setwriter(self, writer):
-        self.writer = writer
-
-    def setprocessor(self, tags, processor):
-        if isinstance(tags, str):
-            tags = tuple(tags.split(":"))
-        else:
-            assert isinstance(tags, tuple)
-        self._tag2proc[tags] = processor
-
-
-class _TagTracerSub(object):
-    def __init__(self, root, tags):
-        self.root = root
-        self.tags = tags
-
-    def __call__(self, *args):
-        self.root.processmessage(self.tags, args)
-
-    def setmyprocessor(self, processor):
-        self.root.setprocessor(self.tags, processor)
-
-    def get(self, name):
-        return self.__class__(self.root, self.tags + (name,))
-
-
-class _TracedHookExecution(object):
-    def __init__(self, pluginmanager, before, after):
-        self.pluginmanager = pluginmanager
-        self.before = before
-        self.after = after
-        self.oldcall = pluginmanager._inner_hookexec
-        assert not isinstance(self.oldcall, _TracedHookExecution)
-        self.pluginmanager._inner_hookexec = self
-
-    def __call__(self, hook, hook_impls, kwargs):
-        self.before(hook.name, hook_impls, kwargs)
-        outcome = _Result.from_call(lambda: self.oldcall(hook, hook_impls, kwargs))
-        self.after(outcome, hook.name, hook_impls, kwargs)
-        return outcome.get_result()
-
-    def undo(self):
-        self.pluginmanager._inner_hookexec = self.oldcall
-
-
-class PluginManager(object):
-    """ Core Pluginmanager class which manages registration
-    of plugin objects and 1:N hook calling.
-
-    You can register new hooks by calling ``add_hookspec(module_or_class)``.
-    You can register plugin objects (which contain hooks) by calling
-    ``register(plugin)``.  The Pluginmanager is initialized with a
-    prefix that is searched for in the names of the dict of registered
-    plugin objects.  An optional excludefunc allows to blacklist names which
-    are not considered as hooks despite a matching prefix.
-
-    For debugging purposes you can call ``enable_tracing()``
-    which will subsequently send debug information to the trace helper.
-    """
-
-    def __init__(self, project_name, implprefix=None):
-        """ if implprefix is given implementation functions
-        will be recognized if their name matches the implprefix. """
-        self.project_name = project_name
-        self._name2plugin = {}
-        self._plugin2hookcallers = {}
-        self._plugin_distinfo = []
-        self.trace = _TagTracer().get("pluginmanage")
-        self.hook = _HookRelay(self.trace.root.get("hook"))
-        self._implprefix = implprefix
-        self._inner_hookexec = lambda hook, methods, kwargs: \
-            hook.multicall(
-                methods, kwargs,
-                firstresult=hook.spec_opts.get('firstresult'),
-            )
-
-    def _hookexec(self, hook, methods, kwargs):
-        # called from all hookcaller instances.
-        # enable_tracing will set its own wrapping function at self._inner_hookexec
-        return self._inner_hookexec(hook, methods, kwargs)
-
-    def register(self, plugin, name=None):
-        """ Register a plugin and return its canonical name or None if the name
-        is blocked from registering.  Raise a ValueError if the plugin is already
-        registered. """
-        plugin_name = name or self.get_canonical_name(plugin)
-
-        if plugin_name in self._name2plugin or plugin in self._plugin2hookcallers:
-            if self._name2plugin.get(plugin_name, -1) is None:
-                return  # blocked plugin, return None to indicate no registration
-            raise ValueError("Plugin already registered: %s=%s\n%s" %
-                             (plugin_name, plugin, self._name2plugin))
-
-        # XXX if an error happens we should make sure no state has been
-        # changed at point of return
-        self._name2plugin[plugin_name] = plugin
-
-        # register matching hook implementations of the plugin
-        self._plugin2hookcallers[plugin] = hookcallers = []
-        for name in dir(plugin):
-            hookimpl_opts = self.parse_hookimpl_opts(plugin, name)
-            if hookimpl_opts is not None:
-                normalize_hookimpl_opts(hookimpl_opts)
-                method = getattr(plugin, name)
-                hookimpl = HookImpl(plugin, plugin_name, method, hookimpl_opts)
-                hook = getattr(self.hook, name, None)
-                if hook is None:
-                    hook = _HookCaller(name, self._hookexec)
-                    setattr(self.hook, name, hook)
-                elif hook.has_spec():
-                    self._verify_hook(hook, hookimpl)
-                    hook._maybe_apply_history(hookimpl)
-                hook._add_hookimpl(hookimpl)
-                hookcallers.append(hook)
-        return plugin_name
-
-    def parse_hookimpl_opts(self, plugin, name):
-        method = getattr(plugin, name)
-        if not inspect.isroutine(method):
-            return
-        try:
-            res = getattr(method, self.project_name + "_impl", None)
-        except Exception:
-            res = {}
-        if res is not None and not isinstance(res, dict):
-            # false positive
-            res = None
-        elif res is None and self._implprefix and name.startswith(self._implprefix):
-            res = {}
-        return res
-
-    def unregister(self, plugin=None, name=None):
-        """ unregister a plugin object and all its contained hook implementations
-        from internal data structures. """
-        if name is None:
-            assert plugin is not None, "one of name or plugin needs to be specified"
-            name = self.get_name(plugin)
-
-        if plugin is None:
-            plugin = self.get_plugin(name)
-
-        # if self._name2plugin[name] == None registration was blocked: ignore
-        if self._name2plugin.get(name):
-            del self._name2plugin[name]
-
-        for hookcaller in self._plugin2hookcallers.pop(plugin, []):
-            hookcaller._remove_plugin(plugin)
-
-        return plugin
-
-    def set_blocked(self, name):
-        """ block registrations of the given name, unregister if already registered. """
-        self.unregister(name=name)
-        self._name2plugin[name] = None
-
-    def is_blocked(self, name):
-        """ return True if the name blogs registering plugins of that name. """
-        return name in self._name2plugin and self._name2plugin[name] is None
-
-    def add_hookspecs(self, module_or_class):
-        """ add new hook specifications defined in the given module_or_class.
-        Functions are recognized if they have been decorated accordingly. """
-        names = []
-        for name in dir(module_or_class):
-            spec_opts = self.parse_hookspec_opts(module_or_class, name)
-            if spec_opts is not None:
-                hc = getattr(self.hook, name, None)
-                if hc is None:
-                    hc = _HookCaller(name, self._hookexec, module_or_class, spec_opts)
-                    setattr(self.hook, name, hc)
-                else:
-                    # plugins registered this hook without knowing the spec
-                    hc.set_specification(module_or_class, spec_opts)
-                    for hookfunction in (hc._wrappers + hc._nonwrappers):
-                        self._verify_hook(hc, hookfunction)
-                names.append(name)
-
-        if not names:
-            raise ValueError("did not find any %r hooks in %r" %
-                             (self.project_name, module_or_class))
-
-    def parse_hookspec_opts(self, module_or_class, name):
-        method = getattr(module_or_class, name)
-        return getattr(method, self.project_name + "_spec", None)
-
-    def get_plugins(self):
-        """ return the set of registered plugins. """
-        return set(self._plugin2hookcallers)
-
-    def is_registered(self, plugin):
-        """ Return True if the plugin is already registered. """
-        return plugin in self._plugin2hookcallers
-
-    def get_canonical_name(self, plugin):
-        """ Return canonical name for a plugin object. Note that a plugin
-        may be registered under a different name which was specified
-        by the caller of register(plugin, name). To obtain the name
-        of an registered plugin use ``get_name(plugin)`` instead."""
-        return getattr(plugin, "__name__", None) or str(id(plugin))
-
-    def get_plugin(self, name):
-        """ Return a plugin or None for the given name. """
-        return self._name2plugin.get(name)
-
-    def has_plugin(self, name):
-        """ Return True if a plugin with the given name is registered. """
-        return self.get_plugin(name) is not None
-
-    def get_name(self, plugin):
-        """ Return name for registered plugin or None if not registered. """
-        for name, val in self._name2plugin.items():
-            if plugin == val:
-                return name
-
-    def _verify_hook(self, hook, hookimpl):
-        if hook.is_historic() and hookimpl.hookwrapper:
-            raise PluginValidationError(
-                "Plugin %r\nhook %r\nhistoric incompatible to hookwrapper" %
-                (hookimpl.plugin_name, hook.name))
-
-        # positional arg checking
-        notinspec = set(hookimpl.argnames) - set(hook.argnames)
-        if notinspec:
-            raise PluginValidationError(
-                "Plugin %r for hook %r\nhookimpl definition: %s\n"
-                "Argument(s) %s are declared in the hookimpl but "
-                "can not be found in the hookspec" %
-                (hookimpl.plugin_name, hook.name,
-                 _formatdef(hookimpl.function), notinspec)
-            )
-
-    def check_pending(self):
-        """ Verify that all hooks which have not been verified against
-        a hook specification are optional, otherwise raise PluginValidationError"""
-        for name in self.hook.__dict__:
-            if name[0] != "_":
-                hook = getattr(self.hook, name)
-                if not hook.has_spec():
-                    for hookimpl in (hook._wrappers + hook._nonwrappers):
-                        if not hookimpl.optionalhook:
-                            raise PluginValidationError(
-                                "unknown hook %r in plugin %r" %
-                                (name, hookimpl.plugin))
-
-    def load_setuptools_entrypoints(self, entrypoint_name):
-        """ Load modules from querying the specified setuptools entrypoint name.
-        Return the number of loaded plugins. """
-        from pkg_resources import (iter_entry_points, DistributionNotFound,
-                                   VersionConflict)
-        for ep in iter_entry_points(entrypoint_name):
-            # is the plugin registered or blocked?
-            if self.get_plugin(ep.name) or self.is_blocked(ep.name):
-                continue
-            try:
-                plugin = ep.load()
-            except DistributionNotFound:
-                continue
-            except VersionConflict as e:
-                raise PluginValidationError(
-                    "Plugin %r could not be loaded: %s!" % (ep.name, e))
-            self.register(plugin, name=ep.name)
-            self._plugin_distinfo.append((plugin, ep.dist))
-        return len(self._plugin_distinfo)
-
-    def list_plugin_distinfo(self):
-        """ return list of distinfo/plugin tuples for all setuptools registered
-        plugins. """
-        return list(self._plugin_distinfo)
-
-    def list_name_plugin(self):
-        """ return list of name/plugin pairs. """
-        return list(self._name2plugin.items())
-
-    def get_hookcallers(self, plugin):
-        """ get all hook callers for the specified plugin. """
-        return self._plugin2hookcallers.get(plugin)
-
-    def add_hookcall_monitoring(self, before, after):
-        """ add before/after tracing functions for all hooks
-        and return an undo function which, when called,
-        will remove the added tracers.
-
-        ``before(hook_name, hook_impls, kwargs)`` will be called ahead
-        of all hook calls and receive a hookcaller instance, a list
-        of HookImpl instances and the keyword arguments for the hook call.
-
-        ``after(outcome, hook_name, hook_impls, kwargs)`` receives the
-        same arguments as ``before`` but also a :py:class:`_Result`` object
-        which represents the result of the overall hook call.
-        """
-        return _TracedHookExecution(self, before, after).undo
-
-    def enable_tracing(self):
-        """ enable tracing of hook calls and return an undo function. """
-        hooktrace = self.hook._trace
-
-        def before(hook_name, methods, kwargs):
-            hooktrace.root.indent += 1
-            hooktrace(hook_name, kwargs)
-
-        def after(outcome, hook_name, methods, kwargs):
-            if outcome.excinfo is None:
-                hooktrace("finish", hook_name, "-->", outcome.get_result())
-            hooktrace.root.indent -= 1
-
-        return self.add_hookcall_monitoring(before, after)
-
-    def subset_hook_caller(self, name, remove_plugins):
-        """ Return a new _HookCaller instance for the named method
-        which manages calls to all registered plugins except the
-        ones from remove_plugins. """
-        orig = getattr(self.hook, name)
-        plugins_to_remove = [plug for plug in remove_plugins if hasattr(plug, name)]
-        if plugins_to_remove:
-            hc = _HookCaller(orig.name, orig._hookexec, orig._specmodule_or_class,
-                             orig.spec_opts)
-            for hookimpl in (orig._wrappers + orig._nonwrappers):
-                plugin = hookimpl.plugin
-                if plugin not in plugins_to_remove:
-                    hc._add_hookimpl(hookimpl)
-                    # we also keep track of this hook caller so it
-                    # gets properly removed on plugin unregistration
-                    self._plugin2hookcallers.setdefault(plugin, []).append(hc)
-            return hc
-        return orig
-
-
-def varnames(func):
-    """Return tuple of positional and keywrord argument names for a function,
-    method, class or callable.
-
-    In case of a class, its ``__init__`` method is considered.
-    For methods the ``self`` parameter is not included.
-    """
-    cache = getattr(func, "__dict__", {})
-    try:
-        return cache["_varnames"]
-    except KeyError:
-        pass
-
-    if inspect.isclass(func):
-        try:
-            func = func.__init__
-        except AttributeError:
-            return (), ()
-    elif not inspect.isroutine(func):  # callable object?
-        try:
-            func = getattr(func, '__call__', func)
-        except Exception:
-            return ()
-
-    try:  # func MUST be a function or method here or we won't parse any args
-        spec = _getargspec(func)
-    except TypeError:
-        return (), ()
-
-    args, defaults = tuple(spec.args), spec.defaults
-    if defaults:
-        index = -len(defaults)
-        args, defaults = args[:index], tuple(args[index:])
-    else:
-        defaults = ()
-
-    # strip any implicit instance arg
-    if args:
-        if inspect.ismethod(func) or (
-            '.' in getattr(func, '__qualname__', ()) and args[0] == 'self'
-        ):
-            args = args[1:]
-
-    assert "self" not in args  # best naming practises check?
-    try:
-        cache["_varnames"] = args, defaults
-    except TypeError:
-        pass
-    return args, defaults
-
-
-class _HookRelay(object):
-    """ hook holder object for performing 1:N hook calls where N is the number
-    of registered plugins.
-
-    """
-
-    def __init__(self, trace):
-        self._trace = trace
-
-
-class _HookCaller(object):
-    def __init__(self, name, hook_execute, specmodule_or_class=None,
-                 spec_opts=None):
-        self.name = name
-        self._wrappers = []
-        self._nonwrappers = []
-        self._hookexec = hook_execute
-        self._specmodule_or_class = None
-        self.argnames = None
-        self.kwargnames = None
-        self.multicall = _multicall
-        self.spec_opts = spec_opts or {}
-        if specmodule_or_class is not None:
-            self.set_specification(specmodule_or_class, spec_opts)
-
-    def has_spec(self):
-        return self._specmodule_or_class is not None
-
-    def set_specification(self, specmodule_or_class, spec_opts):
-        assert not self.has_spec()
-        self._specmodule_or_class = specmodule_or_class
-        specfunc = getattr(specmodule_or_class, self.name)
-        # get spec arg signature
-        argnames, self.kwargnames = varnames(specfunc)
-        self.argnames = ["__multicall__"] + list(argnames)
-        self.spec_opts.update(spec_opts)
-        if spec_opts.get("historic"):
-            self._call_history = []
-
-    def is_historic(self):
-        return hasattr(self, "_call_history")
-
-    def _remove_plugin(self, plugin):
-        def remove(wrappers):
-            for i, method in enumerate(wrappers):
-                if method.plugin == plugin:
-                    del wrappers[i]
-                    return True
-        if remove(self._wrappers) is None:
-            if remove(self._nonwrappers) is None:
-                raise ValueError("plugin %r not found" % (plugin,))
-
-    def _add_hookimpl(self, hookimpl):
-        """A an implementation to the callback chain.
-        """
-        if hookimpl.hookwrapper:
-            methods = self._wrappers
-        else:
-            methods = self._nonwrappers
-
-        if hookimpl.trylast:
-            methods.insert(0, hookimpl)
-        elif hookimpl.tryfirst:
-            methods.append(hookimpl)
-        else:
-            # find last non-tryfirst method
-            i = len(methods) - 1
-            while i >= 0 and methods[i].tryfirst:
-                i -= 1
-            methods.insert(i + 1, hookimpl)
-
-        if '__multicall__' in hookimpl.argnames:
-            warnings.warn(
-                "Support for __multicall__ is now deprecated and will be"
-                "removed in an upcoming release.",
-                DeprecationWarning
-            )
-            self.multicall = _legacymulticall
-
-    def __repr__(self):
-        return "<_HookCaller %r>" % (self.name,)
-
-    def __call__(self, *args, **kwargs):
-        if args:
-            raise TypeError("hook calling supports only keyword arguments")
-        assert not self.is_historic()
-        if self.argnames:
-            notincall = set(self.argnames) - set(['__multicall__']) - set(
-                kwargs.keys())
-            if notincall:
-                warnings.warn(
-                    "Argument(s) {} which are declared in the hookspec "
-                    "can not be found in this hook call"
-                    .format(tuple(notincall)),
-                    stacklevel=2,
-                )
-        return self._hookexec(self, self._nonwrappers + self._wrappers, kwargs)
-
-    def call_historic(self, proc=None, kwargs=None):
-        """ call the hook with given ``kwargs`` for all registered plugins and
-        for all plugins which will be registered afterwards.
-
-        If ``proc`` is not None it will be called for for each non-None result
-        obtained from a hook implementation.
-        """
-        self._call_history.append((kwargs or {}, proc))
-        # historizing hooks don't return results
-        res = self._hookexec(self, self._nonwrappers + self._wrappers, kwargs)
-        for x in res or []:
-            proc(x)
-
-    def call_extra(self, methods, kwargs):
-        """ Call the hook with some additional temporarily participating
-        methods using the specified kwargs as call parameters. """
-        old = list(self._nonwrappers), list(self._wrappers)
-        for method in methods:
-            opts = dict(hookwrapper=False, trylast=False, tryfirst=False)
-            hookimpl = HookImpl(None, "<temp>", method, opts)
-            self._add_hookimpl(hookimpl)
-        try:
-            return self(**kwargs)
-        finally:
-            self._nonwrappers, self._wrappers = old
-
-    def _maybe_apply_history(self, method):
-        """Apply call history to a new hookimpl if it is marked as historic.
-        """
-        if self.is_historic():
-            for kwargs, proc in self._call_history:
-                res = self._hookexec(self, [method], kwargs)
-                if res and proc is not None:
-                    proc(res[0])
-
-
-class HookImpl(object):
-    def __init__(self, plugin, plugin_name, function, hook_impl_opts):
-        self.function = function
-        self.argnames, self.kwargnames = varnames(self.function)
-        self.plugin = plugin
-        self.opts = hook_impl_opts
-        self.plugin_name = plugin_name
-        self.__dict__.update(hook_impl_opts)
-
-
-if hasattr(inspect, 'getfullargspec'):
-    def _getargspec(func):
-        return inspect.getfullargspec(func)
-else:
-    def _getargspec(func):
-        return inspect.getargspec(func)
-
-
-if hasattr(inspect, 'signature'):
-    def _formatdef(func):
-        return "%s%s" % (
-            func.__name__,
-            str(inspect.signature(func))
-        )
-else:
-    def _formatdef(func):
-        return "%s%s" % (
-            func.__name__,
-            inspect.formatargspec(*inspect.getargspec(func))
-        )
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/pyproject.toml b/tests/wpt/web-platform-tests/tools/third_party/pluggy/pyproject.toml
new file mode 100644
index 00000000000..811cf53ed3b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/pyproject.toml
@@ -0,0 +1,44 @@
+[build-system]
+requires = [
+  "setuptools",
+  "setuptools-scm",
+  "wheel",
+]
+
+[tool.towncrier]
+package = "pluggy"
+package_dir = "src/pluggy"
+filename = "CHANGELOG.rst"
+directory = "changelog/"
+title_format = "pluggy {version} ({project_date})"
+template = "changelog/_template.rst"
+
+  [[tool.towncrier.type]]
+  directory = "removal"
+  name = "Deprecations and Removals"
+  showcontent = true
+
+  [[tool.towncrier.type]]
+  directory = "feature"
+  name = "Features"
+  showcontent = true
+
+  [[tool.towncrier.type]]
+  directory = "bugfix"
+  name = "Bug Fixes"
+  showcontent = true
+
+  [[tool.towncrier.type]]
+  directory = "vendor"
+  name = "Vendored Libraries"
+  showcontent = true
+
+  [[tool.towncrier.type]]
+  directory = "doc"
+  name = "Improved Documentation"
+  showcontent = true
+
+  [[tool.towncrier.type]]
+  directory = "trivial"
+  name = "Trivial/Internal Changes"
+  showcontent = true
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/scripts/release.py b/tests/wpt/web-platform-tests/tools/third_party/pluggy/scripts/release.py
new file mode 100644
index 00000000000..a4a18a4c78d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/scripts/release.py
@@ -0,0 +1,69 @@
+"""
+Release script.
+"""
+import argparse
+import sys
+from subprocess import check_call
+
+from colorama import init, Fore
+from git import Repo, Remote
+
+
+def create_branch(version):
+    """Create a fresh branch from upstream/master"""
+    repo = Repo.init(".")
+    if repo.is_dirty(untracked_files=True):
+        raise RuntimeError(f"Repository is dirty, please commit/stash your changes.")
+
+    branch_name = f"release-{version}"
+    print(f"{Fore.CYAN}Create {branch_name} branch from upstream master")
+    upstream = get_upstream(repo)
+    upstream.fetch()
+    release_branch = repo.create_head(branch_name, upstream.refs.master, force=True)
+    release_branch.checkout()
+    return repo
+
+
+def get_upstream(repo: Repo) -> Remote:
+    """Find upstream repository for pluggy on the remotes"""
+    for remote in repo.remotes:
+        for url in remote.urls:
+            if url.endswith(("pytest-dev/pluggy.git", "pytest-dev/pluggy")):
+                return remote
+    raise RuntimeError("could not find pytest-dev/pluggy remote")
+
+
+def pre_release(version):
+    """Generates new docs, release announcements and creates a local tag."""
+    create_branch(version)
+    changelog(version, write_out=True)
+
+    check_call(["git", "commit", "-a", "-m", f"Preparing release {version}"])
+
+    print()
+    print(f"{Fore.GREEN}Please push your branch to your fork and open a PR.")
+
+
+def changelog(version, write_out=False):
+    if write_out:
+        addopts = []
+    else:
+        addopts = ["--draft"]
+    print(f"{Fore.CYAN}Generating CHANGELOG")
+    check_call(["towncrier", "--yes", "--version", version] + addopts)
+
+
+def main():
+    init(autoreset=True)
+    parser = argparse.ArgumentParser()
+    parser.add_argument("version", help="Release version")
+    options = parser.parse_args()
+    try:
+        pre_release(options.version)
+    except RuntimeError as e:
+        print(f"{Fore.RED}ERROR: {e}")
+        return 1
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/setup.py b/tests/wpt/web-platform-tests/tools/third_party/pluggy/setup.py
index b7c0f697120..ae2cd84c119 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pluggy/setup.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/setup.py
@@ -1,51 +1,49 @@
-import os
 from setuptools import setup
 
 classifiers = [
-    'Development Status :: 4 - Beta',
-    'Intended Audience :: Developers',
-    'License :: OSI Approved :: MIT License',
-    'Operating System :: POSIX',
-    'Operating System :: Microsoft :: Windows',
-    'Operating System :: MacOS :: MacOS X',
-    'Topic :: Software Development :: Testing',
-    'Topic :: Software Development :: Libraries',
-    'Topic :: Utilities',
-    'Programming Language :: Python :: Implementation :: CPython',
-    'Programming Language :: Python :: Implementation :: PyPy'] + [
-    ('Programming Language :: Python :: %s' % x) for x in
-    '2 2.7 3 3.4 3.5 3.6'.split()]
+    "Development Status :: 4 - Beta",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: POSIX",
+    "Operating System :: Microsoft :: Windows",
+    "Operating System :: MacOS :: MacOS X",
+    "Topic :: Software Development :: Testing",
+    "Topic :: Software Development :: Libraries",
+    "Topic :: Utilities",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Programming Language :: Python :: Implementation :: PyPy",
+] + [
+    ("Programming Language :: Python :: %s" % x)
+    for x in "2 2.7 3 3.4 3.5 3.6 3.7 3.8".split()
+]
 
-with open('README.rst') as fd:
-    long_description = fd.read()
+with open("README.rst", "rb") as fd:
+    long_description = fd.read().decode("utf-8")
 
-
-def get_version():
-    p = os.path.join(os.path.dirname(
-                     os.path.abspath(__file__)), "pluggy/__init__.py")
-    with open(p) as f:
-        for line in f.readlines():
-            if "__version__" in line:
-                return line.strip().split("=")[-1].strip(" '")
-    raise ValueError("could not read version")
+with open("CHANGELOG.rst", "rb") as fd:
+    long_description += "\n\n" + fd.read().decode("utf-8")
 
 
 def main():
     setup(
-        name='pluggy',
-        description='plugin and hook calling mechanisms for python',
+        name="pluggy",
+        description="plugin and hook calling mechanisms for python",
         long_description=long_description,
-        version=get_version(),
-        license='MIT license',
-        platforms=['unix', 'linux', 'osx', 'win32'],
-        author='Holger Krekel',
-        author_email='holger@merlinux.eu',
-        url='https://github.com/pytest-dev/pluggy',
-        python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
+        use_scm_version={"write_to": "src/pluggy/_version.py"},
+        setup_requires=["setuptools-scm"],
+        license="MIT license",
+        platforms=["unix", "linux", "osx", "win32"],
+        author="Holger Krekel",
+        author_email="holger@merlinux.eu",
+        url="https://github.com/pytest-dev/pluggy",
+        python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
+        install_requires=['importlib-metadata>=0.12;python_version<"3.8"'],
+        extras_require={"dev": ["pre-commit", "tox"]},
         classifiers=classifiers,
-        packages=['pluggy'],
+        packages=["pluggy"],
+        package_dir={"": "src"},
     )
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/__init__.py
new file mode 100644
index 00000000000..fb4f991a610
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/__init__.py
@@ -0,0 +1,18 @@
+try:
+    from ._version import version as __version__
+except ImportError:
+    # broken installation, we don't even try
+    # unknown only works because we do poor mans version compare
+    __version__ = "unknown"
+
+__all__ = [
+    "PluginManager",
+    "PluginValidationError",
+    "HookCallError",
+    "HookspecMarker",
+    "HookimplMarker",
+]
+
+from .manager import PluginManager, PluginValidationError
+from .callers import HookCallError
+from .hooks import HookspecMarker, HookimplMarker
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/_tracing.py b/tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/_tracing.py
new file mode 100644
index 00000000000..8b9715f0261
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/_tracing.py
@@ -0,0 +1,62 @@
+"""
+Tracing utils
+"""
+
+
+class TagTracer(object):
+    def __init__(self):
+        self._tags2proc = {}
+        self._writer = None
+        self.indent = 0
+
+    def get(self, name):
+        return TagTracerSub(self, (name,))
+
+    def _format_message(self, tags, args):
+        if isinstance(args[-1], dict):
+            extra = args[-1]
+            args = args[:-1]
+        else:
+            extra = {}
+
+        content = " ".join(map(str, args))
+        indent = "  " * self.indent
+
+        lines = ["%s%s [%s]\n" % (indent, content, ":".join(tags))]
+
+        for name, value in extra.items():
+            lines.append("%s    %s: %s\n" % (indent, name, value))
+
+        return "".join(lines)
+
+    def _processmessage(self, tags, args):
+        if self._writer is not None and args:
+            self._writer(self._format_message(tags, args))
+        try:
+            processor = self._tags2proc[tags]
+        except KeyError:
+            pass
+        else:
+            processor(tags, args)
+
+    def setwriter(self, writer):
+        self._writer = writer
+
+    def setprocessor(self, tags, processor):
+        if isinstance(tags, str):
+            tags = tuple(tags.split(":"))
+        else:
+            assert isinstance(tags, tuple)
+        self._tags2proc[tags] = processor
+
+
+class TagTracerSub(object):
+    def __init__(self, root, tags):
+        self.root = root
+        self.tags = tags
+
+    def __call__(self, *args):
+        self.root._processmessage(self.tags, args)
+
+    def get(self, name):
+        return self.__class__(self.root, self.tags + (name,))
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/pluggy/callers.py b/tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/callers.py
similarity index 92%
rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/pluggy/callers.py
rename to tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/callers.py
index 3ff67becffb..e7ea464b0da 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pluggy/pluggy/callers.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/callers.py
@@ -1,6 +1,6 @@
-'''
+"""
 Call loop machinery
-'''
+"""
 import sys
 import warnings
 
@@ -8,16 +8,20 @@ _py3 = sys.version_info > (3, 0)
 
 
 if not _py3:
-    exec("""
+    exec(
+        """
 def _reraise(cls, val, tb):
     raise cls, val, tb
-""")
+"""
+    )
 
 
 def _raise_wrapfail(wrap_controller, msg):
     co = wrap_controller.gi_code
-    raise RuntimeError("wrap_controller at %r %s:%d %s" %
-                       (co.co_name, co.co_filename, co.co_firstlineno, msg))
+    raise RuntimeError(
+        "wrap_controller at %r %s:%d %s"
+        % (co.co_name, co.co_filename, co.co_firstlineno, msg)
+    )
 
 
 class HookCallError(Exception):
@@ -36,7 +40,7 @@ class _Result(object):
     @property
     def result(self):
         """Get the result(s) for this hook call (DEPRECATED in favor of ``get_result()``)."""
-        msg = 'Use get_result() which forces correct exception handling'
+        msg = "Use get_result() which forces correct exception handling"
         warnings.warn(DeprecationWarning(msg), stacklevel=2)
         return self._result
 
@@ -84,7 +88,7 @@ def _wrapped_call(wrap_controller, func):
     to finish (raise StopIteration) in order for the wrapped call to complete.
     """
     try:
-        next(wrap_controller)   # first yield
+        next(wrap_controller)  # first yield
     except StopIteration:
         _raise_wrapfail(wrap_controller, "did not yield")
     call_outcome = _Result.from_call(func)
@@ -124,7 +128,8 @@ class _LegacyMultiCall(object):
                 for argname in hook_impl.argnames:
                     if argname not in caller_kwargs:
                         raise HookCallError(
-                            "hook call must provide argument %r" % (argname,))
+                            "hook call must provide argument %r" % (argname,)
+                        )
             if hook_impl.hookwrapper:
                 return _wrapped_call(hook_impl.function(*args), self.execute)
             res = hook_impl.function(*args)
@@ -145,7 +150,8 @@ class _LegacyMultiCall(object):
 
 def _legacymulticall(hook_impls, caller_kwargs, firstresult=False):
     return _LegacyMultiCall(
-        hook_impls, caller_kwargs, firstresult=firstresult).execute()
+        hook_impls, caller_kwargs, firstresult=firstresult
+    ).execute()
 
 
 def _multicall(hook_impls, caller_kwargs, firstresult=False):
@@ -167,12 +173,13 @@ def _multicall(hook_impls, caller_kwargs, firstresult=False):
                     for argname in hook_impl.argnames:
                         if argname not in caller_kwargs:
                             raise HookCallError(
-                                "hook call must provide argument %r" % (argname,))
+                                "hook call must provide argument %r" % (argname,)
+                            )
 
                 if hook_impl.hookwrapper:
                     try:
                         gen = hook_impl.function(*args)
-                        next(gen)   # first yield
+                        next(gen)  # first yield
                         teardowns.append(gen)
                     except StopIteration:
                         _raise_wrapfail(gen, "did not yield")
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/hooks.py b/tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/hooks.py
new file mode 100644
index 00000000000..0a1c287198f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/hooks.py
@@ -0,0 +1,359 @@
+"""
+Internal hook annotation, representation and calling machinery.
+"""
+import inspect
+import sys
+import warnings
+from .callers import _legacymulticall, _multicall
+
+
+class HookspecMarker(object):
+    """ Decorator helper class for marking functions as hook specifications.
+
+    You can instantiate it with a project_name to get a decorator.
+    Calling :py:meth:`.PluginManager.add_hookspecs` later will discover all marked functions
+    if the :py:class:`.PluginManager` uses the same project_name.
+    """
+
+    def __init__(self, project_name):
+        self.project_name = project_name
+
+    def __call__(
+        self, function=None, firstresult=False, historic=False, warn_on_impl=None
+    ):
+        """ if passed a function, directly sets attributes on the function
+        which will make it discoverable to :py:meth:`.PluginManager.add_hookspecs`.
+        If passed no function, returns a decorator which can be applied to a function
+        later using the attributes supplied.
+
+        If ``firstresult`` is ``True`` the 1:N hook call (N being the number of registered
+        hook implementation functions) will stop at I<=N when the I'th function
+        returns a non-``None`` result.
+
+        If ``historic`` is ``True`` calls to a hook will be memorized and replayed
+        on later registered plugins.
+
+        """
+
+        def setattr_hookspec_opts(func):
+            if historic and firstresult:
+                raise ValueError("cannot have a historic firstresult hook")
+            setattr(
+                func,
+                self.project_name + "_spec",
+                dict(
+                    firstresult=firstresult,
+                    historic=historic,
+                    warn_on_impl=warn_on_impl,
+                ),
+            )
+            return func
+
+        if function is not None:
+            return setattr_hookspec_opts(function)
+        else:
+            return setattr_hookspec_opts
+
+
+class HookimplMarker(object):
+    """ Decorator helper class for marking functions as hook implementations.
+
+    You can instantiate with a ``project_name`` to get a decorator.
+    Calling :py:meth:`.PluginManager.register` later will discover all marked functions
+    if the :py:class:`.PluginManager` uses the same project_name.
+    """
+
+    def __init__(self, project_name):
+        self.project_name = project_name
+
+    def __call__(
+        self,
+        function=None,
+        hookwrapper=False,
+        optionalhook=False,
+        tryfirst=False,
+        trylast=False,
+    ):
+
+        """ if passed a function, directly sets attributes on the function
+        which will make it discoverable to :py:meth:`.PluginManager.register`.
+        If passed no function, returns a decorator which can be applied to a
+        function later using the attributes supplied.
+
+        If ``optionalhook`` is ``True`` a missing matching hook specification will not result
+        in an error (by default it is an error if no matching spec is found).
+
+        If ``tryfirst`` is ``True`` this hook implementation will run as early as possible
+        in the chain of N hook implementations for a specification.
+
+        If ``trylast`` is ``True`` this hook implementation will run as late as possible
+        in the chain of N hook implementations.
+
+        If ``hookwrapper`` is ``True`` the hook implementations needs to execute exactly
+        one ``yield``.  The code before the ``yield`` is run early before any non-hookwrapper
+        function is run.  The code after the ``yield`` is run after all non-hookwrapper
+        function have run.  The ``yield`` receives a :py:class:`.callers._Result` object
+        representing the exception or result outcome of the inner calls (including other
+        hookwrapper calls).
+
+        """
+
+        def setattr_hookimpl_opts(func):
+            setattr(
+                func,
+                self.project_name + "_impl",
+                dict(
+                    hookwrapper=hookwrapper,
+                    optionalhook=optionalhook,
+                    tryfirst=tryfirst,
+                    trylast=trylast,
+                ),
+            )
+            return func
+
+        if function is None:
+            return setattr_hookimpl_opts
+        else:
+            return setattr_hookimpl_opts(function)
+
+
+def normalize_hookimpl_opts(opts):
+    opts.setdefault("tryfirst", False)
+    opts.setdefault("trylast", False)
+    opts.setdefault("hookwrapper", False)
+    opts.setdefault("optionalhook", False)
+
+
+if hasattr(inspect, "getfullargspec"):
+
+    def _getargspec(func):
+        return inspect.getfullargspec(func)
+
+
+else:
+
+    def _getargspec(func):
+        return inspect.getargspec(func)
+
+
+_PYPY3 = hasattr(sys, "pypy_version_info") and sys.version_info.major == 3
+
+
+def varnames(func):
+    """Return tuple of positional and keywrord argument names for a function,
+    method, class or callable.
+
+    In case of a class, its ``__init__`` method is considered.
+    For methods the ``self`` parameter is not included.
+    """
+    cache = getattr(func, "__dict__", {})
+    try:
+        return cache["_varnames"]
+    except KeyError:
+        pass
+
+    if inspect.isclass(func):
+        try:
+            func = func.__init__
+        except AttributeError:
+            return (), ()
+    elif not inspect.isroutine(func):  # callable object?
+        try:
+            func = getattr(func, "__call__", func)
+        except Exception:
+            return (), ()
+
+    try:  # func MUST be a function or method here or we won't parse any args
+        spec = _getargspec(func)
+    except TypeError:
+        return (), ()
+
+    args, defaults = tuple(spec.args), spec.defaults
+    if defaults:
+        index = -len(defaults)
+        args, kwargs = args[:index], tuple(args[index:])
+    else:
+        kwargs = ()
+
+    # strip any implicit instance arg
+    # pypy3 uses "obj" instead of "self" for default dunder methods
+    implicit_names = ("self",) if not _PYPY3 else ("self", "obj")
+    if args:
+        if inspect.ismethod(func) or (
+            "." in getattr(func, "__qualname__", ()) and args[0] in implicit_names
+        ):
+            args = args[1:]
+
+    try:
+        cache["_varnames"] = args, kwargs
+    except TypeError:
+        pass
+    return args, kwargs
+
+
+class _HookRelay(object):
+    """ hook holder object for performing 1:N hook calls where N is the number
+    of registered plugins.
+
+    """
+
+
+class _HookCaller(object):
+    def __init__(self, name, hook_execute, specmodule_or_class=None, spec_opts=None):
+        self.name = name
+        self._wrappers = []
+        self._nonwrappers = []
+        self._hookexec = hook_execute
+        self.argnames = None
+        self.kwargnames = None
+        self.multicall = _multicall
+        self.spec = None
+        if specmodule_or_class is not None:
+            assert spec_opts is not None
+            self.set_specification(specmodule_or_class, spec_opts)
+
+    def has_spec(self):
+        return self.spec is not None
+
+    def set_specification(self, specmodule_or_class, spec_opts):
+        assert not self.has_spec()
+        self.spec = HookSpec(specmodule_or_class, self.name, spec_opts)
+        if spec_opts.get("historic"):
+            self._call_history = []
+
+    def is_historic(self):
+        return hasattr(self, "_call_history")
+
+    def _remove_plugin(self, plugin):
+        def remove(wrappers):
+            for i, method in enumerate(wrappers):
+                if method.plugin == plugin:
+                    del wrappers[i]
+                    return True
+
+        if remove(self._wrappers) is None:
+            if remove(self._nonwrappers) is None:
+                raise ValueError("plugin %r not found" % (plugin,))
+
+    def get_hookimpls(self):
+        # Order is important for _hookexec
+        return self._nonwrappers + self._wrappers
+
+    def _add_hookimpl(self, hookimpl):
+        """Add an implementation to the callback chain.
+        """
+        if hookimpl.hookwrapper:
+            methods = self._wrappers
+        else:
+            methods = self._nonwrappers
+
+        if hookimpl.trylast:
+            methods.insert(0, hookimpl)
+        elif hookimpl.tryfirst:
+            methods.append(hookimpl)
+        else:
+            # find last non-tryfirst method
+            i = len(methods) - 1
+            while i >= 0 and methods[i].tryfirst:
+                i -= 1
+            methods.insert(i + 1, hookimpl)
+
+        if "__multicall__" in hookimpl.argnames:
+            warnings.warn(
+                "Support for __multicall__ is now deprecated and will be"
+                "removed in an upcoming release.",
+                DeprecationWarning,
+            )
+            self.multicall = _legacymulticall
+
+    def __repr__(self):
+        return "<_HookCaller %r>" % (self.name,)
+
+    def __call__(self, *args, **kwargs):
+        if args:
+            raise TypeError("hook calling supports only keyword arguments")
+        assert not self.is_historic()
+        if self.spec and self.spec.argnames:
+            notincall = (
+                set(self.spec.argnames) - set(["__multicall__"]) - set(kwargs.keys())
+            )
+            if notincall:
+                warnings.warn(
+                    "Argument(s) {} which are declared in the hookspec "
+                    "can not be found in this hook call".format(tuple(notincall)),
+                    stacklevel=2,
+                )
+        return self._hookexec(self, self.get_hookimpls(), kwargs)
+
+    def call_historic(self, result_callback=None, kwargs=None, proc=None):
+        """Call the hook with given ``kwargs`` for all registered plugins and
+        for all plugins which will be registered afterwards.
+
+        If ``result_callback`` is not ``None`` it will be called for for each
+        non-``None`` result obtained from a hook implementation.
+
+        .. note::
+            The ``proc`` argument is now deprecated.
+        """
+        if proc is not None:
+            warnings.warn(
+                "Support for `proc` argument is now deprecated and will be"
+                "removed in an upcoming release.",
+                DeprecationWarning,
+            )
+            result_callback = proc
+
+        self._call_history.append((kwargs or {}, result_callback))
+        # historizing hooks don't return results
+        res = self._hookexec(self, self.get_hookimpls(), kwargs)
+        if result_callback is None:
+            return
+        # XXX: remember firstresult isn't compat with historic
+        for x in res or []:
+            result_callback(x)
+
+    def call_extra(self, methods, kwargs):
+        """ Call the hook with some additional temporarily participating
+        methods using the specified ``kwargs`` as call parameters. """
+        old = list(self._nonwrappers), list(self._wrappers)
+        for method in methods:
+            opts = dict(hookwrapper=False, trylast=False, tryfirst=False)
+            hookimpl = HookImpl(None, "<temp>", method, opts)
+            self._add_hookimpl(hookimpl)
+        try:
+            return self(**kwargs)
+        finally:
+            self._nonwrappers, self._wrappers = old
+
+    def _maybe_apply_history(self, method):
+        """Apply call history to a new hookimpl if it is marked as historic.
+        """
+        if self.is_historic():
+            for kwargs, result_callback in self._call_history:
+                res = self._hookexec(self, [method], kwargs)
+                if res and result_callback is not None:
+                    result_callback(res[0])
+
+
+class HookImpl(object):
+    def __init__(self, plugin, plugin_name, function, hook_impl_opts):
+        self.function = function
+        self.argnames, self.kwargnames = varnames(self.function)
+        self.plugin = plugin
+        self.opts = hook_impl_opts
+        self.plugin_name = plugin_name
+        self.__dict__.update(hook_impl_opts)
+
+    def __repr__(self):
+        return "<HookImpl plugin_name=%r, plugin=%r>" % (self.plugin_name, self.plugin)
+
+
+class HookSpec(object):
+    def __init__(self, namespace, name, opts):
+        self.namespace = namespace
+        self.function = function = getattr(namespace, name)
+        self.name = name
+        self.argnames, self.kwargnames = varnames(function)
+        self.opts = opts
+        self.argnames = ["__multicall__"] + list(self.argnames)
+        self.warn_on_impl = opts.get("warn_on_impl")
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/manager.py b/tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/manager.py
new file mode 100644
index 00000000000..07b42cba2d5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/manager.py
@@ -0,0 +1,394 @@
+import inspect
+import sys
+from . import _tracing
+from .callers import _Result
+from .hooks import HookImpl, _HookRelay, _HookCaller, normalize_hookimpl_opts
+import warnings
+
+if sys.version_info >= (3, 8):
+    from importlib import metadata as importlib_metadata
+else:
+    import importlib_metadata
+
+
+def _warn_for_function(warning, function):
+    warnings.warn_explicit(
+        warning,
+        type(warning),
+        lineno=function.__code__.co_firstlineno,
+        filename=function.__code__.co_filename,
+    )
+
+
+class PluginValidationError(Exception):
+    """ plugin failed validation.
+
+    :param object plugin: the plugin which failed validation,
+        may be a module or an arbitrary object.
+    """
+
+    def __init__(self, plugin, message):
+        self.plugin = plugin
+        super(Exception, self).__init__(message)
+
+
+class DistFacade(object):
+    """Emulate a pkg_resources Distribution"""
+
+    def __init__(self, dist):
+        self._dist = dist
+
+    @property
+    def project_name(self):
+        return self.metadata["name"]
+
+    def __getattr__(self, attr, default=None):
+        return getattr(self._dist, attr, default)
+
+    def __dir__(self):
+        return sorted(dir(self._dist) + ["_dist", "project_name"])
+
+
+class PluginManager(object):
+    """ Core :py:class:`.PluginManager` class which manages registration
+    of plugin objects and 1:N hook calling.
+
+    You can register new hooks by calling :py:meth:`add_hookspecs(module_or_class)
+    <.PluginManager.add_hookspecs>`.
+    You can register plugin objects (which contain hooks) by calling
+    :py:meth:`register(plugin) <.PluginManager.register>`.  The :py:class:`.PluginManager`
+    is initialized with a prefix that is searched for in the names of the dict
+    of registered plugin objects.
+
+    For debugging purposes you can call :py:meth:`.PluginManager.enable_tracing`
+    which will subsequently send debug information to the trace helper.
+    """
+
+    def __init__(self, project_name, implprefix=None):
+        """If ``implprefix`` is given implementation functions
+        will be recognized if their name matches the ``implprefix``. """
+        self.project_name = project_name
+        self._name2plugin = {}
+        self._plugin2hookcallers = {}
+        self._plugin_distinfo = []
+        self.trace = _tracing.TagTracer().get("pluginmanage")
+        self.hook = _HookRelay()
+        if implprefix is not None:
+            warnings.warn(
+                "Support for the `implprefix` arg is now deprecated and will "
+                "be removed in an upcoming release. Please use HookimplMarker.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+        self._implprefix = implprefix
+        self._inner_hookexec = lambda hook, methods, kwargs: hook.multicall(
+            methods,
+            kwargs,
+            firstresult=hook.spec.opts.get("firstresult") if hook.spec else False,
+        )
+
+    def _hookexec(self, hook, methods, kwargs):
+        # called from all hookcaller instances.
+        # enable_tracing will set its own wrapping function at self._inner_hookexec
+        return self._inner_hookexec(hook, methods, kwargs)
+
+    def register(self, plugin, name=None):
+        """ Register a plugin and return its canonical name or ``None`` if the name
+        is blocked from registering.  Raise a :py:class:`ValueError` if the plugin
+        is already registered. """
+        plugin_name = name or self.get_canonical_name(plugin)
+
+        if plugin_name in self._name2plugin or plugin in self._plugin2hookcallers:
+            if self._name2plugin.get(plugin_name, -1) is None:
+                return  # blocked plugin, return None to indicate no registration
+            raise ValueError(
+                "Plugin already registered: %s=%s\n%s"
+                % (plugin_name, plugin, self._name2plugin)
+            )
+
+        # XXX if an error happens we should make sure no state has been
+        # changed at point of return
+        self._name2plugin[plugin_name] = plugin
+
+        # register matching hook implementations of the plugin
+        self._plugin2hookcallers[plugin] = hookcallers = []
+        for name in dir(plugin):
+            hookimpl_opts = self.parse_hookimpl_opts(plugin, name)
+            if hookimpl_opts is not None:
+                normalize_hookimpl_opts(hookimpl_opts)
+                method = getattr(plugin, name)
+                hookimpl = HookImpl(plugin, plugin_name, method, hookimpl_opts)
+                hook = getattr(self.hook, name, None)
+                if hook is None:
+                    hook = _HookCaller(name, self._hookexec)
+                    setattr(self.hook, name, hook)
+                elif hook.has_spec():
+                    self._verify_hook(hook, hookimpl)
+                    hook._maybe_apply_history(hookimpl)
+                hook._add_hookimpl(hookimpl)
+                hookcallers.append(hook)
+        return plugin_name
+
+    def parse_hookimpl_opts(self, plugin, name):
+        method = getattr(plugin, name)
+        if not inspect.isroutine(method):
+            return
+        try:
+            res = getattr(method, self.project_name + "_impl", None)
+        except Exception:
+            res = {}
+        if res is not None and not isinstance(res, dict):
+            # false positive
+            res = None
+        # TODO: remove when we drop implprefix in 1.0
+        elif res is None and self._implprefix and name.startswith(self._implprefix):
+            _warn_for_function(
+                DeprecationWarning(
+                    "The `implprefix` system is deprecated please decorate "
+                    "this function using an instance of HookimplMarker."
+                ),
+                method,
+            )
+            res = {}
+        return res
+
+    def unregister(self, plugin=None, name=None):
+        """ unregister a plugin object and all its contained hook implementations
+        from internal data structures. """
+        if name is None:
+            assert plugin is not None, "one of name or plugin needs to be specified"
+            name = self.get_name(plugin)
+
+        if plugin is None:
+            plugin = self.get_plugin(name)
+
+        # if self._name2plugin[name] == None registration was blocked: ignore
+        if self._name2plugin.get(name):
+            del self._name2plugin[name]
+
+        for hookcaller in self._plugin2hookcallers.pop(plugin, []):
+            hookcaller._remove_plugin(plugin)
+
+        return plugin
+
+    def set_blocked(self, name):
+        """ block registrations of the given name, unregister if already registered. """
+        self.unregister(name=name)
+        self._name2plugin[name] = None
+
+    def is_blocked(self, name):
+        """ return ``True`` if the given plugin name is blocked. """
+        return name in self._name2plugin and self._name2plugin[name] is None
+
+    def add_hookspecs(self, module_or_class):
+        """ add new hook specifications defined in the given ``module_or_class``.
+        Functions are recognized if they have been decorated accordingly. """
+        names = []
+        for name in dir(module_or_class):
+            spec_opts = self.parse_hookspec_opts(module_or_class, name)
+            if spec_opts is not None:
+                hc = getattr(self.hook, name, None)
+                if hc is None:
+                    hc = _HookCaller(name, self._hookexec, module_or_class, spec_opts)
+                    setattr(self.hook, name, hc)
+                else:
+                    # plugins registered this hook without knowing the spec
+                    hc.set_specification(module_or_class, spec_opts)
+                    for hookfunction in hc.get_hookimpls():
+                        self._verify_hook(hc, hookfunction)
+                names.append(name)
+
+        if not names:
+            raise ValueError(
+                "did not find any %r hooks in %r" % (self.project_name, module_or_class)
+            )
+
+    def parse_hookspec_opts(self, module_or_class, name):
+        method = getattr(module_or_class, name)
+        return getattr(method, self.project_name + "_spec", None)
+
+    def get_plugins(self):
+        """ return the set of registered plugins. """
+        return set(self._plugin2hookcallers)
+
+    def is_registered(self, plugin):
+        """ Return ``True`` if the plugin is already registered. """
+        return plugin in self._plugin2hookcallers
+
+    def get_canonical_name(self, plugin):
+        """ Return canonical name for a plugin object. Note that a plugin
+        may be registered under a different name which was specified
+        by the caller of :py:meth:`register(plugin, name) <.PluginManager.register>`.
+        To obtain the name of an registered plugin use :py:meth:`get_name(plugin)
+        <.PluginManager.get_name>` instead."""
+        return getattr(plugin, "__name__", None) or str(id(plugin))
+
+    def get_plugin(self, name):
+        """ Return a plugin or ``None`` for the given name. """
+        return self._name2plugin.get(name)
+
+    def has_plugin(self, name):
+        """ Return ``True`` if a plugin with the given name is registered. """
+        return self.get_plugin(name) is not None
+
+    def get_name(self, plugin):
+        """ Return name for registered plugin or ``None`` if not registered. """
+        for name, val in self._name2plugin.items():
+            if plugin == val:
+                return name
+
+    def _verify_hook(self, hook, hookimpl):
+        if hook.is_historic() and hookimpl.hookwrapper:
+            raise PluginValidationError(
+                hookimpl.plugin,
+                "Plugin %r\nhook %r\nhistoric incompatible to hookwrapper"
+                % (hookimpl.plugin_name, hook.name),
+            )
+        if hook.spec.warn_on_impl:
+            _warn_for_function(hook.spec.warn_on_impl, hookimpl.function)
+        # positional arg checking
+        notinspec = set(hookimpl.argnames) - set(hook.spec.argnames)
+        if notinspec:
+            raise PluginValidationError(
+                hookimpl.plugin,
+                "Plugin %r for hook %r\nhookimpl definition: %s\n"
+                "Argument(s) %s are declared in the hookimpl but "
+                "can not be found in the hookspec"
+                % (
+                    hookimpl.plugin_name,
+                    hook.name,
+                    _formatdef(hookimpl.function),
+                    notinspec,
+                ),
+            )
+
+    def check_pending(self):
+        """ Verify that all hooks which have not been verified against
+        a hook specification are optional, otherwise raise :py:class:`.PluginValidationError`."""
+        for name in self.hook.__dict__:
+            if name[0] != "_":
+                hook = getattr(self.hook, name)
+                if not hook.has_spec():
+                    for hookimpl in hook.get_hookimpls():
+                        if not hookimpl.optionalhook:
+                            raise PluginValidationError(
+                                hookimpl.plugin,
+                                "unknown hook %r in plugin %r"
+                                % (name, hookimpl.plugin),
+                            )
+
+    def load_setuptools_entrypoints(self, group, name=None):
+        """ Load modules from querying the specified setuptools ``group``.
+
+        :param str group: entry point group to load plugins
+        :param str name: if given, loads only plugins with the given ``name``.
+        :rtype: int
+        :return: return the number of loaded plugins by this call.
+        """
+        count = 0
+        for dist in importlib_metadata.distributions():
+            for ep in dist.entry_points:
+                if (
+                    ep.group != group
+                    or (name is not None and ep.name != name)
+                    # already registered
+                    or self.get_plugin(ep.name)
+                    or self.is_blocked(ep.name)
+                ):
+                    continue
+                plugin = ep.load()
+                self.register(plugin, name=ep.name)
+                self._plugin_distinfo.append((plugin, DistFacade(dist)))
+                count += 1
+        return count
+
+    def list_plugin_distinfo(self):
+        """ return list of distinfo/plugin tuples for all setuptools registered
+        plugins. """
+        return list(self._plugin_distinfo)
+
+    def list_name_plugin(self):
+        """ return list of name/plugin pairs. """
+        return list(self._name2plugin.items())
+
+    def get_hookcallers(self, plugin):
+        """ get all hook callers for the specified plugin. """
+        return self._plugin2hookcallers.get(plugin)
+
+    def add_hookcall_monitoring(self, before, after):
+        """ add before/after tracing functions for all hooks
+        and return an undo function which, when called,
+        will remove the added tracers.
+
+        ``before(hook_name, hook_impls, kwargs)`` will be called ahead
+        of all hook calls and receive a hookcaller instance, a list
+        of HookImpl instances and the keyword arguments for the hook call.
+
+        ``after(outcome, hook_name, hook_impls, kwargs)`` receives the
+        same arguments as ``before`` but also a :py:class:`pluggy.callers._Result` object
+        which represents the result of the overall hook call.
+        """
+        oldcall = self._inner_hookexec
+
+        def traced_hookexec(hook, hook_impls, kwargs):
+            before(hook.name, hook_impls, kwargs)
+            outcome = _Result.from_call(lambda: oldcall(hook, hook_impls, kwargs))
+            after(outcome, hook.name, hook_impls, kwargs)
+            return outcome.get_result()
+
+        self._inner_hookexec = traced_hookexec
+
+        def undo():
+            self._inner_hookexec = oldcall
+
+        return undo
+
+    def enable_tracing(self):
+        """ enable tracing of hook calls and return an undo function. """
+        hooktrace = self.trace.root.get("hook")
+
+        def before(hook_name, methods, kwargs):
+            hooktrace.root.indent += 1
+            hooktrace(hook_name, kwargs)
+
+        def after(outcome, hook_name, methods, kwargs):
+            if outcome.excinfo is None:
+                hooktrace("finish", hook_name, "-->", outcome.get_result())
+            hooktrace.root.indent -= 1
+
+        return self.add_hookcall_monitoring(before, after)
+
+    def subset_hook_caller(self, name, remove_plugins):
+        """ Return a new :py:class:`.hooks._HookCaller` instance for the named method
+        which manages calls to all registered plugins except the
+        ones from remove_plugins. """
+        orig = getattr(self.hook, name)
+        plugins_to_remove = [plug for plug in remove_plugins if hasattr(plug, name)]
+        if plugins_to_remove:
+            hc = _HookCaller(
+                orig.name, orig._hookexec, orig.spec.namespace, orig.spec.opts
+            )
+            for hookimpl in orig.get_hookimpls():
+                plugin = hookimpl.plugin
+                if plugin not in plugins_to_remove:
+                    hc._add_hookimpl(hookimpl)
+                    # we also keep track of this hook caller so it
+                    # gets properly removed on plugin unregistration
+                    self._plugin2hookcallers.setdefault(plugin, []).append(hc)
+            return hc
+        return orig
+
+
+if hasattr(inspect, "signature"):
+
+    def _formatdef(func):
+        return "%s%s" % (func.__name__, str(inspect.signature(func)))
+
+
+else:
+
+    def _formatdef(func):
+        return "%s%s" % (
+            func.__name__,
+            inspect.formatargspec(*inspect.getargspec(func)),
+        )
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/benchmark.py b/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/benchmark.py
index 5a913e9d418..aa8de92911b 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/benchmark.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/benchmark.py
@@ -2,8 +2,9 @@
 Benchmarking and performance tests.
 """
 import pytest
-from pluggy import (_multicall, _legacymulticall, HookImpl, HookspecMarker,
-                    HookimplMarker)
+from pluggy import HookspecMarker, HookimplMarker
+from pluggy.hooks import HookImpl
+from pluggy.callers import _multicall, _legacymulticall
 
 hookspec = HookspecMarker("example")
 hookimpl = HookimplMarker("example")
@@ -14,7 +15,7 @@ def MC(methods, kwargs, callertype, firstresult=False):
     for method in methods:
         f = HookImpl(None, "<temp>", method, method.example_impl)
         hookfuncs.append(f)
-    return callertype(hookfuncs, kwargs, {"firstresult": firstresult})
+    return callertype(hookfuncs, kwargs, firstresult=firstresult)
 
 
 @hookimpl
@@ -27,32 +28,23 @@ def wrapper(arg1, arg2, arg3):
     yield
 
 
-@pytest.fixture(
-    params=[10, 100],
-    ids="hooks={}".format,
-)
+@pytest.fixture(params=[10, 100], ids="hooks={}".format)
 def hooks(request):
     return [hook for i in range(request.param)]
 
 
-@pytest.fixture(
-    params=[10, 100],
-    ids="wrappers={}".format,
-)
+@pytest.fixture(params=[10, 100], ids="wrappers={}".format)
 def wrappers(request):
     return [wrapper for i in range(request.param)]
 
 
-@pytest.fixture(
-    params=[_multicall, _legacymulticall],
-    ids=lambda item: item.__name__
-)
+@pytest.fixture(params=[_multicall, _legacymulticall], ids=lambda item: item.__name__)
 def callertype(request):
     return request.param
 
 
 def inner_exec(methods, callertype):
-    return MC(methods, {'arg1': 1, 'arg2': 2, 'arg3': 3}, callertype)
+    return MC(methods, {"arg1": 1, "arg2": 2, "arg3": 3}, callertype)
 
 
 def test_hook_and_wrappers_speed(benchmark, hooks, wrappers, callertype):
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/conftest.py b/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/conftest.py
index 3d61a349c88..e44667ef5f1 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/conftest.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/conftest.py
@@ -2,17 +2,12 @@ import pytest
 
 
 @pytest.fixture(
-    params=[
-        lambda spec: spec,
-        lambda spec: spec()
-    ],
-    ids=[
-        "spec-is-class",
-        "spec-is-instance"
-    ],
+    params=[lambda spec: spec, lambda spec: spec()],
+    ids=["spec-is-class", "spec-is-instance"],
 )
 def he_pm(request, pm):
     from pluggy import HookspecMarker
+
     hookspec = HookspecMarker("example")
 
     class Hooks(object):
@@ -27,4 +22,5 @@ def he_pm(request, pm):
 @pytest.fixture
 def pm():
     from pluggy import PluginManager
+
     return PluginManager("example")
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_deprecations.py b/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_deprecations.py
new file mode 100644
index 00000000000..7151921b668
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_deprecations.py
@@ -0,0 +1,54 @@
+"""
+Deprecation warnings testing roundup.
+"""
+import pytest
+from pluggy.callers import _Result
+from pluggy import PluginManager, HookimplMarker, HookspecMarker
+
+hookspec = HookspecMarker("example")
+hookimpl = HookimplMarker("example")
+
+
+def test_result_deprecated():
+    r = _Result(10, None)
+    with pytest.deprecated_call():
+        assert r.result == 10
+
+
+def test_implprefix_deprecated():
+    with pytest.deprecated_call():
+        pm = PluginManager("blah", implprefix="blah_")
+
+    class Plugin:
+        def blah_myhook(self, arg1):
+            return arg1
+
+    with pytest.deprecated_call():
+        pm.register(Plugin())
+
+
+def test_callhistoric_proc_deprecated(pm):
+    """``proc`` kwarg to `PluginMananger.call_historic()` is now officially
+    deprecated.
+    """
+
+    class P1(object):
+        @hookspec(historic=True)
+        @hookimpl
+        def m(self, x):
+            pass
+
+    p1 = P1()
+    pm.add_hookspecs(p1)
+    pm.register(p1)
+    with pytest.deprecated_call():
+        pm.hook.m.call_historic(kwargs=dict(x=10), proc=lambda res: res)
+
+
+def test_multicall_deprecated(pm):
+    class P1(object):
+        @hookimpl
+        def m(self, __multicall__, x):
+            pass
+
+    pytest.deprecated_call(pm.register, P1())
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_details.py b/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_details.py
index 2fad198d958..fc49fc308de 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_details.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_details.py
@@ -1,8 +1,6 @@
 import warnings
-
 import pytest
-
-from pluggy import PluginManager, HookimplMarker, HookspecMarker, _Result
+from pluggy import PluginManager, HookimplMarker, HookspecMarker
 
 hookspec = HookspecMarker("example")
 hookimpl = HookimplMarker("example")
@@ -11,8 +9,7 @@ hookimpl = HookimplMarker("example")
 def test_parse_hookimpl_override():
     class MyPluginManager(PluginManager):
         def parse_hookimpl_opts(self, module_or_class, name):
-            opts = PluginManager.parse_hookimpl_opts(
-                self, module_or_class, name)
+            opts = PluginManager.parse_hookimpl_opts(self, module_or_class, name)
             if opts is None:
                 if name.startswith("x1"):
                     opts = {}
@@ -47,13 +44,38 @@ def test_parse_hookimpl_override():
     assert pm.hook.x1meth2._wrappers[0].hookwrapper
 
 
+def test_warn_when_deprecated_specified(recwarn):
+    warning = DeprecationWarning("foo is deprecated")
+
+    class Spec(object):
+        @hookspec(warn_on_impl=warning)
+        def foo(self):
+            pass
+
+    class Plugin(object):
+        @hookimpl
+        def foo(self):
+            pass
+
+    pm = PluginManager(hookspec.project_name)
+    pm.add_hookspecs(Spec)
+
+    with pytest.warns(DeprecationWarning) as records:
+        pm.register(Plugin())
+    (record,) = records
+    assert record.message is warning
+    assert record.filename == Plugin.foo.__code__.co_filename
+    assert record.lineno == Plugin.foo.__code__.co_firstlineno
+
+
 def test_plugin_getattr_raises_errors():
     """Pluggy must be able to handle plugins which raise weird exceptions
     when getattr() gets called (#11).
     """
+
     class DontTouchMe(object):
         def __getattr__(self, x):
-            raise Exception('cant touch me')
+            raise Exception("cant touch me")
 
     class Module(object):
         pass
@@ -63,14 +85,15 @@ def test_plugin_getattr_raises_errors():
 
     pm = PluginManager(hookspec.project_name)
     # register() would raise an error
-    pm.register(module, 'donttouch')
-    assert pm.get_plugin('donttouch') is module
+    pm.register(module, "donttouch")
+    assert pm.get_plugin("donttouch") is module
 
 
 def test_warning_on_call_vs_hookspec_arg_mismatch():
     """Verify that is a hook is called with less arguments then defined in the
     spec that a warning is emitted.
     """
+
     class Spec:
         @hookspec
         def myhook(self, arg1, arg2):
@@ -86,7 +109,7 @@ def test_warning_on_call_vs_hookspec_arg_mismatch():
     pm.add_hookspecs(Spec())
 
     with warnings.catch_warnings(record=True) as warns:
-        warnings.simplefilter('always')
+        warnings.simplefilter("always")
 
         # calling should trigger a warning
         pm.hook.myhook(arg1=1)
@@ -97,7 +120,16 @@ def test_warning_on_call_vs_hookspec_arg_mismatch():
         assert "Argument(s) ('arg2',)" in str(warning.message)
 
 
-def test_result_deprecated():
-    r = _Result(10, None)
-    with pytest.deprecated_call():
-        assert r.result == 10
+def test_repr():
+    class Plugin:
+        @hookimpl
+        def myhook():
+            raise NotImplementedError()
+
+    pm = PluginManager(hookspec.project_name)
+
+    plugin = Plugin()
+    pname = pm.register(plugin)
+    assert repr(pm.hook.myhook._nonwrappers[0]) == (
+        "<HookImpl plugin_name=%r, plugin=%r>" % (pname, plugin)
+    )
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_helpers.py b/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_helpers.py
index b1780968446..64c3edaa0a1 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_helpers.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_helpers.py
@@ -1,4 +1,8 @@
-from pluggy import _formatdef, varnames
+from pluggy.hooks import varnames
+from pluggy.manager import _formatdef
+
+import sys
+import pytest
 
 
 def test_varnames():
@@ -14,8 +18,8 @@ def test_varnames():
             pass
 
     assert varnames(f) == (("x",), ())
-    assert varnames(A().f) == (('y',), ())
-    assert varnames(B()) == (('z',), ())
+    assert varnames(A().f) == (("y",), ())
+    assert varnames(B()) == (("z",), ())
 
 
 def test_varnames_default():
@@ -46,11 +50,29 @@ def test_varnames_class():
     assert varnames(F) == ((), ())
 
 
+@pytest.mark.skipif(
+    sys.version_info < (3,), reason="Keyword only arguments are Python 3 only"
+)
+def test_varnames_keyword_only():
+    # SyntaxError on Python 2, so we exec
+    ns = {}
+    exec(
+        "def f1(x, *, y): pass\n"
+        "def f2(x, *, y=3): pass\n"
+        "def f3(x=1, *, y=3): pass\n",
+        ns,
+    )
+
+    assert varnames(ns["f1"]) == (("x",), ())
+    assert varnames(ns["f2"]) == (("x",), ())
+    assert varnames(ns["f3"]) == ((), ("x",))
+
+
 def test_formatdef():
     def function1():
         pass
 
-    assert _formatdef(function1) == 'function1()'
+    assert _formatdef(function1) == "function1()"
 
     def function2(arg1):
         pass
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_hookcaller.py b/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_hookcaller.py
new file mode 100644
index 00000000000..5664f2bbf66
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_hookcaller.py
@@ -0,0 +1,215 @@
+import pytest
+
+from pluggy import HookimplMarker, HookspecMarker
+from pluggy.hooks import HookImpl
+
+hookspec = HookspecMarker("example")
+hookimpl = HookimplMarker("example")
+
+
+@pytest.fixture
+def hc(pm):
+    class Hooks(object):
+        @hookspec
+        def he_method1(self, arg):
+            pass
+
+    pm.add_hookspecs(Hooks)
+    return pm.hook.he_method1
+
+
+@pytest.fixture
+def addmeth(hc):
+    def addmeth(tryfirst=False, trylast=False, hookwrapper=False):
+        def wrap(func):
+            hookimpl(tryfirst=tryfirst, trylast=trylast, hookwrapper=hookwrapper)(func)
+            hc._add_hookimpl(HookImpl(None, "<temp>", func, func.example_impl))
+            return func
+
+        return wrap
+
+    return addmeth
+
+
+def funcs(hookmethods):
+    return [hookmethod.function for hookmethod in hookmethods]
+
+
+def test_adding_nonwrappers(hc, addmeth):
+    @addmeth()
+    def he_method1():
+        pass
+
+    @addmeth()
+    def he_method2():
+        pass
+
+    @addmeth()
+    def he_method3():
+        pass
+
+    assert funcs(hc._nonwrappers) == [he_method1, he_method2, he_method3]
+
+
+def test_adding_nonwrappers_trylast(hc, addmeth):
+    @addmeth()
+    def he_method1_middle():
+        pass
+
+    @addmeth(trylast=True)
+    def he_method1():
+        pass
+
+    @addmeth()
+    def he_method1_b():
+        pass
+
+    assert funcs(hc._nonwrappers) == [he_method1, he_method1_middle, he_method1_b]
+
+
+def test_adding_nonwrappers_trylast3(hc, addmeth):
+    @addmeth()
+    def he_method1_a():
+        pass
+
+    @addmeth(trylast=True)
+    def he_method1_b():
+        pass
+
+    @addmeth()
+    def he_method1_c():
+        pass
+
+    @addmeth(trylast=True)
+    def he_method1_d():
+        pass
+
+    assert funcs(hc._nonwrappers) == [
+        he_method1_d,
+        he_method1_b,
+        he_method1_a,
+        he_method1_c,
+    ]
+
+
+def test_adding_nonwrappers_trylast2(hc, addmeth):
+    @addmeth()
+    def he_method1_middle():
+        pass
+
+    @addmeth()
+    def he_method1_b():
+        pass
+
+    @addmeth(trylast=True)
+    def he_method1():
+        pass
+
+    assert funcs(hc._nonwrappers) == [he_method1, he_method1_middle, he_method1_b]
+
+
+def test_adding_nonwrappers_tryfirst(hc, addmeth):
+    @addmeth(tryfirst=True)
+    def he_method1():
+        pass
+
+    @addmeth()
+    def he_method1_middle():
+        pass
+
+    @addmeth()
+    def he_method1_b():
+        pass
+
+    assert funcs(hc._nonwrappers) == [he_method1_middle, he_method1_b, he_method1]
+
+
+def test_adding_wrappers_ordering(hc, addmeth):
+    @addmeth(hookwrapper=True)
+    def he_method1():
+        pass
+
+    @addmeth()
+    def he_method1_middle():
+        pass
+
+    @addmeth(hookwrapper=True)
+    def he_method3():
+        pass
+
+    assert funcs(hc._nonwrappers) == [he_method1_middle]
+    assert funcs(hc._wrappers) == [he_method1, he_method3]
+
+
+def test_adding_wrappers_ordering_tryfirst(hc, addmeth):
+    @addmeth(hookwrapper=True, tryfirst=True)
+    def he_method1():
+        pass
+
+    @addmeth(hookwrapper=True)
+    def he_method2():
+        pass
+
+    assert hc._nonwrappers == []
+    assert funcs(hc._wrappers) == [he_method2, he_method1]
+
+
+def test_hookspec(pm):
+    class HookSpec(object):
+        @hookspec()
+        def he_myhook1(arg1):
+            pass
+
+        @hookspec(firstresult=True)
+        def he_myhook2(arg1):
+            pass
+
+        @hookspec(firstresult=False)
+        def he_myhook3(arg1):
+            pass
+
+    pm.add_hookspecs(HookSpec)
+    assert not pm.hook.he_myhook1.spec.opts["firstresult"]
+    assert pm.hook.he_myhook2.spec.opts["firstresult"]
+    assert not pm.hook.he_myhook3.spec.opts["firstresult"]
+
+
+@pytest.mark.parametrize("name", ["hookwrapper", "optionalhook", "tryfirst", "trylast"])
+@pytest.mark.parametrize("val", [True, False])
+def test_hookimpl(name, val):
+    @hookimpl(**{name: val})
+    def he_myhook1(arg1):
+        pass
+
+    if val:
+        assert he_myhook1.example_impl.get(name)
+    else:
+        assert not hasattr(he_myhook1, name)
+
+
+def test_hookrelay_registry(pm):
+    """Verify hook caller instances are registered by name onto the relay
+    and can be likewise unregistered."""
+
+    class Api(object):
+        @hookspec
+        def hello(self, arg):
+            "api hook 1"
+
+    pm.add_hookspecs(Api)
+    hook = pm.hook
+    assert hasattr(hook, "hello")
+    assert repr(hook.hello).find("hello") != -1
+
+    class Plugin(object):
+        @hookimpl
+        def hello(self, arg):
+            return arg + 1
+
+    plugin = Plugin()
+    pm.register(plugin)
+    out = hook.hello(arg=3)
+    assert out == [4]
+    assert not hasattr(hook, "world")
+    pm.unregister(plugin)
+    assert hook.hello(arg=3) == []
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_hookrelay.py b/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_invocations.py
similarity index 89%
rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_hookrelay.py
rename to tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_invocations.py
index 5e7821bed8f..a6ec63cfc7d 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_hookrelay.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_invocations.py
@@ -6,31 +6,6 @@ hookspec = HookspecMarker("example")
 hookimpl = HookimplMarker("example")
 
 
-def test_happypath(pm):
-    class Api(object):
-        @hookspec
-        def hello(self, arg):
-            "api hook 1"
-
-    pm.add_hookspecs(Api)
-    hook = pm.hook
-    assert hasattr(hook, 'hello')
-    assert repr(hook.hello).find("hello") != -1
-
-    class Plugin(object):
-        @hookimpl
-        def hello(self, arg):
-            return arg + 1
-
-    plugin = Plugin()
-    pm.register(plugin)
-    out = hook.hello(arg=3)
-    assert out == [4]
-    assert not hasattr(hook, 'world')
-    pm.unregister(plugin)
-    assert hook.hello(arg=3) == []
-
-
 def test_argmismatch(pm):
     class Api(object):
         @hookspec
@@ -64,6 +39,34 @@ def test_only_kwargs(pm):
     assert comprehensible in str(exc.value)
 
 
+def test_opt_in_args(pm):
+    """Verfiy that two hookimpls with mutex args can serve
+    under the same spec.
+    """
+
+    class Api(object):
+        @hookspec
+        def hello(self, arg1, arg2, common_arg):
+            "api hook 1"
+
+    class Plugin1(object):
+        @hookimpl
+        def hello(self, arg1, common_arg):
+            return arg1 + common_arg
+
+    class Plugin2(object):
+        @hookimpl
+        def hello(self, arg2, common_arg):
+            return arg2 + common_arg
+
+    pm.add_hookspecs(Api)
+    pm.register(Plugin1())
+    pm.register(Plugin2())
+
+    results = pm.hook.hello(arg1=1, arg2=2, common_arg=0)
+    assert results == [2, 1]
+
+
 def test_call_order(pm):
     class Api(object):
         @hookspec
@@ -143,6 +146,7 @@ def test_firstresult_definition(pm):
 def test_firstresult_force_result(pm):
     """Verify forcing a result in a wrapper.
     """
+
     class Api(object):
         @hookspec(firstresult=True)
         def hello(self, arg):
@@ -179,6 +183,7 @@ def test_firstresult_returns_none(pm):
     """If None results are returned by underlying implementations ensure
     the multi-call loop returns a None value.
     """
+
     class Api(object):
         @hookspec(firstresult=True)
         def hello(self, arg):
@@ -200,6 +205,7 @@ def test_firstresult_no_plugin(pm):
     """If no implementations/plugins have been registered for a firstresult
     hook the multi-call loop should return a None value.
     """
+
     class Api(object):
         @hookspec(firstresult=True)
         def hello(self, arg):
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_method_ordering.py b/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_method_ordering.py
deleted file mode 100644
index 9584a0ae5a8..00000000000
--- a/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_method_ordering.py
+++ /dev/null
@@ -1,322 +0,0 @@
-import pytest
-
-
-import sys
-import types
-
-from pluggy import PluginManager, HookImpl, HookimplMarker, HookspecMarker
-
-hookspec = HookspecMarker("example")
-hookimpl = HookimplMarker("example")
-
-
-@pytest.fixture
-def hc(pm):
-    class Hooks(object):
-        @hookspec
-        def he_method1(self, arg):
-            pass
-    pm.add_hookspecs(Hooks)
-    return pm.hook.he_method1
-
-
-@pytest.fixture
-def addmeth(hc):
-    def addmeth(tryfirst=False, trylast=False, hookwrapper=False):
-        def wrap(func):
-            hookimpl(tryfirst=tryfirst, trylast=trylast,
-                     hookwrapper=hookwrapper)(func)
-            hc._add_hookimpl(HookImpl(None, "<temp>", func, func.example_impl))
-            return func
-        return wrap
-    return addmeth
-
-
-def funcs(hookmethods):
-    return [hookmethod.function for hookmethod in hookmethods]
-
-
-def test_adding_nonwrappers(hc, addmeth):
-    @addmeth()
-    def he_method1():
-        pass
-
-    @addmeth()
-    def he_method2():
-        pass
-
-    @addmeth()
-    def he_method3():
-        pass
-    assert funcs(hc._nonwrappers) == [he_method1, he_method2, he_method3]
-
-
-def test_adding_nonwrappers_trylast(hc, addmeth):
-    @addmeth()
-    def he_method1_middle():
-        pass
-
-    @addmeth(trylast=True)
-    def he_method1():
-        pass
-
-    @addmeth()
-    def he_method1_b():
-        pass
-    assert funcs(hc._nonwrappers) == [he_method1, he_method1_middle, he_method1_b]
-
-
-def test_adding_nonwrappers_trylast3(hc, addmeth):
-    @addmeth()
-    def he_method1_a():
-        pass
-
-    @addmeth(trylast=True)
-    def he_method1_b():
-        pass
-
-    @addmeth()
-    def he_method1_c():
-        pass
-
-    @addmeth(trylast=True)
-    def he_method1_d():
-        pass
-    assert funcs(hc._nonwrappers) == \
-        [he_method1_d, he_method1_b, he_method1_a, he_method1_c]
-
-
-def test_adding_nonwrappers_trylast2(hc, addmeth):
-    @addmeth()
-    def he_method1_middle():
-        pass
-
-    @addmeth()
-    def he_method1_b():
-        pass
-
-    @addmeth(trylast=True)
-    def he_method1():
-        pass
-    assert funcs(hc._nonwrappers) == \
-        [he_method1, he_method1_middle, he_method1_b]
-
-
-def test_adding_nonwrappers_tryfirst(hc, addmeth):
-    @addmeth(tryfirst=True)
-    def he_method1():
-        pass
-
-    @addmeth()
-    def he_method1_middle():
-        pass
-
-    @addmeth()
-    def he_method1_b():
-        pass
-    assert funcs(hc._nonwrappers) == [
-        he_method1_middle, he_method1_b, he_method1]
-
-
-def test_adding_wrappers_ordering(hc, addmeth):
-    @addmeth(hookwrapper=True)
-    def he_method1():
-        pass
-
-    @addmeth()
-    def he_method1_middle():
-        pass
-
-    @addmeth(hookwrapper=True)
-    def he_method3():
-        pass
-
-    assert funcs(hc._nonwrappers) == [he_method1_middle]
-    assert funcs(hc._wrappers) == [he_method1, he_method3]
-
-
-def test_adding_wrappers_ordering_tryfirst(hc, addmeth):
-    @addmeth(hookwrapper=True, tryfirst=True)
-    def he_method1():
-        pass
-
-    @addmeth(hookwrapper=True)
-    def he_method2():
-        pass
-
-    assert hc._nonwrappers == []
-    assert funcs(hc._wrappers) == [he_method2, he_method1]
-
-
-def test_hookspec(pm):
-    class HookSpec(object):
-        @hookspec()
-        def he_myhook1(arg1):
-            pass
-
-        @hookspec(firstresult=True)
-        def he_myhook2(arg1):
-            pass
-
-        @hookspec(firstresult=False)
-        def he_myhook3(arg1):
-            pass
-
-    pm.add_hookspecs(HookSpec)
-    assert not pm.hook.he_myhook1.spec_opts["firstresult"]
-    assert pm.hook.he_myhook2.spec_opts["firstresult"]
-    assert not pm.hook.he_myhook3.spec_opts["firstresult"]
-
-
-@pytest.mark.parametrize('name', ["hookwrapper", "optionalhook", "tryfirst", "trylast"])
-@pytest.mark.parametrize('val', [True, False])
-def test_hookimpl(name, val):
-    @hookimpl(**{name: val})
-    def he_myhook1(arg1):
-        pass
-    if val:
-        assert he_myhook1.example_impl.get(name)
-    else:
-        assert not hasattr(he_myhook1, name)
-
-
-def test_load_setuptools_instantiation(monkeypatch, pm):
-    pkg_resources = pytest.importorskip("pkg_resources")
-
-    def my_iter(name):
-        assert name == "hello"
-
-        class EntryPoint(object):
-            name = "myname"
-            dist = None
-
-            def load(self):
-                class PseudoPlugin(object):
-                    x = 42
-                return PseudoPlugin()
-
-        return iter([EntryPoint()])
-
-    monkeypatch.setattr(pkg_resources, 'iter_entry_points', my_iter)
-    num = pm.load_setuptools_entrypoints("hello")
-    assert num == 1
-    plugin = pm.get_plugin("myname")
-    assert plugin.x == 42
-    assert pm.list_plugin_distinfo() == [(plugin, None)]
-
-
-def test_load_setuptools_not_installed(monkeypatch, pm):
-    monkeypatch.setitem(
-        sys.modules, 'pkg_resources',
-        types.ModuleType("pkg_resources"))
-
-    with pytest.raises(ImportError):
-        pm.load_setuptools_entrypoints("qwe")
-
-
-def test_add_tracefuncs(he_pm):
-    out = []
-
-    class api1(object):
-        @hookimpl
-        def he_method1(self):
-            out.append("he_method1-api1")
-
-    class api2(object):
-        @hookimpl
-        def he_method1(self):
-            out.append("he_method1-api2")
-
-    he_pm.register(api1())
-    he_pm.register(api2())
-
-    def before(hook_name, hook_impls, kwargs):
-        out.append((hook_name, list(hook_impls), kwargs))
-
-    def after(outcome, hook_name, hook_impls, kwargs):
-        out.append((outcome, hook_name, list(hook_impls), kwargs))
-
-    undo = he_pm.add_hookcall_monitoring(before, after)
-
-    he_pm.hook.he_method1(arg=1)
-    assert len(out) == 4
-    assert out[0][0] == "he_method1"
-    assert len(out[0][1]) == 2
-    assert isinstance(out[0][2], dict)
-    assert out[1] == "he_method1-api2"
-    assert out[2] == "he_method1-api1"
-    assert len(out[3]) == 4
-    assert out[3][1] == out[0][0]
-
-    undo()
-    he_pm.hook.he_method1(arg=1)
-    assert len(out) == 4 + 2
-
-
-def test_hook_tracing(he_pm):
-    saveindent = []
-
-    class api1(object):
-        @hookimpl
-        def he_method1(self):
-            saveindent.append(he_pm.trace.root.indent)
-
-    class api2(object):
-        @hookimpl
-        def he_method1(self):
-            saveindent.append(he_pm.trace.root.indent)
-            raise ValueError()
-
-    he_pm.register(api1())
-    out = []
-    he_pm.trace.root.setwriter(out.append)
-    undo = he_pm.enable_tracing()
-    try:
-        indent = he_pm.trace.root.indent
-        he_pm.hook.he_method1(arg=1)
-        assert indent == he_pm.trace.root.indent
-        assert len(out) == 2
-        assert 'he_method1' in out[0]
-        assert 'finish' in out[1]
-
-        out[:] = []
-        he_pm.register(api2())
-
-        with pytest.raises(ValueError):
-            he_pm.hook.he_method1(arg=1)
-        assert he_pm.trace.root.indent == indent
-        assert saveindent[0] > indent
-    finally:
-        undo()
-
-
-@pytest.mark.parametrize('include_hookspec', [True, False])
-def test_prefix_hookimpl(include_hookspec):
-    pm = PluginManager(hookspec.project_name, "hello_")
-
-    if include_hookspec:
-        class HookSpec(object):
-            @hookspec
-            def hello_myhook(self, arg1):
-                """ add to arg1 """
-
-        pm.add_hookspecs(HookSpec)
-
-    class Plugin(object):
-        def hello_myhook(self, arg1):
-            return arg1 + 1
-
-    pm.register(Plugin())
-    pm.register(Plugin())
-    results = pm.hook.hello_myhook(arg1=17)
-    assert results == [18, 18]
-
-
-def test_prefix_hookimpl_dontmatch_module():
-    pm = PluginManager(hookspec.project_name, "hello_")
-
-    class BadPlugin(object):
-        hello_module = __import__('email')
-
-    pm.register(BadPlugin())
-    pm.check_pending()
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_multicall.py b/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_multicall.py
index 860a209b669..eaf534a0166 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_multicall.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_multicall.py
@@ -1,30 +1,20 @@
 import pytest
-
-from pluggy import _multicall, _legacymulticall, HookImpl, HookCallError
-from pluggy.callers import _LegacyMultiCall
-from pluggy import HookspecMarker, HookimplMarker
+from pluggy import HookCallError, HookspecMarker, HookimplMarker
+from pluggy.hooks import HookImpl
+from pluggy.callers import _multicall, _legacymulticall
 
 
 hookspec = HookspecMarker("example")
 hookimpl = HookimplMarker("example")
 
 
-def test_uses_copy_of_methods():
-    out = [lambda: 42]
-    mc = _LegacyMultiCall(out, {})
-    repr(mc)
-    out[:] = []
-    res = mc.execute()
-    return res == 42
-
-
 def MC(methods, kwargs, firstresult=False):
     caller = _multicall
     hookfuncs = []
     for method in methods:
         f = HookImpl(None, "<temp>", method, method.example_impl)
         hookfuncs.append(f)
-        if '__multicall__' in f.argnames:
+        if "__multicall__" in f.argnames:
             caller = _legacymulticall
     return caller(hookfuncs, kwargs, firstresult=firstresult)
 
@@ -70,6 +60,7 @@ def test_keyword_args_with_defaultargs():
     @hookimpl
     def f(x, z=1):
         return x + z
+
     reslist = MC([f], dict(x=23, y=24))
     assert reslist == [24]
 
@@ -78,6 +69,7 @@ def test_tags_call_error():
     @hookimpl
     def f(x):
         return x
+
     with pytest.raises(HookCallError):
         MC([f], {})
 
@@ -172,7 +164,7 @@ def test_hookwrapper_too_many_yield():
     with pytest.raises(RuntimeError) as ex:
         MC([m1], {})
     assert "m1" in str(ex.value)
-    assert (__file__ + ':') in str(ex.value)
+    assert (__file__ + ":") in str(ex.value)
 
 
 @pytest.mark.parametrize("exc", [ValueError, SystemExit])
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_pluginmanager.py b/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_pluginmanager.py
index e2c86cc6442..67261aaa7bb 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_pluginmanager.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_pluginmanager.py
@@ -1,8 +1,17 @@
+"""
+``PluginManager`` unit and public API testing.
+"""
 import pytest
 import types
 
-from pluggy import (PluginValidationError,
-                    HookCallError, HookimplMarker, HookspecMarker)
+from pluggy import (
+    PluginManager,
+    PluginValidationError,
+    HookCallError,
+    HookimplMarker,
+    HookspecMarker,
+)
+from pluggy.manager import importlib_metadata
 
 
 hookspec = HookspecMarker("example")
@@ -10,6 +19,7 @@ hookimpl = HookimplMarker("example")
 
 
 def test_plugin_double_register(pm):
+    """Registering the same plugin more then once isn't allowed"""
     pm.register(42, name="abc")
     with pytest.raises(ValueError):
         pm.register(42, name="abc")
@@ -18,6 +28,8 @@ def test_plugin_double_register(pm):
 
 
 def test_pm(pm):
+    """Basic registration with objects"""
+
     class A(object):
         pass
 
@@ -29,7 +41,7 @@ def test_pm(pm):
     out = pm.get_plugins()
     assert a1 in out
     assert a2 in out
-    assert pm.get_plugin('hello') == a2
+    assert pm.get_plugin("hello") == a2
     assert pm.unregister(a1) == a1
     assert not pm.is_registered(a1)
 
@@ -43,9 +55,9 @@ def test_has_plugin(pm):
         pass
 
     a1 = A()
-    pm.register(a1, 'hello')
+    pm.register(a1, "hello")
     assert pm.is_registered(a1)
-    assert pm.has_plugin('hello')
+    assert pm.has_plugin("hello")
 
 
 def test_register_dynamic_attr(he_pm):
@@ -104,9 +116,12 @@ def test_register_mismatch_method(he_pm):
         def he_method_notexists(self):
             pass
 
-    he_pm.register(hello())
-    with pytest.raises(PluginValidationError):
+    plugin = hello()
+
+    he_pm.register(plugin)
+    with pytest.raises(PluginValidationError) as excinfo:
         he_pm.check_pending()
+    assert excinfo.value.plugin is plugin
 
 
 def test_register_mismatch_arg(he_pm):
@@ -115,13 +130,17 @@ def test_register_mismatch_arg(he_pm):
         def he_method1(self, qlwkje):
             pass
 
-    with pytest.raises(PluginValidationError):
-        he_pm.register(hello())
+    plugin = hello()
+
+    with pytest.raises(PluginValidationError) as excinfo:
+        he_pm.register(plugin)
+    assert excinfo.value.plugin is plugin
 
 
 def test_register(pm):
     class MyPlugin(object):
         pass
+
     my = MyPlugin()
     pm.register(my)
     assert my in pm.get_plugins()
@@ -160,6 +179,7 @@ def test_register_historic(pm):
         @hookspec(historic=True)
         def he_method1(self, arg):
             pass
+
     pm.add_hookspecs(Hooks)
 
     pm.hook.he_method1.call_historic(kwargs=dict(arg=1))
@@ -184,24 +204,48 @@ def test_register_historic(pm):
     assert out == [1, 10, 120, 12]
 
 
-def test_with_result_memorized(pm):
+@pytest.mark.parametrize("result_callback", [True, False])
+def test_with_result_memorized(pm, result_callback):
+    """Verify that ``_HookCaller._maybe_apply_history()`
+    correctly applies the ``result_callback`` function, when provided,
+    to the result from calling each newly registered hook.
+    """
+    out = []
+    if result_callback:
+
+        def callback(res):
+            out.append(res)
+
+    else:
+        callback = None
+
     class Hooks(object):
         @hookspec(historic=True)
         def he_method1(self, arg):
             pass
+
     pm.add_hookspecs(Hooks)
 
-    he_method1 = pm.hook.he_method1
-    he_method1.call_historic(lambda res: out.append(res), dict(arg=1))
-    out = []
-
-    class Plugin(object):
+    class Plugin1(object):
         @hookimpl
         def he_method1(self, arg):
             return arg * 10
 
-    pm.register(Plugin())
-    assert out == [10]
+    pm.register(Plugin1())
+
+    he_method1 = pm.hook.he_method1
+    he_method1.call_historic(result_callback=callback, kwargs=dict(arg=1))
+
+    class Plugin2(object):
+        @hookimpl
+        def he_method1(self, arg):
+            return arg * 10
+
+    pm.register(Plugin2())
+    if result_callback:
+        assert out == [10, 10]
+    else:
+        assert out == []
 
 
 def test_with_callbacks_immediately_executed(pm):
@@ -209,6 +253,7 @@ def test_with_callbacks_immediately_executed(pm):
         @hookspec(historic=True)
         def he_method1(self, arg):
             pass
+
     pm.add_hookspecs(Hooks)
 
     class Plugin1(object):
@@ -283,6 +328,7 @@ def test_call_with_too_few_args(pm):
         @hookimpl
         def he_method1(self, arg):
             0 / 0
+
     pm.register(Plugin1())
     with pytest.raises(HookCallError):
         with pytest.warns(UserWarning):
@@ -339,13 +385,36 @@ def test_subset_hook_caller(pm):
     assert out == [10]
 
 
-def test_multicall_deprecated(pm):
-    class P1(object):
-        @hookimpl
-        def m(self, __multicall__, x):
+def test_get_hookimpls(pm):
+    class Hooks(object):
+        @hookspec
+        def he_method1(self, arg):
             pass
 
-    pytest.deprecated_call(pm.register, P1())
+    pm.add_hookspecs(Hooks)
+    assert pm.hook.he_method1.get_hookimpls() == []
+
+    class Plugin1(object):
+        @hookimpl
+        def he_method1(self, arg):
+            pass
+
+    class Plugin2(object):
+        @hookimpl
+        def he_method1(self, arg):
+            pass
+
+    class PluginNo(object):
+        pass
+
+    plugin1, plugin2, plugin3 = Plugin1(), Plugin2(), PluginNo()
+    pm.register(plugin1)
+    pm.register(plugin2)
+    pm.register(plugin3)
+
+    hookimpls = pm.hook.he_method1.get_hookimpls()
+    hook_plugins = [item.plugin for item in hookimpls]
+    assert hook_plugins == [plugin1, plugin2]
 
 
 def test_add_hookspecs_nohooks(pm):
@@ -358,17 +427,174 @@ def test_reject_prefixed_module(pm):
     prefix in its name (in this case `'example_*'` isn't collected
     when registering a module which imports it.
     """
-    pm._implprefix = 'example'
+    pm._implprefix = "example"
     conftest = types.ModuleType("conftest")
-    src = ("""
+    src = """
 def example_hook():
     pass
-""")
+"""
     exec(src, conftest.__dict__)
     conftest.example_blah = types.ModuleType("example_blah")
-    name = pm.register(conftest)
-    assert name == 'conftest'
-    assert getattr(pm.hook, 'example_blah', None) is None
-    assert getattr(pm.hook, 'example_hook', None)  # conftest.example_hook should be collected
-    assert pm.parse_hookimpl_opts(conftest, 'example_blah') is None
-    assert pm.parse_hookimpl_opts(conftest, 'example_hook') == {}
+    with pytest.deprecated_call():
+        name = pm.register(conftest)
+    assert name == "conftest"
+    assert getattr(pm.hook, "example_blah", None) is None
+    assert getattr(
+        pm.hook, "example_hook", None
+    )  # conftest.example_hook should be collected
+    with pytest.deprecated_call():
+        assert pm.parse_hookimpl_opts(conftest, "example_blah") is None
+        assert pm.parse_hookimpl_opts(conftest, "example_hook") == {}
+
+
+def test_load_setuptools_instantiation(monkeypatch, pm):
+    class EntryPoint(object):
+        name = "myname"
+        group = "hello"
+        value = "myname:foo"
+
+        def load(self):
+            class PseudoPlugin(object):
+                x = 42
+
+            return PseudoPlugin()
+
+    class Distribution(object):
+        entry_points = (EntryPoint(),)
+
+    dist = Distribution()
+
+    def my_distributions():
+        return (dist,)
+
+    monkeypatch.setattr(importlib_metadata, "distributions", my_distributions)
+    num = pm.load_setuptools_entrypoints("hello")
+    assert num == 1
+    plugin = pm.get_plugin("myname")
+    assert plugin.x == 42
+    ret = pm.list_plugin_distinfo()
+    # poor man's `assert ret == [(plugin, mock.ANY)]`
+    assert len(ret) == 1
+    assert len(ret[0]) == 2
+    assert ret[0][0] == plugin
+    assert ret[0][1]._dist == dist
+    num = pm.load_setuptools_entrypoints("hello")
+    assert num == 0  # no plugin loaded by this call
+
+
+def test_add_tracefuncs(he_pm):
+    out = []
+
+    class api1(object):
+        @hookimpl
+        def he_method1(self):
+            out.append("he_method1-api1")
+
+    class api2(object):
+        @hookimpl
+        def he_method1(self):
+            out.append("he_method1-api2")
+
+    he_pm.register(api1())
+    he_pm.register(api2())
+
+    def before(hook_name, hook_impls, kwargs):
+        out.append((hook_name, list(hook_impls), kwargs))
+
+    def after(outcome, hook_name, hook_impls, kwargs):
+        out.append((outcome, hook_name, list(hook_impls), kwargs))
+
+    undo = he_pm.add_hookcall_monitoring(before, after)
+
+    he_pm.hook.he_method1(arg=1)
+    assert len(out) == 4
+    assert out[0][0] == "he_method1"
+    assert len(out[0][1]) == 2
+    assert isinstance(out[0][2], dict)
+    assert out[1] == "he_method1-api2"
+    assert out[2] == "he_method1-api1"
+    assert len(out[3]) == 4
+    assert out[3][1] == out[0][0]
+
+    undo()
+    he_pm.hook.he_method1(arg=1)
+    assert len(out) == 4 + 2
+
+
+def test_hook_tracing(he_pm):
+    saveindent = []
+
+    class api1(object):
+        @hookimpl
+        def he_method1(self):
+            saveindent.append(he_pm.trace.root.indent)
+
+    class api2(object):
+        @hookimpl
+        def he_method1(self):
+            saveindent.append(he_pm.trace.root.indent)
+            raise ValueError()
+
+    he_pm.register(api1())
+    out = []
+    he_pm.trace.root.setwriter(out.append)
+    undo = he_pm.enable_tracing()
+    try:
+        indent = he_pm.trace.root.indent
+        he_pm.hook.he_method1(arg=1)
+        assert indent == he_pm.trace.root.indent
+        assert len(out) == 2
+        assert "he_method1" in out[0]
+        assert "finish" in out[1]
+
+        out[:] = []
+        he_pm.register(api2())
+
+        with pytest.raises(ValueError):
+            he_pm.hook.he_method1(arg=1)
+        assert he_pm.trace.root.indent == indent
+        assert saveindent[0] > indent
+    finally:
+        undo()
+
+
+def test_implprefix_warning(recwarn):
+    PluginManager(hookspec.project_name, "hello_")
+    w = recwarn.pop(DeprecationWarning)
+    assert "test_pluginmanager.py" in w.filename
+
+
+@pytest.mark.parametrize("include_hookspec", [True, False])
+def test_prefix_hookimpl(include_hookspec):
+    with pytest.deprecated_call():
+        pm = PluginManager(hookspec.project_name, "hello_")
+
+    if include_hookspec:
+
+        class HookSpec(object):
+            @hookspec
+            def hello_myhook(self, arg1):
+                """ add to arg1 """
+
+        pm.add_hookspecs(HookSpec)
+
+    class Plugin(object):
+        def hello_myhook(self, arg1):
+            return arg1 + 1
+
+    with pytest.deprecated_call():
+        pm.register(Plugin())
+        pm.register(Plugin())
+    results = pm.hook.hello_myhook(arg1=17)
+    assert results == [18, 18]
+
+
+def test_prefix_hookimpl_dontmatch_module():
+    with pytest.deprecated_call():
+        pm = PluginManager(hookspec.project_name, "hello_")
+
+    class BadPlugin(object):
+        hello_module = __import__("email")
+
+    pm.register(BadPlugin())
+    pm.check_pending()
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_tracer.py b/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_tracer.py
index 4a3e16cec43..992ec679149 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_tracer.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_tracer.py
@@ -1,9 +1,14 @@
+from pluggy._tracing import TagTracer
 
-from pluggy import _TagTracer
+import pytest
 
 
-def test_simple():
-    rootlogger = _TagTracer()
+@pytest.fixture
+def rootlogger():
+    return TagTracer()
+
+
+def test_simple(rootlogger):
     log = rootlogger.get("pytest")
     log("hello")
     out = []
@@ -16,8 +21,7 @@ def test_simple():
     assert out[1] == "hello [pytest:collection]\n"
 
 
-def test_indent():
-    rootlogger = _TagTracer()
+def test_indent(rootlogger):
     log = rootlogger.get("1")
     out = []
     log.root.setwriter(lambda arg: out.append(arg))
@@ -33,27 +37,28 @@ def test_indent():
     log.root.indent -= 1
     log("last")
     assert len(out) == 7
-    names = [x[:x.rfind(' [')] for x in out]
+    names = [x[: x.rfind(" [")] for x in out]
     assert names == [
-        'hello', '  line1', '  line2',
-        '    line3', '    line4', '  line5', 'last']
-
-
-def test_readable_output_dictargs():
-    rootlogger = _TagTracer()
-
-    out = rootlogger.format_message(['test'], [1])
-    assert out == ['1 [test]\n']
-
-    out2 = rootlogger.format_message(['test'], ['test', {'a': 1}])
-    assert out2 == [
-        'test [test]\n',
-        '    a: 1\n'
+        "hello",
+        "  line1",
+        "  line2",
+        "    line3",
+        "    line4",
+        "  line5",
+        "last",
     ]
 
 
-def test_setprocessor():
-    rootlogger = _TagTracer()
+def test_readable_output_dictargs(rootlogger):
+
+    out = rootlogger._format_message(["test"], [1])
+    assert out == "1 [test]\n"
+
+    out2 = rootlogger._format_message(["test"], ["test", {"a": 1}])
+    assert out2 == "test [test]\n    a: 1\n"
+
+
+def test_setprocessor(rootlogger):
     log = rootlogger.get("1")
     log2 = log.get("2")
     assert log2.tags == tuple("12")
@@ -71,19 +76,3 @@ def test_setprocessor():
     log2("seen")
     tags, args = l2[0]
     assert args == ("seen",)
-
-
-def test_setmyprocessor():
-    rootlogger = _TagTracer()
-    log = rootlogger.get("1")
-    log2 = log.get("2")
-    out = []
-    log2.setmyprocessor(lambda *args: out.append(args))
-    log("not seen")
-    assert not out
-    log2(42)
-    assert len(out) == 1
-    tags, args = out[0]
-    assert "1" in tags
-    assert "2" in tags
-    assert args == (42,)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/tox.ini b/tests/wpt/web-platform-tests/tools/third_party/pluggy/tox.ini
index 89d44e352db..1a4e3f52883 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pluggy/tox.ini
+++ b/tests/wpt/web-platform-tests/tools/third_party/pluggy/tox.ini
@@ -1,44 +1,58 @@
 [tox]
-envlist=check,docs,py{27,34,35,36,py}-pytestrelease,py{27,36}-pytest{master,features}
+envlist=linting,docs,py{27,34,35,36,37,38,py,py3},py{36,37}-pytest{master,features}
 
 [testenv]
-commands=py.test {posargs:testing/}
+commands=
+  {env:_PLUGGY_TOX_CMD:pytest} {posargs}
+  coverage: coverage report -m
+  coverage: coverage xml
 setenv=
   _PYTEST_SETUP_SKIP_PLUGGY_DEP=1
+  coverage: _PLUGGY_TOX_CMD=coverage run -m pytest
+  pytestmaster: _PYTEST_DEP=git+https://github.com/pytest-dev/pytest.git@master
+  pytestfeatures: _PYTEST_DEP=git+https://github.com/pytest-dev/pytest.git@features
 deps=
-  pytestrelease: pytest
-  pytestmaster: git+https://github.com/pytest-dev/pytest.git@master
-  pytestfeatures: git+https://github.com/pytest-dev/pytest.git@features
+  coverage: coverage
+  {env:_PYTEST_DEP:pytest}
 
 [testenv:benchmark]
-commands=py.test {posargs:testing/benchmark.py}
+commands=pytest {posargs:testing/benchmark.py}
 deps=
   pytest
   pytest-benchmark
 
-[testenv:check]
-deps =
-  flake8
-  restructuredtext_lint
-  pygments
-commands =
-  flake8 pluggy.py setup.py testing
-  rst-lint CHANGELOG.rst README.rst
+[testenv:linting]
+skip_install = true
+basepython = python3.6
+deps = pre-commit
+commands = pre-commit run --all-files --show-diff-on-failure
 
 [testenv:docs]
 deps =
   sphinx
   pygments
 commands =
-  sphinx-build -b html {toxinidir}/docs {toxinidir}/build/html-docs
+  sphinx-build -W -b html {toxinidir}/docs {toxinidir}/build/html-docs
 
 [pytest]
 minversion=2.0
+testpaths = testing
 #--pyargs --doctest-modules --ignore=.tox
-addopts=-rxsX
-norecursedirs=.tox ja .hg .env*
+addopts=-r a
 filterwarnings =
   error
 
 [flake8]
 max-line-length=99
+
+[testenv:release]
+decription = do a release, required posarg of the version number
+basepython = python3
+skipsdist = True
+usedevelop = True
+passenv = *
+deps =
+    colorama
+    gitpython
+    towncrier
+commands = python scripts/release.py {posargs}
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/.coveragerc b/tests/wpt/web-platform-tests/tools/third_party/pytest/.coveragerc
index 61ff66749dc..cbc6c5c5084 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/.coveragerc
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/.coveragerc
@@ -1,4 +1,18 @@
 [run]
-omit =
-    # standlonetemplate is read dynamically and tested by test_genscript
-    *standalonetemplate.py
+include =
+  src/*
+  testing/*
+  */lib/python*/site-packages/_pytest/*
+  */lib/python*/site-packages/pytest.py
+  */pypy*/site-packages/_pytest/*
+  */pypy*/site-packages/pytest.py
+  *\Lib\site-packages\_pytest\*
+  *\Lib\site-packages\pytest.py
+parallel = 1
+branch = 1
+
+[paths]
+source = src/
+  */lib/python*/site-packages/
+  */pypy*/site-packages/
+  *\Lib\site-packages\
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/.gitattributes b/tests/wpt/web-platform-tests/tools/third_party/pytest/.gitattributes
index 242d3da0d74..ec1c66dc1e9 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/.gitattributes
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/.gitattributes
@@ -1 +1 @@
-CHANGELOG    merge=union
+*.bat  text eol=crlf
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/FUNDING.yml b/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/FUNDING.yml
new file mode 100644
index 00000000000..1307445ebbd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# info:
+# * https://help.github.com/en/articles/displaying-a-sponsor-button-in-your-repository
+# * https://tidelift.com/subscription/how-to-connect-tidelift-with-github
+tidelift: pypi/pytest
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/ISSUE_TEMPLATE.md b/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/ISSUE_TEMPLATE.md
index fbcbb16fc35..fb81416dd5e 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/ISSUE_TEMPLATE.md
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/ISSUE_TEMPLATE.md
@@ -1,8 +1,10 @@
+<!--
 Thanks for submitting an issue!
 
-Here's a quick checklist in what to include:
+Here's a quick checklist for what to provide:
+-->
 
-- [ ] Include a detailed description of the bug or suggestion
-- [ ] `pip list` of the virtual environment you are using
+- [ ] a detailed description of the bug or suggestion
+- [ ] output of `pip list` from the virtual environment you are using
 - [ ] pytest and operating system versions
-- [ ] Minimal example if possible
+- [ ] minimal example if possible
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/PULL_REQUEST_TEMPLATE.md b/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/PULL_REQUEST_TEMPLATE.md
index 23a9f8c5683..590cc9958ae 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/PULL_REQUEST_TEMPLATE.md
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,9 +1,10 @@
+<!--
 Thanks for submitting a PR, your contribution is really appreciated!
 
-Here's a quick checklist that should be present in PRs (you can delete this text from the final description, this is
-just a guideline):
+Here is a quick checklist that should be present in PRs.
+(please delete this text from the final description, this is just a guideline)
+-->
 
-- [ ] Create a new changelog file in the `changelog` folder, with a name like `<ISSUE NUMBER>.<TYPE>.rst`. See [changelog/README.rst](/changelog/README.rst) for details.
 - [ ] Target the `master` branch for bug fixes, documentation updates and trivial changes.
 - [ ] Target the `features` branch for new features and removals/deprecations.
 - [ ] Include documentation when adding new features.
@@ -11,4 +12,5 @@ just a guideline):
 
 Unless your change is trivial or a small documentation fix (e.g.,  a typo or reword of a small section) please:
 
+- [ ] Create a new changelog file in the `changelog` folder, with a name like `<ISSUE NUMBER>.<TYPE>.rst`. See [changelog/README.rst](https://github.com/pytest-dev/pytest/blob/master/changelog/README.rst) for details.
 - [ ] Add yourself to `AUTHORS` in alphabetical order;
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/config.yml b/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/config.yml
new file mode 100644
index 00000000000..86a8a97e785
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/config.yml
@@ -0,0 +1,2 @@
+rtd:
+  project: pytest
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/labels.toml b/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/labels.toml
new file mode 100644
index 00000000000..aef1e913af8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/labels.toml
@@ -0,0 +1,149 @@
+["os: cygwin"]
+color = "006b75"
+description = "cygwin platform-specific problem"
+name = "os: cygwin"
+
+["os: linux"]
+color = "1d76db"
+description = "linux platform-specific problem"
+name = "os: linux"
+
+["os: mac"]
+color = "bfdadc"
+description = "mac platform-specific problem"
+name = "os: mac"
+
+["os: windows"]
+color = "fbca04"
+description = "windows platform-specific problem"
+name = "os: windows"
+
+["plugin: argcomplete"]
+color = "d4c5f9"
+description = "related to the argcomplete builtin plugin"
+name = "plugin: argcomplete"
+
+["plugin: cache"]
+color = "c7def8"
+description = "related to the cache builtin plugin"
+name = "plugin: cache"
+
+["plugin: capture"]
+color = "1d76db"
+description = "related to the capture builtin plugin"
+name = "plugin: capture"
+
+["plugin: debugging"]
+color = "dd52a8"
+description = "related to the debugging builtin plugin"
+name = "plugin: debugging"
+
+["plugin: doctests"]
+color = "fad8c7"
+description = "related to the doctests builtin plugin"
+name = "plugin: doctests"
+
+["plugin: junitxml"]
+color = "c5def5"
+description = "related to the junitxml builtin plugin"
+name = "plugin: junitxml"
+
+["plugin: logging"]
+color = "ff5432"
+description = "related to the logging builtin plugin"
+name = "plugin: logging"
+
+["plugin: monkeypatch"]
+color = "0e8a16"
+description = "related to the monkeypatch builtin plugin"
+name = "plugin: monkeypatch"
+
+["plugin: nose"]
+color = "bfdadc"
+description = "related to the nose integration builtin plugin"
+name = "plugin: nose"
+
+["plugin: pastebin"]
+color = "bfd4f2"
+description = "related to the pastebin builtin plugin"
+name = "plugin: pastebin"
+
+["plugin: pytester"]
+color = "c5def5"
+description = "related to the pytester builtin plugin"
+name = "plugin: pytester"
+
+["plugin: tmpdir"]
+color = "bfd4f2"
+description = "related to the tmpdir builtin plugin"
+name = "plugin: tmpdir"
+
+["plugin: unittest"]
+color = "006b75"
+description = "related to the unittest integration builtin plugin"
+name = "plugin: unittest"
+
+["plugin: warnings"]
+color = "fef2c0"
+description = "related to the warnings builtin plugin"
+name = "plugin: warnings"
+
+["plugin: xdist"]
+color = "5319e7"
+description = "related to the xdist external plugin"
+name = "plugin: xdist"
+
+["status: critical"]
+color = "e11d21"
+description = "grave problem or usability issue that affects lots of users"
+name = "status: critical"
+
+["status: easy"]
+color = "bfe5bf"
+description = "easy issue that is friendly to new contributor"
+name = "status: easy"
+
+["status: help wanted"]
+color = "159818"
+description = "developers would like help from experts on this topic"
+name = "status: help wanted"
+
+["status: needs information"]
+color = "5319e7"
+description = "reporter needs to provide more information; can be closed after 2 or more weeks of inactivity"
+name = "status: needs information"
+
+["topic: collection"]
+color = "006b75"
+description = "related to the collection phase"
+name = "topic: collection"
+
+["topic: config"]
+color = "006b75"
+description = "related to config handling, argument parsing and config file"
+name = "topic: config"
+
+["topic: fixtures"]
+color = "5319e7"
+description = "anything involving fixtures directly or indirectly"
+name = "topic: fixtures"
+
+["topic: marks"]
+color = "b60205"
+description = "related to marks, either the general marks or builtin"
+name = "topic: marks"
+
+["topic: parametrize"]
+color = "fbca04"
+description = "related to @pytest.mark.parametrize"
+name = "topic: parametrize"
+
+["topic: reporting"]
+color = "fef2c0"
+description = "related to terminal output and user-facing messages and errors"
+name = "topic: reporting"
+
+["topic: rewrite"]
+color = "0e8a16"
+description = "related to the assertion rewrite mechanism"
+name = "topic: rewrite"
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/workflows/main.yml b/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/workflows/main.yml
new file mode 100644
index 00000000000..a006fb092c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/workflows/main.yml
@@ -0,0 +1,191 @@
+name: main
+
+on:
+  push:
+    branches:
+      - 4.6.x
+    tags:
+      - "*"
+
+  pull_request:
+    branches:
+      - 4.6.x
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        name: [
+          "windows-py27",
+          "windows-py35",
+          "windows-py36",
+          "windows-py37",
+          "windows-py37-pluggy",
+          "windows-py38",
+
+          "ubuntu-py27-pluggy",
+          "ubuntu-py27-nobyte",
+          "ubuntu-py37",
+          "ubuntu-py37-pluggy",
+          "ubuntu-py37-pexpect-py37-twisted",
+          "ubuntu-py37-freeze",
+          "ubuntu-pypy",
+          "ubuntu-pypy3",
+
+          "macos-py27",
+          "macos-py38",
+
+        ]
+
+        include:
+          # Windows jobs
+          - name: "windows-py27"
+            python: "2.7"
+            os: windows-latest
+            tox_env: "py27-xdist"
+            use_coverage: true
+          - name: "windows-py35"
+            python: "3.5"
+            os: windows-latest
+            tox_env: "py35-xdist"
+            use_coverage: true
+          - name: "windows-py36"
+            python: "3.6"
+            os: windows-latest
+            tox_env: "py36-xdist"
+            use_coverage: true
+          - name: "windows-py37"
+            python: "3.7"
+            os: windows-latest
+            tox_env: "py37-twisted-numpy"
+            use_coverage: true
+          - name: "windows-py37-pluggy"
+            python: "3.7"
+            os: windows-latest
+            tox_env: "py37-pluggymaster-xdist"
+            use_coverage: true
+          - name: "windows-py38"
+            python: "3.8"
+            os: windows-latest
+            tox_env: "py38-xdist"
+            use_coverage: true
+
+          # Ubuntu jobs – find the rest of them in .travis.yml
+          - name: "ubuntu-py27-pluggy"
+            python: "2.7"
+            os: ubuntu-latest
+            tox_env: "py27-pluggymaster-xdist"
+            use_coverage: true
+          - name: "ubuntu-py27-nobyte"
+            python: "2.7"
+            os: ubuntu-latest
+            tox_env: "py27-nobyte-numpy-xdist"
+            use_coverage: true
+          - name: "ubuntu-py37"
+            python: "3.7"
+            os: ubuntu-latest
+            tox_env: "py37-lsof-numpy-xdist"
+            use_coverage: true
+          - name: "ubuntu-py37-pluggy"
+            python: "3.7"
+            os: ubuntu-latest
+            tox_env: "py37-pluggymaster-xdist"
+            use_coverage: true
+          - name: "ubuntu-py37-pexpect-py37-twisted"
+            python: "3.7"
+            os: ubuntu-latest
+            tox_env: "py37-pexpect,py37-twisted"
+            use_coverage: true
+          - name: "ubuntu-py37-freeze"
+            python: "3.7"
+            os: ubuntu-latest
+            tox_env: "py37-freeze"
+          - name: "ubuntu-pypy"
+            python: "pypy2"
+            os: ubuntu-latest
+            tox_env: "pypy-xdist"
+            use_coverage: true
+          - name: "ubuntu-pypy3"
+            python: "pypy3"
+            os: ubuntu-latest
+            tox_env: "pypy3-xdist"
+            use_coverage: true
+
+          # MacOS jobs
+          - name: "macos-py27"
+            python: "2.7"
+            os: macos-latest
+            tox_env: "py27-xdist"
+            use_coverage: true
+          - name: "macos-py38"
+            python: "3.8"
+            os: macos-latest
+            tox_env: "py38-xdist"
+            use_coverage: true
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python ${{ matrix.python }} on ${{ matrix.os }}
+      uses: actions/setup-python@v1
+      with:
+        python-version: ${{ matrix.python }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install tox coverage
+    - name: Test without coverage
+      if: "! matrix.use_coverage"
+      run: "tox -e ${{ matrix.tox_env }}"
+
+    - name: Test with coverage
+      if: "matrix.use_coverage"
+      env:
+        _PYTEST_TOX_COVERAGE_RUN: "coverage run -m"
+        COVERAGE_PROCESS_START: ".coveragerc"
+        _PYTEST_TOX_EXTRA_DEP: "coverage-enable-subprocess"
+      run: "tox -vv -e ${{ matrix.tox_env }}"
+
+    - name: Prepare coverage token
+      if: (matrix.use_coverage && ( github.repository == 'pytest-dev/pytest' || github.event_name == 'pull_request' ))
+      run: |
+        python scripts/append_codecov_token.py
+    - name: Report coverage
+      if: (matrix.use_coverage)
+      env:
+        CODECOV_NAME: ${{ matrix.name }}
+      run: bash scripts/report-coverage.sh -F GHA,${{ runner.os }}
+
+  deploy:
+    if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') && github.repository == 'pytest-dev/pytest'
+
+    runs-on: ubuntu-latest
+
+    needs: [build]
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python
+      uses: actions/setup-python@v1
+      with:
+        python-version: "3.7"
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install --upgrade wheel setuptools tox
+    - name: Build package
+      run: |
+        python setup.py sdist bdist_wheel
+    - name: Publish package to PyPI
+      uses: pypa/gh-action-pypi-publish@master
+      with:
+        user: __token__
+        password: ${{ secrets.pypi_token }}
+    - name: Publish GitHub release notes
+      env:
+        GH_RELEASE_NOTES_TOKEN: ${{ secrets.release_notes }}
+      run: |
+        sudo apt-get install pandoc
+        tox -e publish-gh-release-notes
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/.gitignore b/tests/wpt/web-platform-tests/tools/third_party/pytest/.gitignore
index afb6bf9fd3f..a008b436323 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/.gitignore
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/.gitignore
@@ -24,6 +24,7 @@ src/_pytest/_version.py
 .eggs/
 
 doc/*/_build
+doc/*/.doctrees
 build/
 dist/
 *.egg-info
@@ -35,6 +36,15 @@ env/
 .cache
 .pytest_cache
 .coverage
+.coverage.*
+coverage.xml
 .ropeproject
 .idea
 .hypothesis
+.pydevproject
+.project
+.settings
+.vscode
+
+# generated by pip
+pip-wheel-metadata/
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/.pre-commit-config.yaml b/tests/wpt/web-platform-tests/tools/third_party/pytest/.pre-commit-config.yaml
index e50891bbc1c..3aee45c62c5 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/.pre-commit-config.yaml
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/.pre-commit-config.yaml
@@ -1,36 +1,71 @@
 exclude: doc/en/example/py2py3/test_py2.py
 repos:
--   repo: https://github.com/ambv/black
-    rev: 18.4a4
+-   repo: https://github.com/psf/black
+    rev: 19.10b0
     hooks:
     -   id: black
         args: [--safe, --quiet]
-        language_version: python3.6
+        language_version: python3
 -   repo: https://github.com/asottile/blacken-docs
-    rev: v0.1.1
+    rev: v0.5.0
     hooks:
     -   id: blacken-docs
-        additional_dependencies: [black==18.5b1]
-        language_version: python3.6
+        additional_dependencies: [black==19.3b0]
+        language_version: python3
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v1.2.3
+    rev: v2.2.2
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
+    -   id: fix-encoding-pragma
     -   id: check-yaml
     -   id: debug-statements
         exclude: _pytest/debugging.py
-    -   id: flake8
--   repo: https://github.com/asottile/pyupgrade
-    rev: v1.2.0
+        language_version: python3
+-   repo: https://gitlab.com/pycqa/flake8
+    rev: 3.7.7
     hooks:
-    - id: pyupgrade
+    -   id: flake8
+        language_version: python3
+-   repo: https://github.com/asottile/reorder_python_imports
+    rev: v1.4.0
+    hooks:
+    -   id: reorder-python-imports
+        args: ['--application-directories=.:src']
+-   repo: https://github.com/asottile/pyupgrade
+    rev: v1.15.0
+    hooks:
+    -   id: pyupgrade
+        args: [--keep-percent-format]
+-   repo: https://github.com/pre-commit/pygrep-hooks
+    rev: v1.3.0
+    hooks:
+    -   id: rst-backticks
 -   repo: local
     hooks:
     -   id: rst
         name: rst
         entry: rst-lint --encoding utf-8
-        files: ^(CHANGELOG.rst|HOWTORELEASE.rst|README.rst|changelog/.*)$
+        files: ^(CHANGELOG.rst|HOWTORELEASE.rst|README.rst|TIDELIFT.rst|changelog/.*)$
         language: python
         additional_dependencies: [pygments, restructuredtext_lint]
-        python_version: python3.6
+    -   id: changelogs-rst
+        name: changelog filenames
+        language: fail
+        entry: 'changelog files must be named ####.(feature|bugfix|doc|deprecation|removal|vendor|trivial).rst'
+        exclude: changelog/(\d+\.(feature|bugfix|doc|deprecation|removal|vendor|trivial).rst|README.rst|_template.rst)
+        files: ^changelog/
+    -   id: py-deprecated
+        name: py library is deprecated
+        language: pygrep
+        entry: >
+            (?x)\bpy\.(
+                _code\.|
+                builtin\.|
+                code\.|
+                io\.(BytesIO|saferepr)|
+                path\.local\.sysfind|
+                process\.|
+                std\.
+            )
+        types: [python]
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/.travis.yml b/tests/wpt/web-platform-tests/tools/third_party/pytest/.travis.yml
index 1d092149b5d..d4f2d80483d 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/.travis.yml
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/.travis.yml
@@ -1,83 +1,80 @@
-sudo: false
 language: python
-stages:
-- linting
-- test
-- deploy
-python:
-  - '3.6'
-install:
-  - pip install --upgrade --pre tox
+dist: xenial
+python: '3.7.4'
+cache: false
+
 env:
-  matrix:
-    # coveralls is not listed in tox's envlist, but should run in travis
-    - TOXENV=coveralls
-    # note: please use "tox --listenvs" to populate the build matrix below
-    # please remove the linting env in all cases
-    - TOXENV=py27
-    - TOXENV=py34
-    - TOXENV=py36
-    - TOXENV=py27-pexpect
-    - TOXENV=py27-xdist
-    - TOXENV=py27-trial
-    - TOXENV=py27-numpy
-    - TOXENV=py27-pluggymaster
-    - TOXENV=py36-pexpect
-    - TOXENV=py36-xdist
-    - TOXENV=py36-trial
-    - TOXENV=py36-numpy
-    - TOXENV=py36-pluggymaster
-    - TOXENV=py27-nobyte
-    - TOXENV=doctesting
-    - TOXENV=docs
+  global:
+    - PYTEST_ADDOPTS="-vv --showlocals --durations=100 --exitfirst"
+    - PYTEST_COVERAGE=1
+
+# setuptools-scm needs all tags in order to obtain a proper version
+git:
+  depth: false
+
+install:
+  - python -m pip install --upgrade --pre tox
 
 jobs:
   include:
-    - env: TOXENV=pypy
-      python: 'pypy-5.4'
-    - env: TOXENV=py35
-      python: '3.5'
-    - env: TOXENV=py35-freeze
-      python: '3.5'
-    - env: TOXENV=py37
-      python: 'nightly'
+    # Coverage for:
+    # - TestArgComplete (linux only)
+    # - numpy
+    # - verbose=0
+    - stage: baseline
+      env: TOXENV=py27-xdist
+      python: '2.7'
 
-    - stage: deploy
-      python: '3.6'
-      env:
-      install: pip install -U setuptools setuptools_scm
-      script: skip
-      deploy:
-        provider: pypi
-        user: nicoddemus
-        distributions: sdist bdist_wheel
-        skip_upload_docs: true
-        password:
-          secure: xanTgTUu6XDQVqB/0bwJQXoDMnU5tkwZc5koz6mBkkqZhKdNOi2CLoC1XhiSZ+ah24l4V1E0GAqY5kBBcy9d7NVe4WNg4tD095LsHw+CRU6/HCVIFfyk2IZ+FPAlguesCcUiJSXOrlBF+Wj68wEvLoK7EoRFbJeiZ/f91Ww1sbtDlqXABWGHrmhPJL5Wva7o7+wG7JwJowqdZg1pbQExsCc7b53w4v2RBu3D6TJaTAzHiVsW+nUSI67vKI/uf+cR/OixsTfy37wlHgSwihYmrYLFls3V0bSpahCim3bCgMaFZx8S8xrdgJ++PzBCof2HeflFKvW+VCkoYzGEG4NrTWJoNz6ni4red9GdvfjGH3YCjAKS56h9x58zp2E5rpsb/kVq5/45xzV+dq6JRuhQ1nJWjBC6fSKAc/bfwnuFK3EBxNLkvBssLHvsNjj5XG++cB8DdS9wVGUqjpoK4puaXUWFqy4q3S9F86HEsKNgExtieA9qNx+pCIZVs6JCXZNjr0I5eVNzqJIyggNgJG6RyravsU35t9Zd9doL5g4Y7UKmAGTn1Sz24HQ4sMQgXdm2SyD8gEK5je4tlhUvfGtDvMSlstq71kIn9nRpFnqB6MFlbYSEAZmo8dGbCquoUc++6Rum208wcVbrzzVtGlXB/Ow9AbFMYeAGA0+N/K1e59c=
-        on:
-          tags: true
-          repo: pytest-dev/pytest
-    - stage: linting
-      python: '3.6'
-      env:
-      install:
-      - pip install pre-commit
-      - pre-commit install-hooks
-      script:
-      - pre-commit run --all-files
+    - env: TOXENV=py38-xdist
+      python: '3.8'
 
-script: tox --recreate
+    - stage: tests
+    # - _pytest.unittest._handle_skip (via pexpect).
+      env: TOXENV=py27-pexpect,py27-twisted
+      python: '2.7'
 
-notifications:
-  irc:
-    channels:
-      - "chat.freenode.net#pytest"
-    on_success: change
-    on_failure: change
-    skip_join: true
-  email:
-    - pytest-commit@python.org
-cache:
-    directories:
-        - $HOME/.cache/pip
-        - $HOME/.cache/pre-commit
+    - env: TOXENV=py35-xdist
+      python: '3.5.9'
+
+    - env: TOXENV=py36-xdist PYTEST_REORDER_TESTS=0
+      python: '3.6.9'
+
+    - env: TOXENV=py37-numpy-pexpect-twisted
+      python: '3.7.4'
+
+    # - test_sys_breakpoint_interception (via pexpect).
+    - env: TOXENV=py37-pexpect,py37-twisted
+      python: '3.7.4'
+
+    # Run also non-verbosely, to gain coverage
+    - env: TOXENV=py38-xdist PYTEST_ADDOPTS=""
+      python: '3.8'
+
+    - env: TOXENV=linting,docs,doctesting
+      cache:
+        directories:
+          - $HOME/.cache/pre-commit
+
+before_script:
+  - |
+    # Do not (re-)upload coverage with cron runs.
+    if [[ "$TRAVIS_EVENT_TYPE" = cron ]]; then
+      PYTEST_COVERAGE=0
+    fi
+  - |
+    if [[ "$PYTEST_COVERAGE" = 1 ]]; then
+      export COVERAGE_FILE="$PWD/.coverage"
+      export COVERAGE_PROCESS_START="$PWD/.coveragerc"
+      export _PYTEST_TOX_COVERAGE_RUN="coverage run -m"
+      export _PYTEST_TOX_EXTRA_DEP=coverage-enable-subprocess
+    fi
+script: env COLUMNS=120 python -m tox
+
+after_success:
+  - |
+    if [[ "$PYTEST_COVERAGE" = 1 ]]; then
+      env CODECOV_NAME="$TOXENV-$TRAVIS_OS_NAME" scripts/report-coverage.sh
+    fi
+branches:
+  only:
+    - 4.6.x
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/AUTHORS b/tests/wpt/web-platform-tests/tools/third_party/pytest/AUTHORS
index 3edfdcf85ea..80fce539294 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/AUTHORS
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/AUTHORS
@@ -6,20 +6,30 @@ Contributors include::
 Aaron Coleman
 Abdeali JK
 Abhijeet Kasurde
+Adam Johnson
+Adam Uhlir
 Ahn Ki-Wook
+Akiomi Kamakura
 Alan Velasco
 Alexander Johnson
 Alexei Kozlenok
+Allan Feldman
+Aly Sivji
 Anatoly Bubenkoff
 Anders Hovmöller
+Andras Mitzki
 Andras Tim
+Andrea Cimatoribus
 Andreas Zeidler
+Andrey Paramonov
 Andrzej Ostrowski
 Andy Freeland
 Anthon van der Neut
 Anthony Shaw
 Anthony Sottile
+Anton Lodder
 Antony Lee
+Arel Cordero
 Armin Rigo
 Aron Coyle
 Aron Curzon
@@ -43,10 +53,16 @@ Charles Cloud
 Charnjit SiNGH (CCSJ)
 Chris Lamb
 Christian Boelsen
+Christian Fetzer
 Christian Theunert
 Christian Tismer
 Christopher Gilling
+Christopher Dignam
+Claudio Madotto
+CrazyMerlyn
 Cyrus Maden
+Damian Skrzypczak
+Dhiren Serai
 Daniel Grana
 Daniel Hahler
 Daniel Nuri
@@ -55,6 +71,7 @@ Danielle Jenkins
 Dave Hunt
 David Díaz-Barquero
 David Mohr
+David Szotten
 David Vierra
 Daw-Ran Liou
 Denis Kirisov
@@ -71,7 +88,11 @@ Endre Galaczi
 Eric Hunsberger
 Eric Siegerman
 Erik M. Bray
+Evan Kepner
+Fabien Zarifian
+Fabio Zadrozny
 Feng Ma
+Fernando Mezzabotta Rey
 Florian Bruhin
 Floris Bruynooghe
 Gabriel Reis
@@ -89,6 +110,9 @@ Hugo van Kemenade
 Hui Wang (coldnight)
 Ian Bicking
 Ian Lesperance
+Ilya Konstantinov
+Ionuț Turturică
+Iwan Briquemont
 Jaap Broekhuizen
 Jan Balster
 Janne Vanhala
@@ -97,6 +121,7 @@ Javier Domingo Cansino
 Javier Romero
 Jeff Rackauckas
 Jeff Widman
+Jenni Rinker
 John Eddie Ayson
 John Towler
 Jon Sonesen
@@ -104,6 +129,7 @@ Jonas Obrist
 Jordan Guymon
 Jordan Moldow
 Jordan Speicher
+Joseph Hunkeler
 Joshua Bronson
 Jurko Gospodnetić
 Justyna Janczyszyn
@@ -111,8 +137,11 @@ Kale Kundert
 Katarzyna Jachim
 Katerina Koukiou
 Kevin Cox
+Kevin J. Foley
 Kodi B. Arfer
 Kostis Anagnostopoulos
+Kristoffer Nordström
+Kyle Altendorf
 Lawrence Mitchell
 Lee Kamentsky
 Lev Maximov
@@ -126,6 +155,7 @@ Maik Figura
 Mandeep Bhutani
 Manuel Krebber
 Marc Schlaich
+Marcelo Duarte Trevisani
 Marcin Bachry
 Mark Abramowitz
 Markus Unterwaditzer
@@ -146,22 +176,30 @@ Michael Droettboom
 Michael Seifert
 Michal Wajszczuk
 Mihai Capotă
+Mike Hoyle (hoylemd)
 Mike Lundy
 Miro Hrončok
 Nathaniel Waisbrot
 Ned Batchelder
 Neven Mundar
+Nicholas Devenish
+Nicholas Murphy
+Niclas Olofsson
 Nicolas Delaby
+Nikolay Kondratyev
 Oleg Pidsadnyi
 Oleg Sushchenko
 Oliver Bestwalter
 Omar Kohl
 Omer Hadari
+Ondřej Súkup
+Oscar Benjamin
 Patrick Hayes
 Paweł Adamczak
 Pedro Algarvio
 Pieter Mulder
 Piotr Banaszkiewicz
+Pulkit Goyal
 Punyashloka Biswal
 Quentin Pradet
 Ralf Schmitt
@@ -171,6 +209,7 @@ Raphael Pierzina
 Raquel Alegre
 Ravi Chandra
 Roberto Polli
+Roland Puntaier
 Romain Dorgueil
 Roman Bolshakov
 Ronny Pfannschmidt
@@ -178,8 +217,11 @@ Ross Lawley
 Russel Winder
 Ryan Wooden
 Samuel Dion-Girardeau
+Samuel Searles-Bryant
 Samuele Pedroni
+Sankt Petersbug
 Segev Finer
+Serhii Mozghovyi
 Simon Gomizelj
 Skylar Downes
 Srinivas Reddy Thatiparthy
@@ -188,6 +230,9 @@ Stefan Zimmermann
 Stefano Taschini
 Steffen Allner
 Stephan Obermann
+Sven-Hendrik Haase
+Tadek Teleżyński
+Takafumi Arakaki
 Tarcisio Fischer
 Tareq Alayan
 Ted Xiao
@@ -196,18 +241,23 @@ Thomas Hisch
 Tim Strazny
 Tom Dalton
 Tom Viner
+Tomer Keren
 Trevor Bekolay
 Tyler Goodlet
 Tzu-ping Chung
 Vasily Kuznetsov
+Victor Maryama
 Victor Uriarte
 Vidar T. Fauske
+Virgil Dupras
 Vitaly Lashmanov
 Vlad Dragos
+Volodymyr Piskun
+Wil Cooley
 William Lee
+Wim Glenn
 Wouter van Ackooy
 Xuan Luong
 Xuecong Liao
+Zac Hatfield-Dodds
 Zoltán Máté
-Roland Puntaier
-Allan Feldman
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/CHANGELOG.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/CHANGELOG.rst
index 21a090414a0..89437663f59 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/CHANGELOG.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/CHANGELOG.rst
@@ -1,3 +1,13 @@
+=================
+Changelog history
+=================
+
+Versions follow `Semantic Versioning <https://semver.org/>`_ (``<major>.<minor>.<patch>``).
+
+Backward incompatible (breaking) changes will only be introduced in major versions
+with advance notice in the **Deprecations** section of releases.
+
+
 ..
     You should *NOT* be adding new change log entries to this file, this
     file is managed by towncrier. You *may* edit previous change logs to
@@ -8,7 +18,1986 @@
 
 .. towncrier release notes start
 
-Pytest 3.6.2 (2018-06-20)
+pytest 4.6.11 (2020-06-04)
+==========================
+
+Bug Fixes
+---------
+
+- `#6334 <https://github.com/pytest-dev/pytest/issues/6334>`_: Fix summary entries appearing twice when ``f/F`` and ``s/S`` report chars were used at the same time in the ``-r`` command-line option (for example ``-rFf``).
+
+  The upper case variants were never documented and the preferred form should be the lower case.
+
+
+- `#7310 <https://github.com/pytest-dev/pytest/issues/7310>`_: Fix ``UnboundLocalError: local variable 'letter' referenced before
+  assignment`` in ``_pytest.terminal.pytest_report_teststatus()``
+  when plugins return report objects in an unconventional state.
+
+  This was making ``pytest_report_teststatus()`` skip
+  entering if-block branches that declare the ``letter`` variable.
+
+  The fix was to set the initial value of the ``letter`` before
+  the if-block cascade so that it always has a value.
+
+
+pytest 4.6.10 (2020-05-08)
+==========================
+
+Features
+--------
+
+- `#6870 <https://github.com/pytest-dev/pytest/issues/6870>`_: New ``Config.invocation_args`` attribute containing the unchanged arguments passed to ``pytest.main()``.
+
+  Remark: while this is technically a new feature and according to our `policy <https://docs.pytest.org/en/latest/py27-py34-deprecation.html#what-goes-into-4-6-x-releases>`_ it should not have been backported, we have opened an exception in this particular case because it fixes a serious interaction with ``pytest-xdist``, so it can also be considered a bugfix.
+
+Trivial/Internal Changes
+------------------------
+
+- `#6404 <https://github.com/pytest-dev/pytest/issues/6404>`_: Remove usage of ``parser`` module, deprecated in Python 3.9.
+
+
+pytest 4.6.9 (2020-01-04)
+=========================
+
+Bug Fixes
+---------
+
+- `#6301 <https://github.com/pytest-dev/pytest/issues/6301>`_: Fix assertion rewriting for egg-based distributions and ``editable`` installs (``pip install --editable``).
+
+
+pytest 4.6.8 (2019-12-19)
+=========================
+
+Features
+--------
+
+- `#5471 <https://github.com/pytest-dev/pytest/issues/5471>`_: JUnit XML now includes a timestamp and hostname in the testsuite tag.
+
+
+
+Bug Fixes
+---------
+
+- `#5430 <https://github.com/pytest-dev/pytest/issues/5430>`_: junitxml: Logs for failed test are now passed to junit report in case the test fails during call phase.
+
+
+
+Trivial/Internal Changes
+------------------------
+
+- `#6345 <https://github.com/pytest-dev/pytest/issues/6345>`_: Pin ``colorama`` to ``0.4.1`` only for Python 3.4 so newer Python versions can still receive colorama updates.
+
+
+pytest 4.6.7 (2019-12-05)
+=========================
+
+Bug Fixes
+---------
+
+- `#5477 <https://github.com/pytest-dev/pytest/issues/5477>`_: The XML file produced by ``--junitxml`` now correctly contain a ``<testsuites>`` root element.
+
+
+- `#6044 <https://github.com/pytest-dev/pytest/issues/6044>`_: Properly ignore ``FileNotFoundError`` (``OSError.errno == NOENT`` in Python 2) exceptions when trying to remove old temporary directories,
+  for instance when multiple processes try to remove the same directory (common with ``pytest-xdist``
+  for example).
+
+
+pytest 4.6.6 (2019-10-11)
+=========================
+
+Bug Fixes
+---------
+
+- `#5523 <https://github.com/pytest-dev/pytest/issues/5523>`_: Fixed using multiple short options together in the command-line (for example ``-vs``) in Python 3.8+.
+
+
+- `#5537 <https://github.com/pytest-dev/pytest/issues/5537>`_: Replace ``importlib_metadata`` backport with ``importlib.metadata`` from the
+  standard library on Python 3.8+.
+
+
+- `#5806 <https://github.com/pytest-dev/pytest/issues/5806>`_: Fix "lexer" being used when uploading to bpaste.net from ``--pastebin`` to "text".
+
+
+- `#5902 <https://github.com/pytest-dev/pytest/issues/5902>`_: Fix warnings about deprecated ``cmp`` attribute in ``attrs>=19.2``.
+
+
+
+Trivial/Internal Changes
+------------------------
+
+- `#5801 <https://github.com/pytest-dev/pytest/issues/5801>`_: Fixes python version checks (detected by ``flake8-2020``) in case python4 becomes a thing.
+
+
+pytest 4.6.5 (2019-08-05)
+=========================
+
+Bug Fixes
+---------
+
+- `#4344 <https://github.com/pytest-dev/pytest/issues/4344>`_: Fix RuntimeError/StopIteration when trying to collect package with "__init__.py" only.
+
+
+- `#5478 <https://github.com/pytest-dev/pytest/issues/5478>`_: Fix encode error when using unicode strings in exceptions with ``pytest.raises``.
+
+
+- `#5524 <https://github.com/pytest-dev/pytest/issues/5524>`_: Fix issue where ``tmp_path`` and ``tmpdir`` would not remove directories containing files marked as read-only,
+  which could lead to pytest crashing when executed a second time with the ``--basetemp`` option.
+
+
+- `#5547 <https://github.com/pytest-dev/pytest/issues/5547>`_: ``--step-wise`` now handles ``xfail(strict=True)`` markers properly.
+
+
+- `#5650 <https://github.com/pytest-dev/pytest/issues/5650>`_: Improved output when parsing an ini configuration file fails.
+
+
+pytest 4.6.4 (2019-06-28)
+=========================
+
+Bug Fixes
+---------
+
+- `#5404 <https://github.com/pytest-dev/pytest/issues/5404>`_: Emit a warning when attempting to unwrap a broken object raises an exception,
+  for easier debugging (`#5080 <https://github.com/pytest-dev/pytest/issues/5080>`__).
+
+
+- `#5444 <https://github.com/pytest-dev/pytest/issues/5444>`_: Fix ``--stepwise`` mode when the first file passed on the command-line fails to collect.
+
+
+- `#5482 <https://github.com/pytest-dev/pytest/issues/5482>`_: Fix bug introduced in 4.6.0 causing collection errors when passing
+  more than 2 positional arguments to ``pytest.mark.parametrize``.
+
+
+- `#5505 <https://github.com/pytest-dev/pytest/issues/5505>`_: Fix crash when discovery fails while using ``-p no:terminal``.
+
+
+pytest 4.6.3 (2019-06-11)
+=========================
+
+Bug Fixes
+---------
+
+- `#5383 <https://github.com/pytest-dev/pytest/issues/5383>`_: ``-q`` has again an impact on the style of the collected items
+  (``--collect-only``) when ``--log-cli-level`` is used.
+
+
+- `#5389 <https://github.com/pytest-dev/pytest/issues/5389>`_: Fix regressions of `#5063 <https://github.com/pytest-dev/pytest/pull/5063>`__ for ``importlib_metadata.PathDistribution`` which have their ``files`` attribute being ``None``.
+
+
+- `#5390 <https://github.com/pytest-dev/pytest/issues/5390>`_: Fix regression where the ``obj`` attribute of ``TestCase`` items was no longer bound to methods.
+
+
+pytest 4.6.2 (2019-06-03)
+=========================
+
+Bug Fixes
+---------
+
+- `#5370 <https://github.com/pytest-dev/pytest/issues/5370>`_: Revert unrolling of ``all()`` to fix ``NameError`` on nested comprehensions.
+
+
+- `#5371 <https://github.com/pytest-dev/pytest/issues/5371>`_: Revert unrolling of ``all()`` to fix incorrect handling of generators with ``if``.
+
+
+- `#5372 <https://github.com/pytest-dev/pytest/issues/5372>`_: Revert unrolling of ``all()`` to fix incorrect assertion when using ``all()`` in an expression.
+
+
+pytest 4.6.1 (2019-06-02)
+=========================
+
+Bug Fixes
+---------
+
+- `#5354 <https://github.com/pytest-dev/pytest/issues/5354>`_: Fix ``pytest.mark.parametrize`` when the argvalues is an iterator.
+
+
+- `#5358 <https://github.com/pytest-dev/pytest/issues/5358>`_: Fix assertion rewriting of ``all()`` calls to deal with non-generators.
+
+
+pytest 4.6.0 (2019-05-31)
+=========================
+
+Important
+---------
+
+The ``4.6.X`` series will be the last series to support **Python 2 and Python 3.4**.
+
+For more details, see our `Python 2.7 and 3.4 support plan <https://docs.pytest.org/en/latest/py27-py34-deprecation.html>`__.
+
+
+Features
+--------
+
+- `#4559 <https://github.com/pytest-dev/pytest/issues/4559>`_: Added the ``junit_log_passing_tests`` ini value which can be used to enable or disable logging of passing test output in the Junit XML file.
+
+
+- `#4956 <https://github.com/pytest-dev/pytest/issues/4956>`_: pytester's ``testdir.spawn`` uses ``tmpdir`` as HOME/USERPROFILE directory.
+
+
+- `#5062 <https://github.com/pytest-dev/pytest/issues/5062>`_: Unroll calls to ``all`` to full for-loops with assertion rewriting for better failure messages, especially when using Generator Expressions.
+
+
+- `#5063 <https://github.com/pytest-dev/pytest/issues/5063>`_: Switch from ``pkg_resources`` to ``importlib-metadata`` for entrypoint detection for improved performance and import time.
+
+
+- `#5091 <https://github.com/pytest-dev/pytest/issues/5091>`_: The output for ini options in ``--help`` has been improved.
+
+
+- `#5269 <https://github.com/pytest-dev/pytest/issues/5269>`_: ``pytest.importorskip`` includes the ``ImportError`` now in the default ``reason``.
+
+
+- `#5311 <https://github.com/pytest-dev/pytest/issues/5311>`_: Captured logs that are output for each failing test are formatted using the
+  ColoredLevelFormatter.
+
+
+- `#5312 <https://github.com/pytest-dev/pytest/issues/5312>`_: Improved formatting of multiline log messages in Python 3.
+
+
+
+Bug Fixes
+---------
+
+- `#2064 <https://github.com/pytest-dev/pytest/issues/2064>`_: The debugging plugin imports the wrapped ``Pdb`` class (``--pdbcls``) on-demand now.
+
+
+- `#4908 <https://github.com/pytest-dev/pytest/issues/4908>`_: The ``pytest_enter_pdb`` hook gets called with post-mortem (``--pdb``).
+
+
+- `#5036 <https://github.com/pytest-dev/pytest/issues/5036>`_: Fix issue where fixtures dependent on other parametrized fixtures would be erroneously parametrized.
+
+
+- `#5256 <https://github.com/pytest-dev/pytest/issues/5256>`_: Handle internal error due to a lone surrogate unicode character not being representable in Jython.
+
+
+- `#5257 <https://github.com/pytest-dev/pytest/issues/5257>`_: Ensure that ``sys.stdout.mode`` does not include ``'b'`` as it is a text stream.
+
+
+- `#5278 <https://github.com/pytest-dev/pytest/issues/5278>`_: Pytest's internal python plugin can be disabled using ``-p no:python`` again.
+
+
+- `#5286 <https://github.com/pytest-dev/pytest/issues/5286>`_: Fix issue with ``disable_test_id_escaping_and_forfeit_all_rights_to_community_support`` option not working when using a list of test IDs in parametrized tests.
+
+
+- `#5330 <https://github.com/pytest-dev/pytest/issues/5330>`_: Show the test module being collected when emitting ``PytestCollectionWarning`` messages for
+  test classes with ``__init__`` and ``__new__`` methods to make it easier to pin down the problem.
+
+
+- `#5333 <https://github.com/pytest-dev/pytest/issues/5333>`_: Fix regression in 4.5.0 with ``--lf`` not re-running all tests with known failures from non-selected tests.
+
+
+
+Improved Documentation
+----------------------
+
+- `#5250 <https://github.com/pytest-dev/pytest/issues/5250>`_: Expand docs on use of ``setenv`` and ``delenv`` with ``monkeypatch``.
+
+
+pytest 4.5.0 (2019-05-11)
+=========================
+
+Features
+--------
+
+- `#4826 <https://github.com/pytest-dev/pytest/issues/4826>`_: A warning is now emitted when unknown marks are used as a decorator.
+  This is often due to a typo, which can lead to silently broken tests.
+
+
+- `#4907 <https://github.com/pytest-dev/pytest/issues/4907>`_: Show XFail reason as part of JUnitXML message field.
+
+
+- `#5013 <https://github.com/pytest-dev/pytest/issues/5013>`_: Messages from crash reports are displayed within test summaries now, truncated to the terminal width.
+
+
+- `#5023 <https://github.com/pytest-dev/pytest/issues/5023>`_: New flag ``--strict-markers`` that triggers an error when unknown markers (e.g. those not registered using the `markers option`_ in the configuration file) are used in the test suite.
+
+  The existing ``--strict`` option has the same behavior currently, but can be augmented in the future for additional checks.
+
+  .. _`markers option`: https://docs.pytest.org/en/latest/reference.html#confval-markers
+
+
+- `#5026 <https://github.com/pytest-dev/pytest/issues/5026>`_: Assertion failure messages for sequences and dicts contain the number of different items now.
+
+
+- `#5034 <https://github.com/pytest-dev/pytest/issues/5034>`_: Improve reporting with ``--lf`` and ``--ff`` (run-last-failure).
+
+
+- `#5035 <https://github.com/pytest-dev/pytest/issues/5035>`_: The ``--cache-show`` option/action accepts an optional glob to show only matching cache entries.
+
+
+- `#5059 <https://github.com/pytest-dev/pytest/issues/5059>`_: Standard input (stdin) can be given to pytester's ``Testdir.run()`` and ``Testdir.popen()``.
+
+
+- `#5068 <https://github.com/pytest-dev/pytest/issues/5068>`_: The ``-r`` option learnt about ``A`` to display all reports (including passed ones) in the short test summary.
+
+
+- `#5108 <https://github.com/pytest-dev/pytest/issues/5108>`_: The short test summary is displayed after passes with output (``-rP``).
+
+
+- `#5172 <https://github.com/pytest-dev/pytest/issues/5172>`_: The ``--last-failed`` (``--lf``) option got smarter and will now skip entire files if all tests
+  of that test file have passed in previous runs, greatly speeding up collection.
+
+
+- `#5177 <https://github.com/pytest-dev/pytest/issues/5177>`_: Introduce new specific warning ``PytestWarning`` subclasses to make it easier to filter warnings based on the class, rather than on the message. The new subclasses are:
+
+
+  * ``PytestAssertRewriteWarning``
+
+  * ``PytestCacheWarning``
+
+  * ``PytestCollectionWarning``
+
+  * ``PytestConfigWarning``
+
+  * ``PytestUnhandledCoroutineWarning``
+
+  * ``PytestUnknownMarkWarning``
+
+
+- `#5202 <https://github.com/pytest-dev/pytest/issues/5202>`_: New ``record_testsuite_property`` session-scoped fixture allows users to log ``<property>`` tags at the ``testsuite``
+  level with the ``junitxml`` plugin.
+
+  The generated XML is compatible with the latest xunit standard, contrary to
+  the properties recorded by ``record_property`` and ``record_xml_attribute``.
+
+
+- `#5214 <https://github.com/pytest-dev/pytest/issues/5214>`_: The default logging format has been changed to improve readability. Here is an
+  example of a previous logging message::
+
+      test_log_cli_enabled_disabled.py    3 CRITICAL critical message logged by test
+
+  This has now become::
+
+      CRITICAL root:test_log_cli_enabled_disabled.py:3 critical message logged by test
+
+  The formatting can be changed through the `log_format <https://docs.pytest.org/en/latest/reference.html#confval-log_format>`__ configuration option.
+
+
+- `#5220 <https://github.com/pytest-dev/pytest/issues/5220>`_: ``--fixtures`` now also shows fixture scope for scopes other than ``"function"``.
+
+
+
+Bug Fixes
+---------
+
+- `#5113 <https://github.com/pytest-dev/pytest/issues/5113>`_: Deselected items from plugins using ``pytest_collect_modifyitems`` as a hookwrapper are correctly reported now.
+
+
+- `#5144 <https://github.com/pytest-dev/pytest/issues/5144>`_: With usage errors ``exitstatus`` is set to ``EXIT_USAGEERROR`` in the ``pytest_sessionfinish`` hook now as expected.
+
+
+- `#5235 <https://github.com/pytest-dev/pytest/issues/5235>`_: ``outcome.exit`` is not used with ``EOF`` in the pdb wrapper anymore, but only with ``quit``.
+
+
+
+Improved Documentation
+----------------------
+
+- `#4935 <https://github.com/pytest-dev/pytest/issues/4935>`_: Expand docs on registering marks and the effect of ``--strict``.
+
+
+
+Trivial/Internal Changes
+------------------------
+
+- `#4942 <https://github.com/pytest-dev/pytest/issues/4942>`_: ``logging.raiseExceptions`` is not set to ``False`` anymore.
+
+
+- `#5013 <https://github.com/pytest-dev/pytest/issues/5013>`_: pytest now depends on `wcwidth <https://pypi.org/project/wcwidth>`__ to properly track unicode character sizes for more precise terminal output.
+
+
+- `#5059 <https://github.com/pytest-dev/pytest/issues/5059>`_: pytester's ``Testdir.popen()`` uses ``stdout`` and ``stderr`` via keyword arguments with defaults now (``subprocess.PIPE``).
+
+
+- `#5069 <https://github.com/pytest-dev/pytest/issues/5069>`_: The code for the short test summary in the terminal was moved to the terminal plugin.
+
+
+- `#5082 <https://github.com/pytest-dev/pytest/issues/5082>`_: Improved validation of kwargs for various methods in the pytester plugin.
+
+
+- `#5202 <https://github.com/pytest-dev/pytest/issues/5202>`_: ``record_property`` now emits a ``PytestWarning`` when used with ``junit_family=xunit2``: the fixture generates
+  ``property`` tags as children of ``testcase``, which is not permitted according to the most
+  `recent schema <https://github.com/jenkinsci/xunit-plugin/blob/master/
+  src/main/resources/org/jenkinsci/plugins/xunit/types/model/xsd/junit-10.xsd>`__.
+
+
+- `#5239 <https://github.com/pytest-dev/pytest/issues/5239>`_: Pin ``pluggy`` to ``< 1.0`` so we don't update to ``1.0`` automatically when
+  it gets released: there are planned breaking changes, and we want to ensure
+  pytest properly supports ``pluggy 1.0``.
+
+
+pytest 4.4.2 (2019-05-08)
+=========================
+
+Bug Fixes
+---------
+
+- `#5089 <https://github.com/pytest-dev/pytest/issues/5089>`_: Fix crash caused by error in ``__repr__`` function with both ``showlocals`` and verbose output enabled.
+
+
+- `#5139 <https://github.com/pytest-dev/pytest/issues/5139>`_: Eliminate core dependency on 'terminal' plugin.
+
+
+- `#5229 <https://github.com/pytest-dev/pytest/issues/5229>`_: Require ``pluggy>=0.11.0`` which reverts a dependency to ``importlib-metadata`` added in ``0.10.0``.
+  The ``importlib-metadata`` package cannot be imported when installed as an egg and causes issues when relying on ``setup.py`` to install test dependencies.
+
+
+
+Improved Documentation
+----------------------
+
+- `#5171 <https://github.com/pytest-dev/pytest/issues/5171>`_: Doc: ``pytest_ignore_collect``, ``pytest_collect_directory``, ``pytest_collect_file`` and ``pytest_pycollect_makemodule`` hooks's 'path' parameter documented type is now ``py.path.local``
+
+
+- `#5188 <https://github.com/pytest-dev/pytest/issues/5188>`_: Improve help for ``--runxfail`` flag.
+
+
+
+Trivial/Internal Changes
+------------------------
+
+- `#5182 <https://github.com/pytest-dev/pytest/issues/5182>`_: Removed internal and unused ``_pytest.deprecated.MARK_INFO_ATTRIBUTE``.
+
+
+pytest 4.4.1 (2019-04-15)
+=========================
+
+Bug Fixes
+---------
+
+- `#5031 <https://github.com/pytest-dev/pytest/issues/5031>`_: Environment variables are properly restored when using pytester's ``testdir`` fixture.
+
+
+- `#5039 <https://github.com/pytest-dev/pytest/issues/5039>`_: Fix regression with ``--pdbcls``, which stopped working with local modules in 4.0.0.
+
+
+- `#5092 <https://github.com/pytest-dev/pytest/issues/5092>`_: Produce a warning when unknown keywords are passed to ``pytest.param(...)``.
+
+
+- `#5098 <https://github.com/pytest-dev/pytest/issues/5098>`_: Invalidate import caches with ``monkeypatch.syspath_prepend``, which is required with namespace packages being used.
+
+
+pytest 4.4.0 (2019-03-29)
+=========================
+
+Features
+--------
+
+- `#2224 <https://github.com/pytest-dev/pytest/issues/2224>`_: ``async`` test functions are skipped and a warning is emitted when a suitable
+  async plugin is not installed (such as ``pytest-asyncio`` or ``pytest-trio``).
+
+  Previously ``async`` functions would not execute at all but still be marked as "passed".
+
+
+- `#2482 <https://github.com/pytest-dev/pytest/issues/2482>`_: Include new ``disable_test_id_escaping_and_forfeit_all_rights_to_community_support`` option to disable ascii-escaping in parametrized values. This may cause a series of problems and as the name makes clear, use at your own risk.
+
+
+- `#4718 <https://github.com/pytest-dev/pytest/issues/4718>`_: The ``-p`` option can now be used to early-load plugins also by entry-point name, instead of just
+  by module name.
+
+  This makes it possible to early load external plugins like ``pytest-cov`` in the command-line::
+
+      pytest -p pytest_cov
+
+
+- `#4855 <https://github.com/pytest-dev/pytest/issues/4855>`_: The ``--pdbcls`` option handles classes via module attributes now (e.g.
+  ``pdb:pdb.Pdb`` with `pdb++`_), and its validation was improved.
+
+  .. _pdb++: https://pypi.org/project/pdbpp/
+
+
+- `#4875 <https://github.com/pytest-dev/pytest/issues/4875>`_: The `testpaths <https://docs.pytest.org/en/latest/reference.html#confval-testpaths>`__ configuration option is now displayed next
+  to the ``rootdir`` and ``inifile`` lines in the pytest header if the option is in effect, i.e., directories or file names were
+  not explicitly passed in the command line.
+
+  Also, ``inifile`` is only displayed if there's a configuration file, instead of an empty ``inifile:`` string.
+
+
+- `#4911 <https://github.com/pytest-dev/pytest/issues/4911>`_: Doctests can be skipped now dynamically using ``pytest.skip()``.
+
+
+- `#4920 <https://github.com/pytest-dev/pytest/issues/4920>`_: Internal refactorings have been made in order to make the implementation of the
+  `pytest-subtests <https://github.com/pytest-dev/pytest-subtests>`__ plugin
+  possible, which adds unittest sub-test support and a new ``subtests`` fixture as discussed in
+  `#1367 <https://github.com/pytest-dev/pytest/issues/1367>`__.
+
+  For details on the internal refactorings, please see the details on the related PR.
+
+
+- `#4931 <https://github.com/pytest-dev/pytest/issues/4931>`_: pytester's ``LineMatcher`` asserts that the passed lines are a sequence.
+
+
+- `#4936 <https://github.com/pytest-dev/pytest/issues/4936>`_: Handle ``-p plug`` after ``-p no:plug``.
+
+  This can be used to override a blocked plugin (e.g. in "addopts") from the
+  command line etc.
+
+
+- `#4951 <https://github.com/pytest-dev/pytest/issues/4951>`_: Output capturing is handled correctly when only capturing via fixtures (capsys, capfs) with ``pdb.set_trace()``.
+
+
+- `#4956 <https://github.com/pytest-dev/pytest/issues/4956>`_: ``pytester`` sets ``$HOME`` and ``$USERPROFILE`` to the temporary directory during test runs.
+
+  This ensures to not load configuration files from the real user's home directory.
+
+
+- `#4980 <https://github.com/pytest-dev/pytest/issues/4980>`_: Namespace packages are handled better with ``monkeypatch.syspath_prepend`` and ``testdir.syspathinsert`` (via ``pkg_resources.fixup_namespace_packages``).
+
+
+- `#4993 <https://github.com/pytest-dev/pytest/issues/4993>`_: The stepwise plugin reports status information now.
+
+
+- `#5008 <https://github.com/pytest-dev/pytest/issues/5008>`_: If a ``setup.cfg`` file contains ``[tool:pytest]`` and also the no longer supported ``[pytest]`` section, pytest will use ``[tool:pytest]`` ignoring ``[pytest]``. Previously it would unconditionally error out.
+
+  This makes it simpler for plugins to support old pytest versions.
+
+
+
+Bug Fixes
+---------
+
+- `#1895 <https://github.com/pytest-dev/pytest/issues/1895>`_: Fix bug where fixtures requested dynamically via ``request.getfixturevalue()`` might be teardown
+  before the requesting fixture.
+
+
+- `#4851 <https://github.com/pytest-dev/pytest/issues/4851>`_: pytester unsets ``PYTEST_ADDOPTS`` now to not use outer options with ``testdir.runpytest()``.
+
+
+- `#4903 <https://github.com/pytest-dev/pytest/issues/4903>`_: Use the correct modified time for years after 2038 in rewritten ``.pyc`` files.
+
+
+- `#4928 <https://github.com/pytest-dev/pytest/issues/4928>`_: Fix line offsets with ``ScopeMismatch`` errors.
+
+
+- `#4957 <https://github.com/pytest-dev/pytest/issues/4957>`_: ``-p no:plugin`` is handled correctly for default (internal) plugins now, e.g. with ``-p no:capture``.
+
+  Previously they were loaded (imported) always, making e.g. the ``capfd`` fixture available.
+
+
+- `#4968 <https://github.com/pytest-dev/pytest/issues/4968>`_: The pdb ``quit`` command is handled properly when used after the ``debug`` command with `pdb++`_.
+
+  .. _pdb++: https://pypi.org/project/pdbpp/
+
+
+- `#4975 <https://github.com/pytest-dev/pytest/issues/4975>`_: Fix the interpretation of ``-qq`` option where it was being considered as ``-v`` instead.
+
+
+- `#4978 <https://github.com/pytest-dev/pytest/issues/4978>`_: ``outcomes.Exit`` is not swallowed in ``assertrepr_compare`` anymore.
+
+
+- `#4988 <https://github.com/pytest-dev/pytest/issues/4988>`_: Close logging's file handler explicitly when the session finishes.
+
+
+- `#5003 <https://github.com/pytest-dev/pytest/issues/5003>`_: Fix line offset with mark collection error (off by one).
+
+
+
+Improved Documentation
+----------------------
+
+- `#4974 <https://github.com/pytest-dev/pytest/issues/4974>`_: Update docs for ``pytest_cmdline_parse`` hook to note availability liminations
+
+
+
+Trivial/Internal Changes
+------------------------
+
+- `#4718 <https://github.com/pytest-dev/pytest/issues/4718>`_: ``pluggy>=0.9`` is now required.
+
+
+- `#4815 <https://github.com/pytest-dev/pytest/issues/4815>`_: ``funcsigs>=1.0`` is now required for Python 2.7.
+
+
+- `#4829 <https://github.com/pytest-dev/pytest/issues/4829>`_: Some left-over internal code related to ``yield`` tests has been removed.
+
+
+- `#4890 <https://github.com/pytest-dev/pytest/issues/4890>`_: Remove internally unused ``anypython`` fixture from the pytester plugin.
+
+
+- `#4912 <https://github.com/pytest-dev/pytest/issues/4912>`_: Remove deprecated Sphinx directive, ``add_description_unit()``,
+  pin sphinx-removed-in to >= 0.2.0 to support Sphinx 2.0.
+
+
+- `#4913 <https://github.com/pytest-dev/pytest/issues/4913>`_: Fix pytest tests invocation with custom ``PYTHONPATH``.
+
+
+- `#4965 <https://github.com/pytest-dev/pytest/issues/4965>`_: New ``pytest_report_to_serializable`` and ``pytest_report_from_serializable`` **experimental** hooks.
+
+  These hooks will be used by ``pytest-xdist``, ``pytest-subtests``, and the replacement for
+  resultlog to serialize and customize reports.
+
+  They are experimental, meaning that their details might change or even be removed
+  completely in future patch releases without warning.
+
+  Feedback is welcome from plugin authors and users alike.
+
+
+- `#4987 <https://github.com/pytest-dev/pytest/issues/4987>`_: ``Collector.repr_failure`` respects the ``--tb`` option, but only defaults to ``short`` now (with ``auto``).
+
+
+pytest 4.3.1 (2019-03-11)
+=========================
+
+Bug Fixes
+---------
+
+- `#4810 <https://github.com/pytest-dev/pytest/issues/4810>`_: Logging messages inside ``pytest_runtest_logreport()`` are now properly captured and displayed.
+
+
+- `#4861 <https://github.com/pytest-dev/pytest/issues/4861>`_: Improve validation of contents written to captured output so it behaves the same as when capture is disabled.
+
+
+- `#4898 <https://github.com/pytest-dev/pytest/issues/4898>`_: Fix ``AttributeError: FixtureRequest has no 'confg' attribute`` bug in ``testdir.copy_example``.
+
+
+
+Trivial/Internal Changes
+------------------------
+
+- `#4768 <https://github.com/pytest-dev/pytest/issues/4768>`_: Avoid pkg_resources import at the top-level.
+
+
+pytest 4.3.0 (2019-02-16)
+=========================
+
+Deprecations
+------------
+
+- `#4724 <https://github.com/pytest-dev/pytest/issues/4724>`_: ``pytest.warns()`` now emits a warning when it receives unknown keyword arguments.
+
+  This will be changed into an error in the future.
+
+
+
+Features
+--------
+
+- `#2753 <https://github.com/pytest-dev/pytest/issues/2753>`_: Usage errors from argparse are mapped to pytest's ``UsageError``.
+
+
+- `#3711 <https://github.com/pytest-dev/pytest/issues/3711>`_: Add the ``--ignore-glob`` parameter to exclude test-modules with Unix shell-style wildcards.
+  Add the ``collect_ignore_glob`` for ``conftest.py`` to exclude test-modules with Unix shell-style wildcards.
+
+
+- `#4698 <https://github.com/pytest-dev/pytest/issues/4698>`_: The warning about Python 2.7 and 3.4 not being supported in pytest 5.0 has been removed.
+
+  In the end it was considered to be more
+  of a nuisance than actual utility and users of those Python versions shouldn't have problems as ``pip`` will not
+  install pytest 5.0 on those interpreters.
+
+
+- `#4707 <https://github.com/pytest-dev/pytest/issues/4707>`_: With the help of new ``set_log_path()`` method there is a way to set ``log_file`` paths from hooks.
+
+
+
+Bug Fixes
+---------
+
+- `#4651 <https://github.com/pytest-dev/pytest/issues/4651>`_: ``--help`` and ``--version`` are handled with ``UsageError``.
+
+
+- `#4782 <https://github.com/pytest-dev/pytest/issues/4782>`_: Fix ``AssertionError`` with collection of broken symlinks with packages.
+
+
+pytest 4.2.1 (2019-02-12)
+=========================
+
+Bug Fixes
+---------
+
+- `#2895 <https://github.com/pytest-dev/pytest/issues/2895>`_: The ``pytest_report_collectionfinish`` hook now is also called with ``--collect-only``.
+
+
+- `#3899 <https://github.com/pytest-dev/pytest/issues/3899>`_: Do not raise ``UsageError`` when an imported package has a ``pytest_plugins.py`` child module.
+
+
+- `#4347 <https://github.com/pytest-dev/pytest/issues/4347>`_: Fix output capturing when using pdb++ with recursive debugging.
+
+
+- `#4592 <https://github.com/pytest-dev/pytest/issues/4592>`_: Fix handling of ``collect_ignore`` via parent ``conftest.py``.
+
+
+- `#4700 <https://github.com/pytest-dev/pytest/issues/4700>`_: Fix regression where ``setUpClass`` would always be called in subclasses even if all tests
+  were skipped by a ``unittest.skip()`` decorator applied in the subclass.
+
+
+- `#4739 <https://github.com/pytest-dev/pytest/issues/4739>`_: Fix ``parametrize(... ids=<function>)`` when the function returns non-strings.
+
+
+- `#4745 <https://github.com/pytest-dev/pytest/issues/4745>`_: Fix/improve collection of args when passing in ``__init__.py`` and a test file.
+
+
+- `#4770 <https://github.com/pytest-dev/pytest/issues/4770>`_: ``more_itertools`` is now constrained to <6.0.0 when required for Python 2.7 compatibility.
+
+
+- `#526 <https://github.com/pytest-dev/pytest/issues/526>`_: Fix "ValueError: Plugin already registered" exceptions when running in build directories that symlink to actual source.
+
+
+
+Improved Documentation
+----------------------
+
+- `#3899 <https://github.com/pytest-dev/pytest/issues/3899>`_: Add note to ``plugins.rst`` that ``pytest_plugins`` should not be used as a name for a user module containing plugins.
+
+
+- `#4324 <https://github.com/pytest-dev/pytest/issues/4324>`_: Document how to use ``raises`` and ``does_not_raise`` to write parametrized tests with conditional raises.
+
+
+- `#4709 <https://github.com/pytest-dev/pytest/issues/4709>`_: Document how to customize test failure messages when using
+  ``pytest.warns``.
+
+
+
+Trivial/Internal Changes
+------------------------
+
+- `#4741 <https://github.com/pytest-dev/pytest/issues/4741>`_: Some verbosity related attributes of the TerminalReporter plugin are now
+  read only properties.
+
+
+pytest 4.2.0 (2019-01-30)
+=========================
+
+Features
+--------
+
+- `#3094 <https://github.com/pytest-dev/pytest/issues/3094>`_: `Classic xunit-style <https://docs.pytest.org/en/latest/xunit_setup.html>`__ functions and methods
+  now obey the scope of *autouse* fixtures.
+
+  This fixes a number of surprising issues like ``setup_method`` being called before session-scoped
+  autouse fixtures (see `#517 <https://github.com/pytest-dev/pytest/issues/517>`__ for an example).
+
+
+- `#4627 <https://github.com/pytest-dev/pytest/issues/4627>`_: Display a message at the end of the test session when running under Python 2.7 and 3.4 that pytest 5.0 will no longer
+  support those Python versions.
+
+
+- `#4660 <https://github.com/pytest-dev/pytest/issues/4660>`_: The number of *selected* tests now are also displayed when the ``-k`` or ``-m`` flags are used.
+
+
+- `#4688 <https://github.com/pytest-dev/pytest/issues/4688>`_: ``pytest_report_teststatus`` hook now can also receive a ``config`` parameter.
+
+
+- `#4691 <https://github.com/pytest-dev/pytest/issues/4691>`_: ``pytest_terminal_summary`` hook now can also receive a ``config`` parameter.
+
+
+
+Bug Fixes
+---------
+
+- `#3547 <https://github.com/pytest-dev/pytest/issues/3547>`_: ``--junitxml`` can emit XML compatible with Jenkins xUnit.
+  ``junit_family`` INI option accepts ``legacy|xunit1``, which produces old style output, and ``xunit2`` that conforms more strictly to https://github.com/jenkinsci/xunit-plugin/blob/xunit-2.3.2/src/main/resources/org/jenkinsci/plugins/xunit/types/model/xsd/junit-10.xsd
+
+
+- `#4280 <https://github.com/pytest-dev/pytest/issues/4280>`_: Improve quitting from pdb, especially with ``--trace``.
+
+  Using ``q[quit]`` after ``pdb.set_trace()`` will quit pytest also.
+
+
+- `#4402 <https://github.com/pytest-dev/pytest/issues/4402>`_: Warning summary now groups warnings by message instead of by test id.
+
+  This makes the output more compact and better conveys the general idea of how much code is
+  actually generating warnings, instead of how many tests call that code.
+
+
+- `#4536 <https://github.com/pytest-dev/pytest/issues/4536>`_: ``monkeypatch.delattr`` handles class descriptors like ``staticmethod``/``classmethod``.
+
+
+- `#4649 <https://github.com/pytest-dev/pytest/issues/4649>`_: Restore marks being considered keywords for keyword expressions.
+
+
+- `#4653 <https://github.com/pytest-dev/pytest/issues/4653>`_: ``tmp_path`` fixture and other related ones provides resolved path (a.k.a real path)
+
+
+- `#4667 <https://github.com/pytest-dev/pytest/issues/4667>`_: ``pytest_terminal_summary`` uses result from ``pytest_report_teststatus`` hook, rather than hardcoded strings.
+
+
+- `#4669 <https://github.com/pytest-dev/pytest/issues/4669>`_: Correctly handle ``unittest.SkipTest`` exception containing non-ascii characters on Python 2.
+
+
+- `#4680 <https://github.com/pytest-dev/pytest/issues/4680>`_: Ensure the ``tmpdir`` and the ``tmp_path`` fixtures are the same folder.
+
+
+- `#4681 <https://github.com/pytest-dev/pytest/issues/4681>`_: Ensure ``tmp_path`` is always a real path.
+
+
+
+Trivial/Internal Changes
+------------------------
+
+- `#4643 <https://github.com/pytest-dev/pytest/issues/4643>`_: Use ``a.item()`` instead of the deprecated ``np.asscalar(a)`` in ``pytest.approx``.
+
+  ``np.asscalar`` has been `deprecated <https://github.com/numpy/numpy/blob/master/doc/release/1.16.0-notes.rst#new-deprecations>`__ in ``numpy 1.16.``.
+
+
+- `#4657 <https://github.com/pytest-dev/pytest/issues/4657>`_: Copy saferepr from pylib
+
+
+- `#4668 <https://github.com/pytest-dev/pytest/issues/4668>`_: The verbose word for expected failures in the teststatus report changes from ``xfail`` to ``XFAIL`` to be consistent with other test outcomes.
+
+
+pytest 4.1.1 (2019-01-12)
+=========================
+
+Bug Fixes
+---------
+
+- `#2256 <https://github.com/pytest-dev/pytest/issues/2256>`_: Show full repr with ``assert a==b`` and ``-vv``.
+
+
+- `#3456 <https://github.com/pytest-dev/pytest/issues/3456>`_: Extend Doctest-modules to ignore mock objects.
+
+
+- `#4617 <https://github.com/pytest-dev/pytest/issues/4617>`_: Fixed ``pytest.warns`` bug when context manager is reused (e.g. multiple parametrization).
+
+
+- `#4631 <https://github.com/pytest-dev/pytest/issues/4631>`_: Don't rewrite assertion when ``__getattr__`` is broken
+
+
+
+Improved Documentation
+----------------------
+
+- `#3375 <https://github.com/pytest-dev/pytest/issues/3375>`_: Document that using ``setup.cfg`` may crash other tools or cause hard to track down problems because it uses a different parser than ``pytest.ini`` or ``tox.ini`` files.
+
+
+
+Trivial/Internal Changes
+------------------------
+
+- `#4602 <https://github.com/pytest-dev/pytest/issues/4602>`_: Uninstall ``hypothesis`` in regen tox env.
+
+
+pytest 4.1.0 (2019-01-05)
+=========================
+
+Removals
+--------
+
+- `#2169 <https://github.com/pytest-dev/pytest/issues/2169>`_: ``pytest.mark.parametrize``: in previous versions, errors raised by id functions were suppressed and changed into warnings. Now the exceptions are propagated, along with a pytest message informing the node, parameter value and index where the exception occurred.
+
+
+- `#3078 <https://github.com/pytest-dev/pytest/issues/3078>`_: Remove legacy internal warnings system: ``config.warn``, ``Node.warn``. The ``pytest_logwarning`` now issues a warning when implemented.
+
+  See our `docs <https://docs.pytest.org/en/latest/deprecations.html#config-warn-and-node-warn>`__ on information on how to update your code.
+
+
+- `#3079 <https://github.com/pytest-dev/pytest/issues/3079>`_: Removed support for yield tests - they are fundamentally broken because they don't support fixtures properly since collection and test execution were separated.
+
+  See our `docs <https://docs.pytest.org/en/latest/deprecations.html#yield-tests>`__ on information on how to update your code.
+
+
+- `#3082 <https://github.com/pytest-dev/pytest/issues/3082>`_: Removed support for applying marks directly to values in ``@pytest.mark.parametrize``. Use ``pytest.param`` instead.
+
+  See our `docs <https://docs.pytest.org/en/latest/deprecations.html#marks-in-pytest-mark-parametrize>`__ on information on how to update your code.
+
+
+- `#3083 <https://github.com/pytest-dev/pytest/issues/3083>`_: Removed ``Metafunc.addcall``. This was the predecessor mechanism to ``@pytest.mark.parametrize``.
+
+  See our `docs <https://docs.pytest.org/en/latest/deprecations.html#metafunc-addcall>`__ on information on how to update your code.
+
+
+- `#3085 <https://github.com/pytest-dev/pytest/issues/3085>`_: Removed support for passing strings to ``pytest.main``. Now, always pass a list of strings instead.
+
+  See our `docs <https://docs.pytest.org/en/latest/deprecations.html#passing-command-line-string-to-pytest-main>`__ on information on how to update your code.
+
+
+- `#3086 <https://github.com/pytest-dev/pytest/issues/3086>`_: ``[pytest]`` section in **setup.cfg** files is no longer supported, use ``[tool:pytest]`` instead. ``setup.cfg`` files
+  are meant for use with ``distutils``, and a section named ``pytest`` has notoriously been a source of conflicts and bugs.
+
+  Note that for **pytest.ini** and **tox.ini** files the section remains ``[pytest]``.
+
+
+- `#3616 <https://github.com/pytest-dev/pytest/issues/3616>`_: Removed the deprecated compat properties for ``node.Class/Function/Module`` - use ``pytest.Class/Function/Module`` now.
+
+  See our `docs <https://docs.pytest.org/en/latest/deprecations.html#internal-classes-accessed-through-node>`__ on information on how to update your code.
+
+
+- `#4421 <https://github.com/pytest-dev/pytest/issues/4421>`_: Removed the implementation of the ``pytest_namespace`` hook.
+
+  See our `docs <https://docs.pytest.org/en/latest/deprecations.html#pytest-namespace>`__ on information on how to update your code.
+
+
+- `#4489 <https://github.com/pytest-dev/pytest/issues/4489>`_: Removed ``request.cached_setup``. This was the predecessor mechanism to modern fixtures.
+
+  See our `docs <https://docs.pytest.org/en/latest/deprecations.html#cached-setup>`__ on information on how to update your code.
+
+
+- `#4535 <https://github.com/pytest-dev/pytest/issues/4535>`_: Removed the deprecated ``PyCollector.makeitem`` method. This method was made public by mistake a long time ago.
+
+
+- `#4543 <https://github.com/pytest-dev/pytest/issues/4543>`_: Removed support to define fixtures using the ``pytest_funcarg__`` prefix. Use the ``@pytest.fixture`` decorator instead.
+
+  See our `docs <https://docs.pytest.org/en/latest/deprecations.html#pytest-funcarg-prefix>`__ on information on how to update your code.
+
+
+- `#4545 <https://github.com/pytest-dev/pytest/issues/4545>`_: Calling fixtures directly is now always an error instead of a warning.
+
+  See our `docs <https://docs.pytest.org/en/latest/deprecations.html#calling-fixtures-directly>`__ on information on how to update your code.
+
+
+- `#4546 <https://github.com/pytest-dev/pytest/issues/4546>`_: Remove ``Node.get_marker(name)`` the return value was not usable for more than a existence check.
+
+  Use ``Node.get_closest_marker(name)`` as a replacement.
+
+
+- `#4547 <https://github.com/pytest-dev/pytest/issues/4547>`_: The deprecated ``record_xml_property`` fixture has been removed, use the more generic ``record_property`` instead.
+
+  See our `docs <https://docs.pytest.org/en/latest/deprecations.html#record-xml-property>`__ for more information.
+
+
+- `#4548 <https://github.com/pytest-dev/pytest/issues/4548>`_: An error is now raised if the ``pytest_plugins`` variable is defined in a non-top-level ``conftest.py`` file (i.e., not residing in the ``rootdir``).
+
+  See our `docs <https://docs.pytest.org/en/latest/deprecations.html#pytest-plugins-in-non-top-level-conftest-files>`__ for more information.
+
+
+- `#891 <https://github.com/pytest-dev/pytest/issues/891>`_: Remove ``testfunction.markername`` attributes - use ``Node.iter_markers(name=None)`` to iterate them.
+
+
+
+Deprecations
+------------
+
+- `#3050 <https://github.com/pytest-dev/pytest/issues/3050>`_: Deprecated the ``pytest.config`` global.
+
+  See https://docs.pytest.org/en/latest/deprecations.html#pytest-config-global for rationale.
+
+
+- `#3974 <https://github.com/pytest-dev/pytest/issues/3974>`_: Passing the ``message`` parameter of ``pytest.raises`` now issues a ``DeprecationWarning``.
+
+  It is a common mistake to think this parameter will match the exception message, while in fact
+  it only serves to provide a custom message in case the ``pytest.raises`` check fails. To avoid this
+  mistake and because it is believed to be little used, pytest is deprecating it without providing
+  an alternative for the moment.
+
+  If you have concerns about this, please comment on `issue #3974 <https://github.com/pytest-dev/pytest/issues/3974>`__.
+
+
+- `#4435 <https://github.com/pytest-dev/pytest/issues/4435>`_: Deprecated ``raises(..., 'code(as_a_string)')`` and ``warns(..., 'code(as_a_string)')``.
+
+  See https://docs.pytest.org/en/latest/deprecations.html#raises-warns-exec for rationale and examples.
+
+
+
+Features
+--------
+
+- `#3191 <https://github.com/pytest-dev/pytest/issues/3191>`_: A warning is now issued when assertions are made for ``None``.
+
+  This is a common source of confusion among new users, which write:
+
+  .. code-block:: python
+
+      assert mocked_object.assert_called_with(3, 4, 5, key="value")
+
+  When they should write:
+
+  .. code-block:: python
+
+      mocked_object.assert_called_with(3, 4, 5, key="value")
+
+  Because the ``assert_called_with`` method of mock objects already executes an assertion.
+
+  This warning will not be issued when ``None`` is explicitly checked. An assertion like:
+
+  .. code-block:: python
+
+      assert variable is None
+
+  will not issue the warning.
+
+
+- `#3632 <https://github.com/pytest-dev/pytest/issues/3632>`_: Richer equality comparison introspection on ``AssertionError`` for objects created using `attrs <http://www.attrs.org/en/stable/>`__ or `dataclasses <https://docs.python.org/3/library/dataclasses.html>`_ (Python 3.7+, `backported to 3.6 <https://pypi.org/project/dataclasses>`__).
+
+
+- `#4278 <https://github.com/pytest-dev/pytest/issues/4278>`_: ``CACHEDIR.TAG`` files are now created inside cache directories.
+
+  Those files are part of the `Cache Directory Tagging Standard <http://www.bford.info/cachedir/spec.html>`__, and can
+  be used by backup or synchronization programs to identify pytest's cache directory as such.
+
+
+- `#4292 <https://github.com/pytest-dev/pytest/issues/4292>`_: ``pytest.outcomes.Exit`` is derived from ``SystemExit`` instead of ``KeyboardInterrupt``. This allows us to better handle ``pdb`` exiting.
+
+
+- `#4371 <https://github.com/pytest-dev/pytest/issues/4371>`_: Updated the ``--collect-only`` option to display test descriptions when ran using ``--verbose``.
+
+
+- `#4386 <https://github.com/pytest-dev/pytest/issues/4386>`_: Restructured ``ExceptionInfo`` object construction and ensure incomplete instances have a ``repr``/``str``.
+
+
+- `#4416 <https://github.com/pytest-dev/pytest/issues/4416>`_: pdb: added support for keyword arguments with ``pdb.set_trace``.
+
+  It handles ``header`` similar to Python 3.7 does it, and forwards any
+  other keyword arguments to the ``Pdb`` constructor.
+
+  This allows for ``__import__("pdb").set_trace(skip=["foo.*"])``.
+
+
+- `#4483 <https://github.com/pytest-dev/pytest/issues/4483>`_: Added ini parameter ``junit_duration_report`` to optionally report test call durations, excluding setup and teardown times.
+
+  The JUnit XML specification and the default pytest behavior is to include setup and teardown times in the test duration
+  report. You can include just the call durations instead (excluding setup and teardown) by adding this to your ``pytest.ini`` file:
+
+  .. code-block:: ini
+
+      [pytest]
+      junit_duration_report = call
+
+
+- `#4532 <https://github.com/pytest-dev/pytest/issues/4532>`_: ``-ra`` now will show errors and failures last, instead of as the first items in the summary.
+
+  This makes it easier to obtain a list of errors and failures to run tests selectively.
+
+
+- `#4599 <https://github.com/pytest-dev/pytest/issues/4599>`_: ``pytest.importorskip`` now supports a ``reason`` parameter, which will be shown when the
+  requested module cannot be imported.
+
+
+
+Bug Fixes
+---------
+
+- `#3532 <https://github.com/pytest-dev/pytest/issues/3532>`_: ``-p`` now accepts its argument without a space between the value, for example ``-pmyplugin``.
+
+
+- `#4327 <https://github.com/pytest-dev/pytest/issues/4327>`_: ``approx`` again works with more generic containers, more precisely instances of ``Iterable`` and ``Sized`` instead of more restrictive ``Sequence``.
+
+
+- `#4397 <https://github.com/pytest-dev/pytest/issues/4397>`_: Ensure that node ids are printable.
+
+
+- `#4435 <https://github.com/pytest-dev/pytest/issues/4435>`_: Fixed ``raises(..., 'code(string)')`` frame filename.
+
+
+- `#4458 <https://github.com/pytest-dev/pytest/issues/4458>`_: Display actual test ids in ``--collect-only``.
+
+
+
+Improved Documentation
+----------------------
+
+- `#4557 <https://github.com/pytest-dev/pytest/issues/4557>`_: Markers example documentation page updated to support latest pytest version.
+
+
+- `#4558 <https://github.com/pytest-dev/pytest/issues/4558>`_: Update cache documentation example to correctly show cache hit and miss.
+
+
+- `#4580 <https://github.com/pytest-dev/pytest/issues/4580>`_: Improved detailed summary report documentation.
+
+
+
+Trivial/Internal Changes
+------------------------
+
+- `#4447 <https://github.com/pytest-dev/pytest/issues/4447>`_: Changed the deprecation type of ``--result-log`` to ``PytestDeprecationWarning``.
+
+  It was decided to remove this feature at the next major revision.
+
+
+pytest 4.0.2 (2018-12-13)
+=========================
+
+Bug Fixes
+---------
+
+- `#4265 <https://github.com/pytest-dev/pytest/issues/4265>`_: Validate arguments from the ``PYTEST_ADDOPTS`` environment variable and the ``addopts`` ini option separately.
+
+
+- `#4435 <https://github.com/pytest-dev/pytest/issues/4435>`_: Fix ``raises(..., 'code(string)')`` frame filename.
+
+
+- `#4500 <https://github.com/pytest-dev/pytest/issues/4500>`_: When a fixture yields and a log call is made after the test runs, and, if the test is interrupted, capture attributes are ``None``.
+
+
+- `#4538 <https://github.com/pytest-dev/pytest/issues/4538>`_: Raise ``TypeError`` for ``with raises(..., match=<non-None falsey value>)``.
+
+
+
+Improved Documentation
+----------------------
+
+- `#1495 <https://github.com/pytest-dev/pytest/issues/1495>`_: Document common doctest fixture directory tree structure pitfalls
+
+
+pytest 4.0.1 (2018-11-23)
+=========================
+
+Bug Fixes
+---------
+
+- `#3952 <https://github.com/pytest-dev/pytest/issues/3952>`_: Display warnings before "short test summary info" again, but still later warnings in the end.
+
+
+- `#4386 <https://github.com/pytest-dev/pytest/issues/4386>`_: Handle uninitialized exceptioninfo in repr/str.
+
+
+- `#4393 <https://github.com/pytest-dev/pytest/issues/4393>`_: Do not create ``.gitignore``/``README.md`` files in existing cache directories.
+
+
+- `#4400 <https://github.com/pytest-dev/pytest/issues/4400>`_: Rearrange warning handling for the yield test errors so the opt-out in 4.0.x correctly works.
+
+
+- `#4405 <https://github.com/pytest-dev/pytest/issues/4405>`_: Fix collection of testpaths with ``--pyargs``.
+
+
+- `#4412 <https://github.com/pytest-dev/pytest/issues/4412>`_: Fix assertion rewriting involving ``Starred`` + side-effects.
+
+
+- `#4425 <https://github.com/pytest-dev/pytest/issues/4425>`_: Ensure we resolve the absolute path when the given ``--basetemp`` is a relative path.
+
+
+
+Trivial/Internal Changes
+------------------------
+
+- `#4315 <https://github.com/pytest-dev/pytest/issues/4315>`_: Use ``pkg_resources.parse_version`` instead of ``LooseVersion`` in minversion check.
+
+
+- `#4440 <https://github.com/pytest-dev/pytest/issues/4440>`_: Adjust the stack level of some internal pytest warnings.
+
+
+pytest 4.0.0 (2018-11-13)
+=========================
+
+Removals
+--------
+
+- `#3737 <https://github.com/pytest-dev/pytest/issues/3737>`_: **RemovedInPytest4Warnings are now errors by default.**
+
+  Following our plan to remove deprecated features with as little disruption as
+  possible, all warnings of type ``RemovedInPytest4Warnings`` now generate errors
+  instead of warning messages.
+
+  **The affected features will be effectively removed in pytest 4.1**, so please consult the
+  `Deprecations and Removals <https://docs.pytest.org/en/latest/deprecations.html>`__
+  section in the docs for directions on how to update existing code.
+
+  In the pytest ``4.0.X`` series, it is possible to change the errors back into warnings as a stop
+  gap measure by adding this to your ``pytest.ini`` file:
+
+  .. code-block:: ini
+
+      [pytest]
+      filterwarnings =
+          ignore::pytest.RemovedInPytest4Warning
+
+  But this will stop working when pytest ``4.1`` is released.
+
+  **If you have concerns** about the removal of a specific feature, please add a
+  comment to `#4348 <https://github.com/pytest-dev/pytest/issues/4348>`__.
+
+
+- `#4358 <https://github.com/pytest-dev/pytest/issues/4358>`_: Remove the ``::()`` notation to denote a test class instance in node ids.
+
+  Previously, node ids that contain test instances would use ``::()`` to denote the instance like this::
+
+      test_foo.py::Test::()::test_bar
+
+  The extra ``::()`` was puzzling to most users and has been removed, so that the test id becomes now::
+
+      test_foo.py::Test::test_bar
+
+  This change could not accompany a deprecation period as is usual when user-facing functionality changes because
+  it was not really possible to detect when the functionality was being used explicitly.
+
+  The extra ``::()`` might have been removed in some places internally already,
+  which then led to confusion in places where it was expected, e.g. with
+  ``--deselect`` (`#4127 <https://github.com/pytest-dev/pytest/issues/4127>`_).
+
+  Test class instances are also not listed with ``--collect-only`` anymore.
+
+
+
+Features
+--------
+
+- `#4270 <https://github.com/pytest-dev/pytest/issues/4270>`_: The ``cache_dir`` option uses ``$TOX_ENV_DIR`` as prefix (if set in the environment).
+
+  This uses a different cache per tox environment by default.
+
+
+
+Bug Fixes
+---------
+
+- `#3554 <https://github.com/pytest-dev/pytest/issues/3554>`_: Fix ``CallInfo.__repr__`` for when the call is not finished yet.
+
+
+pytest 3.10.1 (2018-11-11)
+==========================
+
+Bug Fixes
+---------
+
+- `#4287 <https://github.com/pytest-dev/pytest/issues/4287>`_: Fix nested usage of debugging plugin (pdb), e.g. with pytester's ``testdir.runpytest``.
+
+
+- `#4304 <https://github.com/pytest-dev/pytest/issues/4304>`_: Block the ``stepwise`` plugin if ``cacheprovider`` is also blocked, as one depends on the other.
+
+
+- `#4306 <https://github.com/pytest-dev/pytest/issues/4306>`_: Parse ``minversion`` as an actual version and not as dot-separated strings.
+
+
+- `#4310 <https://github.com/pytest-dev/pytest/issues/4310>`_: Fix duplicate collection due to multiple args matching the same packages.
+
+
+- `#4321 <https://github.com/pytest-dev/pytest/issues/4321>`_: Fix ``item.nodeid`` with resolved symlinks.
+
+
+- `#4325 <https://github.com/pytest-dev/pytest/issues/4325>`_: Fix collection of direct symlinked files, where the target does not match ``python_files``.
+
+
+- `#4329 <https://github.com/pytest-dev/pytest/issues/4329>`_: Fix TypeError in report_collect with _collect_report_last_write.
+
+
+
+Trivial/Internal Changes
+------------------------
+
+- `#4305 <https://github.com/pytest-dev/pytest/issues/4305>`_: Replace byte/unicode helpers in test_capture with python level syntax.
+
+
+pytest 3.10.0 (2018-11-03)
+==========================
+
+Features
+--------
+
+- `#2619 <https://github.com/pytest-dev/pytest/issues/2619>`_: Resume capturing output after ``continue`` with ``__import__("pdb").set_trace()``.
+
+  This also adds a new ``pytest_leave_pdb`` hook, and passes in ``pdb`` to the
+  existing ``pytest_enter_pdb`` hook.
+
+
+- `#4147 <https://github.com/pytest-dev/pytest/issues/4147>`_: Add ``--sw``, ``--stepwise`` as an alternative to ``--lf -x`` for stopping at the first failure, but starting the next test invocation from that test.  See `the documentation <https://docs.pytest.org/en/latest/cache.html#stepwise>`__ for more info.
+
+
+- `#4188 <https://github.com/pytest-dev/pytest/issues/4188>`_: Make ``--color`` emit colorful dots when not running in verbose mode. Earlier, it would only colorize the test-by-test output if ``--verbose`` was also passed.
+
+
+- `#4225 <https://github.com/pytest-dev/pytest/issues/4225>`_: Improve performance with collection reporting in non-quiet mode with terminals.
+
+  The "collecting …" message is only printed/updated every 0.5s.
+
+
+
+Bug Fixes
+---------
+
+- `#2701 <https://github.com/pytest-dev/pytest/issues/2701>`_: Fix false ``RemovedInPytest4Warning: usage of Session... is deprecated, please use pytest`` warnings.
+
+
+- `#4046 <https://github.com/pytest-dev/pytest/issues/4046>`_: Fix problems with running tests in package ``__init__.py`` files.
+
+
+- `#4260 <https://github.com/pytest-dev/pytest/issues/4260>`_: Swallow warnings during anonymous compilation of source.
+
+
+- `#4262 <https://github.com/pytest-dev/pytest/issues/4262>`_: Fix access denied error when deleting stale directories created by ``tmpdir`` / ``tmp_path``.
+
+
+- `#611 <https://github.com/pytest-dev/pytest/issues/611>`_: Naming a fixture ``request`` will now raise a warning: the ``request`` fixture is internal and
+  should not be overwritten as it will lead to internal errors.
+
+- `#4266 <https://github.com/pytest-dev/pytest/issues/4266>`_: Handle (ignore) exceptions raised during collection, e.g. with Django's LazySettings proxy class.
+
+
+
+Improved Documentation
+----------------------
+
+- `#4255 <https://github.com/pytest-dev/pytest/issues/4255>`_: Added missing documentation about the fact that module names passed to filter warnings are not regex-escaped.
+
+
+
+Trivial/Internal Changes
+------------------------
+
+- `#4272 <https://github.com/pytest-dev/pytest/issues/4272>`_: Display cachedir also in non-verbose mode if non-default.
+
+
+- `#4277 <https://github.com/pytest-dev/pytest/issues/4277>`_: pdb: improve message about output capturing with ``set_trace``.
+
+  Do not display "IO-capturing turned off/on" when ``-s`` is used to avoid
+  confusion.
+
+
+- `#4279 <https://github.com/pytest-dev/pytest/issues/4279>`_: Improve message and stack level of warnings issued by ``monkeypatch.setenv`` when the value of the environment variable is not a ``str``.
+
+
+pytest 3.9.3 (2018-10-27)
+=========================
+
+Bug Fixes
+---------
+
+- `#4174 <https://github.com/pytest-dev/pytest/issues/4174>`_: Fix "ValueError: Plugin already registered" with conftest plugins via symlink.
+
+
+- `#4181 <https://github.com/pytest-dev/pytest/issues/4181>`_: Handle race condition between creation and deletion of temporary folders.
+
+
+- `#4221 <https://github.com/pytest-dev/pytest/issues/4221>`_: Fix bug where the warning summary at the end of the test session was not showing the test where the warning was originated.
+
+
+- `#4243 <https://github.com/pytest-dev/pytest/issues/4243>`_: Fix regression when ``stacklevel`` for warnings was passed as positional argument on python2.
+
+
+
+Improved Documentation
+----------------------
+
+- `#3851 <https://github.com/pytest-dev/pytest/issues/3851>`_: Add reference to ``empty_parameter_set_mark`` ini option in documentation of ``@pytest.mark.parametrize``
+
+
+
+Trivial/Internal Changes
+------------------------
+
+- `#4028 <https://github.com/pytest-dev/pytest/issues/4028>`_: Revert patching of ``sys.breakpointhook`` since it appears to do nothing.
+
+
+- `#4233 <https://github.com/pytest-dev/pytest/issues/4233>`_: Apply an import sorter (``reorder-python-imports``) to the codebase.
+
+
+- `#4248 <https://github.com/pytest-dev/pytest/issues/4248>`_: Remove use of unnecessary compat shim, six.binary_type
+
+
+pytest 3.9.2 (2018-10-22)
+=========================
+
+Bug Fixes
+---------
+
+- `#2909 <https://github.com/pytest-dev/pytest/issues/2909>`_: Improve error message when a recursive dependency between fixtures is detected.
+
+
+- `#3340 <https://github.com/pytest-dev/pytest/issues/3340>`_: Fix logging messages not shown in hooks ``pytest_sessionstart()`` and ``pytest_sessionfinish()``.
+
+
+- `#3533 <https://github.com/pytest-dev/pytest/issues/3533>`_: Fix unescaped XML raw objects in JUnit report for skipped tests
+
+
+- `#3691 <https://github.com/pytest-dev/pytest/issues/3691>`_: Python 2: safely format warning message about passing unicode strings to ``warnings.warn``, which may cause
+  surprising ``MemoryError`` exception when monkey patching ``warnings.warn`` itself.
+
+
+- `#4026 <https://github.com/pytest-dev/pytest/issues/4026>`_: Improve error message when it is not possible to determine a function's signature.
+
+
+- `#4177 <https://github.com/pytest-dev/pytest/issues/4177>`_: Pin ``setuptools>=40.0`` to support ``py_modules`` in ``setup.cfg``
+
+
+- `#4179 <https://github.com/pytest-dev/pytest/issues/4179>`_: Restore the tmpdir behaviour of symlinking the current test run.
+
+
+- `#4192 <https://github.com/pytest-dev/pytest/issues/4192>`_: Fix filename reported by ``warnings.warn`` when using ``recwarn`` under python2.
+
+
+pytest 3.9.1 (2018-10-16)
+=========================
+
+Features
+--------
+
+- `#4159 <https://github.com/pytest-dev/pytest/issues/4159>`_: For test-suites containing test classes, the information about the subclassed
+  module is now output only if a higher verbosity level is specified (at least
+  "-vv").
+
+
+pytest 3.9.0 (2018-10-15 - not published due to a release automation bug)
+=========================================================================
+
+Deprecations
+------------
+
+- `#3616 <https://github.com/pytest-dev/pytest/issues/3616>`_: The following accesses have been documented as deprecated for years, but are now actually emitting deprecation warnings.
+
+  * Access of ``Module``, ``Function``, ``Class``, ``Instance``, ``File`` and ``Item`` through ``Node`` instances. Now
+    users will this warning::
+
+          usage of Function.Module is deprecated, please use pytest.Module instead
+
+    Users should just ``import pytest`` and access those objects using the ``pytest`` module.
+
+  * ``request.cached_setup``, this was the precursor of the setup/teardown mechanism available to fixtures. You can
+    consult `funcarg comparison section in the docs <https://docs.pytest.org/en/latest/funcarg_compare.html>`_.
+
+  * Using objects named ``"Class"`` as a way to customize the type of nodes that are collected in ``Collector``
+    subclasses has been deprecated. Users instead should use ``pytest_collect_make_item`` to customize node types during
+    collection.
+
+    This issue should affect only advanced plugins who create new collection types, so if you see this warning
+    message please contact the authors so they can change the code.
+
+  * The warning that produces the message below has changed to ``RemovedInPytest4Warning``::
+
+          getfuncargvalue is deprecated, use getfixturevalue
+
+
+- `#3988 <https://github.com/pytest-dev/pytest/issues/3988>`_: Add a Deprecation warning for pytest.ensuretemp as it was deprecated since a while.
+
+
+
+Features
+--------
+
+- `#2293 <https://github.com/pytest-dev/pytest/issues/2293>`_: Improve usage errors messages by hiding internal details which can be distracting and noisy.
+
+  This has the side effect that some error conditions that previously raised generic errors (such as
+  ``ValueError`` for unregistered marks) are now raising ``Failed`` exceptions.
+
+
+- `#3332 <https://github.com/pytest-dev/pytest/issues/3332>`_: Improve the error displayed when a ``conftest.py`` file could not be imported.
+
+  In order to implement this, a new ``chain`` parameter was added to ``ExceptionInfo.getrepr``
+  to show or hide chained tracebacks in Python 3 (defaults to ``True``).
+
+
+- `#3849 <https://github.com/pytest-dev/pytest/issues/3849>`_: Add ``empty_parameter_set_mark=fail_at_collect`` ini option for raising an exception when parametrize collects an empty set.
+
+
+- `#3964 <https://github.com/pytest-dev/pytest/issues/3964>`_: Log messages generated in the collection phase are shown when
+  live-logging is enabled and/or when they are logged to a file.
+
+
+- `#3985 <https://github.com/pytest-dev/pytest/issues/3985>`_: Introduce ``tmp_path`` as a fixture providing a Path object.
+
+
+- `#4013 <https://github.com/pytest-dev/pytest/issues/4013>`_: Deprecation warnings are now shown even if you customize the warnings filters yourself. In the previous version
+  any customization would override pytest's filters and deprecation warnings would fall back to being hidden by default.
+
+
+- `#4073 <https://github.com/pytest-dev/pytest/issues/4073>`_: Allow specification of timeout for ``Testdir.runpytest_subprocess()`` and ``Testdir.run()``.
+
+
+- `#4098 <https://github.com/pytest-dev/pytest/issues/4098>`_: Add returncode argument to pytest.exit() to exit pytest with a specific return code.
+
+
+- `#4102 <https://github.com/pytest-dev/pytest/issues/4102>`_: Reimplement ``pytest.deprecated_call`` using ``pytest.warns`` so it supports the ``match='...'`` keyword argument.
+
+  This has the side effect that ``pytest.deprecated_call`` now raises ``pytest.fail.Exception`` instead
+  of ``AssertionError``.
+
+
+- `#4149 <https://github.com/pytest-dev/pytest/issues/4149>`_: Require setuptools>=30.3 and move most of the metadata to ``setup.cfg``.
+
+
+
+Bug Fixes
+---------
+
+- `#2535 <https://github.com/pytest-dev/pytest/issues/2535>`_: Improve error message when test functions of ``unittest.TestCase`` subclasses use a parametrized fixture.
+
+
+- `#3057 <https://github.com/pytest-dev/pytest/issues/3057>`_: ``request.fixturenames`` now correctly returns the name of fixtures created by ``request.getfixturevalue()``.
+
+
+- `#3946 <https://github.com/pytest-dev/pytest/issues/3946>`_: Warning filters passed as command line options using ``-W`` now take precedence over filters defined in ``ini``
+  configuration files.
+
+
+- `#4066 <https://github.com/pytest-dev/pytest/issues/4066>`_: Fix source reindenting by using ``textwrap.dedent`` directly.
+
+
+- `#4102 <https://github.com/pytest-dev/pytest/issues/4102>`_: ``pytest.warn`` will capture previously-warned warnings in Python 2. Previously they were never raised.
+
+
+- `#4108 <https://github.com/pytest-dev/pytest/issues/4108>`_: Resolve symbolic links for args.
+
+  This fixes running ``pytest tests/test_foo.py::test_bar``, where ``tests``
+  is a symlink to ``project/app/tests``:
+  previously ``project/app/conftest.py`` would be ignored for fixtures then.
+
+
+- `#4132 <https://github.com/pytest-dev/pytest/issues/4132>`_: Fix duplicate printing of internal errors when using ``--pdb``.
+
+
+- `#4135 <https://github.com/pytest-dev/pytest/issues/4135>`_: pathlib based tmpdir cleanup now correctly handles symlinks in the folder.
+
+
+- `#4152 <https://github.com/pytest-dev/pytest/issues/4152>`_: Display the filename when encountering ``SyntaxWarning``.
+
+
+
+Improved Documentation
+----------------------
+
+- `#3713 <https://github.com/pytest-dev/pytest/issues/3713>`_: Update usefixtures documentation to clarify that it can't be used with fixture functions.
+
+
+- `#4058 <https://github.com/pytest-dev/pytest/issues/4058>`_: Update fixture documentation to specify that a fixture can be invoked twice in the scope it's defined for.
+
+
+- `#4064 <https://github.com/pytest-dev/pytest/issues/4064>`_: According to unittest.rst, setUpModule and tearDownModule were not implemented, but it turns out they are. So updated the documentation for unittest.
+
+
+- `#4151 <https://github.com/pytest-dev/pytest/issues/4151>`_: Add tempir testing example to CONTRIBUTING.rst guide
+
+
+
+Trivial/Internal Changes
+------------------------
+
+- `#2293 <https://github.com/pytest-dev/pytest/issues/2293>`_: The internal ``MarkerError`` exception has been removed.
+
+
+- `#3988 <https://github.com/pytest-dev/pytest/issues/3988>`_: Port the implementation of tmpdir to pathlib.
+
+
+- `#4063 <https://github.com/pytest-dev/pytest/issues/4063>`_: Exclude 0.00 second entries from ``--duration`` output unless ``-vv`` is passed on the command-line.
+
+
+- `#4093 <https://github.com/pytest-dev/pytest/issues/4093>`_: Fixed formatting of string literals in internal tests.
+
+
+pytest 3.8.2 (2018-10-02)
+=========================
+
+Deprecations and Removals
+-------------------------
+
+- `#4036 <https://github.com/pytest-dev/pytest/issues/4036>`_: The ``item`` parameter of ``pytest_warning_captured`` hook is now documented as deprecated. We realized only after
+  the ``3.8`` release that this parameter is incompatible with ``pytest-xdist``.
+
+  Our policy is to not deprecate features during bugfix releases, but in this case we believe it makes sense as we are
+  only documenting it as deprecated, without issuing warnings which might potentially break test suites. This will get
+  the word out that hook implementers should not use this parameter at all.
+
+  In a future release ``item`` will always be ``None`` and will emit a proper warning when a hook implementation
+  makes use of it.
+
+
+
+Bug Fixes
+---------
+
+- `#3539 <https://github.com/pytest-dev/pytest/issues/3539>`_: Fix reload on assertion rewritten modules.
+
+
+- `#4034 <https://github.com/pytest-dev/pytest/issues/4034>`_: The ``.user_properties`` attribute of ``TestReport`` objects is a list
+  of (name, value) tuples, but could sometimes be instantiated as a tuple
+  of tuples.  It is now always a list.
+
+
+- `#4039 <https://github.com/pytest-dev/pytest/issues/4039>`_: No longer issue warnings about using ``pytest_plugins`` in non-top-level directories when using ``--pyargs``: the
+  current ``--pyargs`` mechanism is not reliable and might give false negatives.
+
+
+- `#4040 <https://github.com/pytest-dev/pytest/issues/4040>`_: Exclude empty reports for passed tests when ``-rP`` option is used.
+
+
+- `#4051 <https://github.com/pytest-dev/pytest/issues/4051>`_: Improve error message when an invalid Python expression is passed to the ``-m`` option.
+
+
+- `#4056 <https://github.com/pytest-dev/pytest/issues/4056>`_: ``MonkeyPatch.setenv`` and ``MonkeyPatch.delenv`` issue a warning if the environment variable name is not ``str`` on Python 2.
+
+  In Python 2, adding ``unicode`` keys to ``os.environ`` causes problems with ``subprocess`` (and possible other modules),
+  making this a subtle bug specially susceptible when used with ``from __future__ import unicode_literals``.
+
+
+
+Improved Documentation
+----------------------
+
+- `#3928 <https://github.com/pytest-dev/pytest/issues/3928>`_: Add possible values for fixture scope to docs.
+
+
+pytest 3.8.1 (2018-09-22)
+=========================
+
+Bug Fixes
+---------
+
+- `#3286 <https://github.com/pytest-dev/pytest/issues/3286>`_: ``.pytest_cache`` directory is now automatically ignored by Git. Users who would like to contribute a solution for other SCMs please consult/comment on this issue.
+
+
+- `#3749 <https://github.com/pytest-dev/pytest/issues/3749>`_: Fix the following error during collection of tests inside packages::
+
+      TypeError: object of type 'Package' has no len()
+
+
+- `#3941 <https://github.com/pytest-dev/pytest/issues/3941>`_: Fix bug where indirect parametrization would consider the scope of all fixtures used by the test function to determine the parametrization scope, and not only the scope of the fixtures being parametrized.
+
+
+- `#3973 <https://github.com/pytest-dev/pytest/issues/3973>`_: Fix crash of the assertion rewriter if a test changed the current working directory without restoring it afterwards.
+
+
+- `#3998 <https://github.com/pytest-dev/pytest/issues/3998>`_: Fix issue that prevented some caplog properties (for example ``record_tuples``) from being available when entering the debugger with ``--pdb``.
+
+
+- `#3999 <https://github.com/pytest-dev/pytest/issues/3999>`_: Fix ``UnicodeDecodeError`` in python2.x when a class returns a non-ascii binary ``__repr__`` in an assertion which also contains non-ascii text.
+
+
+
+Improved Documentation
+----------------------
+
+- `#3996 <https://github.com/pytest-dev/pytest/issues/3996>`_: New `Deprecations and Removals <https://docs.pytest.org/en/latest/deprecations.html>`_ page shows all currently
+  deprecated features, the rationale to do so, and alternatives to update your code. It also list features removed
+  from pytest in past major releases to help those with ancient pytest versions to upgrade.
+
+
+
+Trivial/Internal Changes
+------------------------
+
+- `#3955 <https://github.com/pytest-dev/pytest/issues/3955>`_: Improve pre-commit detection for changelog filenames
+
+
+- `#3975 <https://github.com/pytest-dev/pytest/issues/3975>`_: Remove legacy code around im_func as that was python2 only
+
+
+pytest 3.8.0 (2018-09-05)
+=========================
+
+Deprecations and Removals
+-------------------------
+
+- `#2452 <https://github.com/pytest-dev/pytest/issues/2452>`_: ``Config.warn`` and ``Node.warn`` have been
+  deprecated, see `<https://docs.pytest.org/en/latest/deprecations.html#config-warn-and-node-warn>`_ for rationale and
+  examples.
+
+- `#3936 <https://github.com/pytest-dev/pytest/issues/3936>`_: ``@pytest.mark.filterwarnings`` second parameter is no longer regex-escaped,
+  making it possible to actually use regular expressions to check the warning message.
+
+  **Note**: regex-escaping the match string was an implementation oversight that might break test suites which depend
+  on the old behavior.
+
+
+
+Features
+--------
+
+- `#2452 <https://github.com/pytest-dev/pytest/issues/2452>`_: Internal pytest warnings are now issued using the standard ``warnings`` module, making it possible to use
+  the standard warnings filters to manage those warnings. This introduces ``PytestWarning``,
+  ``PytestDeprecationWarning`` and ``RemovedInPytest4Warning`` warning types as part of the public API.
+
+  Consult `the documentation <https://docs.pytest.org/en/latest/warnings.html#internal-pytest-warnings>`__ for more info.
+
+
+- `#2908 <https://github.com/pytest-dev/pytest/issues/2908>`_: ``DeprecationWarning`` and ``PendingDeprecationWarning`` are now shown by default if no other warning filter is
+  configured. This makes pytest more compliant with
+  `PEP-0506 <https://www.python.org/dev/peps/pep-0565/#recommended-filter-settings-for-test-runners>`_. See
+  `the docs <https://docs.pytest.org/en/latest/warnings.html#deprecationwarning-and-pendingdeprecationwarning>`_ for
+  more info.
+
+
+- `#3251 <https://github.com/pytest-dev/pytest/issues/3251>`_: Warnings are now captured and displayed during test collection.
+
+
+- `#3784 <https://github.com/pytest-dev/pytest/issues/3784>`_: ``PYTEST_DISABLE_PLUGIN_AUTOLOAD`` environment variable disables plugin auto-loading when set.
+
+
+- `#3829 <https://github.com/pytest-dev/pytest/issues/3829>`_: Added the ``count`` option to ``console_output_style`` to enable displaying the progress as a count instead of a percentage.
+
+
+- `#3837 <https://github.com/pytest-dev/pytest/issues/3837>`_: Added support for 'xfailed' and 'xpassed' outcomes to the ``pytester.RunResult.assert_outcomes`` signature.
+
+
+
+Bug Fixes
+---------
+
+- `#3911 <https://github.com/pytest-dev/pytest/issues/3911>`_: Terminal writer now takes into account unicode character width when writing out progress.
+
+
+- `#3913 <https://github.com/pytest-dev/pytest/issues/3913>`_: Pytest now returns with correct exit code (EXIT_USAGEERROR, 4) when called with unknown arguments.
+
+
+- `#3918 <https://github.com/pytest-dev/pytest/issues/3918>`_: Improve performance of assertion rewriting.
+
+
+
+Improved Documentation
+----------------------
+
+- `#3566 <https://github.com/pytest-dev/pytest/issues/3566>`_: Added a blurb in usage.rst for the usage of -r flag which is used to show an extra test summary info.
+
+
+- `#3907 <https://github.com/pytest-dev/pytest/issues/3907>`_: Corrected type of the exceptions collection passed to ``xfail``: ``raises`` argument accepts a ``tuple`` instead of ``list``.
+
+
+
+Trivial/Internal Changes
+------------------------
+
+- `#3853 <https://github.com/pytest-dev/pytest/issues/3853>`_: Removed ``"run all (no recorded failures)"`` message printed with ``--failed-first`` and ``--last-failed`` when there are no failed tests.
+
+
+pytest 3.7.4 (2018-08-29)
+=========================
+
+Bug Fixes
+---------
+
+- `#3506 <https://github.com/pytest-dev/pytest/issues/3506>`_: Fix possible infinite recursion when writing ``.pyc`` files.
+
+
+- `#3853 <https://github.com/pytest-dev/pytest/issues/3853>`_: Cache plugin now obeys the ``-q`` flag when ``--last-failed`` and ``--failed-first`` flags are used.
+
+
+- `#3883 <https://github.com/pytest-dev/pytest/issues/3883>`_: Fix bad console output when using ``console_output_style=classic``.
+
+
+- `#3888 <https://github.com/pytest-dev/pytest/issues/3888>`_: Fix macOS specific code using ``capturemanager`` plugin in doctests.
+
+
+
+Improved Documentation
+----------------------
+
+- `#3902 <https://github.com/pytest-dev/pytest/issues/3902>`_: Fix pytest.org links
+
+
+pytest 3.7.3 (2018-08-26)
+=========================
+
+Bug Fixes
+---------
+
+- `#3033 <https://github.com/pytest-dev/pytest/issues/3033>`_: Fixtures during teardown can again use ``capsys`` and ``capfd`` to inspect output captured during tests.
+
+
+- `#3773 <https://github.com/pytest-dev/pytest/issues/3773>`_: Fix collection of tests from ``__init__.py`` files if they match the ``python_files`` configuration option.
+
+
+- `#3796 <https://github.com/pytest-dev/pytest/issues/3796>`_: Fix issue where teardown of fixtures of consecutive sub-packages were executed once, at the end of the outer
+  package.
+
+
+- `#3816 <https://github.com/pytest-dev/pytest/issues/3816>`_: Fix bug where ``--show-capture=no`` option would still show logs printed during fixture teardown.
+
+
+- `#3819 <https://github.com/pytest-dev/pytest/issues/3819>`_: Fix ``stdout/stderr`` not getting captured when real-time cli logging is active.
+
+
+- `#3843 <https://github.com/pytest-dev/pytest/issues/3843>`_: Fix collection error when specifying test functions directly in the command line using ``test.py::test`` syntax together with ``--doctest-modules``.
+
+
+- `#3848 <https://github.com/pytest-dev/pytest/issues/3848>`_: Fix bugs where unicode arguments could not be passed to ``testdir.runpytest`` on Python 2.
+
+
+- `#3854 <https://github.com/pytest-dev/pytest/issues/3854>`_: Fix double collection of tests within packages when the filename starts with a capital letter.
+
+
+
+Improved Documentation
+----------------------
+
+- `#3824 <https://github.com/pytest-dev/pytest/issues/3824>`_: Added example for multiple glob pattern matches in ``python_files``.
+
+
+- `#3833 <https://github.com/pytest-dev/pytest/issues/3833>`_: Added missing docs for ``pytester.Testdir``.
+
+
+- `#3870 <https://github.com/pytest-dev/pytest/issues/3870>`_: Correct documentation for setuptools integration.
+
+
+
+Trivial/Internal Changes
+------------------------
+
+- `#3826 <https://github.com/pytest-dev/pytest/issues/3826>`_: Replace broken type annotations with type comments.
+
+
+- `#3845 <https://github.com/pytest-dev/pytest/issues/3845>`_: Remove a reference to issue `#568 <https://github.com/pytest-dev/pytest/issues/568>`_ from the documentation, which has since been
+  fixed.
+
+
+pytest 3.7.2 (2018-08-16)
+=========================
+
+Bug Fixes
+---------
+
+- `#3671 <https://github.com/pytest-dev/pytest/issues/3671>`_: Fix ``filterwarnings`` not being registered as a builtin mark.
+
+
+- `#3768 <https://github.com/pytest-dev/pytest/issues/3768>`_, `#3789 <https://github.com/pytest-dev/pytest/issues/3789>`_: Fix test collection from packages mixed with normal directories.
+
+
+- `#3771 <https://github.com/pytest-dev/pytest/issues/3771>`_: Fix infinite recursion during collection if a ``pytest_ignore_collect`` hook returns ``False`` instead of ``None``.
+
+
+- `#3774 <https://github.com/pytest-dev/pytest/issues/3774>`_: Fix bug where decorated fixtures would lose functionality (for example ``@mock.patch``).
+
+
+- `#3775 <https://github.com/pytest-dev/pytest/issues/3775>`_: Fix bug where importing modules or other objects with prefix ``pytest_`` prefix would raise a ``PluginValidationError``.
+
+
+- `#3788 <https://github.com/pytest-dev/pytest/issues/3788>`_: Fix ``AttributeError`` during teardown of ``TestCase`` subclasses which raise an exception during ``__init__``.
+
+
+- `#3804 <https://github.com/pytest-dev/pytest/issues/3804>`_: Fix traceback reporting for exceptions with ``__cause__`` cycles.
+
+
+
+Improved Documentation
+----------------------
+
+- `#3746 <https://github.com/pytest-dev/pytest/issues/3746>`_: Add documentation for ``metafunc.config`` that had been mistakenly hidden.
+
+
+pytest 3.7.1 (2018-08-02)
+=========================
+
+Bug Fixes
+---------
+
+- `#3473 <https://github.com/pytest-dev/pytest/issues/3473>`_: Raise immediately if ``approx()`` is given an expected value of a type it doesn't understand (e.g. strings, nested dicts, etc.).
+
+
+- `#3712 <https://github.com/pytest-dev/pytest/issues/3712>`_: Correctly represent the dimensions of a numpy array when calling ``repr()`` on ``approx()``.
+
+- `#3742 <https://github.com/pytest-dev/pytest/issues/3742>`_: Fix incompatibility with third party plugins during collection, which produced the error ``object has no attribute '_collectfile'``.
+
+- `#3745 <https://github.com/pytest-dev/pytest/issues/3745>`_: Display the absolute path if ``cache_dir`` is not relative to the ``rootdir`` instead of failing.
+
+
+- `#3747 <https://github.com/pytest-dev/pytest/issues/3747>`_: Fix compatibility problem with plugins and the warning code issued by fixture functions when they are called directly.
+
+
+- `#3748 <https://github.com/pytest-dev/pytest/issues/3748>`_: Fix infinite recursion in ``pytest.approx`` with arrays in ``numpy<1.13``.
+
+
+- `#3757 <https://github.com/pytest-dev/pytest/issues/3757>`_: Pin pathlib2 to ``>=2.2.0`` as we require ``__fspath__`` support.
+
+
+- `#3763 <https://github.com/pytest-dev/pytest/issues/3763>`_: Fix ``TypeError`` when the assertion message is ``bytes`` in python 3.
+
+
+pytest 3.7.0 (2018-07-30)
+=========================
+
+Deprecations and Removals
+-------------------------
+
+- `#2639 <https://github.com/pytest-dev/pytest/issues/2639>`_: ``pytest_namespace`` has been `deprecated <https://docs.pytest.org/en/latest/deprecations.html#pytest-namespace>`_.
+
+
+- `#3661 <https://github.com/pytest-dev/pytest/issues/3661>`_: Calling a fixture function directly, as opposed to request them in a test function, now issues a ``RemovedInPytest4Warning``. See `the documentation for rationale and examples <https://docs.pytest.org/en/latest/deprecations.html#calling-fixtures-directly>`_.
+
+
+
+Features
+--------
+
+- `#2283 <https://github.com/pytest-dev/pytest/issues/2283>`_: New ``package`` fixture scope: fixtures are finalized when the last test of a *package* finishes. This feature is considered **experimental**, so use it sparingly.
+
+
+- `#3576 <https://github.com/pytest-dev/pytest/issues/3576>`_: ``Node.add_marker`` now supports an ``append=True/False`` parameter to determine whether the mark comes last (default) or first.
+
+
+- `#3579 <https://github.com/pytest-dev/pytest/issues/3579>`_: Fixture ``caplog`` now has a ``messages`` property, providing convenient access to the format-interpolated log messages without the extra data provided by the formatter/handler.
+
+
+- `#3610 <https://github.com/pytest-dev/pytest/issues/3610>`_: New ``--trace`` option to enter the debugger at the start of a test.
+
+
+- `#3623 <https://github.com/pytest-dev/pytest/issues/3623>`_: Introduce ``pytester.copy_example`` as helper to do acceptance tests against examples from the project.
+
+
+
+Bug Fixes
+---------
+
+- `#2220 <https://github.com/pytest-dev/pytest/issues/2220>`_: Fix a bug where fixtures overridden by direct parameters (for example parametrization) were being instantiated even if they were not being used by a test.
+
+
+- `#3695 <https://github.com/pytest-dev/pytest/issues/3695>`_: Fix ``ApproxNumpy`` initialisation argument mixup, ``abs`` and ``rel`` tolerances were flipped causing strange comparison results.
+  Add tests to check ``abs`` and ``rel`` tolerances for ``np.array`` and test for expecting ``nan`` with ``np.array()``
+
+
+- `#980 <https://github.com/pytest-dev/pytest/issues/980>`_: Fix truncated locals output in verbose mode.
+
+
+
+Improved Documentation
+----------------------
+
+- `#3295 <https://github.com/pytest-dev/pytest/issues/3295>`_: Correct the usage documentation of ``--last-failed-no-failures`` by adding the missing ``--last-failed`` argument in the presented examples, because they are misleading and lead to think that the missing argument is not needed.
+
+
+
+Trivial/Internal Changes
+------------------------
+
+- `#3519 <https://github.com/pytest-dev/pytest/issues/3519>`_: Now a ``README.md`` file is created in ``.pytest_cache`` to make it clear why the directory exists.
+
+
+pytest 3.6.4 (2018-07-28)
+=========================
+
+Bug Fixes
+---------
+
+- Invoke pytest using ``-mpytest`` so ``sys.path`` does not get polluted by packages installed in ``site-packages``. (`#742 <https://github.com/pytest-dev/pytest/issues/742>`_)
+
+
+Improved Documentation
+----------------------
+
+- Use ``smtp_connection`` instead of ``smtp`` in fixtures documentation to avoid possible confusion. (`#3592 <https://github.com/pytest-dev/pytest/issues/3592>`_)
+
+
+Trivial/Internal Changes
+------------------------
+
+- Remove obsolete ``__future__`` imports. (`#2319 <https://github.com/pytest-dev/pytest/issues/2319>`_)
+
+- Add CITATION to provide information on how to formally cite pytest. (`#3402 <https://github.com/pytest-dev/pytest/issues/3402>`_)
+
+- Replace broken type annotations with type comments. (`#3635 <https://github.com/pytest-dev/pytest/issues/3635>`_)
+
+- Pin ``pluggy`` to ``<0.8``. (`#3727 <https://github.com/pytest-dev/pytest/issues/3727>`_)
+
+
+pytest 3.6.3 (2018-07-04)
+=========================
+
+Bug Fixes
+---------
+
+- Fix ``ImportWarning`` triggered by explicit relative imports in
+  assertion-rewritten package modules. (`#3061
+  <https://github.com/pytest-dev/pytest/issues/3061>`_)
+
+- Fix error in ``pytest.approx`` when dealing with 0-dimension numpy
+  arrays. (`#3593 <https://github.com/pytest-dev/pytest/issues/3593>`_)
+
+- No longer raise ``ValueError`` when using the ``get_marker`` API. (`#3605
+  <https://github.com/pytest-dev/pytest/issues/3605>`_)
+
+- Fix problem where log messages with non-ascii characters would not
+  appear in the output log file.
+  (`#3630 <https://github.com/pytest-dev/pytest/issues/3630>`_)
+
+- No longer raise ``AttributeError`` when legacy marks can't be stored in
+  functions. (`#3631 <https://github.com/pytest-dev/pytest/issues/3631>`_)
+
+
+Improved Documentation
+----------------------
+
+- The description above the example for ``@pytest.mark.skipif`` now better
+  matches the code. (`#3611
+  <https://github.com/pytest-dev/pytest/issues/3611>`_)
+
+
+Trivial/Internal Changes
+------------------------
+
+- Internal refactoring: removed unused ``CallSpec2tox ._globalid_args``
+  attribute and ``metafunc`` parameter from ``CallSpec2.copy()``. (`#3598
+  <https://github.com/pytest-dev/pytest/issues/3598>`_)
+
+- Silence usage of ``reduce`` warning in Python 2 (`#3609
+  <https://github.com/pytest-dev/pytest/issues/3609>`_)
+
+- Fix usage of ``attr.ib`` deprecated ``convert`` parameter. (`#3653
+  <https://github.com/pytest-dev/pytest/issues/3653>`_)
+
+
+pytest 3.6.2 (2018-06-20)
 =========================
 
 Bug Fixes
@@ -26,7 +2015,7 @@ Bug Fixes
   raises an exception. (`#3569
   <https://github.com/pytest-dev/pytest/issues/3569>`_)
 
-- Fix encoding error with `print` statements in doctests (`#3583
+- Fix encoding error with ``print`` statements in doctests (`#3583
   <https://github.com/pytest-dev/pytest/issues/3583>`_)
 
 
@@ -54,7 +2043,7 @@ Trivial/Internal Changes
   <https://github.com/pytest-dev/pytest/issues/3567>`_)
 
 
-Pytest 3.6.1 (2018-06-05)
+pytest 3.6.1 (2018-06-05)
 =========================
 
 Bug Fixes
@@ -98,7 +2087,7 @@ Trivial/Internal Changes
   <https://github.com/pytest-dev/pytest/issues/3529>`_)
 
 
-Pytest 3.6.0 (2018-05-23)
+pytest 3.6.0 (2018-05-23)
 =========================
 
 Features
@@ -107,7 +2096,7 @@ Features
 - Revamp the internals of the ``pytest.mark`` implementation with correct per
   node handling which fixes a number of long standing bugs caused by the old
   design. This introduces new ``Node.iter_markers(name)`` and
-  ``Node.get_closest_mark(name)`` APIs. Users are **strongly encouraged** to
+  ``Node.get_closest_marker(name)`` APIs. Users are **strongly encouraged** to
   read the `reasons for the revamp in the docs
   <https://docs.pytest.org/en/latest/mark.html#marker-revamp-and-iteration>`_,
   or jump over to details about `updating existing code to use the new APIs
@@ -133,7 +2122,7 @@ Features
   exits the debugger. On python 3.2 and higher, use CTRL+D. (`#3299
   <https://github.com/pytest-dev/pytest/issues/3299>`_)
 
-- pytest not longer changes the log level of the root logger when the
+- pytest no longer changes the log level of the root logger when the
   ``log-level`` parameter has greater numeric value than that of the level of
   the root logger, which makes it play better with custom logging configuration
   in user code. (`#3307 <https://github.com/pytest-dev/pytest/issues/3307>`_)
@@ -184,7 +2173,7 @@ Trivial/Internal Changes
   3.7 or newer. (`#3497 <https://github.com/pytest-dev/pytest/issues/3497>`_)
 
 
-Pytest 3.5.1 (2018-04-23)
+pytest 3.5.1 (2018-04-23)
 =========================
 
 
@@ -236,7 +2225,7 @@ Trivial/Internal Changes
   <https://github.com/pytest-dev/pytest/issues/3398>`_)
 
 
-Pytest 3.5.0 (2018-03-21)
+pytest 3.5.0 (2018-03-21)
 =========================
 
 Deprecations and Removals
@@ -247,7 +2236,7 @@ Deprecations and Removals
   <https://github.com/pytest-dev/pytest/issues/2770>`_)
 
 - Defining ``pytest_plugins`` is now deprecated in non-top-level conftest.py
-  files, because they "leak" to the entire directory tree. (`#3084
+  files, because they "leak" to the entire directory tree. `See the docs <https://docs.pytest.org/en/latest/deprecations.html#pytest-plugins-in-non-top-level-conftest-files>`_ for the rationale behind this decision (`#3084
   <https://github.com/pytest-dev/pytest/issues/3084>`_)
 
 
@@ -299,7 +2288,7 @@ Features
   ``pytest_runtest_logfinish`` hooks when live logs are enabled. (`#3189
   <https://github.com/pytest-dev/pytest/issues/3189>`_)
 
-- Passing `--log-cli-level` in the command-line now automatically activates
+- Passing ``--log-cli-level`` in the command-line now automatically activates
   live logging. (`#3190 <https://github.com/pytest-dev/pytest/issues/3190>`_)
 
 - Add command line option ``--deselect`` to allow deselection of individual
@@ -388,7 +2377,7 @@ Trivial/Internal Changes
   <https://github.com/pytest-dev/pytest/issues/3308>`_)
 
 
-Pytest 3.4.2 (2018-03-04)
+pytest 3.4.2 (2018-03-04)
 =========================
 
 Bug Fixes
@@ -425,7 +2414,7 @@ Trivial/Internal Changes
   <https://github.com/pytest-dev/pytest/issues/3259>`_)
 
 
-Pytest 3.4.1 (2018-02-20)
+pytest 3.4.1 (2018-02-20)
 =========================
 
 Bug Fixes
@@ -486,7 +2475,7 @@ Trivial/Internal Changes
   <https://github.com/pytest-dev/pytest/issues/985>`_)
 
 
-Pytest 3.4.0 (2018-01-30)
+pytest 3.4.0 (2018-01-30)
 =========================
 
 Deprecations and Removals
@@ -618,7 +2607,7 @@ Trivial/Internal Changes
   <https://github.com/pytest-dev/pytest/issues/3129>`_)
 
 
-Pytest 3.3.2 (2017-12-25)
+pytest 3.3.2 (2017-12-25)
 =========================
 
 Bug Fixes
@@ -651,11 +2640,11 @@ Trivial/Internal Changes
 - Code cleanup. (`#3015 <https://github.com/pytest-dev/pytest/issues/3015>`_,
   `#3021 <https://github.com/pytest-dev/pytest/issues/3021>`_)
 
-- Clean up code by replacing imports and references of `_ast` to `ast`. (`#3018
-  <https://github.com/pytest-dev/pytest/issues/3018>`_)
+- Clean up code by replacing imports and references of ``_ast`` to ``ast``.
+  (`#3018 <https://github.com/pytest-dev/pytest/issues/3018>`_)
 
 
-Pytest 3.3.1 (2017-12-05)
+pytest 3.3.1 (2017-12-05)
 =========================
 
 Bug Fixes
@@ -697,13 +2686,13 @@ Trivial/Internal Changes
   <https://github.com/pytest-dev/pytest/issues/2949>`_)
 
 
-Pytest 3.3.0 (2017-11-23)
+pytest 3.3.0 (2017-11-23)
 =========================
 
 Deprecations and Removals
 -------------------------
 
-- Pytest no longer supports Python **2.6** and **3.3**. Those Python versions
+- pytest no longer supports Python **2.6** and **3.3**. Those Python versions
   are EOL for some time now and incur maintenance and compatibility costs on
   the pytest core team, and following up with the rest of the community we
   decided that they will no longer be supported starting on this version. Users
@@ -757,7 +2746,7 @@ Features
 - Match ``warns`` signature to ``raises`` by adding ``match`` keyword. (`#2708
   <https://github.com/pytest-dev/pytest/issues/2708>`_)
 
-- Pytest now captures and displays output from the standard ``logging`` module.
+- pytest now captures and displays output from the standard ``logging`` module.
   The user can control the logging level to be captured by specifying options
   in ``pytest.ini``, the command line and also during individual tests using
   markers. Also, a ``caplog`` fixture is available that enables users to test
@@ -822,7 +2811,7 @@ Bug Fixes
   avoids a number of potential problems. (`#2751
   <https://github.com/pytest-dev/pytest/issues/2751>`_)
 
-- Pytest no longer complains about warnings with unicode messages being
+- pytest no longer complains about warnings with unicode messages being
   non-ascii compatible even for ascii-compatible messages. As a result of this,
   warnings with unicode messages are converted first to an ascii representation
   for safety. (`#2809 <https://github.com/pytest-dev/pytest/issues/2809>`_)
@@ -842,7 +2831,7 @@ Bug Fixes
 Trivial/Internal Changes
 ------------------------
 
-- pytest now depends on `attrs <https://pypi.org/project/attrs/>`_ for internal
+- pytest now depends on `attrs <https://pypi.org/project/attrs/>`__ for internal
   structures to ease code maintainability. (`#2641
   <https://github.com/pytest-dev/pytest/issues/2641>`_)
 
@@ -874,7 +2863,7 @@ Trivial/Internal Changes
   <https://github.com/pytest-dev/pytest/issues/2922>`_)
 
 
-Pytest 3.2.5 (2017-11-15)
+pytest 3.2.5 (2017-11-15)
 =========================
 
 Bug Fixes
@@ -885,7 +2874,7 @@ Bug Fixes
   <https://github.com/pytest-dev/pytest/issues/2926>`_)
 
 
-Pytest 3.2.4 (2017-11-13)
+pytest 3.2.4 (2017-11-13)
 =========================
 
 Bug Fixes
@@ -934,7 +2923,7 @@ Improved Documentation
   <https://github.com/pytest-dev/pytest/issues/911>`_)
 
 
-Pytest 3.2.3 (2017-10-03)
+pytest 3.2.3 (2017-10-03)
 =========================
 
 Bug Fixes
@@ -974,13 +2963,13 @@ Trivial/Internal Changes
   (`#2765 <https://github.com/pytest-dev/pytest/issues/2765>`_)
 
 
-Pytest 3.2.2 (2017-09-06)
+pytest 3.2.2 (2017-09-06)
 =========================
 
 Bug Fixes
 ---------
 
-- Calling the deprecated `request.getfuncargvalue()` now shows the source of
+- Calling the deprecated ``request.getfuncargvalue()`` now shows the source of
   the call. (`#2681 <https://github.com/pytest-dev/pytest/issues/2681>`_)
 
 - Allow tests declared as ``@staticmethod`` to use fixtures. (`#2699
@@ -1002,10 +2991,10 @@ Improved Documentation
   ``pytest.mark.MARKER_NAME.__call__`` (`#2604
   <https://github.com/pytest-dev/pytest/issues/2604>`_)
 
-- In one of the simple examples, use `pytest_collection_modifyitems()` to skip
+- In one of the simple examples, use ``pytest_collection_modifyitems()`` to skip
   tests based on a command-line option, allowing its sharing while preventing a
-  user error when acessing `pytest.config` before the argument parsing. (`#2653
-  <https://github.com/pytest-dev/pytest/issues/2653>`_)
+  user error when acessing ``pytest.config`` before the argument parsing.
+  (`#2653 <https://github.com/pytest-dev/pytest/issues/2653>`_)
 
 
 Trivial/Internal Changes
@@ -1021,7 +3010,7 @@ Trivial/Internal Changes
   <https://github.com/pytest-dev/pytest/issues/2739>`_)
 
 
-Pytest 3.2.1 (2017-08-08)
+pytest 3.2.1 (2017-08-08)
 =========================
 
 Bug Fixes
@@ -1051,7 +3040,7 @@ Improved Documentation
   <https://github.com/pytest-dev/pytest/issues/2626>`_)
 
 
-Pytest 3.2.0 (2017-07-30)
+pytest 3.2.0 (2017-07-30)
 =========================
 
 Deprecations and Removals
@@ -1083,7 +3072,7 @@ Features
   from parent classes or modules. (`#2516 <https://github.com/pytest-
   dev/pytest/issues/2516>`_)
 
-- Collection ignores local virtualenvs by default; `--collect-in-virtualenv`
+- Collection ignores local virtualenvs by default; ``--collect-in-virtualenv``
   overrides this behavior. (`#2518 <https://github.com/pytest-
   dev/pytest/issues/2518>`_)
 
@@ -1217,7 +3206,7 @@ Trivial/Internal Changes
   <https://github.com/pytest-dev/pytest/issues/2620>`_)
 
 
-Pytest 3.1.3 (2017-07-03)
+pytest 3.1.3 (2017-07-03)
 =========================
 
 Bug Fixes
@@ -1263,7 +3252,7 @@ Trivial/Internal Changes
   (`#2499 <https://github.com/pytest-dev/pytest/issues/2499>`_)
 
 
-Pytest 3.1.2 (2017-06-08)
+pytest 3.1.2 (2017-06-08)
 =========================
 
 Bug Fixes
@@ -1295,7 +3284,7 @@ Improved Documentation
   and improve overall flow of the ``skipping`` docs. (#810)
 
 
-Pytest 3.1.1 (2017-05-30)
+pytest 3.1.1 (2017-05-30)
 =========================
 
 Bug Fixes
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/CITATION b/tests/wpt/web-platform-tests/tools/third_party/pytest/CITATION
new file mode 100644
index 00000000000..d4e9d8ec7a1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/CITATION
@@ -0,0 +1,16 @@
+NOTE: Change "x.y" by the version you use. If you are unsure about which version
+you are using run: `pip show pytest`.
+
+Text:
+
+[pytest] pytest x.y, 2004
+Krekel et al., https://github.com/pytest-dev/pytest
+
+BibTeX:
+
+@misc{pytestx.y,
+  title =        {pytest x.y},
+  author = {Krekel, Holger and Oliveira, Bruno and Pfannschmidt, Ronny and Bruynooghe, Floris and Laugher, Brianna and Bruhin, Florian},
+  year =         {2004},
+  url = {https://github.com/pytest-dev/pytest},
+}
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/CONTRIBUTING.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/CONTRIBUTING.rst
index c005c2fb254..57628a34bdf 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/CONTRIBUTING.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/CONTRIBUTING.rst
@@ -166,10 +166,10 @@ Short version
 #. Enable and install `pre-commit <https://pre-commit.com>`_ to ensure style-guides and code checks are followed.
 #. Target ``master`` for bugfixes and doc changes.
 #. Target ``features`` for new features or functionality changes.
-#. Follow **PEP-8** for naming and `black <https://github.com/ambv/black>`_ for formatting.
+#. Follow **PEP-8** for naming and `black <https://github.com/python/black>`_ for formatting.
 #. Tests are run using ``tox``::
 
-    tox -e linting,py27,py36
+    tox -e linting,py27,py37
 
    The test environments above are usually enough to cover most cases locally.
 
@@ -237,12 +237,12 @@ Here is a simple overview, with pytest-specific bits:
 
 #. Run all the tests
 
-   You need to have Python 2.7 and 3.6 available in your system.  Now
+   You need to have Python 2.7 and 3.7 available in your system.  Now
    running tests is as simple as issuing this command::
 
-    $ tox -e linting,py27,py36
+    $ tox -e linting,py27,py37
 
-   This command will run tests via the "tox" tool against Python 2.7 and 3.6
+   This command will run tests via the "tox" tool against Python 2.7 and 3.7
    and also perform "lint" coding-style checks.
 
 #. You can now edit your local working copy and run the tests again as necessary. Please follow PEP-8 for naming.
@@ -252,9 +252,9 @@ Here is a simple overview, with pytest-specific bits:
 
     $ tox -e py27 -- --pdb
 
-   Or to only run tests in a particular test module on Python 3.6::
+   Or to only run tests in a particular test module on Python 3.7::
 
-    $ tox -e py36 -- testing/test_config.py
+    $ tox -e py37 -- testing/test_config.py
 
 
    When committing, ``pre-commit`` will re-format the files if necessary.
@@ -280,6 +280,47 @@ Here is a simple overview, with pytest-specific bits:
     base: features        # if it's a feature
 
 
+Writing Tests
+----------------------------
+
+Writing tests for plugins or for pytest itself is often done using the `testdir fixture <https://docs.pytest.org/en/latest/reference.html#testdir>`_, as a "black-box" test.
+
+For example, to ensure a simple test passes you can write:
+
+.. code-block:: python
+
+    def test_true_assertion(testdir):
+        testdir.makepyfile(
+            """
+            def test_foo():
+                assert True
+        """
+        )
+        result = testdir.runpytest()
+        result.assert_outcomes(failed=0, passed=1)
+
+
+Alternatively, it is possible to make checks based on the actual output of the termal using
+*glob-like* expressions:
+
+.. code-block:: python
+
+    def test_true_assertion(testdir):
+        testdir.makepyfile(
+            """
+            def test_foo():
+                assert False
+        """
+        )
+        result = testdir.runpytest()
+        result.stdout.fnmatch_lines(["*assert False*", "*1 failed*"])
+
+When choosing a file where to write a new test, take a look at the existing files and see if there's
+one file which looks like a good fit. For example, a regression test about a bug in the ``--lf`` option
+should go into ``test_cacheprovider.py``, given that this option is implemented in ``cacheprovider.py``.
+If in doubt, go ahead and open a PR with your best guess and we can discuss this over the code.
+
+
 Joining the Development Team
 ----------------------------
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/HOWTORELEASE.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/HOWTORELEASE.rst
index 97bddf7202b..b37a245c0be 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/HOWTORELEASE.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/HOWTORELEASE.rst
@@ -10,10 +10,6 @@ taking a lot of time to make a new one.
     pytest releases must be prepared on **Linux** because the docs and examples expect
     to be executed in that platform.
 
-#. Install development dependencies in a virtual environment with::
-
-    pip3 install -U -r tasks/requirements.txt
-
 #. Create a branch ``release-X.Y.Z`` with the version for the release.
 
    * **patch releases**: from the latest ``master``;
@@ -22,18 +18,23 @@ taking a lot of time to make a new one.
 
    Ensure your are in a clean work tree.
 
-#. Generate docs, changelog, announcements and a **local** tag::
+#. Using ``tox``, generate docs, changelog, announcements::
 
-     invoke generate.pre-release <VERSION>
+    $ tox -e release -- <VERSION>
+
+   This will generate a commit with all the changes ready for pushing.
 
 #. Open a PR for this branch targeting ``master``.
 
 #. After all tests pass and the PR has been approved, publish to PyPI by pushing the tag::
 
+     git tag <VERSION>
      git push git@github.com:pytest-dev/pytest.git <VERSION>
 
    Wait for the deploy to complete, then make sure it is `available on PyPI <https://pypi.org/project/pytest>`_.
 
+#. Merge the PR into ``master``.
+
 #. Send an email announcement with the contents from::
 
      doc/en/announce/release-<VERSION>.rst
@@ -45,5 +46,3 @@ taking a lot of time to make a new one.
    * testing-in-python@lists.idyll.org (only major/minor releases)
 
    And announce it on `Twitter <https://twitter.com/>`_ with the ``#pytest`` hashtag.
-
-#. After a minor/major release, merge ``release-X.Y.Z`` into ``master`` and push (or open a PR).
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/LICENSE b/tests/wpt/web-platform-tests/tools/third_party/pytest/LICENSE
index 629df45ac40..d14fb7ff4b3 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/LICENSE
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2004-2017 Holger Krekel and others
+Copyright (c) 2004-2020 Holger Krekel and others
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/README.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/README.rst
index 564ffff6c91..69408978703 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/README.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/README.rst
@@ -1,8 +1,9 @@
-.. image:: http://docs.pytest.org/en/latest/_static/pytest1.png
-   :target: http://docs.pytest.org
+.. image:: https://docs.pytest.org/en/latest/_static/pytest1.png
+   :target: https://docs.pytest.org/en/latest/
    :align: center
    :alt: pytest
 
+
 ------
 
 .. image:: https://img.shields.io/pypi/v/pytest.svg
@@ -14,17 +15,18 @@
 .. image:: https://img.shields.io/pypi/pyversions/pytest.svg
     :target: https://pypi.org/project/pytest/
 
-.. image:: https://img.shields.io/coveralls/pytest-dev/pytest/master.svg
-    :target: https://coveralls.io/r/pytest-dev/pytest
+.. image:: https://codecov.io/gh/pytest-dev/pytest/branch/master/graph/badge.svg
+    :target: https://codecov.io/gh/pytest-dev/pytest
+    :alt: Code coverage Status
 
 .. image:: https://travis-ci.org/pytest-dev/pytest.svg?branch=master
     :target: https://travis-ci.org/pytest-dev/pytest
 
-.. image:: https://ci.appveyor.com/api/projects/status/mrgbjaua7t33pg6b?svg=true
-    :target: https://ci.appveyor.com/project/pytestbot/pytest
+.. image:: https://dev.azure.com/pytest-dev/pytest/_apis/build/status/pytest-CI?branchName=master
+    :target: https://dev.azure.com/pytest-dev/pytest
 
 .. image:: https://img.shields.io/badge/code%20style-black-000000.svg
-  :target: https://github.com/ambv/black
+    :target: https://github.com/python/black
 
 .. image:: https://www.codetriage.com/pytest-dev/pytest/badges/users.svg
     :target: https://www.codetriage.com/pytest-dev/pytest
@@ -65,23 +67,23 @@ To execute it::
     ========================== 1 failed in 0.04 seconds ===========================
 
 
-Due to ``pytest``'s detailed assertion introspection, only plain ``assert`` statements are used. See `getting-started <http://docs.pytest.org/en/latest/getting-started.html#our-first-test-run>`_ for more examples.
+Due to ``pytest``'s detailed assertion introspection, only plain ``assert`` statements are used. See `getting-started <https://docs.pytest.org/en/latest/getting-started.html#our-first-test-run>`_ for more examples.
 
 
 Features
 --------
 
-- Detailed info on failing `assert statements <http://docs.pytest.org/en/latest/assert.html>`_ (no need to remember ``self.assert*`` names);
+- Detailed info on failing `assert statements <https://docs.pytest.org/en/latest/assert.html>`_ (no need to remember ``self.assert*`` names);
 
 - `Auto-discovery
-  <http://docs.pytest.org/en/latest/goodpractices.html#python-test-discovery>`_
+  <https://docs.pytest.org/en/latest/goodpractices.html#python-test-discovery>`_
   of test modules and functions;
 
-- `Modular fixtures <http://docs.pytest.org/en/latest/fixture.html>`_ for
+- `Modular fixtures <https://docs.pytest.org/en/latest/fixture.html>`_ for
   managing small or parametrized long-lived test resources;
 
-- Can run `unittest <http://docs.pytest.org/en/latest/unittest.html>`_ (or trial),
-  `nose <http://docs.pytest.org/en/latest/nose.html>`_ test suites out of the box;
+- Can run `unittest <https://docs.pytest.org/en/latest/unittest.html>`_ (or trial),
+  `nose <https://docs.pytest.org/en/latest/nose.html>`_ test suites out of the box;
 
 - Python 2.7, Python 3.4+, PyPy 2.3, Jython 2.5 (untested);
 
@@ -91,7 +93,7 @@ Features
 Documentation
 -------------
 
-For full documentation, including installation, tutorials and PDF documents, please see http://docs.pytest.org.
+For full documentation, including installation, tutorials and PDF documents, please see https://docs.pytest.org/en/latest/.
 
 
 Bugs/Requests
@@ -103,13 +105,33 @@ Please use the `GitHub issue tracker <https://github.com/pytest-dev/pytest/issue
 Changelog
 ---------
 
-Consult the `Changelog <http://docs.pytest.org/en/latest/changelog.html>`__ page for fixes and enhancements of each version.
+Consult the `Changelog <https://docs.pytest.org/en/latest/changelog.html>`__ page for fixes and enhancements of each version.
+
+
+Support pytest
+--------------
+
+You can support pytest by obtaining a `Tideflift subscription`_.
+
+Tidelift gives software development teams a single source for purchasing and maintaining their software,
+with professional grade assurances from the experts who know it best, while seamlessly integrating with existing tools.
+
+
+.. _`Tideflift subscription`: https://tidelift.com/subscription/pkg/pypi-pytest?utm_source=pypi-pytest&utm_medium=referral&utm_campaign=readme
+
+
+Security
+^^^^^^^^
+
+pytest has never been associated with a security vunerability, but in any case, to report a
+security vulnerability please use the `Tidelift security contact <https://tidelift.com/security>`_.
+Tidelift will coordinate the fix and disclosure.
 
 
 License
 -------
 
-Copyright Holger Krekel and others, 2004-2017.
+Copyright Holger Krekel and others, 2004-2020.
 
 Distributed under the terms of the `MIT`_ license, pytest is free and open source software.
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/TIDELIFT.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/TIDELIFT.rst
new file mode 100644
index 00000000000..f7081817dfd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/TIDELIFT.rst
@@ -0,0 +1,57 @@
+========
+Tidelift
+========
+
+pytest is a member of `Tidelift`_. This document describes how the core team manages
+Tidelift-related activities.
+
+What is it
+==========
+
+Tidelift aims to make Open Source sustainable by offering subscriptions to companies which rely
+on Open Source packages. This subscription allows it to pay maintainers of those Open Source
+packages to aid sustainability of the work.
+
+Funds
+=====
+
+It was decided in the `mailing list`_ that the Tidelift contribution will be split evenly between
+members of the `contributors team`_ interested in receiving funding.
+
+The current list of contributors receiving funding are:
+
+* `@asottile`_
+* `@blueyed`_
+* `@nicoddemus`_
+
+Contributors interested in receiving a part of the funds just need to submit a PR adding their
+name to the list. Contributors that want to stop receiving the funds should also submit a PR
+in the same way.
+
+The PR should mention `@pytest-dev/tidelift-admins`_ so appropriate changes
+can be made in the Tidelift platform.
+
+After the PR has been accepted and merged, the contributor should register in the `Tidelift`_
+platform and follow the instructions there, including signing an `agreement`_.
+
+Admins
+======
+
+A few people have admin access to the Tidelift dashboard to make changes. Those people
+are part of the `@pytest-dev/tidelift-admins`_ team.
+
+`Core contributors`_ interested in helping out with Tidelift maintenance are welcome! We don't
+expect much work here other than the occasional adding/removal of a contributor from receiving
+funds. Just drop a line to one of the `@pytest-dev/tidelift-admins`_ or use the mailing list.
+
+
+.. _`Tidelift`: https://tidelift.com
+.. _`mailing list`: https://mail.python.org/pipermail/pytest-dev/2019-May/004716.html
+.. _`contributors team`: https://github.com/orgs/pytest-dev/teams/contributors
+.. _`core contributors`: https://github.com/orgs/pytest-dev/teams/core/members
+.. _`@pytest-dev/tidelift-admins`: https://github.com/orgs/pytest-dev/teams/tidelift-admins/members
+.. _`agreement`: https://tidelift.com/docs/lifting/agreement
+
+.. _`@asottile`: https://github.com/asottile
+.. _`@blueyed`: https://github.com/blueyed
+.. _`@nicoddemus`: https://github.com/nicoddemus
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/appveyor.yml b/tests/wpt/web-platform-tests/tools/third_party/pytest/appveyor.yml
deleted file mode 100644
index b808fa6d91a..00000000000
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/appveyor.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-environment:
-  COVERALLS_REPO_TOKEN:
-    secure: 2NJ5Ct55cHJ9WEg3xbSqCuv0rdgzzb6pnzOIG5OkMbTndw3wOBrXntWFoQrXiMFi
-    # this is pytest's token in coveralls.io, encrypted
-    # using pytestbot account as detailed here:
-    # https://www.appveyor.com/docs/build-configuration#secure-variables
-
-  matrix:
-  # coveralls is not in the default env list
-  - TOXENV: "coveralls"
-  # note: please use "tox --listenvs" to populate the build matrix below
-  - TOXENV: "linting"
-  - TOXENV: "py27"
-  - TOXENV: "py34"
-  - TOXENV: "py35"
-  - TOXENV: "py36"
-  - TOXENV: "pypy"
-  - TOXENV: "py27-pexpect"
-  - TOXENV: "py27-xdist"
-  - TOXENV: "py27-trial"
-  - TOXENV: "py27-numpy"
-  - TOXENV: "py27-pluggymaster"
-  - TOXENV: "py36-pexpect"
-  - TOXENV: "py36-xdist"
-  - TOXENV: "py36-trial"
-  - TOXENV: "py36-numpy"
-  - TOXENV: "py36-pluggymaster"
-  - TOXENV: "py27-nobyte"
-  - TOXENV: "doctesting"
-  - TOXENV: "py35-freeze"
-  - TOXENV: "docs"
-
-install:
-  - echo Installed Pythons
-  - dir c:\Python*
-
-  - if "%TOXENV%" == "pypy" call scripts\install-pypy.bat
-
-  - C:\Python36\python -m pip install --upgrade --pre tox
-
-build: false  # Not a C# project, build stuff at the test step instead.
-
-test_script:
-  - call scripts\call-tox.bat
-
-cache:
-  - '%LOCALAPPDATA%\pip\cache'
-  - '%USERPROFILE%\.cache\pre-commit'
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/azure-pipelines.yml b/tests/wpt/web-platform-tests/tools/third_party/pytest/azure-pipelines.yml
new file mode 100644
index 00000000000..5184610fd18
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/azure-pipelines.yml
@@ -0,0 +1,107 @@
+trigger:
+- master
+- features
+
+variables:
+  PYTEST_ADDOPTS: "--junitxml=build/test-results/$(tox.env).xml -vv"
+  python.needs_vc: False
+  COVERAGE_FILE: "$(Build.Repository.LocalPath)/.coverage"
+  COVERAGE_PROCESS_START: "$(Build.Repository.LocalPath)/.coveragerc"
+  PYTEST_COVERAGE: '0'
+
+jobs:
+
+- job: 'Test'
+  pool:
+    vmImage: "vs2017-win2016"
+  strategy:
+    matrix:
+      py27:
+        python.version: '2.7'
+        tox.env: 'py27'
+      py27-nobyte-lsof-numpy:
+        python.version: '2.7'
+        tox.env: 'py27-lsof-nobyte-numpy'
+        # Coverage for:
+        # - test_supports_breakpoint_module_global
+        # - test_terminal_reporter_writer_attr (without xdist)
+        # - "if write" branch in _pytest.assertion.rewrite
+        # - numpy
+        # - pytester's LsofFdLeakChecker (being skipped)
+        PYTEST_COVERAGE: '1'
+      py27-twisted:
+        python.version: '2.7'
+        tox.env: 'py27-twisted'
+        python.needs_vc: True
+      py27-pluggymaster-xdist:
+        python.version: '2.7'
+        tox.env: 'py27-pluggymaster-xdist'
+        # Coverage for:
+        # - except-IOError in _attempt_to_close_capture_file for py2.
+        #   Also seen with py27-nobyte (using xdist), and py27-xdist.
+        #   But no exception with py27-pexpect,py27-twisted,py27-numpy.
+        PYTEST_COVERAGE: '1'
+      # -- pypy2 and pypy3 are disabled for now: #5279 --
+      # pypy:
+      #   python.version: 'pypy2'
+      #   tox.env: 'pypy'
+      # pypy3:
+      #   python.version: 'pypy3'
+      #   tox.env: 'pypy3'
+      py35-xdist:
+        python.version: '3.5'
+        tox.env: 'py35-xdist'
+        # Coverage for:
+        # - test_supports_breakpoint_module_global
+        PYTEST_COVERAGE: '1'
+      py36-xdist:
+        python.version: '3.6'
+        tox.env: 'py36-xdist'
+      py37:
+        python.version: '3.7'
+        tox.env: 'py37'
+        # Coverage for:
+        # - _py36_windowsconsoleio_workaround (with py36+)
+        # - test_request_garbage (no xdist)
+        PYTEST_COVERAGE: '1'
+      py37-linting/docs/doctesting:
+        python.version: '3.7'
+        tox.env: 'linting,docs,doctesting'
+      py37-twisted/numpy:
+        python.version: '3.7'
+        tox.env: 'py37-twisted,py37-numpy'
+      py37-pluggymaster-xdist:
+        python.version: '3.7'
+        tox.env: 'py37-pluggymaster-xdist'
+    maxParallel: 10
+
+  steps:
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '$(python.version)'
+      architecture: 'x64'
+
+  - script: choco install vcpython27
+    condition: eq(variables['python.needs_vc'], True)
+    displayName: 'Install VC for py27'
+
+  - script: python -m pip install tox
+    displayName: 'Install tox'
+
+  - script: |
+      call scripts/setup-coverage-vars.bat || goto :eof
+      python -m tox -e $(tox.env)
+    displayName: 'Run tests'
+
+  - task: PublishTestResults@2
+    inputs:
+      testResultsFiles: 'build/test-results/$(tox.env).xml'
+      testRunTitle: '$(tox.env)'
+    condition: succeededOrFailed()
+
+  - script: call scripts\upload-coverage.bat
+    displayName: 'Report and upload coverage'
+    condition: eq(variables['PYTEST_COVERAGE'], '1')
+    env:
+      CODECOV_TOKEN: $(CODECOV_TOKEN)
+      PYTEST_CODECOV_NAME: $(tox.env)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/bench/bench.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/bench/bench.py
index 4e72444e7d7..468ef521957 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/bench/bench.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/bench/bench.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import sys
 
 if __name__ == "__main__":
@@ -5,7 +6,7 @@ if __name__ == "__main__":
     import pytest  # NOQA
     import pstats
 
-    script = sys.argv[1:] if len(sys.argv) > 1 else "empty.py"
+    script = sys.argv[1:] if len(sys.argv) > 1 else ["empty.py"]
     stats = cProfile.run("pytest.cmdline.main(%r)" % script, "prof")
     p = pstats.Stats("prof")
     p.strip_dirs()
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/bench/bench_argcomplete.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/bench/bench_argcomplete.py
index 495e2c4ed3b..297637bad0d 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/bench/bench_argcomplete.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/bench/bench_argcomplete.py
@@ -1,10 +1,8 @@
-
-
+# -*- coding: utf-8 -*-
 # 10000 iterations, just for relative comparison
 #                      2.7.5     3.3.2
 # FilesCompleter       75.1109   69.2116
 # FastFilesCompleter    0.7383    1.0760
-
 import timeit
 
 imports = [
@@ -19,4 +17,4 @@ run = 'fc("/d")'
 
 if __name__ == "__main__":
     print(timeit.timeit(run, setup=setup % imports[0], number=count))
-    print((timeit.timeit(run, setup=setup % imports[1], number=count)))
+    print(timeit.timeit(run, setup=setup % imports[1], number=count))
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/bench/empty.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/bench/empty.py
index b90319936b3..bfda88235de 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/bench/empty.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/bench/empty.py
@@ -1,4 +1,3 @@
-import py
-
+# -*- coding: utf-8 -*-
 for i in range(1000):
-    py.builtin.exec_("def test_func_%d(): pass" % i)
+    exec("def test_func_%d(): pass" % i)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/bench/manyparam.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/bench/manyparam.py
index a25b098de86..c47e25f5182 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/bench/manyparam.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/bench/manyparam.py
@@ -1,4 +1,4 @@
-
+# -*- coding: utf-8 -*-
 import pytest
 
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/bench/skip.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/bench/skip.py
index b105e79f82e..29e03e54fc6 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/bench/skip.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/bench/skip.py
@@ -1,6 +1,7 @@
+# -*- coding: utf-8 -*-
 from six.moves import range
-import pytest
 
+import pytest
 
 SKIP = True
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/changelog/README.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/changelog/README.rst
index e34bd4da267..e471409b023 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/changelog/README.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/changelog/README.rst
@@ -14,7 +14,8 @@ Each file should be named like ``<ISSUE>.<TYPE>.rst``, where
 * ``feature``: new user facing features, like new command-line options and new behavior.
 * ``bugfix``: fixes a reported bug.
 * ``doc``: documentation improvement, like rewording an entire session or adding missing docs.
-* ``removal``: feature deprecation or removal.
+* ``deprecation``: feature deprecation.
+* ``removal``: feature removal.
 * ``vendor``: changes in packages vendored in pytest.
 * ``trivial``: fixing a small typo or internal change that might be noteworthy.
 
@@ -26,7 +27,7 @@ changelog using that instead.
 
 If you are not sure what issue type to use, don't hesitate to ask in your PR.
 
-Note that the ``towncrier`` tool will automatically
-reflow your text, so it will work best if you stick to a single paragraph, but multiple sentences and links are OK
-and encouraged. You can install ``towncrier`` and then run ``towncrier --draft``
+``towncrier`` preserves multiple paragraphs and formatting (code blocks, lists, and so on), but for entries
+other than ``features`` it is usually better to stick to a single paragraph to keep it concise. You can install
+``towncrier`` and then run ``towncrier --draft``
 if you want to get a preview of how your change will look in the final release notes.
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/changelog/_template.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/changelog/_template.rst
index a898abc15af..5de4ae97ea8 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/changelog/_template.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/changelog/_template.rst
@@ -14,7 +14,7 @@
 {% if definitions[category]['showcontent'] %}
 {% for text, values in sections[section][category]|dictsort(by='value') %}
 {% set issue_joiner = joiner(', ') %}
-- {{ text }}{% if category != 'vendor' %} ({% for value in values|sort %}{{ issue_joiner() }}`{{ value }} <https://github.com/pytest-dev/pytest/issues/{{ value[1:] }}>`_{% endfor %}){% endif %}
+- {% for value in values|sort %}{{ issue_joiner() }}`{{ value }} <https://github.com/pytest-dev/pytest/issues/{{ value[1:] }}>`_{% endfor %}: {{ text }}
 
 
 {% endfor %}
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/codecov.yml b/tests/wpt/web-platform-tests/tools/third_party/pytest/codecov.yml
new file mode 100644
index 00000000000..a0a308588e2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/codecov.yml
@@ -0,0 +1,7 @@
+coverage:
+  status:
+    project: true
+    patch: true
+    changes: true
+
+comment: off
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/Makefile b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/Makefile
index fa8e8266a29..341a5cb8524 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/Makefile
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/Makefile
@@ -13,6 +13,9 @@ PAPEROPT_letter = -D latex_paper_size=letter
 ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 
 REGENDOC_ARGS := \
+	--normalize "/[ \t]+\n/\n/" \
+	--normalize "~\$$REGENDOC_TMPDIR~/home/sweet/project~" \
+	--normalize "~/path/to/example~/home/sweet/project~" \
 	--normalize "/in \d+.\d+ seconds/in 0.12 seconds/" \
 	--normalize "@/tmp/pytest-of-.*/pytest-\d+@PYTEST_TMPDIR@" \
 	--normalize "@pytest-(\d+)\\.[^ ,]+@pytest-\1.x.y@" \
@@ -38,8 +41,9 @@ help:
 clean:
 	-rm -rf $(BUILDDIR)/*
 
+regen: REGENDOC_FILES:=*.rst */*.rst
 regen:
-	PYTHONDONTWRITEBYTECODE=1 PYTEST_ADDOPT=-pno:hypothesis COLUMNS=76 regendoc --update *.rst */*.rst ${REGENDOC_ARGS}
+	PYTHONDONTWRITEBYTECODE=1 PYTEST_ADDOPTS="-pno:hypothesis -Wignore::pytest.PytestUnknownMarkWarning" COLUMNS=76 regendoc --update ${REGENDOC_FILES} ${REGENDOC_ARGS}
 
 html:
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/_themes/flask_theme_support.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/_themes/flask_theme_support.py
index 0dcf53b7542..c5dcdbe2737 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/_themes/flask_theme_support.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/_themes/flask_theme_support.py
@@ -1,19 +1,18 @@
+# -*- coding: utf-8 -*-
 # flasky extensions.  flasky pygments style based on tango style
 from pygments.style import Style
-from pygments.token import (
-    Keyword,
-    Name,
-    Comment,
-    String,
-    Error,
-    Number,
-    Operator,
-    Generic,
-    Whitespace,
-    Punctuation,
-    Other,
-    Literal,
-)
+from pygments.token import Comment
+from pygments.token import Error
+from pygments.token import Generic
+from pygments.token import Keyword
+from pygments.token import Literal
+from pygments.token import Name
+from pygments.token import Number
+from pygments.token import Operator
+from pygments.token import Other
+from pygments.token import Punctuation
+from pygments.token import String
+from pygments.token import Whitespace
 
 
 class FlaskyStyle(Style):
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/index.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/index.rst
index 107fcd2ad33..74ad0285509 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/index.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/index.rst
@@ -6,6 +6,47 @@ Release announcements
    :maxdepth: 2
 
 
+   release-4.6.11
+   release-4.6.10
+   release-4.6.9
+   release-4.6.8
+   release-4.6.7
+   release-4.6.6
+   release-4.6.5
+   release-4.6.4
+   release-4.6.3
+   release-4.6.2
+   release-4.6.1
+   release-4.6.0
+   release-4.5.0
+   release-4.4.2
+   release-4.4.1
+   release-4.4.0
+   release-4.3.1
+   release-4.3.0
+   release-4.2.1
+   release-4.2.0
+   release-4.1.1
+   release-4.1.0
+   release-4.0.2
+   release-4.0.1
+   release-4.0.0
+   release-3.10.1
+   release-3.10.0
+   release-3.9.3
+   release-3.9.2
+   release-3.9.1
+   release-3.9.0
+   release-3.8.2
+   release-3.8.1
+   release-3.8.0
+   release-3.7.4
+   release-3.7.3
+   release-3.7.2
+   release-3.7.1
+   release-3.7.0
+   release-3.6.4
+   release-3.6.3
    release-3.6.2
    release-3.6.1
    release-3.6.0
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.4.0.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.4.0.rst
index 25f6254c529..1b016884146 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.4.0.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.4.0.rst
@@ -23,7 +23,7 @@ a full list of details.  A few feature highlights:
   called if the corresponding setup method succeeded.
 
 - integrate tab-completion on command line options if you
-  have `argcomplete <http://pypi.python.org/pypi/argcomplete>`_
+  have `argcomplete <https://pypi.org/project/argcomplete/>`_
   configured.
 
 - allow boolean expression directly with skipif/xfail
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.9.0.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.9.0.rst
index 8d829996d83..c079fdf6bfd 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.9.0.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.9.0.rst
@@ -124,7 +124,7 @@ The py.test Development Team
   Thanks `@biern`_ for the PR.
 
 * Fix `traceback style docs`_ to describe all of the available options
-  (auto/long/short/line/native/no), with `auto` being the default since v2.6.
+  (auto/long/short/line/native/no), with ``auto`` being the default since v2.6.
   Thanks `@hackebrot`_ for the PR.
 
 * Fix (`#1422`_): junit record_xml_property doesn't allow multiple records
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.10.0.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.10.0.rst
new file mode 100644
index 00000000000..b53df270219
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.10.0.rst
@@ -0,0 +1,43 @@
+pytest-3.10.0
+=======================================
+
+The pytest team is proud to announce the 3.10.0 release!
+
+pytest is a mature Python testing tool with more than a 2000 tests
+against itself, passing on many different interpreters and platforms.
+
+This release contains a number of bugs fixes and improvements, so users are encouraged
+to take a look at the CHANGELOG:
+
+    https://docs.pytest.org/en/latest/changelog.html
+
+For complete documentation, please visit:
+
+    https://docs.pytest.org/en/latest/
+
+As usual, you can upgrade from pypi via:
+
+    pip install -U pytest
+
+Thanks to all who contributed to this release, among them:
+
+* Anders Hovmöller
+* Andreu Vallbona Plazas
+* Ankit Goel
+* Anthony Sottile
+* Bernardo Gomes
+* Brianna Laugher
+* Bruno Oliveira
+* Daniel Hahler
+* David Szotten
+* Mick Koch
+* Niclas Olofsson
+* Palash Chatterjee
+* Ronny Pfannschmidt
+* Sven-Hendrik Haase
+* Ville Skyttä
+* William Jamir Silva
+
+
+Happy testing,
+The Pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.10.1.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.10.1.rst
new file mode 100644
index 00000000000..556b24ae15b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.10.1.rst
@@ -0,0 +1,24 @@
+pytest-3.10.1
+=======================================
+
+pytest 3.10.1 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Anthony Sottile
+* Boris Feld
+* Bruno Oliveira
+* Daniel Hahler
+* Fabien ZARIFIAN
+* Jon Dufresne
+* Ronny Pfannschmidt
+
+
+Happy testing,
+The pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.6.3.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.6.3.rst
new file mode 100644
index 00000000000..07bb05a3d72
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.6.3.rst
@@ -0,0 +1,27 @@
+pytest-3.6.3
+=======================================
+
+pytest 3.6.3 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at http://doc.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* AdamEr8
+* Anthony Sottile
+* Bruno Oliveira
+* Jean-Paul Calderone
+* Jon Dufresne
+* Marcelo Duarte Trevisani
+* Ondřej Súkup
+* Ronny Pfannschmidt
+* T.E.A de Souza
+* Victor Maryama
+
+
+Happy testing,
+The pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.6.4.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.6.4.rst
new file mode 100644
index 00000000000..fd6cff50305
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.6.4.rst
@@ -0,0 +1,24 @@
+pytest-3.6.4
+=======================================
+
+pytest 3.6.4 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at http://doc.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Anthony Sottile
+* Bernhard M. Wiedemann
+* Bruno Oliveira
+* Drew
+* E Hershey
+* Hugo Martins
+* Vlad Shcherbina
+
+
+Happy testing,
+The pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.7.0.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.7.0.rst
new file mode 100644
index 00000000000..922b22517e9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.7.0.rst
@@ -0,0 +1,41 @@
+pytest-3.7.0
+=======================================
+
+The pytest team is proud to announce the 3.7.0 release!
+
+pytest is a mature Python testing tool with more than a 2000 tests
+against itself, passing on many different interpreters and platforms.
+
+This release contains a number of bugs fixes and improvements, so users are encouraged
+to take a look at the CHANGELOG:
+
+    http://doc.pytest.org/en/latest/changelog.html
+
+For complete documentation, please visit:
+
+    http://docs.pytest.org
+
+As usual, you can upgrade from pypi via:
+
+    pip install -U pytest
+
+Thanks to all who contributed to this release, among them:
+
+* Alan
+* Alan Brammer
+* Ammar Najjar
+* Anthony Sottile
+* Bruno Oliveira
+* Jeffrey Rackauckas
+* Kale Kundert
+* Ronny Pfannschmidt
+* Serhii Mozghovyi
+* Tadek Teleżyński
+* Wil Cooley
+* abrammer
+* avirlrma
+* turturica
+
+
+Happy testing,
+The Pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.7.1.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.7.1.rst
new file mode 100644
index 00000000000..e1c35123dbf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.7.1.rst
@@ -0,0 +1,21 @@
+pytest-3.7.1
+=======================================
+
+pytest 3.7.1 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at http://doc.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Anthony Sottile
+* Bruno Oliveira
+* Kale Kundert
+* Ronny Pfannschmidt
+
+
+Happy testing,
+The pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.7.2.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.7.2.rst
new file mode 100644
index 00000000000..4f7e0744d50
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.7.2.rst
@@ -0,0 +1,25 @@
+pytest-3.7.2
+=======================================
+
+pytest 3.7.2 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at http://doc.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Anthony Sottile
+* Bruno Oliveira
+* Daniel Hahler
+* Josh Holland
+* Ronny Pfannschmidt
+* Sankt Petersbug
+* Wes Thomas
+* turturica
+
+
+Happy testing,
+The pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.7.3.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.7.3.rst
new file mode 100644
index 00000000000..454d4fdfee7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.7.3.rst
@@ -0,0 +1,32 @@
+pytest-3.7.3
+=======================================
+
+pytest 3.7.3 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at http://doc.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Andrew Champion
+* Anthony Sottile
+* Bruno Oliveira
+* Daniel Hahler
+* Gandalf Saxe
+* Jennifer Rinker
+* Natan Lao
+* Ondřej Súkup
+* Ronny Pfannschmidt
+* Sankt Petersbug
+* Tyler Richard
+* Victor Maryama
+* Vlad Shcherbina
+* turturica
+* wim glenn
+
+
+Happy testing,
+The pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.7.4.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.7.4.rst
new file mode 100644
index 00000000000..0ab8938f4f6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.7.4.rst
@@ -0,0 +1,22 @@
+pytest-3.7.4
+=======================================
+
+pytest 3.7.4 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Anthony Sottile
+* Bruno Oliveira
+* Daniel Hahler
+* Jiri Kuncar
+* Steve Piercy
+
+
+Happy testing,
+The pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.8.0.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.8.0.rst
new file mode 100644
index 00000000000..1fc344ea23e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.8.0.rst
@@ -0,0 +1,38 @@
+pytest-3.8.0
+=======================================
+
+The pytest team is proud to announce the 3.8.0 release!
+
+pytest is a mature Python testing tool with more than a 2000 tests
+against itself, passing on many different interpreters and platforms.
+
+This release contains a number of bugs fixes and improvements, so users are encouraged
+to take a look at the CHANGELOG:
+
+    https://docs.pytest.org/en/latest/changelog.html
+
+For complete documentation, please visit:
+
+    https://docs.pytest.org/en/latest/
+
+As usual, you can upgrade from pypi via:
+
+    pip install -U pytest
+
+Thanks to all who contributed to this release, among them:
+
+* Anthony Sottile
+* Bruno Oliveira
+* CrazyMerlyn
+* Daniel Hahler
+* Fabio Zadrozny
+* Jeffrey Rackauckas
+* Ronny Pfannschmidt
+* Virgil Dupras
+* dhirensr
+* hoefling
+* wim glenn
+
+
+Happy testing,
+The Pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.8.1.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.8.1.rst
new file mode 100644
index 00000000000..3e05e58cb3f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.8.1.rst
@@ -0,0 +1,25 @@
+pytest-3.8.1
+=======================================
+
+pytest 3.8.1 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Ankit Goel
+* Anthony Sottile
+* Bruno Oliveira
+* Daniel Hahler
+* Maximilian Albert
+* Ronny Pfannschmidt
+* William Jamir Silva
+* wim glenn
+
+
+Happy testing,
+The pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.8.2.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.8.2.rst
new file mode 100644
index 00000000000..124c33aa40e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.8.2.rst
@@ -0,0 +1,28 @@
+pytest-3.8.2
+=======================================
+
+pytest 3.8.2 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Ankit Goel
+* Anthony Sottile
+* Bruno Oliveira
+* Daniel Hahler
+* Denis Otkidach
+* Harry Percival
+* Jeffrey Rackauckas
+* Jose Carlos Menezes
+* Ronny Pfannschmidt
+* Zac-HD
+* iwanb
+
+
+Happy testing,
+The pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.9.0.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.9.0.rst
new file mode 100644
index 00000000000..14cfbe9037d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.9.0.rst
@@ -0,0 +1,43 @@
+pytest-3.9.0
+=======================================
+
+The pytest team is proud to announce the 3.9.0 release!
+
+pytest is a mature Python testing tool with more than a 2000 tests
+against itself, passing on many different interpreters and platforms.
+
+This release contains a number of bugs fixes and improvements, so users are encouraged
+to take a look at the CHANGELOG:
+
+    https://docs.pytest.org/en/latest/changelog.html
+
+For complete documentation, please visit:
+
+    https://docs.pytest.org/en/latest/
+
+As usual, you can upgrade from pypi via:
+
+    pip install -U pytest
+
+Thanks to all who contributed to this release, among them:
+
+* Andrea Cimatoribus
+* Ankit Goel
+* Anthony Sottile
+* Ben Eyal
+* Bruno Oliveira
+* Daniel Hahler
+* Jeffrey Rackauckas
+* Jose Carlos Menezes
+* Kyle Altendorf
+* Niklas JQ
+* Palash Chatterjee
+* Ronny Pfannschmidt
+* Thomas Hess
+* Thomas Hisch
+* Tomer Keren
+* Victor Maryama
+
+
+Happy testing,
+The Pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.9.1.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.9.1.rst
new file mode 100644
index 00000000000..f050e465305
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.9.1.rst
@@ -0,0 +1,20 @@
+pytest-3.9.1
+=======================================
+
+pytest 3.9.1 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Bruno Oliveira
+* Ronny Pfannschmidt
+* Thomas Hisch
+
+
+Happy testing,
+The pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.9.2.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.9.2.rst
new file mode 100644
index 00000000000..1440831cb93
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.9.2.rst
@@ -0,0 +1,23 @@
+pytest-3.9.2
+=======================================
+
+pytest 3.9.2 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Ankit Goel
+* Anthony Sottile
+* Bruno Oliveira
+* Ronny Pfannschmidt
+* Vincent Barbaresi
+* ykantor
+
+
+Happy testing,
+The pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.9.3.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.9.3.rst
new file mode 100644
index 00000000000..8d84b4cabcb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.9.3.rst
@@ -0,0 +1,24 @@
+pytest-3.9.3
+=======================================
+
+pytest 3.9.3 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Andreas Profous
+* Ankit Goel
+* Anthony Sottile
+* Bruno Oliveira
+* Daniel Hahler
+* Jon Dufresne
+* Ronny Pfannschmidt
+
+
+Happy testing,
+The pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.0.0.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.0.0.rst
new file mode 100644
index 00000000000..e5ad69b5fd6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.0.0.rst
@@ -0,0 +1,30 @@
+pytest-4.0.0
+=======================================
+
+The pytest team is proud to announce the 4.0.0 release!
+
+pytest is a mature Python testing tool with more than a 2000 tests
+against itself, passing on many different interpreters and platforms.
+
+This release contains a number of bugs fixes and improvements, so users are encouraged
+to take a look at the CHANGELOG:
+
+    https://docs.pytest.org/en/latest/changelog.html
+
+For complete documentation, please visit:
+
+    https://docs.pytest.org/en/latest/
+
+As usual, you can upgrade from pypi via:
+
+    pip install -U pytest
+
+Thanks to all who contributed to this release, among them:
+
+* Bruno Oliveira
+* Daniel Hahler
+* Ronny Pfannschmidt
+
+
+Happy testing,
+The Pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.0.1.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.0.1.rst
new file mode 100644
index 00000000000..31b222c03b5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.0.1.rst
@@ -0,0 +1,23 @@
+pytest-4.0.1
+=======================================
+
+pytest 4.0.1 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Anthony Sottile
+* Bruno Oliveira
+* Daniel Hahler
+* Michael D. Hoyle
+* Ronny Pfannschmidt
+* Slam
+
+
+Happy testing,
+The pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.0.2.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.0.2.rst
new file mode 100644
index 00000000000..3b6e4be7183
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.0.2.rst
@@ -0,0 +1,24 @@
+pytest-4.0.2
+=======================================
+
+pytest 4.0.2 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Anthony Sottile
+* Bruno Oliveira
+* Daniel Hahler
+* Pedro Algarvio
+* Ronny Pfannschmidt
+* Tomer Keren
+* Yash Todi
+
+
+Happy testing,
+The pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.1.0.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.1.0.rst
new file mode 100644
index 00000000000..b7a076f61c9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.1.0.rst
@@ -0,0 +1,44 @@
+pytest-4.1.0
+=======================================
+
+The pytest team is proud to announce the 4.1.0 release!
+
+pytest is a mature Python testing tool with more than a 2000 tests
+against itself, passing on many different interpreters and platforms.
+
+This release contains a number of bugs fixes and improvements, so users are encouraged
+to take a look at the CHANGELOG:
+
+    https://docs.pytest.org/en/latest/changelog.html
+
+For complete documentation, please visit:
+
+    https://docs.pytest.org/en/latest/
+
+As usual, you can upgrade from pypi via:
+
+    pip install -U pytest
+
+Thanks to all who contributed to this release, among them:
+
+* Adam Johnson
+* Aly Sivji
+* Andrey Paramonov
+* Anthony Sottile
+* Bruno Oliveira
+* Daniel Hahler
+* David Vo
+* Hyunchel Kim
+* Jeffrey Rackauckas
+* Kanguros
+* Nicholas Devenish
+* Pedro Algarvio
+* Randy Barlow
+* Ronny Pfannschmidt
+* Tomer Keren
+* feuillemorte
+* wim glenn
+
+
+Happy testing,
+The Pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.1.1.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.1.1.rst
new file mode 100644
index 00000000000..80644fc84ef
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.1.1.rst
@@ -0,0 +1,27 @@
+pytest-4.1.1
+=======================================
+
+pytest 4.1.1 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Anthony Sottile
+* Anton Lodder
+* Bruno Oliveira
+* Daniel Hahler
+* David Vo
+* Oscar Benjamin
+* Ronny Pfannschmidt
+* Victor Maryama
+* Yoav Caspi
+* dmitry.dygalo
+
+
+Happy testing,
+The pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.2.0.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.2.0.rst
new file mode 100644
index 00000000000..6c262c1e01b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.2.0.rst
@@ -0,0 +1,37 @@
+pytest-4.2.0
+=======================================
+
+The pytest team is proud to announce the 4.2.0 release!
+
+pytest is a mature Python testing tool with more than a 2000 tests
+against itself, passing on many different interpreters and platforms.
+
+This release contains a number of bugs fixes and improvements, so users are encouraged
+to take a look at the CHANGELOG:
+
+    https://docs.pytest.org/en/latest/changelog.html
+
+For complete documentation, please visit:
+
+    https://docs.pytest.org/en/latest/
+
+As usual, you can upgrade from pypi via:
+
+    pip install -U pytest
+
+Thanks to all who contributed to this release, among them:
+
+* Adam Uhlir
+* Anthony Sottile
+* Bruno Oliveira
+* Christopher Dignam
+* Daniel Hahler
+* Joseph Hunkeler
+* Kristoffer Nordstroem
+* Ronny Pfannschmidt
+* Thomas Hisch
+* wim glenn
+
+
+Happy testing,
+The Pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.2.1.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.2.1.rst
new file mode 100644
index 00000000000..5aec022df0b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.2.1.rst
@@ -0,0 +1,30 @@
+pytest-4.2.1
+=======================================
+
+pytest 4.2.1 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Anthony Sottile
+* Arel Cordero
+* Bruno Oliveira
+* Daniel Hahler
+* Holger Kohr
+* Kevin J. Foley
+* Nick Murphy
+* Paweł Stradomski
+* Raphael Pierzina
+* Ronny Pfannschmidt
+* Sam Brightman
+* Thomas Hisch
+* Zac Hatfield-Dodds
+
+
+Happy testing,
+The pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.3.0.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.3.0.rst
new file mode 100644
index 00000000000..59393814846
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.3.0.rst
@@ -0,0 +1,36 @@
+pytest-4.3.0
+=======================================
+
+The pytest team is proud to announce the 4.3.0 release!
+
+pytest is a mature Python testing tool with more than a 2000 tests
+against itself, passing on many different interpreters and platforms.
+
+This release contains a number of bugs fixes and improvements, so users are encouraged
+to take a look at the CHANGELOG:
+
+    https://docs.pytest.org/en/latest/changelog.html
+
+For complete documentation, please visit:
+
+    https://docs.pytest.org/en/latest/
+
+As usual, you can upgrade from pypi via:
+
+    pip install -U pytest
+
+Thanks to all who contributed to this release, among them:
+
+* Andras Mitzki
+* Anthony Sottile
+* Bruno Oliveira
+* Christian Fetzer
+* Daniel Hahler
+* Grygorii Iermolenko
+* R. Alex Matevish
+* Ronny Pfannschmidt
+* cclauss
+
+
+Happy testing,
+The Pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.3.1.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.3.1.rst
new file mode 100644
index 00000000000..45d14fffed9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.3.1.rst
@@ -0,0 +1,29 @@
+pytest-4.3.1
+=======================================
+
+pytest 4.3.1 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Andras Mitzki
+* Anthony Sottile
+* Bruno Oliveira
+* Daniel Hahler
+* Danilo Horta
+* Grygorii Iermolenko
+* Jeff Hale
+* Kyle Altendorf
+* Stephan Hoyer
+* Zac Hatfield-Dodds
+* Zac-HD
+* songbowen
+
+
+Happy testing,
+The pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.4.0.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.4.0.rst
new file mode 100644
index 00000000000..4c5bcbc7d35
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.4.0.rst
@@ -0,0 +1,39 @@
+pytest-4.4.0
+=======================================
+
+The pytest team is proud to announce the 4.4.0 release!
+
+pytest is a mature Python testing tool with more than a 2000 tests
+against itself, passing on many different interpreters and platforms.
+
+This release contains a number of bugs fixes and improvements, so users are encouraged
+to take a look at the CHANGELOG:
+
+    https://docs.pytest.org/en/latest/changelog.html
+
+For complete documentation, please visit:
+
+    https://docs.pytest.org/en/latest/
+
+As usual, you can upgrade from pypi via:
+
+    pip install -U pytest
+
+Thanks to all who contributed to this release, among them:
+
+* Anthony Sottile
+* ApaDoctor
+* Bernhard M. Wiedemann
+* Brian Skinn
+* Bruno Oliveira
+* Daniel Hahler
+* Gary Tyler
+* Jeong YunWon
+* Miro Hrončok
+* Takafumi Arakaki
+* henrykironde
+* smheidrich
+
+
+Happy testing,
+The Pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.4.1.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.4.1.rst
new file mode 100644
index 00000000000..12c0ee7798b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.4.1.rst
@@ -0,0 +1,20 @@
+pytest-4.4.1
+=======================================
+
+pytest 4.4.1 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Anthony Sottile
+* Bruno Oliveira
+* Daniel Hahler
+
+
+Happy testing,
+The pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.4.2.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.4.2.rst
new file mode 100644
index 00000000000..4fe2dac56b3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.4.2.rst
@@ -0,0 +1,33 @@
+pytest-4.4.2
+=======================================
+
+pytest 4.4.2 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Allan Lewis
+* Anthony Sottile
+* Bruno Oliveira
+* DamianSkrzypczak
+* Daniel Hahler
+* Don Kirkby
+* Douglas Thor
+* Hugo
+* Ilya Konstantinov
+* Jon Dufresne
+* Matt Cooper
+* Nikolay Kondratyev
+* Ondřej Súkup
+* Peter Schutt
+* Romain Chossart
+* Sitaktif
+
+
+Happy testing,
+The pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.5.0.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.5.0.rst
new file mode 100644
index 00000000000..084579ac419
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.5.0.rst
@@ -0,0 +1,35 @@
+pytest-4.5.0
+=======================================
+
+The pytest team is proud to announce the 4.5.0 release!
+
+pytest is a mature Python testing tool with more than a 2000 tests
+against itself, passing on many different interpreters and platforms.
+
+This release contains a number of bugs fixes and improvements, so users are encouraged
+to take a look at the CHANGELOG:
+
+    https://docs.pytest.org/en/latest/changelog.html
+
+For complete documentation, please visit:
+
+    https://docs.pytest.org/en/latest/
+
+As usual, you can upgrade from pypi via:
+
+    pip install -U pytest
+
+Thanks to all who contributed to this release, among them:
+
+* Anthony Sottile
+* Bruno Oliveira
+* Daniel Hahler
+* Floris Bruynooghe
+* Pulkit Goyal
+* Samuel Searles-Bryant
+* Zac Hatfield-Dodds
+* Zac-HD
+
+
+Happy testing,
+The Pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.0.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.0.rst
new file mode 100644
index 00000000000..373f5d66eb7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.0.rst
@@ -0,0 +1,43 @@
+pytest-4.6.0
+=======================================
+
+The pytest team is proud to announce the 4.6.0 release!
+
+pytest is a mature Python testing tool with more than a 2000 tests
+against itself, passing on many different interpreters and platforms.
+
+This release contains a number of bugs fixes and improvements, so users are encouraged
+to take a look at the CHANGELOG:
+
+    https://docs.pytest.org/en/latest/changelog.html
+
+For complete documentation, please visit:
+
+    https://docs.pytest.org/en/latest/
+
+As usual, you can upgrade from pypi via:
+
+    pip install -U pytest
+
+Thanks to all who contributed to this release, among them:
+
+* Akiomi Kamakura
+* Anthony Sottile
+* Bruno Oliveira
+* Daniel Hahler
+* David Röthlisberger
+* Evan Kepner
+* Jeffrey Rackauckas
+* MyComputer
+* Nikita Krokosh
+* Raul Tambre
+* Thomas Hisch
+* Tim Hoffmann
+* Tomer Keren
+* Victor Maryama
+* danielx123
+* oleg-yegorov
+
+
+Happy testing,
+The Pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.1.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.1.rst
new file mode 100644
index 00000000000..78d017544d2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.1.rst
@@ -0,0 +1,19 @@
+pytest-4.6.1
+=======================================
+
+pytest 4.6.1 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Anthony Sottile
+* Bruno Oliveira
+
+
+Happy testing,
+The pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.10.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.10.rst
new file mode 100644
index 00000000000..57938b8751a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.10.rst
@@ -0,0 +1,20 @@
+pytest-4.6.10
+=======================================
+
+pytest 4.6.10 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Anthony Sottile
+* Bruno Oliveira
+* Fernando Mez
+
+
+Happy testing,
+The pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.11.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.11.rst
new file mode 100644
index 00000000000..276584bdf52
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.11.rst
@@ -0,0 +1,20 @@
+pytest-4.6.11
+=======================================
+
+pytest 4.6.11 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Anthony Sottile
+* Bruno Oliveira
+* Sviatoslav Sydorenko
+
+
+Happy testing,
+The pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.2.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.2.rst
new file mode 100644
index 00000000000..8526579b9e7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.2.rst
@@ -0,0 +1,18 @@
+pytest-4.6.2
+=======================================
+
+pytest 4.6.2 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Anthony Sottile
+
+
+Happy testing,
+The pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.3.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.3.rst
new file mode 100644
index 00000000000..0bfb355a15a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.3.rst
@@ -0,0 +1,21 @@
+pytest-4.6.3
+=======================================
+
+pytest 4.6.3 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Anthony Sottile
+* Bruno Oliveira
+* Daniel Hahler
+* Dirk Thomas
+
+
+Happy testing,
+The pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.4.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.4.rst
new file mode 100644
index 00000000000..7b35ed4f0d4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.4.rst
@@ -0,0 +1,22 @@
+pytest-4.6.4
+=======================================
+
+pytest 4.6.4 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Anthony Sottile
+* Bruno Oliveira
+* Daniel Hahler
+* Thomas Grainger
+* Zac Hatfield-Dodds
+
+
+Happy testing,
+The pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.5.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.5.rst
new file mode 100644
index 00000000000..6998d4e4c5f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.5.rst
@@ -0,0 +1,21 @@
+pytest-4.6.5
+=======================================
+
+pytest 4.6.5 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Anthony Sottile
+* Bruno Oliveira
+* Daniel Hahler
+* Thomas Grainger
+
+
+Happy testing,
+The pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.6.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.6.rst
new file mode 100644
index 00000000000..c47a31695b2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.6.rst
@@ -0,0 +1,20 @@
+pytest-4.6.6
+=======================================
+
+pytest 4.6.6 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Anthony Sottile
+* Bruno Oliveira
+* Michael Goerz
+
+
+Happy testing,
+The pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.7.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.7.rst
new file mode 100644
index 00000000000..0e6cf6a950a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.7.rst
@@ -0,0 +1,19 @@
+pytest-4.6.7
+=======================================
+
+pytest 4.6.7 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Bruno Oliveira
+* Daniel Hahler
+
+
+Happy testing,
+The pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.8.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.8.rst
new file mode 100644
index 00000000000..3c04e5dbe9b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.8.rst
@@ -0,0 +1,20 @@
+pytest-4.6.8
+=======================================
+
+pytest 4.6.8 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Anthony Sottile
+* Bruno Oliveira
+* Ryan Mast
+
+
+Happy testing,
+The pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.9.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.9.rst
new file mode 100644
index 00000000000..ae0478c52d9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.9.rst
@@ -0,0 +1,21 @@
+pytest-4.6.9
+=======================================
+
+pytest 4.6.9 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Anthony Sottile
+* Bruno Oliveira
+* Felix Yan
+* Hugo
+
+
+Happy testing,
+The pytest Development Team
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/assert.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/assert.rst
index e0e9b930587..1e06d9757b3 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/assert.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/assert.rst
@@ -12,22 +12,28 @@ Asserting with the ``assert`` statement
 
 ``pytest`` allows you to use the standard python ``assert`` for verifying
 expectations and values in Python tests.  For example, you can write the
-following::
+following:
+
+.. code-block:: python
 
     # content of test_assert1.py
     def f():
         return 3
 
+
     def test_function():
         assert f() == 4
 
 to assert that your function returns a certain value. If this assertion fails
-you will see the return value of the function call::
+you will see the return value of the function call:
+
+.. code-block:: pytest
 
     $ pytest test_assert1.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 1 item
 
     test_assert1.py F                                                    [100%]
@@ -40,7 +46,7 @@ you will see the return value of the function call::
     E       assert 3 == 4
     E        +  where 3 = f()
 
-    test_assert1.py:5: AssertionError
+    test_assert1.py:6: AssertionError
     ========================= 1 failed in 0.12 seconds =========================
 
 ``pytest`` has support for showing the values of the most common subexpressions
@@ -49,7 +55,9 @@ operators. (See :ref:`tbreportdemo`).  This allows you to use the
 idiomatic python constructs without boilerplate code while not losing
 introspection information.
 
-However, if you specify a message with the assertion like this::
+However, if you specify a message with the assertion like this:
+
+.. code-block:: python
 
     assert a % 2 == 0, "value was odd, should be even"
 
@@ -64,50 +72,71 @@ Assertions about expected exceptions
 ------------------------------------------
 
 In order to write assertions about raised exceptions, you can use
-``pytest.raises`` as a context manager like this::
+``pytest.raises`` as a context manager like this:
+
+.. code-block:: python
 
     import pytest
 
+
     def test_zero_division():
         with pytest.raises(ZeroDivisionError):
             1 / 0
 
-and if you need to have access to the actual exception info you may use::
+and if you need to have access to the actual exception info you may use:
+
+.. code-block:: python
 
     def test_recursion_depth():
         with pytest.raises(RuntimeError) as excinfo:
+
             def f():
                 f()
+
             f()
-        assert 'maximum recursion' in str(excinfo.value)
+        assert "maximum recursion" in str(excinfo.value)
 
 ``excinfo`` is a ``ExceptionInfo`` instance, which is a wrapper around
 the actual exception raised.  The main attributes of interest are
 ``.type``, ``.value`` and ``.traceback``.
 
-.. versionchanged:: 3.0
+You can pass a ``match`` keyword parameter to the context-manager to test
+that a regular expression matches on the string representation of an exception
+(similar to the ``TestCase.assertRaisesRegexp`` method from ``unittest``):
 
-In the context manager form you may use the keyword argument
-``message`` to specify a custom failure message::
+.. code-block:: python
 
-     >>> with raises(ZeroDivisionError, message="Expecting ZeroDivisionError"):
-     ...     pass
-     ... Failed: Expecting ZeroDivisionError
+    import pytest
 
-If you want to write test code that works on Python 2.4 as well,
-you may also use two other ways to test for an expected exception::
+
+    def myfunc():
+        raise ValueError("Exception 123 raised")
+
+
+    def test_match():
+        with pytest.raises(ValueError, match=r".* 123 .*"):
+            myfunc()
+
+The regexp parameter of the ``match`` method is matched with the ``re.search``
+function, so in the above example ``match='123'`` would have worked as
+well.
+
+There's an alternate form of the ``pytest.raises`` function where you pass
+a function that will be executed with the given ``*args`` and ``**kwargs`` and
+assert that the given exception is raised:
+
+.. code-block:: python
 
     pytest.raises(ExpectedException, func, *args, **kwargs)
-    pytest.raises(ExpectedException, "func(*args, **kwargs)")
 
-both of which execute the specified function with args and kwargs and
-asserts that the given ``ExpectedException`` is raised.  The reporter will
-provide you with helpful output in case of failures such as *no
+The reporter will provide you with helpful output in case of failures such as *no
 exception* or *wrong exception*.
 
 Note that it is also possible to specify a "raises" argument to
 ``pytest.mark.xfail``, which checks that the test is failing in a more
-specific way than just having any exception raised::
+specific way than just having any exception raised:
+
+.. code-block:: python
 
     @pytest.mark.xfail(raises=IndexError)
     def test_f():
@@ -119,30 +148,13 @@ exceptions your own code is deliberately raising, whereas using
 like documenting unfixed bugs (where the test describes what "should" happen)
 or bugs in dependencies.
 
-Also, the context manager form accepts a ``match`` keyword parameter to test
-that a regular expression matches on the string representation of an exception
-(like the ``TestCase.assertRaisesRegexp`` method from ``unittest``)::
-
-    import pytest
-
-    def myfunc():
-        raise ValueError("Exception 123 raised")
-
-    def test_match():
-        with pytest.raises(ValueError, match=r'.* 123 .*'):
-            myfunc()
-
-The regexp parameter of the ``match`` method is matched with the ``re.search``
-function. So in the above example ``match='123'`` would have worked as
-well.
-
 
 .. _`assertwarns`:
 
 Assertions about expected warnings
 -----------------------------------------
 
-.. versionadded:: 2.8
+
 
 You can check that code raises a particular warning using
 :ref:`pytest.warns <warns>`.
@@ -153,24 +165,30 @@ You can check that code raises a particular warning using
 Making use of context-sensitive comparisons
 -------------------------------------------------
 
-.. versionadded:: 2.0
+
 
 ``pytest`` has rich support for providing context-sensitive information
-when it encounters comparisons.  For example::
+when it encounters comparisons.  For example:
+
+.. code-block:: python
 
     # content of test_assert2.py
 
+
     def test_set_comparison():
         set1 = set("1308")
         set2 = set("8035")
         assert set1 == set2
 
-if you run this module::
+if you run this module:
+
+.. code-block:: pytest
 
     $ pytest test_assert2.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 1 item
 
     test_assert2.py F                                                    [100%]
@@ -189,7 +207,7 @@ if you run this module::
     E         '5'
     E         Use -v to get the full diff
 
-    test_assert2.py:5: AssertionError
+    test_assert2.py:6: AssertionError
     ========================= 1 failed in 0.12 seconds =========================
 
 Special comparisons are done for a number of cases:
@@ -200,8 +218,8 @@ Special comparisons are done for a number of cases:
 
 See the :ref:`reporting demo <tbreportdemo>` for many more examples.
 
-Defining your own assertion comparison
-----------------------------------------------
+Defining your own explanation for failed assertions
+---------------------------------------------------
 
 It is possible to add your own detailed explanations by implementing
 the ``pytest_assertrepr_compare`` hook.
@@ -210,16 +228,21 @@ the ``pytest_assertrepr_compare`` hook.
    :noindex:
 
 As an example consider adding the following hook in a :ref:`conftest.py <conftest.py>`
-file which provides an alternative explanation for ``Foo`` objects::
+file which provides an alternative explanation for ``Foo`` objects:
+
+.. code-block:: python
 
    # content of conftest.py
    from test_foocompare import Foo
+
+
    def pytest_assertrepr_compare(op, left, right):
        if isinstance(left, Foo) and isinstance(right, Foo) and op == "==":
-           return ['Comparing Foo instances:',
-                   '   vals: %s != %s' % (left.val, right.val)]
+           return ["Comparing Foo instances:", "   vals: %s != %s" % (left.val, right.val)]
 
-now, given this test module::
+now, given this test module:
+
+.. code-block:: python
 
    # content of test_foocompare.py
    class Foo(object):
@@ -229,13 +252,16 @@ now, given this test module::
        def __eq__(self, other):
            return self.val == other.val
 
+
    def test_compare():
        f1 = Foo(1)
        f2 = Foo(2)
        assert f1 == f2
 
 you can run the test module and get the custom output defined in
-the conftest file::
+the conftest file:
+
+.. code-block:: pytest
 
    $ pytest -q test_foocompare.py
    F                                                                    [100%]
@@ -249,51 +275,73 @@ the conftest file::
    E       assert Comparing Foo instances:
    E            vals: 1 != 2
 
-   test_foocompare.py:11: AssertionError
+   test_foocompare.py:12: AssertionError
    1 failed in 0.12 seconds
 
 .. _assert-details:
 .. _`assert introspection`:
 
-Advanced assertion introspection
-----------------------------------
+Assertion introspection details
+-------------------------------
+
 
-.. versionadded:: 2.1
 
 
 Reporting details about a failing assertion is achieved by rewriting assert
 statements before they are run.  Rewritten assert statements put introspection
 information into the assertion failure message.  ``pytest`` only rewrites test
-modules directly discovered by its test collection process, so asserts in
-supporting modules which are not themselves test modules will not be rewritten.
-
-.. note::
-
-   ``pytest`` rewrites test modules on import by using an import
-   hook to write new ``pyc`` files. Most of the time this works transparently.
-   However, if you are messing with import yourself, the import hook may
-   interfere.
-
-   If this is the case you have two options:
-
-   * Disable rewriting for a specific module by adding the string
-     ``PYTEST_DONT_REWRITE`` to its docstring.
-
-   * Disable rewriting for all modules by using ``--assert=plain``.
-
-   Additionally, rewriting will fail silently if it cannot write new ``.pyc`` files,
-   i.e. in a read-only filesystem or a zipfile.
+modules directly discovered by its test collection process, so **asserts in
+supporting modules which are not themselves test modules will not be rewritten**.
 
+You can manually enable assertion rewriting for an imported module by calling
+`register_assert_rewrite <https://docs.pytest.org/en/latest/writing_plugins.html#assertion-rewriting>`_
+before you import it (a good place to do that is in your root ``conftest.py``).
 
 For further information, Benjamin Peterson wrote up `Behind the scenes of pytest's new assertion rewriting <http://pybites.blogspot.com/2011/07/behind-scenes-of-pytests-new-assertion.html>`_.
 
-.. versionadded:: 2.1
+Assertion rewriting caches files on disk
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``pytest`` will write back the rewritten modules to disk for caching. You can disable
+this behavior (for example to avoid leaving stale ``.pyc`` files around in projects that
+move files around a lot) by adding this to the top of your ``conftest.py`` file:
+
+.. code-block:: python
+
+   import sys
+
+   sys.dont_write_bytecode = True
+
+Note that you still get the benefits of assertion introspection, the only change is that
+the ``.pyc`` files won't be cached on disk.
+
+Additionally, rewriting will silently skip caching if it cannot write new ``.pyc`` files,
+i.e. in a read-only filesystem or a zipfile.
+
+
+Disabling assert rewriting
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``pytest`` rewrites test modules on import by using an import
+hook to write new ``pyc`` files. Most of the time this works transparently.
+However, if you are working with the import machinery yourself, the import hook may
+interfere.
+
+If this is the case you have two options:
+
+* Disable rewriting for a specific module by adding the string
+  ``PYTEST_DONT_REWRITE`` to its docstring.
+
+* Disable rewriting for all modules by using ``--assert=plain``.
+
+
+
    Add assert rewriting as an alternate introspection technique.
 
-.. versionchanged:: 2.1
+
    Introduce the ``--assert`` option. Deprecate ``--no-assert`` and
    ``--nomagic``.
 
-.. versionchanged:: 3.0
+
    Removes the ``--no-assert`` and ``--nomagic`` options.
    Removes the ``--assert=reinterp`` option.
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/backwards-compatibility.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/backwards-compatibility.rst
index 55506e7c338..56afd98afa7 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/backwards-compatibility.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/backwards-compatibility.rst
@@ -7,14 +7,16 @@ Keeping backwards compatibility has a very high priority in the pytest project.
 
 With the pytest 3.0 release we introduced a clear communication scheme for when we will actually remove the old busted joint and politely ask you to use the new hotness instead, while giving you enough time to adjust your tests or raise concerns if there are valid reasons to keep deprecated functionality around.
 
-To communicate changes we are already issuing deprecation warnings, but they are not displayed by default. In pytest 3.0 we changed the default setting so that pytest deprecation warnings are displayed if not explicitly silenced (with ``--disable-pytest-warnings``).
+To communicate changes we issue deprecation warnings using a custom warning hierarchy (see :ref:`internal-warnings`). These warnings may be suppressed using the standard means: ``-W`` command-line flag or ``filterwarnings`` ini options (see :ref:`warnings`), but we suggest to use these sparingly and temporarily, and heed the warnings when possible.
 
-We will only remove deprecated functionality in major releases (e.g. if we deprecate something in 3.0 we will remove it in 4.0), and keep it around for at least two minor releases (e.g. if we deprecate something in 3.9 and 4.0 is the next release, we will not remove it in 4.0 but in 5.0).
+We will only start the removal of deprecated functionality in major releases (e.g. if we deprecate something in 3.0 we will start to remove it in 4.0), and keep it around for at least two minor releases (e.g. if we deprecate something in 3.9 and 4.0 is the next release, we start to remove it in 5.0, not in 4.0).
+
+When the deprecation expires (e.g. 4.0 is released), we won't remove the deprecated functionality immediately, but will use the standard warning filters to turn them into **errors** by default. This approach makes it explicit that removal is imminent, and still gives you time to turn the deprecated feature into a warning instead of an error so it can be dealt with in your own time. In the next minor release (e.g. 4.1), the feature will be effectively removed.
 
 
 Deprecation Roadmap
 -------------------
 
-We track deprecation and removal of features using milestones and the `deprecation <https://github.com/pytest-dev/pytest/issues?q=label%3A%22type%3A+deprecation%22>`_ and `removal <https://github.com/pytest-dev/pytest/labels/type%3A%20removal>`_ labels on GitHub.
+Features currently deprecated and removed in previous releases can be found in :ref:`deprecations`.
 
-Following our deprecation policy, after starting issuing deprecation warnings we keep features for *at least* two minor versions before considering removal.
+We track future deprecation and removal of features using milestones and the `deprecation <https://github.com/pytest-dev/pytest/issues?q=label%3A%22type%3A+deprecation%22>`_ and `removal <https://github.com/pytest-dev/pytest/labels/type%3A%20removal>`_ labels on GitHub.
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/bash-completion.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/bash-completion.rst
index 08d9782090c..eaa07881414 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/bash-completion.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/bash-completion.rst
@@ -8,18 +8,26 @@ When using bash as your shell, ``pytest`` can use argcomplete
 (https://argcomplete.readthedocs.io/) for auto-completion.
 For this ``argcomplete`` needs to be installed **and** enabled.
 
-Install argcomplete using::
+Install argcomplete using:
 
-        sudo pip install 'argcomplete>=0.5.7'
+.. code-block:: bash
 
-For global activation of all argcomplete enabled python applications run::
+    sudo pip install 'argcomplete>=0.5.7'
+
+For global activation of all argcomplete enabled python applications run:
+
+.. code-block:: bash
 
     sudo activate-global-python-argcomplete
 
-For permanent (but not global) ``pytest`` activation, use::
+For permanent (but not global) ``pytest`` activation, use:
 
-        register-python-argcomplete pytest >> ~/.bashrc
+.. code-block:: bash
 
-For one-time activation of argcomplete for ``pytest`` only, use::
+    register-python-argcomplete pytest >> ~/.bashrc
 
-        eval "$(register-python-argcomplete pytest)"
+For one-time activation of argcomplete for ``pytest`` only, use:
+
+.. code-block:: bash
+
+    eval "$(register-python-argcomplete pytest)"
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/builtin.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/builtin.rst
index c2d23469bc8..a4c20695c3b 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/builtin.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/builtin.rst
@@ -12,7 +12,9 @@ For information on plugin hooks and objects, see :ref:`plugins`.
 
 For information on the ``pytest.mark`` mechanism, see :ref:`mark`.
 
-For information about fixtures, see :ref:`fixtures`. To see a complete list of available fixtures (add ``-v`` to also see fixtures with leading ``_``), type ::
+For information about fixtures, see :ref:`fixtures`. To see a complete list of available fixtures (add ``-v`` to also see fixtures with leading ``_``), type :
+
+.. code-block:: pytest
 
     $ pytest -q --fixtures
     cache
@@ -25,36 +27,47 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
         name of your plugin or application to avoid clashes with other cache users.
 
         Values can be any object handled by the json stdlib module.
+
     capsys
-        Enable capturing of writes to ``sys.stdout`` and ``sys.stderr`` and make
-        captured output available via ``capsys.readouterr()`` method calls
-        which return a ``(out, err)`` namedtuple.  ``out`` and ``err`` will be ``text``
-        objects.
+        Enable text capturing of writes to ``sys.stdout`` and ``sys.stderr``.
+
+        The captured output is made available via ``capsys.readouterr()`` method
+        calls, which return a ``(out, err)`` namedtuple.
+        ``out`` and ``err`` will be ``text`` objects.
+
     capsysbinary
-        Enable capturing of writes to ``sys.stdout`` and ``sys.stderr`` and make
-        captured output available via ``capsys.readouterr()`` method calls
-        which return a ``(out, err)`` tuple.  ``out`` and ``err`` will be ``bytes``
-        objects.
+        Enable bytes capturing of writes to ``sys.stdout`` and ``sys.stderr``.
+
+        The captured output is made available via ``capsysbinary.readouterr()``
+        method calls, which return a ``(out, err)`` namedtuple.
+        ``out`` and ``err`` will be ``bytes`` objects.
+
     capfd
-        Enable capturing of writes to file descriptors ``1`` and ``2`` and make
-        captured output available via ``capfd.readouterr()`` method calls
-        which return a ``(out, err)`` tuple.  ``out`` and ``err`` will be ``text``
-        objects.
+        Enable text capturing of writes to file descriptors ``1`` and ``2``.
+
+        The captured output is made available via ``capfd.readouterr()`` method
+        calls, which return a ``(out, err)`` namedtuple.
+        ``out`` and ``err`` will be ``text`` objects.
+
     capfdbinary
-        Enable capturing of write to file descriptors 1 and 2 and make
-        captured output available via ``capfdbinary.readouterr`` method calls
-        which return a ``(out, err)`` tuple.  ``out`` and ``err`` will be
-        ``bytes`` objects.
-    doctest_namespace
+        Enable bytes capturing of writes to file descriptors ``1`` and ``2``.
+
+        The captured output is made available via ``capfd.readouterr()`` method
+        calls, which return a ``(out, err)`` namedtuple.
+        ``out`` and ``err`` will be ``byte`` objects.
+
+    doctest_namespace [session scope]
         Fixture that returns a :py:class:`dict` that will be injected into the namespace of doctests.
-    pytestconfig
+
+    pytestconfig [session scope]
         Session-scoped fixture that returns the :class:`_pytest.config.Config` object.
 
         Example::
 
             def test_foo(pytestconfig):
-                if pytestconfig.getoption("verbose"):
+                if pytestconfig.getoption("verbose") > 0:
                     ...
+
     record_property
         Add an extra properties the calling test.
         User properties become part of the test report and are available to the
@@ -66,21 +79,36 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
 
             def test_function(record_property):
                 record_property("example_key", 1)
-    record_xml_property
-        (Deprecated) use record_property.
+
     record_xml_attribute
         Add extra xml attributes to the tag for the calling test.
         The fixture is callable with ``(name, value)``, with value being
         automatically xml-encoded
+
+    record_testsuite_property [session scope]
+        Records a new ``<property>`` tag as child of the root ``<testsuite>``. This is suitable to
+        writing global information regarding the entire test suite, and is compatible with ``xunit2`` JUnit family.
+
+        This is a ``session``-scoped fixture which is called with ``(name, value)``. Example:
+
+        .. code-block:: python
+
+            def test_foo(record_testsuite_property):
+                record_testsuite_property("ARCH", "PPC")
+                record_testsuite_property("STORAGE_TYPE", "CEPH")
+
+        ``name`` must be a string, ``value`` will be converted to a string and properly xml-escaped.
+
     caplog
         Access and control log capturing.
 
-        Captured logs are available through the following methods::
+        Captured logs are available through the following properties/methods::
 
         * caplog.text            -> string containing formatted log output
         * caplog.records         -> list of logging.LogRecord instances
         * caplog.record_tuples   -> list of (logger_name, level, message) tuples
         * caplog.clear()         -> clear captured records and formatted log output string
+
     monkeypatch
         The returned ``monkeypatch`` fixture provides these
         helper methods to modify objects, dictionaries or os.environ::
@@ -90,7 +118,7 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
             monkeypatch.setitem(mapping, name, value)
             monkeypatch.delitem(obj, name, raising=True)
             monkeypatch.setenv(name, value, prepend=False)
-            monkeypatch.delenv(name, value, raising=True)
+            monkeypatch.delenv(name, raising=True)
             monkeypatch.syspath_prepend(path)
             monkeypatch.chdir(path)
 
@@ -98,13 +126,19 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
         test function or fixture has finished. The ``raising``
         parameter determines if a KeyError or AttributeError
         will be raised if the set/deletion operation has no target.
+
     recwarn
         Return a :class:`WarningsRecorder` instance that records all warnings emitted by test functions.
 
         See http://docs.python.org/library/warnings.html for information
         on warning categories.
-    tmpdir_factory
-        Return a TempdirFactory instance for the test session.
+
+    tmpdir_factory [session scope]
+        Return a :class:`_pytest.tmpdir.TempdirFactory` instance for the test session.
+
+    tmp_path_factory [session scope]
+        Return a :class:`_pytest.tmpdir.TempPathFactory` instance for the test session.
+
     tmpdir
         Return a temporary directory path object
         which is unique to each test function invocation,
@@ -114,6 +148,18 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
 
         .. _`py.path.local`: https://py.readthedocs.io/en/latest/path.html
 
+    tmp_path
+        Return a temporary directory path object
+        which is unique to each test function invocation,
+        created as a sub directory of the base temporary
+        directory.  The returned object is a :class:`pathlib.Path`
+        object.
+
+        .. note::
+
+            in python < 3.6 this is a pathlib2.Path
+
+
     no tests ran in 0.12 seconds
 
 You can also interactively ask for help, e.g. by typing on the Python interactive prompt something like::
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/cache.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/cache.rst
index 37bcf7070d4..27a8449108c 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/cache.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/cache.rst
@@ -5,7 +5,7 @@
 Cache: working with cross-testrun state
 =======================================
 
-.. versionadded:: 2.8
+
 
 Usage
 ---------
@@ -43,7 +43,9 @@ First, let's create 50 test invocation of which only 2 fail::
         if i in (17, 25):
            pytest.fail("bad luck")
 
-If you run this for the first time you will see two failures::
+If you run this for the first time you will see two failures:
+
+.. code-block:: pytest
 
     $ pytest -q
     .................F.......F........................                   [100%]
@@ -72,13 +74,16 @@ If you run this for the first time you will see two failures::
     test_50.py:6: Failed
     2 failed, 48 passed in 0.12 seconds
 
-If you then run it with ``--lf``::
+If you then run it with ``--lf``:
+
+.. code-block:: pytest
 
     $ pytest --lf
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
-    collected 50 items / 48 deselected
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
+    collected 50 items / 48 deselected / 2 selected
     run-last-failure: rerun previous 2 failures
 
     test_50.py FF                                                        [100%]
@@ -113,12 +118,15 @@ not been run ("deselected").
 
 Now, if you run with the ``--ff`` option, all tests will be run but the first
 previous failures will be executed first (as can be seen from the series
-of ``FF`` and dots)::
+of ``FF`` and dots):
+
+.. code-block:: pytest
 
     $ pytest --ff
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 50 items
     run-last-failure: rerun previous 2 failures first
 
@@ -160,10 +168,12 @@ Behavior when no tests failed in the last run
 
 When no tests failed in the last run, or when no cached ``lastfailed`` data was
 found, ``pytest`` can be configured either to run all of the tests or no tests,
-using the ``--last-failed-no-failures`` option, which takes one of the following values::
+using the ``--last-failed-no-failures`` option, which takes one of the following values:
 
-    pytest --last-failed-no-failures all    # run all tests (default behavior)
-    pytest --last-failed-no-failures none   # run no tests and exit
+.. code-block:: bash
+
+    pytest --last-failed --last-failed-no-failures all    # run all tests (default behavior)
+    pytest --last-failed --last-failed-no-failures none   # run no tests and exit
 
 The new config.cache object
 --------------------------------
@@ -179,11 +189,14 @@ across pytest invocations::
     import pytest
     import time
 
+    def expensive_computation():
+        print("running expensive computation...")
+
     @pytest.fixture
     def mydata(request):
         val = request.config.cache.get("example/value", None)
         if val is None:
-            time.sleep(9*0.6) # expensive computation :)
+            expensive_computation()
             val = 42
             request.config.cache.set("example/value", val)
         return val
@@ -191,8 +204,9 @@ across pytest invocations::
     def test_function(mydata):
         assert mydata == 23
 
-If you run this command once, it will take a while because
-of the sleep::
+If you run this command for the first time, you can see the print statement:
+
+.. code-block:: pytest
 
     $ pytest -q
     F                                                                    [100%]
@@ -205,11 +219,15 @@ of the sleep::
     >       assert mydata == 23
     E       assert 42 == 23
 
-    test_caching.py:14: AssertionError
+    test_caching.py:17: AssertionError
+    -------------------------- Captured stdout setup ---------------------------
+    running expensive computation...
     1 failed in 0.12 seconds
 
 If you run it a second time the value will be retrieved from
-the cache and this will be quick::
+the cache and nothing will be printed:
+
+.. code-block:: pytest
 
     $ pytest -q
     F                                                                    [100%]
@@ -222,41 +240,76 @@ the cache and this will be quick::
     >       assert mydata == 23
     E       assert 42 == 23
 
-    test_caching.py:14: AssertionError
+    test_caching.py:17: AssertionError
     1 failed in 0.12 seconds
 
 See the :ref:`cache-api` for more details.
 
 
 Inspecting Cache content
--------------------------------
+------------------------
 
 You can always peek at the content of the cache using the
-``--cache-show`` command line option::
+``--cache-show`` command line option:
+
+.. code-block:: pytest
 
     $ pytest --cache-show
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
-    cachedir: $REGENDOC_TMPDIR/.pytest_cache
-    ------------------------------- cache values -------------------------------
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    --------------------------- cache values for '*' ---------------------------
     cache/lastfailed contains:
-      {'test_caching.py::test_function': True}
+      {'test_50.py::test_num[17]': True,
+       'test_50.py::test_num[25]': True,
+       'test_assert1.py::test_function': True,
+       'test_assert2.py::test_set_comparison': True,
+       'test_caching.py::test_function': True,
+       'test_foocompare.py::test_compare': True}
     cache/nodeids contains:
       ['test_caching.py::test_function']
+    cache/stepwise contains:
+      []
+    example/value contains:
+      42
+
+    ======================= no tests ran in 0.12 seconds =======================
+
+``--cache-show`` takes an optional argument to specify a glob pattern for
+filtering:
+
+.. code-block:: pytest
+
+    $ pytest --cache-show example/*
+    =========================== test session starts ============================
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    ----------------------- cache values for 'example/*' -----------------------
     example/value contains:
       42
 
     ======================= no tests ran in 0.12 seconds =======================
 
 Clearing Cache content
--------------------------------
+----------------------
 
 You can instruct pytest to clear all cache files and values
-by adding the ``--cache-clear`` option like this::
+by adding the ``--cache-clear`` option like this:
+
+.. code-block:: bash
 
     pytest --cache-clear
 
 This is recommended for invocations from Continuous Integration
 servers where isolation and correctness is more important
 than speed.
+
+
+Stepwise
+--------
+
+As an alternative to ``--lf -x``, especially for cases where you expect a large part of the test suite will fail, ``--sw``, ``--stepwise`` allows you to fix them one at a time. The test suite will run until the first failure and then stop. At the next invocation, tests will continue from the last failing test and then run until the next failing test. You may use the ``--stepwise-skip`` option to ignore one failing test and stop the test execution on the second failing test instead. This is useful if you get stuck on a failing test and just want to ignore it until later.
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/capture.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/capture.rst
index ab86fb55f3d..90403d23ab7 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/capture.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/capture.rst
@@ -35,7 +35,9 @@ There are two ways in which ``pytest`` can perform capturing:
 
 .. _`disable capturing`:
 
-You can influence output capturing mechanisms from the command line::
+You can influence output capturing mechanisms from the command line:
+
+.. code-block:: bash
 
     pytest -s            # disable all capturing
     pytest --capture=sys # replace sys.stdout/stderr with in-mem files
@@ -52,7 +54,7 @@ is that you can use print statements for debugging::
     # content of test_module.py
 
     def setup_function(function):
-        print ("setting up %s" % function)
+        print("setting up %s" % function)
 
     def test_func1():
         assert True
@@ -61,12 +63,15 @@ is that you can use print statements for debugging::
         assert False
 
 and running this module will show you precisely the output
-of the failing function and hide the other one::
+of the failing function and hide the other one:
+
+.. code-block:: pytest
 
     $ pytest
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 2 items
 
     test_module.py .F                                                    [100%]
@@ -116,11 +121,11 @@ same interface but allows to also capture output from
 libraries or subprocesses that directly write to operating
 system level output streams (FD1 and FD2).
 
-.. versionadded:: 3.3
+
 
 The return value from ``readouterr`` changed to a ``namedtuple`` with two attributes, ``out`` and ``err``.
 
-.. versionadded:: 3.3
+
 
 If the code under test writes non-textual data, you can capture this using
 the ``capsysbinary`` fixture which instead returns ``bytes`` from
@@ -128,7 +133,7 @@ the ``readouterr`` method.  The ``capfsysbinary`` fixture is currently only
 available in python 3.
 
 
-.. versionadded:: 3.3
+
 
 If the code under test writes non-textual data, you can capture this using
 the ``capfdbinary`` fixture which instead returns ``bytes`` from
@@ -136,7 +141,7 @@ the ``readouterr`` method.  The ``capfdbinary`` fixture operates on the
 filedescriptor level.
 
 
-.. versionadded:: 3.0
+
 
 To temporarily disable capture within a test, both ``capsys``
 and ``capfd`` have a ``disabled()`` method that can be used
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/changelog.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/changelog.rst
index a59b3c7e250..f9a219a92ae 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/changelog.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/changelog.rst
@@ -1,7 +1,4 @@
 
 .. _changelog:
 
-Changelog history
-=================================
-
 .. include:: ../../CHANGELOG.rst
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/conf.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/conf.py
index ebff6ff3bfa..39ba5e4f854 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/conf.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/conf.py
@@ -10,17 +10,15 @@
 #
 # All configuration values have a default; values that are commented out
 # serve to show the default.
-
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The full version, including alpha/beta/rc tags.
 # The short X.Y version.
-
+import datetime
 import os
 import sys
-import datetime
 
 from _pytest import __version__ as version
 
@@ -42,11 +40,13 @@ todo_include_todos = 1
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
+    "pygments_pytest",
     "sphinx.ext.autodoc",
-    "sphinx.ext.todo",
     "sphinx.ext.autosummary",
     "sphinx.ext.intersphinx",
+    "sphinx.ext.todo",
     "sphinx.ext.viewcode",
+    "sphinx_removed_in",
     "sphinxcontrib_trio",
 ]
 
@@ -65,7 +65,7 @@ master_doc = "contents"
 # General information about the project.
 project = u"pytest"
 year = datetime.datetime.utcnow().year
-copyright = u"2015–{} , holger krekel and pytest-dev team".format(year)
+copyright = u"2015–2020, holger krekel and pytest-dev team"
 
 
 # The language for content autogenerated by Sphinx. Refer to documentation
@@ -275,7 +275,7 @@ man_pages = [("usage", "pytest", u"pytest usage", [u"holger krekel at merlinux e
 epub_title = u"pytest"
 epub_author = u"holger krekel at merlinux eu"
 epub_publisher = u"holger krekel at merlinux eu"
-epub_copyright = u"2013, holger krekel et alii"
+epub_copyright = u"2013-2020, holger krekel et alii"
 
 # The language of the text. It defaults to the language option
 # or en if the language is not set.
@@ -329,13 +329,13 @@ texinfo_documents = [
 
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {"python": ("http://docs.python.org/3", None)}
+intersphinx_mapping = {"python": ("https://docs.python.org/3", None)}
 
 
 def setup(app):
     # from sphinx.ext.autodoc import cut_lines
     # app.connect('autodoc-process-docstring', cut_lines(4, what=['module']))
-    app.add_description_unit(
+    app.add_object_type(
         "confval",
         "confval",
         objname="configuration value",
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/conftest.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/conftest.py
index 1a62e1b5df5..b51aae5b685 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/conftest.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/conftest.py
@@ -1 +1,2 @@
+# -*- coding: utf-8 -*-
 collect_ignore = ["conf.py"]
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/contents.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/contents.rst
index 9f1d8d85ac2..1ec502c1f2b 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/contents.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/contents.rst
@@ -33,12 +33,15 @@ Full pytest documentation
    reference
 
    goodpractices
+   flaky
    pythonpath
    customize
    example/index
    bash-completion
 
    backwards-compatibility
+   deprecations
+   py27-py34-deprecation
    historical-notes
    license
    contributing
@@ -47,6 +50,7 @@ Full pytest documentation
    projects
    faq
    contact
+   tidelift
 
 .. only:: html
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/customize.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/customize.rst
index c1a3498c7b6..77217e9d2e3 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/customize.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/customize.rst
@@ -5,7 +5,9 @@ Command line options and configuration file settings
 -----------------------------------------------------------------
 
 You can get help on command line options and values in INI-style
-configurations files by using the general help option::
+configurations files by using the general help option:
+
+.. code-block:: bash
 
     pytest -h   # prints options _and_ config file settings
 
@@ -18,7 +20,7 @@ which were registered by installed plugins.
 Initialization: determining rootdir and inifile
 -----------------------------------------------
 
-.. versionadded:: 2.7
+
 
 pytest determines a ``rootdir`` for each test run which depends on
 the command line arguments (specified test files, paths) and on
@@ -32,7 +34,7 @@ Here's a summary what ``pytest`` uses ``rootdir`` for:
   class name, function name and parametrization (if any).
 
 * Is used by plugins as a stable location to store project/test run specific information;
-  for example, the internal :ref:`cache <cache>` plugin creates a ``.cache`` subdirectory
+  for example, the internal :ref:`cache <cache>` plugin creates a ``.pytest_cache`` subdirectory
   in ``rootdir`` to store its cross-test run state.
 
 Important to emphasize that ``rootdir`` is **NOT** used to modify ``sys.path``/``PYTHONPATH`` or
@@ -88,16 +90,20 @@ The ``config`` object will subsequently carry these attributes:
 
 - ``config.inifile``: the determined ini-file, may be ``None``.
 
-The rootdir is used a reference directory for constructing test
+The rootdir is used as a reference directory for constructing test
 addresses ("nodeids") and can be used also by plugins for storing
 per-testrun information.
 
-Example::
+Example:
+
+.. code-block:: bash
 
     pytest path/to/testdir path/other/
 
 will determine the common ancestor as ``path`` and then
-check for ini-files as follows::
+check for ini-files as follows:
+
+.. code-block:: text
 
     # first look for pytest.ini files
     path/pytest.ini
@@ -127,25 +133,33 @@ progress output, you can write it into a configuration file:
 
 .. code-block:: ini
 
-    # content of pytest.ini
-    # (or tox.ini or setup.cfg)
+    # content of pytest.ini or tox.ini
+    # setup.cfg files should use [tool:pytest] section instead
     [pytest]
     addopts = -ra -q
 
 Alternatively, you can set a ``PYTEST_ADDOPTS`` environment variable to add command
-line options while the environment is in use::
+line options while the environment is in use:
+
+.. code-block:: bash
 
     export PYTEST_ADDOPTS="-v"
 
-Here's how the command-line is built in the presence of ``addopts`` or the environment variable::
+Here's how the command-line is built in the presence of ``addopts`` or the environment variable:
 
-    <pytest.ini:addopts> $PYTEST_ADDOTPS <extra command-line arguments>
+.. code-block:: text
 
-So if the user executes in the command-line::
+    <pytest.ini:addopts> $PYTEST_ADDOPTS <extra command-line arguments>
+
+So if the user executes in the command-line:
+
+.. code-block:: bash
 
     pytest -m slow
 
-The actual command line executed is::
+The actual command line executed is:
+
+.. code-block:: bash
 
     pytest -ra -q -v -m slow
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/deprecations.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/deprecations.rst
new file mode 100644
index 00000000000..a505c0a94ac
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/deprecations.rst
@@ -0,0 +1,535 @@
+.. _deprecations:
+
+Deprecations and Removals
+=========================
+
+This page lists all pytest features that are currently deprecated or have been removed in past major releases.
+The objective is to give users a clear rationale why a certain feature has been removed, and what alternatives
+should be used instead.
+
+.. contents::
+    :depth: 3
+    :local:
+
+
+Deprecated Features
+-------------------
+
+Below is a complete list of all pytest features which are considered deprecated. Using those features will issue
+:class:`_pytest.warning_types.PytestWarning` or subclasses, which can be filtered using
+:ref:`standard warning filters <warnings>`.
+
+.. _`raises message deprecated`:
+
+``"message"`` parameter of ``pytest.raises``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. deprecated:: 4.1
+
+It is a common mistake to think this parameter will match the exception message, while in fact
+it only serves to provide a custom message in case the ``pytest.raises`` check fails. To prevent
+users from making this mistake, and because it is believed to be little used, pytest is
+deprecating it without providing an alternative for the moment.
+
+If you have a valid use case for this parameter, consider that to obtain the same results
+you can just call ``pytest.fail`` manually at the end of the ``with`` statement.
+
+For example:
+
+.. code-block:: python
+
+    with pytest.raises(TimeoutError, message="Client got unexpected message"):
+        wait_for(websocket.recv(), 0.5)
+
+
+Becomes:
+
+.. code-block:: python
+
+    with pytest.raises(TimeoutError):
+        wait_for(websocket.recv(), 0.5)
+        pytest.fail("Client got unexpected message")
+
+
+If you still have concerns about this deprecation and future removal, please comment on
+`issue #3974 <https://github.com/pytest-dev/pytest/issues/3974>`__.
+
+
+``pytest.config`` global
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. deprecated:: 4.1
+
+The ``pytest.config`` global object is deprecated.  Instead use
+``request.config`` (via the ``request`` fixture) or if you are a plugin author
+use the ``pytest_configure(config)`` hook. Note that many hooks can also access
+the ``config`` object indirectly, through ``session.config`` or ``item.config`` for example.
+
+.. _raises-warns-exec:
+
+``raises`` / ``warns`` with a string as the second argument
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. deprecated:: 4.1
+
+Use the context manager form of these instead.  When necessary, invoke ``exec``
+directly.
+
+Example:
+
+.. code-block:: python
+
+    pytest.raises(ZeroDivisionError, "1 / 0")
+    pytest.raises(SyntaxError, "a $ b")
+
+    pytest.warns(DeprecationWarning, "my_function()")
+    pytest.warns(SyntaxWarning, "assert(1, 2)")
+
+Becomes:
+
+.. code-block:: python
+
+    with pytest.raises(ZeroDivisionError):
+        1 / 0
+    with pytest.raises(SyntaxError):
+        exec("a $ b")  # exec is required for invalid syntax
+
+    with pytest.warns(DeprecationWarning):
+        my_function()
+    with pytest.warns(SyntaxWarning):
+        exec("assert(1, 2)")  # exec is used to avoid a top-level warning
+
+
+
+
+
+
+Result log (``--result-log``)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+
+The ``--resultlog`` command line option has been deprecated: it is little used
+and there are more modern and better alternatives, for example `pytest-tap <https://tappy.readthedocs.io/en/latest/>`_.
+
+This feature will be effectively removed in pytest 4.0 as the team intends to include a better alternative in the core.
+
+If you have any concerns, please don't hesitate to `open an issue <https://github.com/pytest-dev/pytest/issues>`__.
+
+Removed Features
+----------------
+
+As stated in our :ref:`backwards-compatibility` policy, deprecated features are removed only in major releases after
+an appropriate period of deprecation has passed.
+
+Using ``Class`` in custom Collectors
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. versionremoved:: 4.0
+
+Using objects named ``"Class"`` as a way to customize the type of nodes that are collected in ``Collector``
+subclasses has been deprecated. Users instead should use ``pytest_pycollect_makeitem`` to customize node types during
+collection.
+
+This issue should affect only advanced plugins who create new collection types, so if you see this warning
+message please contact the authors so they can change the code.
+
+
+marks in ``pytest.mark.parametrize``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. versionremoved:: 4.0
+
+Applying marks to values of a ``pytest.mark.parametrize`` call is now deprecated. For example:
+
+.. code-block:: python
+
+    @pytest.mark.parametrize(
+        "a, b",
+        [
+            (3, 9),
+            pytest.mark.xfail(reason="flaky")(6, 36),
+            (10, 100),
+            (20, 200),
+            (40, 400),
+            (50, 500),
+        ],
+    )
+    def test_foo(a, b):
+        ...
+
+This code applies the ``pytest.mark.xfail(reason="flaky")`` mark to the ``(6, 36)`` value of the above parametrization
+call.
+
+This was considered hard to read and understand, and also its implementation presented problems to the code preventing
+further internal improvements in the marks architecture.
+
+To update the code, use ``pytest.param``:
+
+.. code-block:: python
+
+    @pytest.mark.parametrize(
+        "a, b",
+        [
+            (3, 9),
+            pytest.param(6, 36, marks=pytest.mark.xfail(reason="flaky")),
+            (10, 100),
+            (20, 200),
+            (40, 400),
+            (50, 500),
+        ],
+    )
+    def test_foo(a, b):
+        ...
+
+
+``pytest_funcarg__`` prefix
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. versionremoved:: 4.0
+
+In very early pytest versions fixtures could be defined using the ``pytest_funcarg__`` prefix:
+
+.. code-block:: python
+
+    def pytest_funcarg__data():
+        return SomeData()
+
+Switch over to the ``@pytest.fixture`` decorator:
+
+.. code-block:: python
+
+    @pytest.fixture
+    def data():
+        return SomeData()
+
+
+
+[pytest] section in setup.cfg files
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. versionremoved:: 4.0
+
+``[pytest]`` sections in ``setup.cfg`` files should now be named ``[tool:pytest]``
+to avoid conflicts with other distutils commands.
+
+
+Metafunc.addcall
+~~~~~~~~~~~~~~~~
+
+.. versionremoved:: 4.0
+
+:meth:`_pytest.python.Metafunc.addcall` was a precursor to the current parametrized mechanism. Users should use
+:meth:`_pytest.python.Metafunc.parametrize` instead.
+
+Example:
+
+.. code-block:: python
+
+    def pytest_generate_tests(metafunc):
+        metafunc.addcall({"i": 1}, id="1")
+        metafunc.addcall({"i": 2}, id="2")
+
+Becomes:
+
+.. code-block:: python
+
+    def pytest_generate_tests(metafunc):
+        metafunc.parametrize("i", [1, 2], ids=["1", "2"])
+
+
+``cached_setup``
+~~~~~~~~~~~~~~~~
+
+.. versionremoved:: 4.0
+
+``request.cached_setup`` was the precursor of the setup/teardown mechanism available to fixtures.
+
+Example:
+
+.. code-block:: python
+
+    @pytest.fixture
+    def db_session():
+        return request.cached_setup(
+            setup=Session.create, teardown=lambda session: session.close(), scope="module"
+        )
+
+This should be updated to make use of standard fixture mechanisms:
+
+.. code-block:: python
+
+    @pytest.fixture(scope="module")
+    def db_session():
+        session = Session.create()
+        yield session
+        session.close()
+
+
+You can consult `funcarg comparison section in the docs <https://docs.pytest.org/en/latest/funcarg_compare.html>`_ for
+more information.
+
+
+pytest_plugins in non-top-level conftest files
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. versionremoved:: 4.0
+
+Defining ``pytest_plugins`` is now deprecated in non-top-level conftest.py
+files because they will activate referenced plugins *globally*, which is surprising because for all other pytest
+features ``conftest.py`` files are only *active* for tests at or below it.
+
+
+``Config.warn`` and ``Node.warn``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. versionremoved:: 4.0
+
+Those methods were part of the internal pytest warnings system, but since ``3.8`` pytest is using the builtin warning
+system for its own warnings, so those two functions are now deprecated.
+
+``Config.warn`` should be replaced by calls to the standard ``warnings.warn``, example:
+
+.. code-block:: python
+
+    config.warn("C1", "some warning")
+
+Becomes:
+
+.. code-block:: python
+
+    warnings.warn(pytest.PytestWarning("some warning"))
+
+``Node.warn`` now supports two signatures:
+
+* ``node.warn(PytestWarning("some message"))``: is now the **recommended** way to call this function.
+  The warning instance must be a PytestWarning or subclass.
+
+* ``node.warn("CI", "some message")``: this code/message form has been **removed** and should be converted to the warning instance form above.
+
+record_xml_property
+~~~~~~~~~~~~~~~~~~~
+
+.. versionremoved:: 4.0
+
+The ``record_xml_property`` fixture is now deprecated in favor of the more generic ``record_property``, which
+can be used by other consumers (for example ``pytest-html``) to obtain custom information about the test run.
+
+This is just a matter of renaming the fixture as the API is the same:
+
+.. code-block:: python
+
+    def test_foo(record_xml_property):
+        ...
+
+Change to:
+
+.. code-block:: python
+
+    def test_foo(record_property):
+        ...
+
+
+Passing command-line string to ``pytest.main()``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. versionremoved:: 4.0
+
+Passing a command-line string to ``pytest.main()`` is deprecated:
+
+.. code-block:: python
+
+    pytest.main("-v -s")
+
+Pass a list instead:
+
+.. code-block:: python
+
+    pytest.main(["-v", "-s"])
+
+
+By passing a string, users expect that pytest will interpret that command-line using the shell rules they are working
+on (for example ``bash`` or ``Powershell``), but this is very hard/impossible to do in a portable way.
+
+
+Calling fixtures directly
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. versionremoved:: 4.0
+
+Calling a fixture function directly, as opposed to request them in a test function, is deprecated.
+
+For example:
+
+.. code-block:: python
+
+    @pytest.fixture
+    def cell():
+        return ...
+
+
+    @pytest.fixture
+    def full_cell():
+        cell = cell()
+        cell.make_full()
+        return cell
+
+This is a great source of confusion to new users, which will often call the fixture functions and request them from test functions interchangeably, which breaks the fixture resolution model.
+
+In those cases just request the function directly in the dependent fixture:
+
+.. code-block:: python
+
+    @pytest.fixture
+    def cell():
+        return ...
+
+
+    @pytest.fixture
+    def full_cell(cell):
+        cell.make_full()
+        return cell
+
+Alternatively if the fixture function is called multiple times inside a test (making it hard to apply the above pattern) or
+if you would like to make minimal changes to the code, you can create a fixture which calls the original function together
+with the ``name`` parameter:
+
+.. code-block:: python
+
+    def cell():
+        return ...
+
+
+    @pytest.fixture(name="cell")
+    def cell_fixture():
+        return cell()
+
+
+``yield`` tests
+~~~~~~~~~~~~~~~
+
+.. versionremoved:: 4.0
+
+pytest supported ``yield``-style tests, where a test function actually ``yield`` functions and values
+that are then turned into proper test methods. Example:
+
+.. code-block:: python
+
+    def check(x, y):
+        assert x ** x == y
+
+
+    def test_squared():
+        yield check, 2, 4
+        yield check, 3, 9
+
+This would result into two actual test functions being generated.
+
+This form of test function doesn't support fixtures properly, and users should switch to ``pytest.mark.parametrize``:
+
+.. code-block:: python
+
+    @pytest.mark.parametrize("x, y", [(2, 4), (3, 9)])
+    def test_squared(x, y):
+        assert x ** x == y
+
+Internal classes accessed through ``Node``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. versionremoved:: 4.0
+
+Access of ``Module``, ``Function``, ``Class``, ``Instance``, ``File`` and ``Item`` through ``Node`` instances now issue
+this warning::
+
+    usage of Function.Module is deprecated, please use pytest.Module instead
+
+Users should just ``import pytest`` and access those objects using the ``pytest`` module.
+
+This has been documented as deprecated for years, but only now we are actually emitting deprecation warnings.
+
+``Node.get_marker``
+~~~~~~~~~~~~~~~~~~~
+
+.. versionremoved:: 4.0
+
+As part of a large :ref:`marker-revamp`, :meth:`_pytest.nodes.Node.get_marker` is deprecated. See
+:ref:`the documentation <update marker code>` on tips on how to update your code.
+
+
+``somefunction.markname``
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. versionremoved:: 4.0
+
+As part of a large :ref:`marker-revamp` we already deprecated using ``MarkInfo``
+the only correct way to get markers of an element is via ``node.iter_markers(name)``.
+
+
+``pytest_namespace``
+~~~~~~~~~~~~~~~~~~~~
+
+.. versionremoved:: 4.0
+
+This hook is deprecated because it greatly complicates the pytest internals regarding configuration and initialization, making some
+bug fixes and refactorings impossible.
+
+Example of usage:
+
+.. code-block:: python
+
+    class MySymbol:
+        ...
+
+
+    def pytest_namespace():
+        return {"my_symbol": MySymbol()}
+
+
+Plugin authors relying on this hook should instead require that users now import the plugin modules directly (with an appropriate public API).
+
+As a stopgap measure, plugin authors may still inject their names into pytest's namespace, usually during ``pytest_configure``:
+
+.. code-block:: python
+
+    import pytest
+
+
+    def pytest_configure():
+        pytest.my_symbol = MySymbol()
+
+
+
+
+Reinterpretation mode (``--assert=reinterp``)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. versionremoved:: 3.0
+
+Reinterpretation mode has now been removed and only plain and rewrite
+mode are available, consequently the ``--assert=reinterp`` option is
+no longer available.  This also means files imported from plugins or
+``conftest.py`` will not benefit from improved assertions by
+default, you should use ``pytest.register_assert_rewrite()`` to
+explicitly turn on assertion rewriting for those files.
+
+Removed command-line options
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. versionremoved:: 3.0
+
+The following deprecated commandline options were removed:
+
+* ``--genscript``: no longer supported;
+* ``--no-assert``: use ``--assert=plain`` instead;
+* ``--nomagic``: use ``--assert=plain`` instead;
+* ``--report``: use ``-r`` instead;
+
+py.test-X* entry points
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. versionremoved:: 3.0
+
+Removed all ``py.test-X*`` entry points. The versioned, suffixed entry points
+were never documented and a leftover from a pre-virtualenv era. These entry
+points also created broken entry points in wheels, so removing them also
+removes a source of confusion for users.
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/development_guide.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/development_guide.rst
index 69e866943e5..649419316d1 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/development_guide.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/development_guide.rst
@@ -39,6 +39,11 @@ avoid creating labels just for the sake of creating them.
 
 Each label should include a description in the GitHub's interface stating its purpose.
 
+Labels are managed using `labels <https://github.com/hackebrot/labels>`_. All the labels in the repository
+are kept in ``.github/labels.toml``, so any changes should be via PRs to that file.
+After a PR is accepted and merged, one of the maintainers must manually synchronize the labels file with the
+GitHub repository.
+
 Temporary labels
 ~~~~~~~~~~~~~~~~
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/doctest.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/doctest.rst
index 9488ee82657..2cb70af7258 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/doctest.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/doctest.rst
@@ -4,31 +4,69 @@ Doctest integration for modules and test files
 
 By default all files matching the ``test*.txt`` pattern will
 be run through the python standard ``doctest`` module.  You
-can change the pattern by issuing::
+can change the pattern by issuing:
+
+.. code-block:: bash
 
     pytest --doctest-glob='*.rst'
 
-on the command line. Since version ``2.9``, ``--doctest-glob``
-can be given multiple times in the command-line.
+on the command line. ``--doctest-glob`` can be given multiple times in the command-line.
 
-.. versionadded:: 3.1
+If you then have a text file like this:
 
-    You can specify the encoding that will be used for those doctest files
-    using the ``doctest_encoding`` ini option:
+.. code-block:: text
 
-    .. code-block:: ini
+    # content of test_example.txt
 
-        # content of pytest.ini
-        [pytest]
-        doctest_encoding = latin1
+    hello this is a doctest
+    >>> x = 3
+    >>> x
+    3
 
-    The default encoding is UTF-8.
+then you can just invoke ``pytest`` directly:
 
-You can also trigger running of doctests
-from docstrings in all python modules (including regular
-python test modules)::
+.. code-block:: pytest
 
-    pytest --doctest-modules
+    $ pytest
+    =========================== test session starts ============================
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
+    collected 1 item
+
+    test_example.txt .                                                   [100%]
+
+    ========================= 1 passed in 0.12 seconds =========================
+
+By default, pytest will collect ``test*.txt`` files looking for doctest directives, but you
+can pass additional globs using the ``--doctest-glob`` option (multi-allowed).
+
+In addition to text files, you can also execute doctests directly from docstrings of your classes
+and functions, including from test modules:
+
+.. code-block:: python
+
+    # content of mymodule.py
+    def something():
+        """ a doctest in a docstring
+        >>> something()
+        42
+        """
+        return 42
+
+.. code-block:: bash
+
+    $ pytest --doctest-modules
+    =========================== test session starts ============================
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
+    collected 2 items
+
+    mymodule.py .                                                        [ 50%]
+    test_example.txt .                                                   [100%]
+
+    ========================= 2 passed in 0.12 seconds =========================
 
 You can make these changes permanent in your project by
 putting them into a pytest.ini file like this:
@@ -39,50 +77,37 @@ putting them into a pytest.ini file like this:
     [pytest]
     addopts = --doctest-modules
 
-If you then have a text file like this::
+.. note::
 
-    # content of example.rst
+    The builtin pytest doctest supports only ``doctest`` blocks, but if you are looking
+    for more advanced checking over *all* your documentation,
+    including doctests, ``.. codeblock:: python`` Sphinx directive support,
+    and any other examples your documentation may include, you may wish to
+    consider `Sybil <https://sybil.readthedocs.io/en/latest/index.html>`__.
+    It provides pytest integration out of the box.
 
-    hello this is a doctest
-    >>> x = 3
-    >>> x
-    3
 
-and another like this::
+Encoding
+--------
 
-    # content of mymodule.py
-    def something():
-        """ a doctest in a docstring
-        >>> something()
-        42
-        """
-        return 42
+The default encoding is **UTF-8**, but you can specify the encoding
+that will be used for those doctest files using the
+``doctest_encoding`` ini option:
 
-then you can just invoke ``pytest`` without command line options::
+.. code-block:: ini
 
-    $ pytest
-    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile: pytest.ini
-    collected 1 item
+    # content of pytest.ini
+    [pytest]
+    doctest_encoding = latin1
 
-    mymodule.py .                                                        [100%]
+Using 'doctest' options
+-----------------------
 
-    ========================= 1 passed in 0.12 seconds =========================
+The standard ``doctest`` module provides some `options <https://docs.python.org/3/library/doctest.html#option-flags>`__
+to configure the strictness of doctest tests. In pytest, you can enable those flags using the
+configuration file.
 
-It is possible to use fixtures using the ``getfixture`` helper::
-
-    # content of example.rst
-    >>> tmp = getfixture('tmpdir')
-    >>> ...
-    >>>
-
-Also, :ref:`usefixtures` and :ref:`autouse` fixtures are supported
-when executing text doctest files.
-
-The standard ``doctest`` module provides some setting flags to configure the
-strictness of doctest tests. In pytest, you can enable those flags using the
-configuration file. To make pytest ignore trailing whitespaces and ignore
+For example, to make pytest ignore trailing whitespaces and ignore
 lengthy exception stack traces you can just write:
 
 .. code-block:: ini
@@ -99,34 +124,67 @@ Python 3 unchanged:
 * ``ALLOW_BYTES``: when enabled, the ``b`` prefix is stripped from byte strings
   in expected doctest output.
 
-As with any other option flag, these flags can be enabled in ``pytest.ini`` using
-the ``doctest_optionflags`` ini option:
+Alternatively, options can be enabled by an inline comment in the doc test
+itself:
 
-.. code-block:: ini
-
-    [pytest]
-    doctest_optionflags = ALLOW_UNICODE ALLOW_BYTES
-
-
-Alternatively, it can be enabled by an inline comment in the doc test
-itself::
+.. code-block:: rst
 
     # content of example.rst
     >>> get_unicode_greeting()  # doctest: +ALLOW_UNICODE
     'Hello'
 
-By default, pytest would report only the first failure for a given doctest.  If
-you want to continue the test even when you have failures, do::
+By default, pytest would report only the first failure for a given doctest. If
+you want to continue the test even when you have failures, do:
+
+.. code-block:: bash
 
     pytest --doctest-modules --doctest-continue-on-failure
 
 
+Output format
+-------------
+
+You can change the diff output format on failure for your doctests
+by using one of standard doctest modules format in options
+(see :data:`python:doctest.REPORT_UDIFF`, :data:`python:doctest.REPORT_CDIFF`,
+:data:`python:doctest.REPORT_NDIFF`, :data:`python:doctest.REPORT_ONLY_FIRST_FAILURE`):
+
+.. code-block:: bash
+
+    pytest --doctest-modules --doctest-report none
+    pytest --doctest-modules --doctest-report udiff
+    pytest --doctest-modules --doctest-report cdiff
+    pytest --doctest-modules --doctest-report ndiff
+    pytest --doctest-modules --doctest-report only_first_failure
+
+
+pytest-specific features
+------------------------
+
+Some features are provided to make writing doctests easier or with better integration with
+your existing test suite. Keep in mind however that by using those features you will make
+your doctests incompatible with the standard ``doctests`` module.
+
+Using fixtures
+^^^^^^^^^^^^^^
+
+It is possible to use fixtures using the ``getfixture`` helper:
+
+.. code-block:: text
+
+    # content of example.rst
+    >>> tmp = getfixture('tmpdir')
+    >>> ...
+    >>>
+
+Also, :ref:`usefixtures` and :ref:`autouse` fixtures are supported
+when executing text doctest files.
+
+
 .. _`doctest_namespace`:
 
-The 'doctest_namespace' fixture
--------------------------------
-
-.. versionadded:: 3.0
+'doctest_namespace' fixture
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The ``doctest_namespace`` fixture can be used to inject items into the
 namespace in which your doctests run. It is intended to be used within
@@ -152,19 +210,18 @@ which can then be used in your doctests directly::
         """
         pass
 
+Note that like the normal ``conftest.py``, the fixtures are discovered in the directory tree conftest is in.
+Meaning that if you put your doctest with your source code, the relevant conftest.py needs to be in the same directory tree.
+Fixtures will not be discovered in a sibling directory tree!
 
-Output format
--------------
+Skipping tests dynamically
+^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. versionadded:: 3.0
+.. versionadded:: 4.4
 
-You can change the diff output format on failure for your doctests
-by using one of standard doctest modules format in options
-(see :data:`python:doctest.REPORT_UDIFF`, :data:`python:doctest.REPORT_CDIFF`,
-:data:`python:doctest.REPORT_NDIFF`, :data:`python:doctest.REPORT_ONLY_FIRST_FAILURE`)::
+You can use ``pytest.skip`` to dynamically skip doctests. For example::
 
-    pytest --doctest-modules --doctest-report none
-    pytest --doctest-modules --doctest-report udiff
-    pytest --doctest-modules --doctest-report cdiff
-    pytest --doctest-modules --doctest-report ndiff
-    pytest --doctest-modules --doctest-report only_first_failure
+    >>> import sys, pytest
+    >>> if sys.platform.startswith('win'):
+    ...     pytest.skip('this doctest does not work on Windows')
+    ...
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/assertion/failure_demo.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/assertion/failure_demo.py
index dc27f5dfbc1..ba910ef6a88 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/assertion/failure_demo.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/assertion/failure_demo.py
@@ -1,6 +1,7 @@
-from pytest import raises
+# -*- coding: utf-8 -*-
 import _pytest._code
-import py
+import pytest
+from pytest import raises
 
 
 def otherfunc(a, b):
@@ -15,19 +16,13 @@ def otherfunc_multi(a, b):
     assert a == b
 
 
+@pytest.mark.parametrize("param1, param2", [(3, 6)])
 def test_generative(param1, param2):
     assert param1 * 2 < param2
 
 
-def pytest_generate_tests(metafunc):
-    if "param1" in metafunc.fixturenames:
-        metafunc.addcall(funcargs=dict(param1=3, param2=6))
-
-
 class TestFailing(object):
-
     def test_simple(self):
-
         def f():
             return 42
 
@@ -40,7 +35,6 @@ class TestFailing(object):
         otherfunc_multi(42, 6 * 9)
 
     def test_not(self):
-
         def f():
             return 42
 
@@ -48,7 +42,6 @@ class TestFailing(object):
 
 
 class TestSpecialisedExplanations(object):
-
     def test_eq_text(self):
         assert "spam" == "eggs"
 
@@ -104,9 +97,32 @@ class TestSpecialisedExplanations(object):
         text = "head " * 50 + "f" * 70 + "tail " * 20
         assert "f" * 70 not in text
 
+    def test_eq_dataclass(self):
+        from dataclasses import dataclass
+
+        @dataclass
+        class Foo(object):
+            a: int
+            b: str
+
+        left = Foo(1, "b")
+        right = Foo(1, "c")
+        assert left == right
+
+    def test_eq_attrs(self):
+        import attr
+
+        @attr.s
+        class Foo(object):
+            a = attr.ib()
+            b = attr.ib()
+
+        left = Foo(1, "b")
+        right = Foo(1, "c")
+        assert left == right
+
 
 def test_attribute():
-
     class Foo(object):
         b = 1
 
@@ -115,7 +131,6 @@ def test_attribute():
 
 
 def test_attribute_instance():
-
     class Foo(object):
         b = 1
 
@@ -123,9 +138,7 @@ def test_attribute_instance():
 
 
 def test_attribute_failure():
-
     class Foo(object):
-
         def _get_b(self):
             raise Exception("Failed to get attrib")
 
@@ -136,7 +149,6 @@ def test_attribute_failure():
 
 
 def test_attribute_multiple():
-
     class Foo(object):
         b = 1
 
@@ -151,13 +163,12 @@ def globf(x):
 
 
 class TestRaises(object):
-
     def test_raises(self):
-        s = "qwe"  # NOQA
-        raises(TypeError, "int(s)")
+        s = "qwe"
+        raises(TypeError, int, s)
 
     def test_raises_doesnt(self):
-        raises(IOError, "int('3')")
+        raises(IOError, int, "3")
 
     def test_raise(self):
         raise ValueError("demo error")
@@ -187,15 +198,13 @@ def test_dynamic_compile_shows_nicely():
     name = "abc-123"
     module = imp.new_module(name)
     code = _pytest._code.compile(src, name, "exec")
-    py.builtin.exec_(code, module.__dict__)
+    exec(code, module.__dict__)
     sys.modules[name] = module
     module.foo()
 
 
 class TestMoreErrors(object):
-
     def test_complex_error(self):
-
         def f():
             return 44
 
@@ -218,7 +227,6 @@ class TestMoreErrors(object):
         assert s.startswith(g)
 
     def test_startswith_nested(self):
-
         def f():
             return "123"
 
@@ -246,9 +254,7 @@ class TestMoreErrors(object):
 
 
 class TestCustomAssertMsg(object):
-
     def test_single_line(self):
-
         class A(object):
             a = 1
 
@@ -256,17 +262,15 @@ class TestCustomAssertMsg(object):
         assert A.a == b, "A.a appears not to be b"
 
     def test_multiline(self):
-
         class A(object):
             a = 1
 
         b = 2
         assert (
             A.a == b
-        ), "A.a appears not to be b\n" "or does not appear to be b\none of those"
+        ), "A.a appears not to be b\nor does not appear to be b\none of those"
 
     def test_custom_repr(self):
-
         class JSON(object):
             a = 1
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/assertion/global_testmodule_config/conftest.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/assertion/global_testmodule_config/conftest.py
index 4859bea78e6..8e04ac2ac46 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/assertion/global_testmodule_config/conftest.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/assertion/global_testmodule_config/conftest.py
@@ -1,6 +1,8 @@
-import pytest
+# -*- coding: utf-8 -*-
 import py
 
+import pytest
+
 mydir = py.path.local(__file__).dirpath()
 
 
@@ -10,4 +12,4 @@ def pytest_runtest_setup(item):
             return
         mod = item.getparent(pytest.Module).obj
         if hasattr(mod, "hello"):
-            print("mod.hello %r" % (mod.hello,))
+            print("mod.hello {!r}".format(mod.hello))
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/assertion/global_testmodule_config/test_hello_world.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/assertion/global_testmodule_config/test_hello_world.py
index 828e6b9fd7d..bfccc94f712 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/assertion/global_testmodule_config/test_hello_world.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/assertion/global_testmodule_config/test_hello_world.py
@@ -1,5 +1,6 @@
-
+# -*- coding: utf-8 -*-
 hello = "world"
 
+
 def test_func():
     pass
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/assertion/test_failures.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/assertion/test_failures.py
index 1150ec12f66..60b5e213118 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/assertion/test_failures.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/assertion/test_failures.py
@@ -1,8 +1,8 @@
-
+# -*- coding: utf-8 -*-
 import py
 
 failure_demo = py.path.local(__file__).dirpath("failure_demo.py")
-pytest_plugins = "pytester",
+pytest_plugins = ("pytester",)
 
 
 def test_failure_demo_fails_properly(testdir):
@@ -10,5 +10,5 @@ def test_failure_demo_fails_properly(testdir):
     failure_demo.copy(target)
     failure_demo.copy(testdir.tmpdir.join(failure_demo.basename))
     result = testdir.runpytest(target, syspathinsert=True)
-    result.stdout.fnmatch_lines(["*42 failed*"])
+    result.stdout.fnmatch_lines(["*44 failed*"])
     assert result.ret != 0
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/assertion/test_setup_flow_example.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/assertion/test_setup_flow_example.py
index c00711dc238..f49d6d8ed31 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/assertion/test_setup_flow_example.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/assertion/test_setup_flow_example.py
@@ -1,9 +1,9 @@
+# -*- coding: utf-8 -*-
 def setup_module(module):
     module.TestStateFullThing.classcount = 0
 
 
 class TestStateFullThing(object):
-
     def setup_class(cls):
         cls.classcount += 1
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/attic.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/attic.rst
index d6fecf340b6..9bf3703ce1a 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/attic.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/attic.rst
@@ -24,10 +24,10 @@ example: specifying and selecting acceptance tests
                 pytest.skip("specify -A to run acceptance tests")
             self.tmpdir = request.config.mktemp(request.function.__name__, numbered=True)
 
-        def run(self, cmd):
+        def run(self, *cmd):
             """ called by test code to execute an acceptance test. """
             self.tmpdir.chdir()
-            return py.process.cmdexec(cmd)
+            return subprocess.check_output(cmd).decode()
 
 
 and the actual test function example:
@@ -36,7 +36,7 @@ and the actual test function example:
 
     def test_some_acceptance_aspect(accept):
         accept.tmpdir.mkdir("somesub")
-        result = accept.run("ls -la")
+        result = accept.run("ls", "-la")
         assert "somesub" in result
 
 If you run this test without specifying a command line option
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/conftest.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/conftest.py
index f905738c4f6..1f5a961ada0 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/conftest.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/conftest.py
@@ -1 +1,2 @@
+# -*- coding: utf-8 -*-
 collect_ignore = ["nonpython"]
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/costlysetup/conftest.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/costlysetup/conftest.py
index 466c62c06ab..b90c774733b 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/costlysetup/conftest.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/costlysetup/conftest.py
@@ -1,4 +1,4 @@
-
+# -*- coding: utf-8 -*-
 import pytest
 
 
@@ -10,7 +10,6 @@ def setup(request):
 
 
 class CostlySetup(object):
-
     def __init__(self):
         import time
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/costlysetup/sub_a/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/costlysetup/sub_a/__init__.py
index 792d6005489..ec51c5a2b9d 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/costlysetup/sub_a/__init__.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/costlysetup/sub_a/__init__.py
@@ -1 +1,2 @@
+# -*- coding: utf-8 -*-
 #
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/costlysetup/sub_a/test_quick.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/costlysetup/sub_a/test_quick.py
index 38dda2660d2..4f7b9f1ac7d 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/costlysetup/sub_a/test_quick.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/costlysetup/sub_a/test_quick.py
@@ -1,2 +1,3 @@
+# -*- coding: utf-8 -*-
 def test_quick(setup):
     pass
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/costlysetup/sub_b/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/costlysetup/sub_b/__init__.py
index 792d6005489..ec51c5a2b9d 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/costlysetup/sub_b/__init__.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/costlysetup/sub_b/__init__.py
@@ -1 +1,2 @@
+# -*- coding: utf-8 -*-
 #
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/costlysetup/sub_b/test_two.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/costlysetup/sub_b/test_two.py
index b1653aaab88..4e08bc2b69e 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/costlysetup/sub_b/test_two.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/costlysetup/sub_b/test_two.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 def test_something(setup):
     assert setup.timecostly == 1
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/markers.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/markers.rst
index bf352bc8129..b8d8bef0cb1 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/markers.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/markers.rst
@@ -4,50 +4,66 @@
 Working with custom markers
 =================================================
 
-Here are some example using the :ref:`mark` mechanism.
+Here are some examples using the :ref:`mark` mechanism.
+
+.. _`mark run`:
 
 Marking test functions and selecting them for a run
 ----------------------------------------------------
 
-You can "mark" a test function with custom metadata like this::
+You can "mark" a test function with custom metadata like this:
+
+.. code-block:: python
 
     # content of test_server.py
 
     import pytest
+
+
     @pytest.mark.webtest
     def test_send_http():
-        pass # perform some webtest test for your app
+        pass  # perform some webtest test for your app
+
+
     def test_something_quick():
         pass
+
+
     def test_another():
         pass
+
+
     class TestClass(object):
         def test_method(self):
             pass
 
-.. versionadded:: 2.2
 
-You can then restrict a test run to only run tests marked with ``webtest``::
+
+You can then restrict a test run to only run tests marked with ``webtest``:
+
+.. code-block:: pytest
 
     $ pytest -v -m webtest
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.5
-    cachedir: .pytest_cache
-    rootdir: $REGENDOC_TMPDIR, inifile:
-    collecting ... collected 4 items / 3 deselected
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
+    collecting ... collected 4 items / 3 deselected / 1 selected
 
     test_server.py::test_send_http PASSED                                [100%]
 
     ================== 1 passed, 3 deselected in 0.12 seconds ==================
 
-Or the inverse, running all tests except the webtest ones::
+Or the inverse, running all tests except the webtest ones:
+
+.. code-block:: pytest
 
     $ pytest -v -m "not webtest"
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.5
-    cachedir: .pytest_cache
-    rootdir: $REGENDOC_TMPDIR, inifile:
-    collecting ... collected 4 items / 1 deselected
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
+    collecting ... collected 4 items / 1 deselected / 3 selected
 
     test_server.py::test_something_quick PASSED                          [ 33%]
     test_server.py::test_another PASSED                                  [ 66%]
@@ -60,45 +76,51 @@ Selecting tests based on their node ID
 
 You can provide one or more :ref:`node IDs <node-id>` as positional
 arguments to select only specified tests. This makes it easy to select
-tests based on their module, class, method, or function name::
+tests based on their module, class, method, or function name:
+
+.. code-block:: pytest
 
     $ pytest -v test_server.py::TestClass::test_method
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.5
-    cachedir: .pytest_cache
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collecting ... collected 1 item
 
     test_server.py::TestClass::test_method PASSED                        [100%]
 
     ========================= 1 passed in 0.12 seconds =========================
 
-You can also select on the class::
+You can also select on the class:
+
+.. code-block:: pytest
 
     $ pytest -v test_server.py::TestClass
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.5
-    cachedir: .pytest_cache
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collecting ... collected 1 item
 
     test_server.py::TestClass::test_method PASSED                        [100%]
 
     ========================= 1 passed in 0.12 seconds =========================
 
-Or select multiple nodes::
+Or select multiple nodes:
 
-  $ pytest -v test_server.py::TestClass test_server.py::test_send_http
-  =========================== test session starts ============================
-  platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.5
-  cachedir: .pytest_cache
-  rootdir: $REGENDOC_TMPDIR, inifile:
-  collecting ... collected 2 items
+.. code-block:: pytest
 
-  test_server.py::TestClass::test_method PASSED                        [ 50%]
-  test_server.py::test_send_http PASSED                                [100%]
+    $ pytest -v test_server.py::TestClass test_server.py::test_send_http
+    =========================== test session starts ============================
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
+    collecting ... collected 2 items
 
-  ========================= 2 passed in 0.12 seconds =========================
+    test_server.py::TestClass::test_method PASSED                        [ 50%]
+    test_server.py::test_send_http PASSED                                [100%]
+
+    ========================= 2 passed in 0.12 seconds =========================
 
 .. _node-id:
 
@@ -124,27 +146,31 @@ Using ``-k expr`` to select tests based on their name
 You can use the ``-k`` command line option to specify an expression
 which implements a substring match on the test names instead of the
 exact match on markers that ``-m`` provides.  This makes it easy to
-select tests based on their names::
+select tests based on their names:
+
+.. code-block:: pytest
 
     $ pytest -v -k http  # running with the above defined example module
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.5
-    cachedir: .pytest_cache
-    rootdir: $REGENDOC_TMPDIR, inifile:
-    collecting ... collected 4 items / 3 deselected
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
+    collecting ... collected 4 items / 3 deselected / 1 selected
 
     test_server.py::test_send_http PASSED                                [100%]
 
     ================== 1 passed, 3 deselected in 0.12 seconds ==================
 
-And you can also run all tests except the ones that match the keyword::
+And you can also run all tests except the ones that match the keyword:
+
+.. code-block:: pytest
 
     $ pytest -k "not send_http" -v
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.5
-    cachedir: .pytest_cache
-    rootdir: $REGENDOC_TMPDIR, inifile:
-    collecting ... collected 4 items / 1 deselected
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
+    collecting ... collected 4 items / 1 deselected / 3 selected
 
     test_server.py::test_something_quick PASSED                          [ 33%]
     test_server.py::test_another PASSED                                  [ 66%]
@@ -152,14 +178,16 @@ And you can also run all tests except the ones that match the keyword::
 
     ================== 3 passed, 1 deselected in 0.12 seconds ==================
 
-Or to select "http" and "quick" tests::
+Or to select "http" and "quick" tests:
+
+.. code-block:: pytest
 
     $ pytest -k "http or quick" -v
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.5
-    cachedir: .pytest_cache
-    rootdir: $REGENDOC_TMPDIR, inifile:
-    collecting ... collected 4 items / 2 deselected
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
+    collecting ... collected 4 items / 2 deselected / 2 selected
 
     test_server.py::test_send_http PASSED                                [ 50%]
     test_server.py::test_something_quick PASSED                          [100%]
@@ -184,31 +212,37 @@ Or to select "http" and "quick" tests::
 Registering markers
 -------------------------------------
 
-.. versionadded:: 2.2
+
 
 .. ini-syntax for custom markers:
 
-Registering markers for your test suite is simple::
+Registering markers for your test suite is simple:
+
+.. code-block:: ini
 
     # content of pytest.ini
     [pytest]
     markers =
         webtest: mark a test as a webtest.
 
-You can ask which markers exist for your test suite - the list includes our just defined ``webtest`` markers::
+You can ask which markers exist for your test suite - the list includes our just defined ``webtest`` markers:
+
+.. code-block:: pytest
 
     $ pytest --markers
     @pytest.mark.webtest: mark a test as a webtest.
 
+    @pytest.mark.filterwarnings(warning): add a warning filter to the given test. see https://docs.pytest.org/en/latest/warnings.html#pytest-mark-filterwarnings
+
     @pytest.mark.skip(reason=None): skip the given test function with an optional reason. Example: skip(reason="no way of currently testing this") skips the test.
 
-    @pytest.mark.skipif(condition): skip the given test function if eval(condition) results in a True value.  Evaluation happens within the module global context. Example: skipif('sys.platform == "win32"') skips the test if we are on the win32 platform. see http://pytest.org/latest/skipping.html
+    @pytest.mark.skipif(condition): skip the given test function if eval(condition) results in a True value.  Evaluation happens within the module global context. Example: skipif('sys.platform == "win32"') skips the test if we are on the win32 platform. see https://docs.pytest.org/en/latest/skipping.html
 
-    @pytest.mark.xfail(condition, reason=None, run=True, raises=None, strict=False): mark the test function as an expected failure if eval(condition) has a True value. Optionally specify a reason for better reporting and run=False if you don't even want to execute the test function. If only specific exception(s) are expected, you can list them in raises, and if the test fails in other ways, it will be reported as a true failure. See http://pytest.org/latest/skipping.html
+    @pytest.mark.xfail(condition, reason=None, run=True, raises=None, strict=False): mark the test function as an expected failure if eval(condition) has a True value. Optionally specify a reason for better reporting and run=False if you don't even want to execute the test function. If only specific exception(s) are expected, you can list them in raises, and if the test fails in other ways, it will be reported as a true failure. See https://docs.pytest.org/en/latest/skipping.html
 
-    @pytest.mark.parametrize(argnames, argvalues): call a test function multiple times passing in different arguments in turn. argvalues generally needs to be a list of values if argnames specifies only one name or a list of tuples of values if argnames specifies multiple names. Example: @parametrize('arg1', [1,2]) would lead to two calls of the decorated test function, one with arg1=1 and another with arg1=2.see http://pytest.org/latest/parametrize.html for more info and examples.
+    @pytest.mark.parametrize(argnames, argvalues): call a test function multiple times passing in different arguments in turn. argvalues generally needs to be a list of values if argnames specifies only one name or a list of tuples of values if argnames specifies multiple names. Example: @parametrize('arg1', [1,2]) would lead to two calls of the decorated test function, one with arg1=1 and another with arg1=2.see https://docs.pytest.org/en/latest/parametrize.html for more info and examples.
 
-    @pytest.mark.usefixtures(fixturename1, fixturename2, ...): mark tests as needing all of the specified fixtures. see http://pytest.org/latest/fixture.html#usefixtures
+    @pytest.mark.usefixtures(fixturename1, fixturename2, ...): mark tests as needing all of the specified fixtures. see https://docs.pytest.org/en/latest/fixture.html#usefixtures
 
     @pytest.mark.tryfirst: mark a hook implementation function such that the plugin machinery will try to call it first/as early as possible.
 
@@ -227,7 +261,7 @@ For an example on how to add and work with markers from a plugin, see
     * Asking for existing markers via ``pytest --markers`` gives good output
 
     * Typos in function markers are treated as an error if you use
-      the ``--strict`` option.
+      the ``--strict-markers`` option.
 
 .. _`scoped-marking`:
 
@@ -235,14 +269,19 @@ Marking whole classes or modules
 ----------------------------------------------------
 
 You may use ``pytest.mark`` decorators with classes to apply markers to all of
-its test methods::
+its test methods:
+
+.. code-block:: python
 
     # content of test_mark_classlevel.py
     import pytest
+
+
     @pytest.mark.webtest
     class TestClass(object):
         def test_startup(self):
             pass
+
         def test_startup_and_more(self):
             pass
 
@@ -250,17 +289,23 @@ This is equivalent to directly applying the decorator to the
 two test functions.
 
 To remain backward-compatible with Python 2.4 you can also set a
-``pytestmark`` attribute on a TestClass like this::
+``pytestmark`` attribute on a TestClass like this:
+
+.. code-block:: python
 
     import pytest
 
+
     class TestClass(object):
         pytestmark = pytest.mark.webtest
 
-or if you need to use multiple markers you can use a list::
+or if you need to use multiple markers you can use a list:
+
+.. code-block:: python
 
     import pytest
 
+
     class TestClass(object):
         pytestmark = [pytest.mark.webtest, pytest.mark.slowtest]
 
@@ -269,8 +314,12 @@ You can also set a module level marker::
     import pytest
     pytestmark = pytest.mark.webtest
 
-in which case it will be applied to all functions and
-methods defined in the module.
+or multiple markers::
+
+    pytestmark = [pytest.mark.webtest, pytest.mark.slowtest]
+
+in which case markers will be applied (in left-to-right order) to
+all functions and methods defined in the module.
 
 .. _`marking individual tests when using parametrize`:
 
@@ -279,32 +328,24 @@ Marking individual tests when using parametrize
 
 When using parametrize, applying a mark will make it apply
 to each individual test. However it is also possible to
-apply a marker to an individual test instance::
+apply a marker to an individual test instance:
+
+.. code-block:: python
 
     import pytest
 
+
     @pytest.mark.foo
-    @pytest.mark.parametrize(("n", "expected"), [
-        (1, 2),
-        pytest.mark.bar((1, 3)),
-        (2, 3),
-    ])
+    @pytest.mark.parametrize(
+        ("n", "expected"), [(1, 2), pytest.param((1, 3), marks=pytest.mark.bar), (2, 3)]
+    )
     def test_increment(n, expected):
-         assert n + 1 == expected
+        assert n + 1 == expected
 
 In this example the mark "foo" will apply to each of the three
 tests, whereas the "bar" mark is only applied to the second test.
 Skip and xfail marks can also be applied in this way, see :ref:`skip/xfail with parametrize`.
 
-.. note::
-
-    If the data you are parametrizing happen to be single callables, you need to be careful
-    when marking these items. `pytest.mark.xfail(my_func)` won't work because it's also the
-    signature of a function being decorated. To resolve this ambiguity, you need to pass a
-    reason argument:
-    `pytest.mark.xfail(func_bar, reason="Issue#7")`.
-
-
 .. _`adding a custom marker from a plugin`:
 
 Custom marker and command line option to control test runs
@@ -315,74 +356,99 @@ Custom marker and command line option to control test runs
 Plugins can provide custom markers and implement specific behaviour
 based on it. This is a self-contained example which adds a command
 line option and a parametrized test function marker to run tests
-specifies via named environments::
+specifies via named environments:
+
+.. code-block:: python
 
     # content of conftest.py
 
     import pytest
+
+
     def pytest_addoption(parser):
-        parser.addoption("-E", action="store", metavar="NAME",
-            help="only run tests matching the environment NAME.")
+        parser.addoption(
+            "-E",
+            action="store",
+            metavar="NAME",
+            help="only run tests matching the environment NAME.",
+        )
+
 
     def pytest_configure(config):
         # register an additional marker
-        config.addinivalue_line("markers",
-            "env(name): mark test to run only on named environment")
+        config.addinivalue_line(
+            "markers", "env(name): mark test to run only on named environment"
+        )
+
 
     def pytest_runtest_setup(item):
-        envnames = [mark.args[0] for mark in item.iter_markers(name='env')]
+        envnames = [mark.args[0] for mark in item.iter_markers(name="env")]
         if envnames:
             if item.config.getoption("-E") not in envnames:
                 pytest.skip("test requires env in %r" % envnames)
 
-A test file using this local plugin::
+A test file using this local plugin:
+
+.. code-block:: python
 
     # content of test_someenv.py
 
     import pytest
+
+
     @pytest.mark.env("stage1")
     def test_basic_db_operation():
         pass
 
 and an example invocations specifying a different environment than what
-the test needs::
+the test needs:
+
+.. code-block:: pytest
 
     $ pytest -E stage2
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 1 item
 
     test_someenv.py s                                                    [100%]
 
     ======================== 1 skipped in 0.12 seconds =========================
 
-and here is one that specifies exactly the environment needed::
+and here is one that specifies exactly the environment needed:
+
+.. code-block:: pytest
 
     $ pytest -E stage1
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 1 item
 
     test_someenv.py .                                                    [100%]
 
     ========================= 1 passed in 0.12 seconds =========================
 
-The ``--markers`` option always gives you a list of available markers::
+The ``--markers`` option always gives you a list of available markers:
+
+.. code-block:: pytest
 
     $ pytest --markers
     @pytest.mark.env(name): mark test to run only on named environment
 
+    @pytest.mark.filterwarnings(warning): add a warning filter to the given test. see https://docs.pytest.org/en/latest/warnings.html#pytest-mark-filterwarnings
+
     @pytest.mark.skip(reason=None): skip the given test function with an optional reason. Example: skip(reason="no way of currently testing this") skips the test.
 
-    @pytest.mark.skipif(condition): skip the given test function if eval(condition) results in a True value.  Evaluation happens within the module global context. Example: skipif('sys.platform == "win32"') skips the test if we are on the win32 platform. see http://pytest.org/latest/skipping.html
+    @pytest.mark.skipif(condition): skip the given test function if eval(condition) results in a True value.  Evaluation happens within the module global context. Example: skipif('sys.platform == "win32"') skips the test if we are on the win32 platform. see https://docs.pytest.org/en/latest/skipping.html
 
-    @pytest.mark.xfail(condition, reason=None, run=True, raises=None, strict=False): mark the test function as an expected failure if eval(condition) has a True value. Optionally specify a reason for better reporting and run=False if you don't even want to execute the test function. If only specific exception(s) are expected, you can list them in raises, and if the test fails in other ways, it will be reported as a true failure. See http://pytest.org/latest/skipping.html
+    @pytest.mark.xfail(condition, reason=None, run=True, raises=None, strict=False): mark the test function as an expected failure if eval(condition) has a True value. Optionally specify a reason for better reporting and run=False if you don't even want to execute the test function. If only specific exception(s) are expected, you can list them in raises, and if the test fails in other ways, it will be reported as a true failure. See https://docs.pytest.org/en/latest/skipping.html
 
-    @pytest.mark.parametrize(argnames, argvalues): call a test function multiple times passing in different arguments in turn. argvalues generally needs to be a list of values if argnames specifies only one name or a list of tuples of values if argnames specifies multiple names. Example: @parametrize('arg1', [1,2]) would lead to two calls of the decorated test function, one with arg1=1 and another with arg1=2.see http://pytest.org/latest/parametrize.html for more info and examples.
+    @pytest.mark.parametrize(argnames, argvalues): call a test function multiple times passing in different arguments in turn. argvalues generally needs to be a list of values if argnames specifies only one name or a list of tuples of values if argnames specifies multiple names. Example: @parametrize('arg1', [1,2]) would lead to two calls of the decorated test function, one with arg1=1 and another with arg1=2.see https://docs.pytest.org/en/latest/parametrize.html for more info and examples.
 
-    @pytest.mark.usefixtures(fixturename1, fixturename2, ...): mark tests as needing all of the specified fixtures. see http://pytest.org/latest/fixture.html#usefixtures
+    @pytest.mark.usefixtures(fixturename1, fixturename2, ...): mark tests as needing all of the specified fixtures. see https://docs.pytest.org/en/latest/fixture.html#usefixtures
 
     @pytest.mark.tryfirst: mark a hook implementation function such that the plugin machinery will try to call it first/as early as possible.
 
@@ -396,31 +462,40 @@ Passing a callable to custom markers
 
 .. regendoc:wipe
 
-Below is the config file that will be used in the next examples::
+Below is the config file that will be used in the next examples:
+
+.. code-block:: python
 
     # content of conftest.py
     import sys
 
+
     def pytest_runtest_setup(item):
-        for marker in item.iter_markers(name='my_marker'):
+        for marker in item.iter_markers(name="my_marker"):
             print(marker)
             sys.stdout.flush()
 
 A custom marker can have its argument set, i.e. ``args`` and ``kwargs`` properties, defined by either invoking it as a callable or using ``pytest.mark.MARKER_NAME.with_args``. These two methods achieve the same effect most of the time.
 
-However, if there is a callable as the single positional argument with no keyword arguments, using the ``pytest.mark.MARKER_NAME(c)`` will not pass ``c`` as a positional argument but decorate ``c`` with the custom marker (see :ref:`MarkDecorator <mark>`). Fortunately, ``pytest.mark.MARKER_NAME.with_args`` comes to the rescue::
+However, if there is a callable as the single positional argument with no keyword arguments, using the ``pytest.mark.MARKER_NAME(c)`` will not pass ``c`` as a positional argument but decorate ``c`` with the custom marker (see :ref:`MarkDecorator <mark>`). Fortunately, ``pytest.mark.MARKER_NAME.with_args`` comes to the rescue:
+
+.. code-block:: python
 
     # content of test_custom_marker.py
     import pytest
 
+
     def hello_world(*args, **kwargs):
-        return 'Hello World'
+        return "Hello World"
+
 
     @pytest.mark.my_marker.with_args(hello_world)
     def test_with_args():
         pass
 
-The output is as follows::
+The output is as follows:
+
+.. code-block:: pytest
 
     $ pytest -q -s
     Mark(name='my_marker', args=(<function hello_world at 0xdeadbeef>,), kwargs={})
@@ -438,12 +513,16 @@ Reading markers which were set from multiple places
 .. regendoc:wipe
 
 If you are heavily using markers in your test suite you may encounter the case where a marker is applied several times to a test function.  From plugin
-code you can read over all such settings.  Example::
+code you can read over all such settings.  Example:
+
+.. code-block:: python
 
     # content of test_mark_three_times.py
     import pytest
+
     pytestmark = pytest.mark.glob("module", x=1)
 
+
     @pytest.mark.glob("class", x=2)
     class TestClass(object):
         @pytest.mark.glob("function", x=3)
@@ -451,17 +530,22 @@ code you can read over all such settings.  Example::
             pass
 
 Here we have the marker "glob" applied three times to the same
-test function.  From a conftest file we can read it like this::
+test function.  From a conftest file we can read it like this:
+
+.. code-block:: python
 
     # content of conftest.py
     import sys
 
+
     def pytest_runtest_setup(item):
-        for mark in item.iter_markers(name='glob'):
-            print ("glob args=%s kwargs=%s" %(mark.args, mark.kwargs))
+        for mark in item.iter_markers(name="glob"):
+            print("glob args=%s kwargs=%s" % (mark.args, mark.kwargs))
             sys.stdout.flush()
 
-Let's run this without capturing output and see what we get::
+Let's run this without capturing output and see what we get:
+
+.. code-block:: pytest
 
     $ pytest -q -s
     glob args=('function',) kwargs={'x': 3}
@@ -479,7 +563,9 @@ Consider you have a test suite which marks tests for particular platforms,
 namely ``pytest.mark.darwin``, ``pytest.mark.win32`` etc. and you
 also have tests that run on all platforms and have no specific
 marker.  If you now want to have a way to only run the tests
-for your particular platform, you could use the following plugin::
+for your particular platform, you could use the following plugin:
+
+.. code-block:: python
 
     # content of conftest.py
     #
@@ -488,6 +574,7 @@ for your particular platform, you could use the following plugin::
 
     ALL = set("darwin linux win32".split())
 
+
     def pytest_runtest_setup(item):
         supported_platforms = ALL.intersection(mark.name for mark in item.iter_markers())
         plat = sys.platform
@@ -495,48 +582,60 @@ for your particular platform, you could use the following plugin::
             pytest.skip("cannot run on platform %s" % (plat))
 
 then tests will be skipped if they were specified for a different platform.
-Let's do a little test file to show how this looks like::
+Let's do a little test file to show how this looks like:
+
+.. code-block:: python
 
     # content of test_plat.py
 
     import pytest
 
+
     @pytest.mark.darwin
     def test_if_apple_is_evil():
         pass
 
+
     @pytest.mark.linux
     def test_if_linux_works():
         pass
 
+
     @pytest.mark.win32
     def test_if_win32_crashes():
         pass
 
+
     def test_runs_everywhere():
         pass
 
-then you will see two tests skipped and two executed tests as expected::
+then you will see two tests skipped and two executed tests as expected:
+
+.. code-block:: pytest
 
     $ pytest -rs # this option reports skip reasons
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 4 items
 
     test_plat.py s.s.                                                    [100%]
-    ========================= short test summary info ==========================
-    SKIP [2] $REGENDOC_TMPDIR/conftest.py:12: cannot run on platform linux
 
+    ========================= short test summary info ==========================
+    SKIPPED [2] $REGENDOC_TMPDIR/conftest.py:13: cannot run on platform linux
     =================== 2 passed, 2 skipped in 0.12 seconds ====================
 
-Note that if you specify a platform via the marker-command line option like this::
+Note that if you specify a platform via the marker-command line option like this:
+
+.. code-block:: pytest
 
     $ pytest -m linux
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
-    collected 4 items / 3 deselected
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
+    collected 4 items / 3 deselected / 1 selected
 
     test_plat.py .                                                       [100%]
 
@@ -552,28 +651,38 @@ Automatically adding markers based on test names
 If you a test suite where test function names indicate a certain
 type of test, you can implement a hook that automatically defines
 markers so that you can use the ``-m`` option with it. Let's look
-at this test module::
+at this test module:
+
+.. code-block:: python
 
     # content of test_module.py
 
+
     def test_interface_simple():
         assert 0
 
+
     def test_interface_complex():
         assert 0
 
+
     def test_event_simple():
         assert 0
 
+
     def test_something_else():
         assert 0
 
 We want to dynamically define two markers and can do it in a
-``conftest.py`` plugin::
+``conftest.py`` plugin:
+
+.. code-block:: python
 
     # content of conftest.py
 
     import pytest
+
+
     def pytest_collection_modifyitems(items):
         for item in items:
             if "interface" in item.nodeid:
@@ -581,48 +690,54 @@ We want to dynamically define two markers and can do it in a
             elif "event" in item.nodeid:
                 item.add_marker(pytest.mark.event)
 
-We can now use the ``-m option`` to select one set::
+We can now use the ``-m option`` to select one set:
 
-  $ pytest -m interface --tb=short
-  =========================== test session starts ============================
-  platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-  rootdir: $REGENDOC_TMPDIR, inifile:
-  collected 4 items / 2 deselected
+.. code-block:: pytest
 
-  test_module.py FF                                                    [100%]
+    $ pytest -m interface --tb=short
+    =========================== test session starts ============================
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
+    collected 4 items / 2 deselected / 2 selected
 
-  ================================= FAILURES =================================
-  __________________________ test_interface_simple ___________________________
-  test_module.py:3: in test_interface_simple
-      assert 0
-  E   assert 0
-  __________________________ test_interface_complex __________________________
-  test_module.py:6: in test_interface_complex
-      assert 0
-  E   assert 0
-  ================== 2 failed, 2 deselected in 0.12 seconds ==================
+    test_module.py FF                                                    [100%]
 
-or to select both "event" and "interface" tests::
+    ================================= FAILURES =================================
+    __________________________ test_interface_simple ___________________________
+    test_module.py:4: in test_interface_simple
+        assert 0
+    E   assert 0
+    __________________________ test_interface_complex __________________________
+    test_module.py:8: in test_interface_complex
+        assert 0
+    E   assert 0
+    ================== 2 failed, 2 deselected in 0.12 seconds ==================
 
-  $ pytest -m "interface or event" --tb=short
-  =========================== test session starts ============================
-  platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-  rootdir: $REGENDOC_TMPDIR, inifile:
-  collected 4 items / 1 deselected
+or to select both "event" and "interface" tests:
 
-  test_module.py FFF                                                   [100%]
+.. code-block:: pytest
 
-  ================================= FAILURES =================================
-  __________________________ test_interface_simple ___________________________
-  test_module.py:3: in test_interface_simple
-      assert 0
-  E   assert 0
-  __________________________ test_interface_complex __________________________
-  test_module.py:6: in test_interface_complex
-      assert 0
-  E   assert 0
-  ____________________________ test_event_simple _____________________________
-  test_module.py:9: in test_event_simple
-      assert 0
-  E   assert 0
-  ================== 3 failed, 1 deselected in 0.12 seconds ==================
+    $ pytest -m "interface or event" --tb=short
+    =========================== test session starts ============================
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
+    collected 4 items / 1 deselected / 3 selected
+
+    test_module.py FFF                                                   [100%]
+
+    ================================= FAILURES =================================
+    __________________________ test_interface_simple ___________________________
+    test_module.py:4: in test_interface_simple
+        assert 0
+    E   assert 0
+    __________________________ test_interface_complex __________________________
+    test_module.py:8: in test_interface_complex
+        assert 0
+    E   assert 0
+    ____________________________ test_event_simple _____________________________
+    test_module.py:12: in test_event_simple
+        assert 0
+    E   assert 0
+    ================== 3 failed, 1 deselected in 0.12 seconds ==================
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/multipython.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/multipython.py
index 970800c7e61..dc722aac91d 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/multipython.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/multipython.py
@@ -1,10 +1,13 @@
+# -*- coding: utf-8 -*-
 """
 module containing a parametrized tests testing cross-python
 serialization via the pickle module.
 """
-import py
+import distutils.spawn
+import subprocess
+import textwrap
+
 import pytest
-import _pytest._code
 
 pythonlist = ["python2.7", "python3.4", "python3.5"]
 
@@ -21,46 +24,47 @@ def python2(request, python1):
 
 
 class Python(object):
-
     def __init__(self, version, picklefile):
-        self.pythonpath = py.path.local.sysfind(version)
+        self.pythonpath = distutils.spawn.find_executable(version)
         if not self.pythonpath:
-            pytest.skip("%r not found" % (version,))
+            pytest.skip("{!r} not found".format(version))
         self.picklefile = picklefile
 
     def dumps(self, obj):
         dumpfile = self.picklefile.dirpath("dump.py")
         dumpfile.write(
-            _pytest._code.Source(
-                """
-            import pickle
-            f = open(%r, 'wb')
-            s = pickle.dump(%r, f, protocol=2)
-            f.close()
-        """
-                % (str(self.picklefile), obj)
+            textwrap.dedent(
+                r"""
+                import pickle
+                f = open({!r}, 'wb')
+                s = pickle.dump({!r}, f, protocol=2)
+                f.close()
+                """.format(
+                    str(self.picklefile), obj
+                )
             )
         )
-        py.process.cmdexec("%s %s" % (self.pythonpath, dumpfile))
+        subprocess.check_call((self.pythonpath, str(dumpfile)))
 
     def load_and_is_true(self, expression):
         loadfile = self.picklefile.dirpath("load.py")
         loadfile.write(
-            _pytest._code.Source(
-                """
-            import pickle
-            f = open(%r, 'rb')
-            obj = pickle.load(f)
-            f.close()
-            res = eval(%r)
-            if not res:
-                raise SystemExit(1)
-        """
-                % (str(self.picklefile), expression)
+            textwrap.dedent(
+                r"""
+                import pickle
+                f = open({!r}, 'rb')
+                obj = pickle.load(f)
+                f.close()
+                res = eval({!r})
+                if not res:
+                    raise SystemExit(1)
+                """.format(
+                    str(self.picklefile), expression
+                )
             )
         )
         print(loadfile)
-        py.process.cmdexec("%s %s" % (self.pythonpath, loadfile))
+        subprocess.check_call((self.pythonpath, str(loadfile)))
 
 
 @pytest.mark.parametrize("obj", [42, {}, {1: 3}])
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/nonpython.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/nonpython.rst
index 4f5adf63fd7..0910071c14a 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/nonpython.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/nonpython.rst
@@ -23,12 +23,15 @@ You can create a simple example file:
     :literal:
 
 and if you installed `PyYAML`_ or a compatible YAML-parser you can
-now execute the test specification::
+now execute the test specification:
+
+.. code-block:: pytest
 
     nonpython $ pytest test_simple.yml
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR/nonpython, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR/nonpython
     collected 2 items
 
     test_simple.yml F.                                                   [100%]
@@ -55,13 +58,15 @@ your own domain specific testing language this way.
     will be reported as a (red) string.
 
 ``reportinfo()`` is used for representing the test location and is also
-consulted when reporting in ``verbose`` mode::
+consulted when reporting in ``verbose`` mode:
+
+.. code-block:: pytest
 
     nonpython $ pytest -v
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.5
-    cachedir: .pytest_cache
-    rootdir: $REGENDOC_TMPDIR/nonpython, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR/nonpython
     collecting ... collected 2 items
 
     test_simple.yml::hello FAILED                                        [ 50%]
@@ -77,15 +82,19 @@ consulted when reporting in ``verbose`` mode::
 .. regendoc:wipe
 
 While developing your custom test collection and execution it's also
-interesting to just look at the collection tree::
+interesting to just look at the collection tree:
+
+.. code-block:: pytest
 
     nonpython $ pytest --collect-only
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR/nonpython, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR/nonpython
     collected 2 items
-    <YamlFile 'test_simple.yml'>
-      <YamlItem 'hello'>
-      <YamlItem 'ok'>
+    <Package $REGENDOC_TMPDIR/nonpython>
+      <YamlFile test_simple.yml>
+        <YamlItem hello>
+        <YamlItem ok>
 
     ======================= no tests ran in 0.12 seconds =======================
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/nonpython/conftest.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/nonpython/conftest.py
index 8429dd114b1..306aa250379 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/nonpython/conftest.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/nonpython/conftest.py
@@ -1,5 +1,5 @@
+# -*- coding: utf-8 -*-
 # content of conftest.py
-
 import pytest
 
 
@@ -9,7 +9,6 @@ def pytest_collect_file(parent, path):
 
 
 class YamlFile(pytest.File):
-
     def collect(self):
         import yaml  # we need a yaml parser, e.g. PyYAML
 
@@ -19,7 +18,6 @@ class YamlFile(pytest.File):
 
 
 class YamlItem(pytest.Item):
-
     def __init__(self, name, parent, spec):
         super(YamlItem, self).__init__(name, parent)
         self.spec = spec
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/parametrize.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/parametrize.rst
index 882700fec11..2ab5e3ab10c 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/parametrize.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/parametrize.rst
@@ -42,14 +42,18 @@ Now we add a test configuration like this::
                 end = 2
             metafunc.parametrize("param1", range(end))
 
-This means that we only run 2 tests if we do not pass ``--all``::
+This means that we only run 2 tests if we do not pass ``--all``:
+
+.. code-block:: pytest
 
     $ pytest -q test_compute.py
     ..                                                                   [100%]
     2 passed in 0.12 seconds
 
 We run only two computations, so we see two dots.
-let's run the full monty::
+let's run the full monty:
+
+.. code-block:: pytest
 
     $ pytest -q --all
     ....F                                                                [100%]
@@ -134,23 +138,25 @@ used as the test IDs. These are succinct, but can be a pain to maintain.
 In ``test_timedistance_v2``, we specified ``ids`` as a function that can generate a
 string representation to make part of the test ID. So our ``datetime`` values use the
 label generated by ``idfn``, but because we didn't generate a label for ``timedelta``
-objects, they are still using the default pytest representation::
+objects, they are still using the default pytest representation:
 
+.. code-block:: pytest
 
     $ pytest test_time.py --collect-only
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 8 items
-    <Module 'test_time.py'>
-      <Function 'test_timedistance_v0[a0-b0-expected0]'>
-      <Function 'test_timedistance_v0[a1-b1-expected1]'>
-      <Function 'test_timedistance_v1[forward]'>
-      <Function 'test_timedistance_v1[backward]'>
-      <Function 'test_timedistance_v2[20011212-20011211-expected0]'>
-      <Function 'test_timedistance_v2[20011211-20011212-expected1]'>
-      <Function 'test_timedistance_v3[forward]'>
-      <Function 'test_timedistance_v3[backward]'>
+    <Module test_time.py>
+      <Function test_timedistance_v0[a0-b0-expected0]>
+      <Function test_timedistance_v0[a1-b1-expected1]>
+      <Function test_timedistance_v1[forward]>
+      <Function test_timedistance_v1[backward]>
+      <Function test_timedistance_v2[20011212-20011211-expected0]>
+      <Function test_timedistance_v2[20011211-20011212-expected1]>
+      <Function test_timedistance_v3[forward]>
+      <Function test_timedistance_v3[backward]>
 
     ======================= no tests ran in 0.12 seconds =======================
 
@@ -191,33 +197,37 @@ only have to work a bit to construct the correct arguments for pytest's
         def test_demo2(self, attribute):
             assert isinstance(attribute, str)
 
-this is a fully self-contained example which you can run with::
+this is a fully self-contained example which you can run with:
+
+.. code-block:: pytest
 
     $ pytest test_scenarios.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 4 items
 
     test_scenarios.py ....                                               [100%]
 
     ========================= 4 passed in 0.12 seconds =========================
 
-If you just collect tests you'll also nicely see 'advanced' and 'basic' as variants for the test function::
+If you just collect tests you'll also nicely see 'advanced' and 'basic' as variants for the test function:
 
+.. code-block:: pytest
 
     $ pytest --collect-only test_scenarios.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 4 items
-    <Module 'test_scenarios.py'>
-      <Class 'TestSampleWithScenarios'>
-        <Instance '()'>
-          <Function 'test_demo1[basic]'>
-          <Function 'test_demo2[basic]'>
-          <Function 'test_demo1[advanced]'>
-          <Function 'test_demo2[advanced]'>
+    <Module test_scenarios.py>
+      <Class TestSampleWithScenarios>
+          <Function test_demo1[basic]>
+          <Function test_demo2[basic]>
+          <Function test_demo1[advanced]>
+          <Function test_demo2[advanced]>
 
     ======================= no tests ran in 0.12 seconds =======================
 
@@ -269,20 +279,25 @@ creates a database object for the actual test invocations::
         else:
             raise ValueError("invalid internal test config")
 
-Let's first see how it looks like at collection time::
+Let's first see how it looks like at collection time:
+
+.. code-block:: pytest
 
     $ pytest test_backends.py --collect-only
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 2 items
-    <Module 'test_backends.py'>
-      <Function 'test_db_initialized[d1]'>
-      <Function 'test_db_initialized[d2]'>
+    <Module test_backends.py>
+      <Function test_db_initialized[d1]>
+      <Function test_db_initialized[d2]>
 
     ======================= no tests ran in 0.12 seconds =======================
 
-And then when we run the test::
+And then when we run the test:
+
+.. code-block:: pytest
 
     $ pytest -q test_backends.py
     .F                                                                   [100%]
@@ -330,15 +345,18 @@ will be passed to respective fixture function::
         assert x == 'aaa'
         assert y == 'b'
 
-The result of this test will be successful::
+The result of this test will be successful:
+
+.. code-block:: pytest
 
     $ pytest test_indirect_list.py --collect-only
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 1 item
-    <Module 'test_indirect_list.py'>
-      <Function 'test_indirect[a-b]'>
+    <Module test_indirect_list.py>
+      <Function test_indirect[a-b]>
 
     ======================= no tests ran in 0.12 seconds =======================
 
@@ -375,10 +393,13 @@ parametrizer`_ but in a lot less code::
             assert a == b
 
         def test_zerodivision(self, a, b):
-            pytest.raises(ZeroDivisionError, "a/b")
+            with pytest.raises(ZeroDivisionError):
+                a / b
 
 Our test generator looks up a class-level definition which specifies which
-argument sets to use for each test function.  Let's run it::
+argument sets to use for each test function.  Let's run it:
+
+.. code-block:: pytest
 
     $ pytest -q
     F..                                                                  [100%]
@@ -408,11 +429,16 @@ is to be run with different sets of arguments for its three arguments:
 
 .. literalinclude:: multipython.py
 
-Running it results in some skips if we don't have all the python interpreters installed and otherwise runs all combinations (5 interpreters times 5 interpreters times 3 objects to serialize/deserialize)::
+Running it results in some skips if we don't have all the python interpreters installed and otherwise runs all combinations (5 interpreters times 5 interpreters times 3 objects to serialize/deserialize):
+
+.. code-block:: pytest
 
    . $ pytest -rs -q multipython.py
-   ...........................                                          [100%]
-   27 passed in 0.12 seconds
+   ...ssssssssssssssssssssssss                                          [100%]
+   ========================= short test summary info ==========================
+   SKIPPED [12] $REGENDOC_TMPDIR/CWD/multipython.py:31: 'python3.4' not found
+   SKIPPED [12] $REGENDOC_TMPDIR/CWD/multipython.py:31: 'python3.5' not found
+   3 passed, 24 skipped in 0.12 seconds
 
 Indirect parametrization of optional implementations/imports
 --------------------------------------------------------------------
@@ -455,18 +481,21 @@ And finally a little test module::
         assert round(basemod.func1(), 3) == round(optmod.func1(), 3)
 
 
-If you run this with reporting for skips enabled::
+If you run this with reporting for skips enabled:
+
+.. code-block:: pytest
 
     $ pytest -rs test_module.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 2 items
 
     test_module.py .s                                                    [100%]
-    ========================= short test summary info ==========================
-    SKIP [1] $REGENDOC_TMPDIR/conftest.py:11: could not import 'opt2'
 
+    ========================= short test summary info ==========================
+    SKIPPED [1] $REGENDOC_TMPDIR/conftest.py:11: could not import 'opt2': No module named 'opt2'
     =================== 1 passed, 1 skipped in 0.12 seconds ====================
 
 You'll see that we don't have an ``opt2`` module and thus the second test run
@@ -487,21 +516,25 @@ Set marks or test ID for individual parametrized test
 --------------------------------------------------------------------
 
 Use ``pytest.param`` to apply marks or set test ID to individual parametrized test.
-For example::
+For example:
+
+.. code-block:: python
 
     # content of test_pytest_param_example.py
     import pytest
-    @pytest.mark.parametrize('test_input,expected', [
-        ('3+5', 8),
-        pytest.param('1+7', 8,
-                     marks=pytest.mark.basic),
-        pytest.param('2+4', 6,
-                     marks=pytest.mark.basic,
-                     id='basic_2+4'),
-        pytest.param('6*9', 42,
-                     marks=[pytest.mark.basic, pytest.mark.xfail],
-                     id='basic_6*9'),
-    ])
+
+
+    @pytest.mark.parametrize(
+        "test_input,expected",
+        [
+            ("3+5", 8),
+            pytest.param("1+7", 8, marks=pytest.mark.basic),
+            pytest.param("2+4", 6, marks=pytest.mark.basic, id="basic_2+4"),
+            pytest.param(
+                "6*9", 42, marks=[pytest.mark.basic, pytest.mark.xfail], id="basic_6*9"
+            ),
+        ],
+    )
     def test_eval(test_input, expected):
         assert eval(test_input) == expected
 
@@ -510,21 +543,22 @@ we mark the rest three parametrized tests with the custom marker ``basic``,
 and for the fourth test we also use the built-in mark ``xfail`` to indicate this
 test is expected to fail. For explicitness, we set test ids for some tests.
 
-Then run ``pytest`` with verbose mode and with only the ``basic`` marker::
+Then run ``pytest`` with verbose mode and with only the ``basic`` marker:
 
-    pytest -v -m basic
-    ============================================ test session starts =============================================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
-    collected 4 items
+.. code-block:: pytest
 
-    test_pytest_param_example.py::test_eval[1+7-8] PASSED
-    test_pytest_param_example.py::test_eval[basic_2+4] PASSED
-    test_pytest_param_example.py::test_eval[basic_6*9] xfail
-    ========================================== short test summary info ===========================================
-    XFAIL test_pytest_param_example.py::test_eval[basic_6*9]
+    $ pytest -v -m basic
+    =========================== test session starts ============================
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
+    collecting ... collected 17 items / 14 deselected / 3 selected
 
-    ============================================= 1 tests deselected =============================================
+    test_pytest_param_example.py::test_eval[1+7-8] PASSED                [ 33%]
+    test_pytest_param_example.py::test_eval[basic_2+4] PASSED            [ 66%]
+    test_pytest_param_example.py::test_eval[basic_6*9] XFAIL             [100%]
+
+    ============ 2 passed, 14 deselected, 1 xfailed in 0.12 seconds ============
 
 As the result:
 
@@ -534,3 +568,50 @@ As the result:
 - The test ``test_eval[1+7-8]`` passed, but the name is autogenerated and confusing.
 - The test ``test_eval[basic_2+4]`` passed.
 - The test ``test_eval[basic_6*9]`` was expected to fail and did fail.
+
+.. _`parametrizing_conditional_raising`:
+
+Parametrizing conditional raising
+--------------------------------------------------------------------
+
+Use :func:`pytest.raises` with the
+:ref:`pytest.mark.parametrize ref` decorator to write parametrized tests
+in which some tests raise exceptions and others do not.
+
+It is helpful to define a no-op context manager ``does_not_raise`` to serve
+as a complement to ``raises``. For example::
+
+    from contextlib import contextmanager
+    import pytest
+
+    @contextmanager
+    def does_not_raise():
+        yield
+
+
+    @pytest.mark.parametrize('example_input,expectation', [
+        (3, does_not_raise()),
+        (2, does_not_raise()),
+        (1, does_not_raise()),
+        (0, pytest.raises(ZeroDivisionError)),
+    ])
+    def test_division(example_input, expectation):
+        """Test how much I know division."""
+        with expectation:
+            assert (6 / example_input) is not None
+
+In the example above, the first three test cases should run unexceptionally,
+while the fourth should raise ``ZeroDivisionError``.
+
+If you're only supporting Python 3.7+, you can simply use ``nullcontext``
+to define ``does_not_raise``::
+
+    from contextlib import nullcontext as does_not_raise
+
+Or, if you're supporting Python 3.3+ you can use::
+
+    from contextlib import ExitStack as does_not_raise
+
+Or, if desired, you can ``pip install contextlib2`` and use::
+
+    from contextlib2 import ExitStack as does_not_raise
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/py2py3/conftest.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/py2py3/conftest.py
index 5d9a07e3e32..a6b9af7a860 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/py2py3/conftest.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/py2py3/conftest.py
@@ -1,11 +1,12 @@
+# -*- coding: utf-8 -*-
 import sys
+
 import pytest
 
 py3 = sys.version_info[0] >= 3
 
 
 class DummyCollector(pytest.collect.File):
-
     def collect(self):
         return []
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/py2py3/test_py2.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/py2py3/test_py2.py
index 664acf178a0..1f665086e60 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/py2py3/test_py2.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/py2py3/test_py2.py
@@ -1,6 +1,5 @@
-
 def test_exception_syntax():
     try:
-        0/0
+        0 / 0
     except ZeroDivisionError, e:
-        pass
+        assert e
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/py2py3/test_py3.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/py2py3/test_py3.py
index baf0ffbd822..30151f914a8 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/py2py3/test_py3.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/py2py3/test_py3.py
@@ -1,5 +1,6 @@
+# -*- coding: utf-8 -*-
 def test_exception_syntax():
     try:
         0 / 0
     except ZeroDivisionError as e:
-        pass
+        assert e
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/pythoncollection.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/pythoncollection.py
index 3603361c3dc..bbc3fe868ea 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/pythoncollection.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/pythoncollection.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # run this with $ pytest --collect-only test_collectonly.py
 #
 
@@ -7,7 +8,6 @@ def test_function():
 
 
 class TestClass(object):
-
     def test_method(self):
         pass
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/pythoncollection.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/pythoncollection.rst
index 8e9d3ae62a7..02c12f6bc9f 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/pythoncollection.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/pythoncollection.rst
@@ -6,7 +6,9 @@ Ignore paths during test collection
 
 You can easily ignore certain test directories and modules during collection
 by passing the ``--ignore=path`` option on the cli. ``pytest`` allows multiple
-``--ignore`` options. Example::
+``--ignore`` options. Example:
+
+.. code-block:: text
 
     tests/
     |-- example
@@ -24,20 +26,25 @@ by passing the ``--ignore=path`` option on the cli. ``pytest`` allows multiple
             '-- test_world_03.py
 
 Now if you invoke ``pytest`` with ``--ignore=tests/foobar/test_foobar_03.py --ignore=tests/hello/``,
-you will see that ``pytest`` only collects test-modules, which do not match the patterns specified::
+you will see that ``pytest`` only collects test-modules, which do not match the patterns specified:
 
-    ========= test session starts ==========
-    platform darwin -- Python 2.7.10, pytest-2.8.2, py-1.4.30, pluggy-0.3.1
+.. code-block:: pytest
+
+    =========================== test session starts ============================
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
     rootdir: $REGENDOC_TMPDIR, inifile:
     collected 5 items
 
-    tests/example/test_example_01.py .
-    tests/example/test_example_02.py .
-    tests/example/test_example_03.py .
-    tests/foobar/test_foobar_01.py .
-    tests/foobar/test_foobar_02.py .
+    tests/example/test_example_01.py .                                   [ 20%]
+    tests/example/test_example_02.py .                                   [ 40%]
+    tests/example/test_example_03.py .                                   [ 60%]
+    tests/foobar/test_foobar_01.py .                                     [ 80%]
+    tests/foobar/test_foobar_02.py .                                     [100%]
 
-    ======= 5 passed in 0.02 seconds =======
+    ========================= 5 passed in 0.02 seconds =========================
+
+The ``--ignore-glob`` option allows to ignore test file paths based on Unix shell-style wildcards.
+If you want to exclude test-modules that end with ``_01.py``, execute ``pytest`` with ``--ignore-glob='*_01.py'``.
 
 Deselect tests during test collection
 -------------------------------------
@@ -52,7 +59,9 @@ Keeping duplicate paths specified from command line
 ----------------------------------------------------
 
 Default behavior of ``pytest`` is to ignore duplicate paths specified from the command line.
-Example::
+Example:
+
+.. code-block:: pytest
 
     pytest path_a path_a
 
@@ -63,7 +72,9 @@ Example::
 Just collect tests once.
 
 To collect duplicate tests, use the ``--keep-duplicates`` option on the cli.
-Example::
+Example:
+
+.. code-block:: pytest
 
     pytest --keep-duplicates path_a path_a
 
@@ -73,7 +84,9 @@ Example::
 
 As the collector just works on directories, if you specify twice a single test file, ``pytest`` will
 still collect it twice, no matter if the ``--keep-duplicates`` is not specified.
-Example::
+Example:
+
+.. code-block:: pytest
 
     pytest test_a.py test_a.py
 
@@ -85,7 +98,9 @@ Example::
 Changing directory recursion
 -----------------------------------------------------
 
-You can set the :confval:`norecursedirs` option in an ini-file, for example your ``pytest.ini`` in the project root directory::
+You can set the :confval:`norecursedirs` option in an ini-file, for example your ``pytest.ini`` in the project root directory:
+
+.. code-block:: ini
 
     # content of pytest.ini
     [pytest]
@@ -100,19 +115,23 @@ Changing naming conventions
 
 You can configure different naming conventions by setting
 the :confval:`python_files`, :confval:`python_classes` and
-:confval:`python_functions` configuration options.  Example::
+:confval:`python_functions` configuration options.
+Here is an example:
+
+.. code-block:: ini
 
     # content of pytest.ini
+    # Example 1: have pytest look for "check" instead of "test"
     # can also be defined in tox.ini or setup.cfg file, although the section
     # name in setup.cfg files should be "tool:pytest"
     [pytest]
-    python_files=check_*.py
-    python_classes=Check
-    python_functions=*_check
+    python_files = check_*.py
+    python_classes = Check
+    python_functions = *_check
 
 This would make ``pytest`` look for tests in files that match the ``check_*
 .py`` glob-pattern, ``Check`` prefixes in classes, and functions and methods
-that match ``*_check``.  For example, if we have::
+that match ``*_check``. For example, if we have::
 
     # content of check_myapp.py
     class CheckMyApp(object):
@@ -121,26 +140,38 @@ that match ``*_check``.  For example, if we have::
         def complex_check(self):
             pass
 
-then the test collection looks like this::
+The test collection would look like this:
+
+.. code-block:: pytest
 
     $ pytest --collect-only
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
     rootdir: $REGENDOC_TMPDIR, inifile: pytest.ini
     collected 2 items
-    <Module 'check_myapp.py'>
-      <Class 'CheckMyApp'>
-        <Instance '()'>
-          <Function 'simple_check'>
-          <Function 'complex_check'>
+    <Module check_myapp.py>
+      <Class CheckMyApp>
+          <Function simple_check>
+          <Function complex_check>
 
     ======================= no tests ran in 0.12 seconds =======================
 
+You can check for multiple glob patterns by adding a space between the patterns:
+
+.. code-block:: ini
+
+    # Example 2: have pytest look for files with "test" and "example"
+    # content of pytest.ini, tox.ini, or setup.cfg file (replace "pytest"
+    # with "tool:pytest" for setup.cfg)
+    [pytest]
+    python_files = test_*.py example_*.py
+
 .. note::
 
    the ``python_functions`` and ``python_classes`` options has no effect
    for ``unittest.TestCase`` test discovery because pytest delegates
-   detection of test case methods to unittest code.
+   discovery of test case methods to unittest code.
 
 Interpreting cmdline arguments as Python packages
 -----------------------------------------------------
@@ -148,13 +179,17 @@ Interpreting cmdline arguments as Python packages
 You can use the ``--pyargs`` option to make ``pytest`` try
 interpreting arguments as python package names, deriving
 their file system path and then running the test. For
-example if you have unittest2 installed you can type::
+example if you have unittest2 installed you can type:
+
+.. code-block:: bash
 
     pytest --pyargs unittest2.test.test_skipping -q
 
 which would run the respective test module.  Like with
 other options, through an ini-file and the :confval:`addopts` option you
-can make this change more permanently::
+can make this change more permanently:
+
+.. code-block:: ini
 
     # content of pytest.ini
     [pytest]
@@ -167,19 +202,21 @@ treat it as a filesystem path.
 Finding out what is collected
 -----------------------------------------------
 
-You can always peek at the collection tree without running tests like this::
+You can always peek at the collection tree without running tests like this:
+
+.. code-block:: pytest
 
     . $ pytest --collect-only pythoncollection.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
     rootdir: $REGENDOC_TMPDIR, inifile: pytest.ini
     collected 3 items
-    <Module 'CWD/pythoncollection.py'>
-      <Function 'test_function'>
-      <Class 'TestClass'>
-        <Instance '()'>
-          <Function 'test_method'>
-          <Function 'test_anothermethod'>
+    <Module CWD/pythoncollection.py>
+      <Function test_function>
+      <Class TestClass>
+          <Function test_method>
+          <Function test_anothermethod>
 
     ======================= no tests ran in 0.12 seconds =======================
 
@@ -190,7 +227,9 @@ Customizing test collection
 
 .. regendoc:wipe
 
-You can easily instruct ``pytest`` to discover tests from every Python file::
+You can easily instruct ``pytest`` to discover tests from every Python file:
+
+.. code-block:: ini
 
     # content of pytest.ini
     [pytest]
@@ -223,7 +262,9 @@ and a ``setup.py`` dummy file like this::
     0/0  # will raise exception if imported
 
 If you run with a Python 2 interpreter then you will find the one test and will
-leave out the ``setup.py`` file::
+leave out the ``setup.py`` file:
+
+.. code-block:: pytest
 
     #$ pytest --collect-only
     ====== test session starts ======
@@ -236,12 +277,29 @@ leave out the ``setup.py`` file::
     ====== no tests ran in 0.04 seconds ======
 
 If you run with a Python 3 interpreter both the one test and the ``setup.py``
-file will be left out::
+file will be left out:
+
+.. code-block:: pytest
 
     $ pytest --collect-only
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
     rootdir: $REGENDOC_TMPDIR, inifile: pytest.ini
     collected 0 items
 
     ======================= no tests ran in 0.12 seconds =======================
+
+It's also possible to ignore files based on Unix shell-style wildcards by adding
+patterns to ``collect_ignore_glob``.
+
+The following example ``conftest.py`` ignores the file ``setup.py`` and in
+addition all files that end with ``*_py2.py`` when executed with a Python 3
+interpreter::
+
+    # content of conftest.py
+    import sys
+
+    collect_ignore = ["setup.py"]
+    if sys.version_info[0] > 2:
+        collect_ignore_glob = ["*_py2.py"]
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/reportingdemo.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/reportingdemo.rst
index 4691b128bb8..d00c9836265 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/reportingdemo.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/reportingdemo.rst
@@ -1,38 +1,37 @@
-
 .. _`tbreportdemo`:
 
 Demo of Python failure reports with pytest
-==================================================
+==========================================
 
-Here is a nice run of several tens of failures
-and how ``pytest`` presents things (unfortunately
-not showing the nice colors here in the HTML that you
-get on the terminal - we are working on that)::
+Here is a nice run of several failures and how ``pytest`` presents things:
+
+.. code-block:: pytest
 
     assertion $ pytest failure_demo.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR/assertion, inifile:
-    collected 42 items
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR/assertion
+    collected 44 items
 
-    failure_demo.py FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF           [100%]
+    failure_demo.py FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF         [100%]
 
     ================================= FAILURES =================================
-    ____________________________ test_generative[0] ____________________________
+    ___________________________ test_generative[3-6] ___________________________
 
     param1 = 3, param2 = 6
 
+        @pytest.mark.parametrize("param1, param2", [(3, 6)])
         def test_generative(param1, param2):
     >       assert param1 * 2 < param2
     E       assert (3 * 2) < 6
 
-    failure_demo.py:19: AssertionError
+    failure_demo.py:21: AssertionError
     _________________________ TestFailing.test_simple __________________________
 
     self = <failure_demo.TestFailing object at 0xdeadbeef>
 
         def test_simple(self):
-
             def f():
                 return 42
 
@@ -44,7 +43,7 @@ get on the terminal - we are working on that)::
     E        +  where 42 = <function TestFailing.test_simple.<locals>.f at 0xdeadbeef>()
     E        +  and   43 = <function TestFailing.test_simple.<locals>.g at 0xdeadbeef>()
 
-    failure_demo.py:37: AssertionError
+    failure_demo.py:32: AssertionError
     ____________________ TestFailing.test_simple_multiline _____________________
 
     self = <failure_demo.TestFailing object at 0xdeadbeef>
@@ -52,7 +51,7 @@ get on the terminal - we are working on that)::
         def test_simple_multiline(self):
     >       otherfunc_multi(42, 6 * 9)
 
-    failure_demo.py:40:
+    failure_demo.py:35:
     _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
 
     a = 42, b = 54
@@ -61,13 +60,12 @@ get on the terminal - we are working on that)::
     >       assert a == b
     E       assert 42 == 54
 
-    failure_demo.py:15: AssertionError
+    failure_demo.py:16: AssertionError
     ___________________________ TestFailing.test_not ___________________________
 
     self = <failure_demo.TestFailing object at 0xdeadbeef>
 
         def test_not(self):
-
             def f():
                 return 42
 
@@ -75,7 +73,7 @@ get on the terminal - we are working on that)::
     E       assert not 42
     E        +  where 42 = <function TestFailing.test_not.<locals>.f at 0xdeadbeef>()
 
-    failure_demo.py:47: AssertionError
+    failure_demo.py:41: AssertionError
     _________________ TestSpecialisedExplanations.test_eq_text _________________
 
     self = <failure_demo.TestSpecialisedExplanations object at 0xdeadbeef>
@@ -86,7 +84,7 @@ get on the terminal - we are working on that)::
     E         - spam
     E         + eggs
 
-    failure_demo.py:53: AssertionError
+    failure_demo.py:46: AssertionError
     _____________ TestSpecialisedExplanations.test_eq_similar_text _____________
 
     self = <failure_demo.TestSpecialisedExplanations object at 0xdeadbeef>
@@ -99,7 +97,7 @@ get on the terminal - we are working on that)::
     E         + foo 2 bar
     E         ?     ^
 
-    failure_demo.py:56: AssertionError
+    failure_demo.py:49: AssertionError
     ____________ TestSpecialisedExplanations.test_eq_multiline_text ____________
 
     self = <failure_demo.TestSpecialisedExplanations object at 0xdeadbeef>
@@ -112,7 +110,7 @@ get on the terminal - we are working on that)::
     E         + eggs
     E           bar
 
-    failure_demo.py:59: AssertionError
+    failure_demo.py:52: AssertionError
     ______________ TestSpecialisedExplanations.test_eq_long_text _______________
 
     self = <failure_demo.TestSpecialisedExplanations object at 0xdeadbeef>
@@ -129,7 +127,7 @@ get on the terminal - we are working on that)::
     E         + 1111111111b222222222
     E         ?           ^
 
-    failure_demo.py:64: AssertionError
+    failure_demo.py:57: AssertionError
     _________ TestSpecialisedExplanations.test_eq_long_text_multiline __________
 
     self = <failure_demo.TestSpecialisedExplanations object at 0xdeadbeef>
@@ -149,7 +147,7 @@ get on the terminal - we are working on that)::
     E
     E         ...Full output truncated (7 lines hidden), use '-vv' to show
 
-    failure_demo.py:69: AssertionError
+    failure_demo.py:62: AssertionError
     _________________ TestSpecialisedExplanations.test_eq_list _________________
 
     self = <failure_demo.TestSpecialisedExplanations object at 0xdeadbeef>
@@ -160,7 +158,7 @@ get on the terminal - we are working on that)::
     E         At index 2 diff: 2 != 3
     E         Use -v to get the full diff
 
-    failure_demo.py:72: AssertionError
+    failure_demo.py:65: AssertionError
     ______________ TestSpecialisedExplanations.test_eq_list_long _______________
 
     self = <failure_demo.TestSpecialisedExplanations object at 0xdeadbeef>
@@ -173,7 +171,7 @@ get on the terminal - we are working on that)::
     E         At index 100 diff: 1 != 2
     E         Use -v to get the full diff
 
-    failure_demo.py:77: AssertionError
+    failure_demo.py:70: AssertionError
     _________________ TestSpecialisedExplanations.test_eq_dict _________________
 
     self = <failure_demo.TestSpecialisedExplanations object at 0xdeadbeef>
@@ -184,14 +182,14 @@ get on the terminal - we are working on that)::
     E         Omitting 1 identical items, use -vv to show
     E         Differing items:
     E         {'b': 1} != {'b': 2}
-    E         Left contains more items:
+    E         Left contains 1 more item:
     E         {'c': 0}
-    E         Right contains more items:
+    E         Right contains 1 more item:
     E         {'d': 0}...
     E
     E         ...Full output truncated (2 lines hidden), use '-vv' to show
 
-    failure_demo.py:80: AssertionError
+    failure_demo.py:73: AssertionError
     _________________ TestSpecialisedExplanations.test_eq_set __________________
 
     self = <failure_demo.TestSpecialisedExplanations object at 0xdeadbeef>
@@ -209,7 +207,7 @@ get on the terminal - we are working on that)::
     E
     E         ...Full output truncated (2 lines hidden), use '-vv' to show
 
-    failure_demo.py:83: AssertionError
+    failure_demo.py:76: AssertionError
     _____________ TestSpecialisedExplanations.test_eq_longer_list ______________
 
     self = <failure_demo.TestSpecialisedExplanations object at 0xdeadbeef>
@@ -217,10 +215,10 @@ get on the terminal - we are working on that)::
         def test_eq_longer_list(self):
     >       assert [1, 2] == [1, 2, 3]
     E       assert [1, 2] == [1, 2, 3]
-    E         Right contains more items, first extra item: 3
+    E         Right contains one more item: 3
     E         Use -v to get the full diff
 
-    failure_demo.py:86: AssertionError
+    failure_demo.py:79: AssertionError
     _________________ TestSpecialisedExplanations.test_in_list _________________
 
     self = <failure_demo.TestSpecialisedExplanations object at 0xdeadbeef>
@@ -229,7 +227,7 @@ get on the terminal - we are working on that)::
     >       assert 1 in [0, 2, 3, 4, 5]
     E       assert 1 in [0, 2, 3, 4, 5]
 
-    failure_demo.py:89: AssertionError
+    failure_demo.py:82: AssertionError
     __________ TestSpecialisedExplanations.test_not_in_text_multiline __________
 
     self = <failure_demo.TestSpecialisedExplanations object at 0xdeadbeef>
@@ -248,7 +246,7 @@ get on the terminal - we are working on that)::
     E
     E         ...Full output truncated (2 lines hidden), use '-vv' to show
 
-    failure_demo.py:93: AssertionError
+    failure_demo.py:86: AssertionError
     ___________ TestSpecialisedExplanations.test_not_in_text_single ____________
 
     self = <failure_demo.TestSpecialisedExplanations object at 0xdeadbeef>
@@ -261,7 +259,7 @@ get on the terminal - we are working on that)::
     E           single foo line
     E         ?        +++
 
-    failure_demo.py:97: AssertionError
+    failure_demo.py:90: AssertionError
     _________ TestSpecialisedExplanations.test_not_in_text_single_long _________
 
     self = <failure_demo.TestSpecialisedExplanations object at 0xdeadbeef>
@@ -274,7 +272,7 @@ get on the terminal - we are working on that)::
     E           head head foo tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail
     E         ?           +++
 
-    failure_demo.py:101: AssertionError
+    failure_demo.py:94: AssertionError
     ______ TestSpecialisedExplanations.test_not_in_text_single_long_term _______
 
     self = <failure_demo.TestSpecialisedExplanations object at 0xdeadbeef>
@@ -287,11 +285,52 @@ get on the terminal - we are working on that)::
     E           head head fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffftail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail
     E         ?           ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-    failure_demo.py:105: AssertionError
+    failure_demo.py:98: AssertionError
+    ______________ TestSpecialisedExplanations.test_eq_dataclass _______________
+
+    self = <failure_demo.TestSpecialisedExplanations object at 0xdeadbeef>
+
+        def test_eq_dataclass(self):
+            from dataclasses import dataclass
+
+            @dataclass
+            class Foo(object):
+                a: int
+                b: str
+
+            left = Foo(1, "b")
+            right = Foo(1, "c")
+    >       assert left == right
+    E       AssertionError: assert TestSpecialis...oo(a=1, b='b') == TestSpecialise...oo(a=1, b='c')
+    E         Omitting 1 identical items, use -vv to show
+    E         Differing attributes:
+    E         b: 'b' != 'c'
+
+    failure_demo.py:110: AssertionError
+    ________________ TestSpecialisedExplanations.test_eq_attrs _________________
+
+    self = <failure_demo.TestSpecialisedExplanations object at 0xdeadbeef>
+
+        def test_eq_attrs(self):
+            import attr
+
+            @attr.s
+            class Foo(object):
+                a = attr.ib()
+                b = attr.ib()
+
+            left = Foo(1, "b")
+            right = Foo(1, "c")
+    >       assert left == right
+    E       AssertionError: assert Foo(a=1, b='b') == Foo(a=1, b='c')
+    E         Omitting 1 identical items, use -vv to show
+    E         Differing attributes:
+    E         b: 'b' != 'c'
+
+    failure_demo.py:122: AssertionError
     ______________________________ test_attribute ______________________________
 
         def test_attribute():
-
             class Foo(object):
                 b = 1
 
@@ -300,11 +339,10 @@ get on the terminal - we are working on that)::
     E       assert 1 == 2
     E        +  where 1 = <failure_demo.test_attribute.<locals>.Foo object at 0xdeadbeef>.b
 
-    failure_demo.py:114: AssertionError
+    failure_demo.py:130: AssertionError
     _________________________ test_attribute_instance __________________________
 
         def test_attribute_instance():
-
             class Foo(object):
                 b = 1
 
@@ -313,13 +351,11 @@ get on the terminal - we are working on that)::
     E        +  where 1 = <failure_demo.test_attribute_instance.<locals>.Foo object at 0xdeadbeef>.b
     E        +    where <failure_demo.test_attribute_instance.<locals>.Foo object at 0xdeadbeef> = <class 'failure_demo.test_attribute_instance.<locals>.Foo'>()
 
-    failure_demo.py:122: AssertionError
+    failure_demo.py:137: AssertionError
     __________________________ test_attribute_failure __________________________
 
         def test_attribute_failure():
-
             class Foo(object):
-
                 def _get_b(self):
                     raise Exception("Failed to get attrib")
 
@@ -328,7 +364,7 @@ get on the terminal - we are working on that)::
             i = Foo()
     >       assert i.b == 2
 
-    failure_demo.py:135:
+    failure_demo.py:148:
     _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
 
     self = <failure_demo.test_attribute_failure.<locals>.Foo object at 0xdeadbeef>
@@ -337,11 +373,10 @@ get on the terminal - we are working on that)::
     >       raise Exception("Failed to get attrib")
     E       Exception: Failed to get attrib
 
-    failure_demo.py:130: Exception
+    failure_demo.py:143: Exception
     _________________________ test_attribute_multiple __________________________
 
         def test_attribute_multiple():
-
             class Foo(object):
                 b = 1
 
@@ -355,31 +390,26 @@ get on the terminal - we are working on that)::
     E        +  and   2 = <failure_demo.test_attribute_multiple.<locals>.Bar object at 0xdeadbeef>.b
     E        +    where <failure_demo.test_attribute_multiple.<locals>.Bar object at 0xdeadbeef> = <class 'failure_demo.test_attribute_multiple.<locals>.Bar'>()
 
-    failure_demo.py:146: AssertionError
+    failure_demo.py:158: AssertionError
     __________________________ TestRaises.test_raises __________________________
 
     self = <failure_demo.TestRaises object at 0xdeadbeef>
 
         def test_raises(self):
-            s = "qwe"  # NOQA
-    >       raises(TypeError, "int(s)")
+            s = "qwe"
+    >       raises(TypeError, int, s)
+    E       ValueError: invalid literal for int() with base 10: 'qwe'
 
-    failure_demo.py:157:
-    _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
-
-    >   int(s)
-    E   ValueError: invalid literal for int() with base 10: 'qwe'
-
-    <0-codegen $PYTHON_PREFIX/lib/python3.5/site-packages/_pytest/python_api.py:634>:1: ValueError
+    failure_demo.py:168: ValueError
     ______________________ TestRaises.test_raises_doesnt _______________________
 
     self = <failure_demo.TestRaises object at 0xdeadbeef>
 
         def test_raises_doesnt(self):
-    >       raises(IOError, "int('3')")
+    >       raises(IOError, int, "3")
     E       Failed: DID NOT RAISE <class 'OSError'>
 
-    failure_demo.py:160: Failed
+    failure_demo.py:171: Failed
     __________________________ TestRaises.test_raise ___________________________
 
     self = <failure_demo.TestRaises object at 0xdeadbeef>
@@ -388,7 +418,7 @@ get on the terminal - we are working on that)::
     >       raise ValueError("demo error")
     E       ValueError: demo error
 
-    failure_demo.py:163: ValueError
+    failure_demo.py:174: ValueError
     ________________________ TestRaises.test_tupleerror ________________________
 
     self = <failure_demo.TestRaises object at 0xdeadbeef>
@@ -397,7 +427,7 @@ get on the terminal - we are working on that)::
     >       a, b = [1]  # NOQA
     E       ValueError: not enough values to unpack (expected 2, got 1)
 
-    failure_demo.py:166: ValueError
+    failure_demo.py:177: ValueError
     ______ TestRaises.test_reinterpret_fails_with_print_for_the_fun_of_it ______
 
     self = <failure_demo.TestRaises object at 0xdeadbeef>
@@ -406,9 +436,9 @@ get on the terminal - we are working on that)::
             items = [1, 2, 3]
             print("items is %r" % items)
     >       a, b = items.pop()
-    E       TypeError: 'int' object is not iterable
+    E       TypeError: cannot unpack non-iterable int object
 
-    failure_demo.py:171: TypeError
+    failure_demo.py:182: TypeError
     --------------------------- Captured stdout call ---------------------------
     items is [1, 2, 3]
     ________________________ TestRaises.test_some_error ________________________
@@ -419,7 +449,7 @@ get on the terminal - we are working on that)::
     >       if namenotexi:  # NOQA
     E       NameError: name 'namenotexi' is not defined
 
-    failure_demo.py:174: NameError
+    failure_demo.py:185: NameError
     ____________________ test_dynamic_compile_shows_nicely _____________________
 
         def test_dynamic_compile_shows_nicely():
@@ -430,24 +460,23 @@ get on the terminal - we are working on that)::
             name = "abc-123"
             module = imp.new_module(name)
             code = _pytest._code.compile(src, name, "exec")
-            py.builtin.exec_(code, module.__dict__)
+            exec(code, module.__dict__)
             sys.modules[name] = module
     >       module.foo()
 
-    failure_demo.py:192:
+    failure_demo.py:203:
     _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
 
         def foo():
     >    assert 1 == 0
     E    AssertionError
 
-    <2-codegen 'abc-123' $REGENDOC_TMPDIR/assertion/failure_demo.py:189>:2: AssertionError
+    <0-codegen 'abc-123' $REGENDOC_TMPDIR/assertion/failure_demo.py:200>:2: AssertionError
     ____________________ TestMoreErrors.test_complex_error _____________________
 
     self = <failure_demo.TestMoreErrors object at 0xdeadbeef>
 
         def test_complex_error(self):
-
             def f():
                 return 44
 
@@ -456,9 +485,9 @@ get on the terminal - we are working on that)::
 
     >       somefunc(f(), g())
 
-    failure_demo.py:205:
+    failure_demo.py:214:
     _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
-    failure_demo.py:11: in somefunc
+    failure_demo.py:12: in somefunc
         otherfunc(x, y)
     _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
 
@@ -468,7 +497,7 @@ get on the terminal - we are working on that)::
     >       assert a == b
     E       assert 44 == 43
 
-    failure_demo.py:7: AssertionError
+    failure_demo.py:8: AssertionError
     ___________________ TestMoreErrors.test_z1_unpack_error ____________________
 
     self = <failure_demo.TestMoreErrors object at 0xdeadbeef>
@@ -478,7 +507,7 @@ get on the terminal - we are working on that)::
     >       a, b = items
     E       ValueError: not enough values to unpack (expected 2, got 0)
 
-    failure_demo.py:209: ValueError
+    failure_demo.py:218: ValueError
     ____________________ TestMoreErrors.test_z2_type_error _____________________
 
     self = <failure_demo.TestMoreErrors object at 0xdeadbeef>
@@ -486,9 +515,9 @@ get on the terminal - we are working on that)::
         def test_z2_type_error(self):
             items = 3
     >       a, b = items
-    E       TypeError: 'int' object is not iterable
+    E       TypeError: cannot unpack non-iterable int object
 
-    failure_demo.py:213: TypeError
+    failure_demo.py:222: TypeError
     ______________________ TestMoreErrors.test_startswith ______________________
 
     self = <failure_demo.TestMoreErrors object at 0xdeadbeef>
@@ -501,13 +530,12 @@ get on the terminal - we are working on that)::
     E        +  where False = <built-in method startswith of str object at 0xdeadbeef>('456')
     E        +    where <built-in method startswith of str object at 0xdeadbeef> = '123'.startswith
 
-    failure_demo.py:218: AssertionError
+    failure_demo.py:227: AssertionError
     __________________ TestMoreErrors.test_startswith_nested ___________________
 
     self = <failure_demo.TestMoreErrors object at 0xdeadbeef>
 
         def test_startswith_nested(self):
-
             def f():
                 return "123"
 
@@ -521,7 +549,7 @@ get on the terminal - we are working on that)::
     E        +      where '123' = <function TestMoreErrors.test_startswith_nested.<locals>.f at 0xdeadbeef>()
     E        +    and   '456' = <function TestMoreErrors.test_startswith_nested.<locals>.g at 0xdeadbeef>()
 
-    failure_demo.py:228: AssertionError
+    failure_demo.py:236: AssertionError
     _____________________ TestMoreErrors.test_global_func ______________________
 
     self = <failure_demo.TestMoreErrors object at 0xdeadbeef>
@@ -532,7 +560,7 @@ get on the terminal - we are working on that)::
     E        +  where False = isinstance(43, float)
     E        +    where 43 = globf(42)
 
-    failure_demo.py:231: AssertionError
+    failure_demo.py:239: AssertionError
     _______________________ TestMoreErrors.test_instance _______________________
 
     self = <failure_demo.TestMoreErrors object at 0xdeadbeef>
@@ -543,7 +571,7 @@ get on the terminal - we are working on that)::
     E       assert 42 != 42
     E        +  where 42 = <failure_demo.TestMoreErrors object at 0xdeadbeef>.x
 
-    failure_demo.py:235: AssertionError
+    failure_demo.py:243: AssertionError
     _______________________ TestMoreErrors.test_compare ________________________
 
     self = <failure_demo.TestMoreErrors object at 0xdeadbeef>
@@ -553,7 +581,7 @@ get on the terminal - we are working on that)::
     E       assert 11 < 5
     E        +  where 11 = globf(10)
 
-    failure_demo.py:238: AssertionError
+    failure_demo.py:246: AssertionError
     _____________________ TestMoreErrors.test_try_finally ______________________
 
     self = <failure_demo.TestMoreErrors object at 0xdeadbeef>
@@ -564,13 +592,12 @@ get on the terminal - we are working on that)::
     >           assert x == 0
     E           assert 1 == 0
 
-    failure_demo.py:243: AssertionError
+    failure_demo.py:251: AssertionError
     ___________________ TestCustomAssertMsg.test_single_line ___________________
 
     self = <failure_demo.TestCustomAssertMsg object at 0xdeadbeef>
 
         def test_single_line(self):
-
             class A(object):
                 a = 1
 
@@ -580,33 +607,31 @@ get on the terminal - we are working on that)::
     E       assert 1 == 2
     E        +  where 1 = <class 'failure_demo.TestCustomAssertMsg.test_single_line.<locals>.A'>.a
 
-    failure_demo.py:256: AssertionError
+    failure_demo.py:262: AssertionError
     ____________________ TestCustomAssertMsg.test_multiline ____________________
 
     self = <failure_demo.TestCustomAssertMsg object at 0xdeadbeef>
 
         def test_multiline(self):
-
             class A(object):
                 a = 1
 
             b = 2
     >       assert (
                 A.a == b
-            ), "A.a appears not to be b\n" "or does not appear to be b\none of those"
+            ), "A.a appears not to be b\nor does not appear to be b\none of those"
     E       AssertionError: A.a appears not to be b
     E         or does not appear to be b
     E         one of those
     E       assert 1 == 2
     E        +  where 1 = <class 'failure_demo.TestCustomAssertMsg.test_multiline.<locals>.A'>.a
 
-    failure_demo.py:264: AssertionError
+    failure_demo.py:269: AssertionError
     ___________________ TestCustomAssertMsg.test_custom_repr ___________________
 
     self = <failure_demo.TestCustomAssertMsg object at 0xdeadbeef>
 
         def test_custom_repr(self):
-
             class JSON(object):
                 a = 1
 
@@ -623,11 +648,5 @@ get on the terminal - we are working on that)::
     E       assert 1 == 2
     E        +  where 1 = This is JSON\n{\n  'foo': 'bar'\n}.a
 
-    failure_demo.py:278: AssertionError
-    ============================= warnings summary =============================
-    <undetermined location>
-      Metafunc.addcall is deprecated and scheduled to be removed in pytest 4.0.
-      Please use Metafunc.parametrize instead.
-
-    -- Docs: http://doc.pytest.org/en/latest/warnings.html
-    ================== 42 failed, 1 warnings in 0.12 seconds ===================
+    failure_demo.py:282: AssertionError
+    ======================== 44 failed in 0.12 seconds =========================
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/simple.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/simple.rst
index 180637ae994..1dee981be77 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/simple.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/simple.rst
@@ -43,7 +43,9 @@ provide the ``cmdopt`` through a :ref:`fixture function <fixture function>`:
     def cmdopt(request):
         return request.config.getoption("--cmdopt")
 
-Let's run this without supplying our new option::
+Let's run this without supplying our new option:
+
+.. code-block:: pytest
 
     $ pytest -q test_sample.py
     F                                                                    [100%]
@@ -65,7 +67,9 @@ Let's run this without supplying our new option::
     first
     1 failed in 0.12 seconds
 
-And now with supplying a command line option::
+And now with supplying a command line option:
+
+.. code-block:: pytest
 
     $ pytest -q --cmdopt=type2
     F                                                                    [100%]
@@ -103,7 +107,7 @@ the command line arguments before they get processed:
 
 .. code-block:: python
 
-    # content of conftest.py
+    # setuptools plugin
     import sys
 
 
@@ -117,12 +121,15 @@ the command line arguments before they get processed:
 If you have the `xdist plugin <https://pypi.org/project/pytest-xdist/>`_ installed
 you will now always perform test runs using a number
 of subprocesses close to your CPU. Running in an empty
-directory with the above conftest.py::
+directory with the above conftest.py:
+
+.. code-block:: pytest
 
     $ pytest
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 0 items
 
     ======================= no tests ran in 0.12 seconds =======================
@@ -175,26 +182,32 @@ We can now write a test module like this:
     def test_func_slow():
         pass
 
-and when running it will see a skipped "slow" test::
+and when running it will see a skipped "slow" test:
+
+.. code-block:: pytest
 
     $ pytest -rs    # "-rs" means report details on the little 's'
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 2 items
 
     test_module.py .s                                                    [100%]
-    ========================= short test summary info ==========================
-    SKIP [1] test_module.py:8: need --runslow option to run
 
+    ========================= short test summary info ==========================
+    SKIPPED [1] test_module.py:8: need --runslow option to run
     =================== 1 passed, 1 skipped in 0.12 seconds ====================
 
-Or run it including the ``slow`` marked test::
+Or run it including the ``slow`` marked test:
+
+.. code-block:: pytest
 
     $ pytest --runslow
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 2 items
 
     test_module.py ..                                                    [100%]
@@ -230,7 +243,9 @@ Example:
 The ``__tracebackhide__`` setting influences ``pytest`` showing
 of tracebacks: the ``checkconfig`` function will not be shown
 unless the ``--full-trace`` command line option is specified.
-Let's run our little function::
+Let's run our little function:
+
+.. code-block:: pytest
 
     $ pytest -q test_checkconfig.py
     F                                                                    [100%]
@@ -327,13 +342,16 @@ It's easy to present extra information in a ``pytest`` run:
     def pytest_report_header(config):
         return "project deps: mylib-1.1"
 
-which will add the string to the test header accordingly::
+which will add the string to the test header accordingly:
+
+.. code-block:: pytest
 
     $ pytest
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
     project deps: mylib-1.1
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    rootdir: $REGENDOC_TMPDIR
     collected 0 items
 
     ======================= no tests ran in 0.12 seconds =======================
@@ -353,25 +371,30 @@ display more information if applicable:
         if config.getoption("verbose") > 0:
             return ["info1: did you know that ...", "did you?"]
 
-which will add info only when run with "--v"::
+which will add info only when run with "--v":
+
+.. code-block:: pytest
 
     $ pytest -v
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.5
-    cachedir: .pytest_cache
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
+    cachedir: $PYTHON_PREFIX/.pytest_cache
     info1: did you know that ...
     did you?
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    rootdir: $REGENDOC_TMPDIR
     collecting ... collected 0 items
 
     ======================= no tests ran in 0.12 seconds =======================
 
-and nothing when run plainly::
+and nothing when run plainly:
+
+.. code-block:: pytest
 
     $ pytest
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 0 items
 
     ======================= no tests ran in 0.12 seconds =======================
@@ -403,18 +426,21 @@ out which tests are the slowest. Let's make an artificial test suite:
     def test_funcslow2():
         time.sleep(0.3)
 
-Now we can profile which test functions execute the slowest::
+Now we can profile which test functions execute the slowest:
+
+.. code-block:: pytest
 
     $ pytest --durations=3
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 3 items
 
     test_some_are_slow.py ...                                            [100%]
 
     ========================= slowest 3 test durations =========================
-    0.30s call     test_some_are_slow.py::test_funcslow2
+    0.31s call     test_some_are_slow.py::test_funcslow2
     0.20s call     test_some_are_slow.py::test_funcslow1
     0.10s call     test_some_are_slow.py::test_funcfast
     ========================= 3 passed in 0.12 seconds =========================
@@ -475,12 +501,15 @@ tests in a class.  Here is a test module example:
     def test_normal():
         pass
 
-If we run this::
+If we run this:
+
+.. code-block:: pytest
 
     $ pytest -rx
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 4 items
 
     test_step.py .Fx.                                                    [100%]
@@ -496,7 +525,7 @@ If we run this::
 
     test_step.py:11: AssertionError
     ========================= short test summary info ==========================
-    XFAIL test_step.py::TestUserHandling::()::test_deletion
+    XFAIL test_step.py::TestUserHandling::test_deletion
       reason: previous test failed (test_modification)
     ============== 1 failed, 2 passed, 1 xfailed in 0.12 seconds ===============
 
@@ -556,12 +585,15 @@ the ``db`` fixture:
     def test_root(db):  # no db here, will error out
         pass
 
-We can run this::
+We can run this:
+
+.. code-block:: pytest
 
     $ pytest
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 7 items
 
     test_step.py .Fx.                                                    [ 57%]
@@ -574,7 +606,7 @@ We can run this::
     file $REGENDOC_TMPDIR/b/test_error.py, line 1
       def test_root(db):  # no db here, will error out
     E       fixture 'db' not found
-    >       available fixtures: cache, capfd, capfdbinary, caplog, capsys, capsysbinary, doctest_namespace, monkeypatch, pytestconfig, record_property, record_xml_attribute, record_xml_property, recwarn, tmpdir, tmpdir_factory
+    >       available fixtures: cache, capfd, capfdbinary, caplog, capsys, capsysbinary, doctest_namespace, monkeypatch, pytestconfig, record_property, record_testsuite_property, record_xml_attribute, recwarn, tmp_path, tmp_path_factory, tmpdir, tmpdir_factory
     >       use 'pytest --fixtures [testpath]' for help on them.
 
     $REGENDOC_TMPDIR/b/test_error.py:1
@@ -667,12 +699,15 @@ if you then have failing tests:
     def test_fail2():
         assert 0
 
-and run them::
+and run them:
+
+.. code-block:: pytest
 
     $ pytest test_module.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 2 items
 
     test_module.py FF                                                    [100%]
@@ -696,7 +731,9 @@ and run them::
     test_module.py:6: AssertionError
     ========================= 2 failed in 0.12 seconds =========================
 
-you will have a "failures" file which contains the failing test ids::
+you will have a "failures" file which contains the failing test ids:
+
+.. code-block:: bash
 
     $ cat failures
     test_module.py::test_fail1 (PYTEST_TMPDIR/test_fail10)
@@ -766,12 +803,15 @@ if you then have failing tests:
     def test_fail2():
         assert 0
 
-and run it::
+and run it:
+
+.. code-block:: pytest
 
     $ pytest -s test_module.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 3 items
 
     test_module.py Esetting up a test failed! test_module.py::test_setup_fails
@@ -814,7 +854,7 @@ information.
 ``PYTEST_CURRENT_TEST`` environment variable
 --------------------------------------------
 
-.. versionadded:: 3.2
+
 
 Sometimes a test session might get stuck and there might be no easy way to figure out
 which test got stuck, for example if pytest was run in quiet mode (``-q``) or you don't have access to the console
@@ -852,6 +892,8 @@ In that order.
     can be changed between releases (even bug fixes) so it shouldn't be relied on for scripting
     or automation.
 
+.. _freezing-pytest:
+
 Freezing pytest
 ---------------
 
@@ -895,6 +937,8 @@ like ``pytest-timeout`` they must be imported explicitly and passed on to pytest
 
 
 This allows you to execute tests using the frozen
-application with standard ``pytest`` command-line options::
+application with standard ``pytest`` command-line options:
+
+.. code-block:: bash
 
     ./app_main --pytest --verbose --tb=long --junitxml=results.xml test-suite/
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/special.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/special.rst
index 1fc32f6c817..800cb8e9010 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/special.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/special.rst
@@ -13,7 +13,7 @@ calls it::
 
     @pytest.fixture(scope="session", autouse=True)
     def callattr_ahead_of_alltests(request):
-        print ("callattr_ahead_of_alltests called")
+        print("callattr_ahead_of_alltests called")
         seen = set([None])
         session = request.node
         for item in session.items:
@@ -31,20 +31,20 @@ will be called ahead of running any tests::
     class TestHello(object):
         @classmethod
         def callme(cls):
-            print ("callme called!")
+            print("callme called!")
 
         def test_method1(self):
-            print ("test_method1 called")
+            print("test_method1 called")
 
         def test_method2(self):
-            print ("test_method1 called")
+            print("test_method1 called")
 
     class TestOther(object):
         @classmethod
         def callme(cls):
-            print ("callme other called")
+            print("callme other called")
         def test_other(self):
-            print ("test other")
+            print("test other")
 
     # works with unittest as well ...
     import unittest
@@ -52,12 +52,14 @@ will be called ahead of running any tests::
     class SomeTest(unittest.TestCase):
         @classmethod
         def callme(self):
-            print ("SomeTest callme called")
+            print("SomeTest callme called")
 
         def test_unit1(self):
-            print ("test_unit1 method called")
+            print("test_unit1 method called")
 
-If you run this without output capturing::
+If you run this without output capturing:
+
+.. code-block:: pytest
 
     $ pytest -q -s test_module.py
     callattr_ahead_of_alltests called
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/xfail_demo.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/xfail_demo.py
index 01e6da1ad2e..88384a1562a 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/xfail_demo.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/xfail_demo.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import pytest
 
 xfail = pytest.mark.xfail
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/fixture.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/fixture.rst
index d4d386792e0..ed9c11b2ea7 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/fixture.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/fixture.rst
@@ -7,7 +7,7 @@ pytest fixtures: explicit, modular, scalable
 
 .. currentmodule:: _pytest.python
 
-.. versionadded:: 2.0/2.3/2.4
+
 
 .. _`xUnit`: http://en.wikipedia.org/wiki/XUnit
 .. _`purpose of test fixtures`: http://en.wikipedia.org/wiki/Test_fixture#Software
@@ -55,23 +55,26 @@ using it::
     import pytest
 
     @pytest.fixture
-    def smtp():
+    def smtp_connection():
         import smtplib
         return smtplib.SMTP("smtp.gmail.com", 587, timeout=5)
 
-    def test_ehlo(smtp):
-        response, msg = smtp.ehlo()
+    def test_ehlo(smtp_connection):
+        response, msg = smtp_connection.ehlo()
         assert response == 250
         assert 0 # for demo purposes
 
-Here, the ``test_ehlo`` needs the ``smtp`` fixture value.  pytest
+Here, the ``test_ehlo`` needs the ``smtp_connection`` fixture value.  pytest
 will discover and call the :py:func:`@pytest.fixture <_pytest.python.fixture>`
-marked ``smtp`` fixture function.  Running the test looks like this::
+marked ``smtp_connection`` fixture function.  Running the test looks like this:
+
+.. code-block:: pytest
 
     $ pytest test_smtpsimple.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 1 item
 
     test_smtpsimple.py F                                                 [100%]
@@ -79,10 +82,10 @@ marked ``smtp`` fixture function.  Running the test looks like this::
     ================================= FAILURES =================================
     ________________________________ test_ehlo _________________________________
 
-    smtp = <smtplib.SMTP object at 0xdeadbeef>
+    smtp_connection = <smtplib.SMTP object at 0xdeadbeef>
 
-        def test_ehlo(smtp):
-            response, msg = smtp.ehlo()
+        def test_ehlo(smtp_connection):
+            response, msg = smtp_connection.ehlo()
             assert response == 250
     >       assert 0 # for demo purposes
     E       assert 0
@@ -91,18 +94,18 @@ marked ``smtp`` fixture function.  Running the test looks like this::
     ========================= 1 failed in 0.12 seconds =========================
 
 In the failure traceback we see that the test function was called with a
-``smtp`` argument, the ``smtplib.SMTP()`` instance created by the fixture
+``smtp_connection`` argument, the ``smtplib.SMTP()`` instance created by the fixture
 function.  The test function fails on our deliberate ``assert 0``.  Here is
 the exact protocol used by ``pytest`` to call the test function this way:
 
 1. pytest :ref:`finds <test discovery>` the ``test_ehlo`` because
    of the ``test_`` prefix.  The test function needs a function argument
-   named ``smtp``.  A matching fixture function is discovered by
-   looking for a fixture-marked function named ``smtp``.
+   named ``smtp_connection``.  A matching fixture function is discovered by
+   looking for a fixture-marked function named ``smtp_connection``.
 
-2. ``smtp()`` is called to create an instance.
+2. ``smtp_connection()`` is called to create an instance.
 
-3. ``test_ehlo(<SMTP instance>)`` is called and fails in the last
+3. ``test_ehlo(<smtp_connection instance>)`` is called and fails in the last
    line of the test function.
 
 Note that if you misspell a function argument or want
@@ -111,7 +114,9 @@ with a list of available function arguments.
 
 .. note::
 
-    You can always issue ::
+    You can always issue:
+
+    .. code-block:: bash
 
         pytest --fixtures test_simplefactory.py
 
@@ -153,8 +158,8 @@ This makes use of the automatic caching mechanisms of pytest.
 
 Another good approach is by adding the data files in the ``tests`` folder.
 There are also community plugins available to help managing this aspect of
-testing, e.g. `pytest-datadir <https://github.com/gabrielcnr/pytest-datadir>`__
-and `pytest-datafiles <https://pypi.python.org/pypi/pytest-datafiles>`__.
+testing, e.g. `pytest-datadir <https://pypi.org/project/pytest-datadir/>`__
+and `pytest-datafiles <https://pypi.org/project/pytest-datafiles/>`__.
 
 .. _smtpshared:
 
@@ -167,10 +172,11 @@ Fixtures requiring network access depend on connectivity and are
 usually time-expensive to create.  Extending the previous example, we
 can add a ``scope="module"`` parameter to the
 :py:func:`@pytest.fixture <_pytest.python.fixture>` invocation
-to cause the decorated ``smtp`` fixture function to only be invoked once
-per test *module* (the default is to invoke once per test *function*).
+to cause the decorated ``smtp_connection`` fixture function to only be invoked
+once per test *module* (the default is to invoke once per test *function*).
 Multiple test functions in a test module will thus
-each receive the same ``smtp`` fixture instance, thus saving time.
+each receive the same ``smtp_connection`` fixture instance, thus saving time.
+Possible values for ``scope`` are: ``function``, ``class``, ``module``, ``package`` or ``session``.
 
 The next example puts the fixture function into a separate ``conftest.py`` file
 so that tests from multiple test modules in the directory can
@@ -181,33 +187,37 @@ access the fixture function::
     import smtplib
 
     @pytest.fixture(scope="module")
-    def smtp():
+    def smtp_connection():
         return smtplib.SMTP("smtp.gmail.com", 587, timeout=5)
 
-The name of the fixture again is ``smtp`` and you can access its result by
-listing the name ``smtp`` as an input parameter in any test or fixture
-function (in or below the directory where ``conftest.py`` is located)::
+The name of the fixture again is ``smtp_connection`` and you can access its
+result by listing the name ``smtp_connection`` as an input parameter in any
+test or fixture function (in or below the directory where ``conftest.py`` is
+located)::
 
     # content of test_module.py
 
-    def test_ehlo(smtp):
-        response, msg = smtp.ehlo()
+    def test_ehlo(smtp_connection):
+        response, msg = smtp_connection.ehlo()
         assert response == 250
         assert b"smtp.gmail.com" in msg
         assert 0  # for demo purposes
 
-    def test_noop(smtp):
-        response, msg = smtp.noop()
+    def test_noop(smtp_connection):
+        response, msg = smtp_connection.noop()
         assert response == 250
         assert 0  # for demo purposes
 
 We deliberately insert failing ``assert 0`` statements in order to
-inspect what is going on and can now run the tests::
+inspect what is going on and can now run the tests:
+
+.. code-block:: pytest
 
     $ pytest test_module.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 2 items
 
     test_module.py FF                                                    [100%]
@@ -215,10 +225,10 @@ inspect what is going on and can now run the tests::
     ================================= FAILURES =================================
     ________________________________ test_ehlo _________________________________
 
-    smtp = <smtplib.SMTP object at 0xdeadbeef>
+    smtp_connection = <smtplib.SMTP object at 0xdeadbeef>
 
-        def test_ehlo(smtp):
-            response, msg = smtp.ehlo()
+        def test_ehlo(smtp_connection):
+            response, msg = smtp_connection.ehlo()
             assert response == 250
             assert b"smtp.gmail.com" in msg
     >       assert 0  # for demo purposes
@@ -227,10 +237,10 @@ inspect what is going on and can now run the tests::
     test_module.py:6: AssertionError
     ________________________________ test_noop _________________________________
 
-    smtp = <smtplib.SMTP object at 0xdeadbeef>
+    smtp_connection = <smtplib.SMTP object at 0xdeadbeef>
 
-        def test_noop(smtp):
-            response, msg = smtp.noop()
+        def test_noop(smtp_connection):
+            response, msg = smtp_connection.noop()
             assert response == 250
     >       assert 0  # for demo purposes
     E       assert 0
@@ -239,29 +249,50 @@ inspect what is going on and can now run the tests::
     ========================= 2 failed in 0.12 seconds =========================
 
 You see the two ``assert 0`` failing and more importantly you can also see
-that the same (module-scoped) ``smtp`` object was passed into the two
-test functions because pytest shows the incoming argument values in the
-traceback.  As a result, the two test functions using ``smtp`` run as
-quick as a single one because they reuse the same instance.
+that the same (module-scoped) ``smtp_connection`` object was passed into the
+two test functions because pytest shows the incoming argument values in the
+traceback.  As a result, the two test functions using ``smtp_connection`` run
+as quick as a single one because they reuse the same instance.
 
-If you decide that you rather want to have a session-scoped ``smtp``
+If you decide that you rather want to have a session-scoped ``smtp_connection``
 instance, you can simply declare it:
 
 .. code-block:: python
 
     @pytest.fixture(scope="session")
-    def smtp():
+    def smtp_connection():
         # the returned fixture value will be shared for
         # all tests needing it
         ...
 
 Finally, the ``class`` scope will invoke the fixture once per test *class*.
 
+.. note::
+
+    Pytest will only cache one instance of a fixture at a time.
+    This means that when using a parametrized fixture, pytest may invoke a fixture more than once in the given scope.
+
+
+``package`` scope (experimental)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+
+In pytest 3.7 the ``package`` scope has been introduced. Package-scoped fixtures
+are finalized when the last test of a *package* finishes.
+
+.. warning::
+    This functionality is considered **experimental** and may be removed in future
+    versions if hidden corner-cases or serious problems with this functionality
+    are discovered after it gets more usage in the wild.
+
+    Use this new feature sparingly and please make sure to report any issues you find.
+
 
 Higher-scoped fixtures are instantiated first
 ---------------------------------------------
 
-.. versionadded:: 3.5
+
 
 Within a function request for features, fixture of higher-scopes (such as ``session``) are instantiated first than
 lower-scoped fixtures (such as ``function`` or ``class``). The relative order of fixtures of same scope follows
@@ -323,24 +354,26 @@ the code after the *yield* statement serves as the teardown code:
 
 
     @pytest.fixture(scope="module")
-    def smtp():
-        smtp = smtplib.SMTP("smtp.gmail.com", 587, timeout=5)
-        yield smtp  # provide the fixture value
+    def smtp_connection():
+        smtp_connection = smtplib.SMTP("smtp.gmail.com", 587, timeout=5)
+        yield smtp_connection  # provide the fixture value
         print("teardown smtp")
-        smtp.close()
+        smtp_connection.close()
 
 The ``print`` and ``smtp.close()`` statements will execute when the last test in
 the module has finished execution, regardless of the exception status of the
 tests.
 
-Let's execute it::
+Let's execute it:
+
+.. code-block:: pytest
 
     $ pytest -s -q --tb=no
     FFteardown smtp
 
     2 failed in 0.12 seconds
 
-We see that the ``smtp`` instance is finalized after the two
+We see that the ``smtp_connection`` instance is finalized after the two
 tests finished execution.  Note that if we decorated our fixture
 function with ``scope='function'`` then fixture setup and cleanup would
 occur around each single test.  In either case the test
@@ -358,13 +391,13 @@ Note that we can also seamlessly use the ``yield`` syntax with ``with`` statemen
 
 
     @pytest.fixture(scope="module")
-    def smtp():
-        with smtplib.SMTP("smtp.gmail.com", 587, timeout=5) as smtp:
-            yield smtp  # provide the fixture value
+    def smtp_connection():
+        with smtplib.SMTP("smtp.gmail.com", 587, timeout=5) as smtp_connection:
+            yield smtp_connection  # provide the fixture value
 
 
-The ``smtp`` connection will be closed after the test finished execution
-because the ``smtp`` object automatically closes when
+The ``smtp_connection`` connection will be closed after the test finished
+execution because the ``smtp_connection`` object automatically closes when
 the ``with`` statement ends.
 
 Note that if an exception happens during the *setup* code (before the ``yield`` keyword), the
@@ -374,7 +407,7 @@ An alternative option for executing *teardown* code is to
 make use of the ``addfinalizer`` method of the `request-context`_ object to register
 finalization functions.
 
-Here's the ``smtp`` fixture changed to use ``addfinalizer`` for cleanup:
+Here's the ``smtp_connection`` fixture changed to use ``addfinalizer`` for cleanup:
 
 .. code-block:: python
 
@@ -384,15 +417,15 @@ Here's the ``smtp`` fixture changed to use ``addfinalizer`` for cleanup:
 
 
     @pytest.fixture(scope="module")
-    def smtp(request):
-        smtp = smtplib.SMTP("smtp.gmail.com", 587, timeout=5)
+    def smtp_connection(request):
+        smtp_connection = smtplib.SMTP("smtp.gmail.com", 587, timeout=5)
 
         def fin():
-            print("teardown smtp")
-            smtp.close()
+            print("teardown smtp_connection")
+            smtp_connection.close()
 
         request.addfinalizer(fin)
-        return smtp  # provide the fixture value
+        return smtp_connection  # provide the fixture value
 
 
 Both ``yield`` and ``addfinalizer`` methods work similarly by calling their code after the test
@@ -425,7 +458,7 @@ Fixtures can introspect the requesting test context
 
 Fixture functions can accept the :py:class:`request <FixtureRequest>` object
 to introspect the "requesting" test function, class or module context.
-Further extending the previous ``smtp`` fixture example, let's
+Further extending the previous ``smtp_connection`` fixture example, let's
 read an optional server URL from the test module which uses our fixture::
 
     # content of conftest.py
@@ -433,16 +466,18 @@ read an optional server URL from the test module which uses our fixture::
     import smtplib
 
     @pytest.fixture(scope="module")
-    def smtp(request):
+    def smtp_connection(request):
         server = getattr(request.module, "smtpserver", "smtp.gmail.com")
-        smtp = smtplib.SMTP(server, 587, timeout=5)
-        yield smtp
-        print ("finalizing %s (%s)" % (smtp, server))
-        smtp.close()
+        smtp_connection = smtplib.SMTP(server, 587, timeout=5)
+        yield smtp_connection
+        print("finalizing %s (%s)" % (smtp_connection, server))
+        smtp_connection.close()
 
 We use the ``request.module`` attribute to optionally obtain an
 ``smtpserver`` attribute from the test module.  If we just execute
-again, nothing much has changed::
+again, nothing much has changed:
+
+.. code-block:: pytest
 
     $ pytest -s -q --tb=no
     FFfinalizing <smtplib.SMTP object at 0xdeadbeef> (smtp.gmail.com)
@@ -456,23 +491,25 @@ server URL in its module namespace::
 
     smtpserver = "mail.python.org"  # will be read by smtp fixture
 
-    def test_showhelo(smtp):
-        assert 0, smtp.helo()
+    def test_showhelo(smtp_connection):
+        assert 0, smtp_connection.helo()
 
-Running it::
+Running it:
+
+.. code-block:: pytest
 
     $ pytest -qq --tb=short test_anothersmtp.py
     F                                                                    [100%]
     ================================= FAILURES =================================
     ______________________________ test_showhelo _______________________________
     test_anothersmtp.py:5: in test_showhelo
-        assert 0, smtp.helo()
+        assert 0, smtp_connection.helo()
     E   AssertionError: (250, b'mail.python.org')
     E   assert 0
     ------------------------- Captured stdout teardown -------------------------
     finalizing <smtplib.SMTP object at 0xdeadbeef> (mail.python.org)
 
-voila! The ``smtp`` fixture function picked up our mail server name
+voila! The ``smtp_connection`` fixture function picked up our mail server name
 from the module namespace.
 
 .. _`fixture-factory`:
@@ -535,13 +572,13 @@ Parametrizing fixtures
 
 Fixture functions can be parametrized in which case they will be called
 multiple times, each time executing the set of dependent tests, i. e. the
-tests that depend on this fixture.  Test functions do usually not need
+tests that depend on this fixture.  Test functions usually do not need
 to be aware of their re-running.  Fixture parametrization helps to
 write exhaustive functional tests for components which themselves can be
 configured in multiple ways.
 
 Extending the previous example, we can flag the fixture to create two
-``smtp`` fixture instances which will cause all tests using the fixture
+``smtp_connection`` fixture instances which will cause all tests using the fixture
 to run twice.  The fixture function gets access to each parameter
 through the special :py:class:`request <FixtureRequest>` object::
 
@@ -551,27 +588,29 @@ through the special :py:class:`request <FixtureRequest>` object::
 
     @pytest.fixture(scope="module",
                     params=["smtp.gmail.com", "mail.python.org"])
-    def smtp(request):
-        smtp = smtplib.SMTP(request.param, 587, timeout=5)
-        yield smtp
-        print ("finalizing %s" % smtp)
-        smtp.close()
+    def smtp_connection(request):
+        smtp_connection = smtplib.SMTP(request.param, 587, timeout=5)
+        yield smtp_connection
+        print("finalizing %s" % smtp_connection)
+        smtp_connection.close()
 
 The main change is the declaration of ``params`` with
 :py:func:`@pytest.fixture <_pytest.python.fixture>`, a list of values
 for each of which the fixture function will execute and can access
 a value via ``request.param``.  No test function code needs to change.
-So let's just do another run::
+So let's just do another run:
+
+.. code-block:: pytest
 
     $ pytest -q test_module.py
     FFFF                                                                 [100%]
     ================================= FAILURES =================================
     ________________________ test_ehlo[smtp.gmail.com] _________________________
 
-    smtp = <smtplib.SMTP object at 0xdeadbeef>
+    smtp_connection = <smtplib.SMTP object at 0xdeadbeef>
 
-        def test_ehlo(smtp):
-            response, msg = smtp.ehlo()
+        def test_ehlo(smtp_connection):
+            response, msg = smtp_connection.ehlo()
             assert response == 250
             assert b"smtp.gmail.com" in msg
     >       assert 0  # for demo purposes
@@ -580,10 +619,10 @@ So let's just do another run::
     test_module.py:6: AssertionError
     ________________________ test_noop[smtp.gmail.com] _________________________
 
-    smtp = <smtplib.SMTP object at 0xdeadbeef>
+    smtp_connection = <smtplib.SMTP object at 0xdeadbeef>
 
-        def test_noop(smtp):
-            response, msg = smtp.noop()
+        def test_noop(smtp_connection):
+            response, msg = smtp_connection.noop()
             assert response == 250
     >       assert 0  # for demo purposes
     E       assert 0
@@ -591,23 +630,23 @@ So let's just do another run::
     test_module.py:11: AssertionError
     ________________________ test_ehlo[mail.python.org] ________________________
 
-    smtp = <smtplib.SMTP object at 0xdeadbeef>
+    smtp_connection = <smtplib.SMTP object at 0xdeadbeef>
 
-        def test_ehlo(smtp):
-            response, msg = smtp.ehlo()
+        def test_ehlo(smtp_connection):
+            response, msg = smtp_connection.ehlo()
             assert response == 250
     >       assert b"smtp.gmail.com" in msg
-    E       AssertionError: assert b'smtp.gmail.com' in b'mail.python.org\nPIPELINING\nSIZE 51200000\nETRN\nSTARTTLS\nAUTH DIGEST-MD5 NTLM CRAM-MD5\nENHANCEDSTATUSCODES\n8BITMIME\nDSN\nSMTPUTF8'
+    E       AssertionError: assert b'smtp.gmail.com' in b'mail.python.org\nPIPELINING\nSIZE 51200000\nETRN\nSTARTTLS\nAUTH DIGEST-MD5 NTLM CRAM-MD5\nENHANCEDSTATUSCODES\n8BITMIME\nDSN\nSMTPUTF8\nCHUNKING'
 
     test_module.py:5: AssertionError
     -------------------------- Captured stdout setup ---------------------------
     finalizing <smtplib.SMTP object at 0xdeadbeef>
     ________________________ test_noop[mail.python.org] ________________________
 
-    smtp = <smtplib.SMTP object at 0xdeadbeef>
+    smtp_connection = <smtplib.SMTP object at 0xdeadbeef>
 
-        def test_noop(smtp):
-            response, msg = smtp.noop()
+        def test_noop(smtp_connection):
+            response, msg = smtp_connection.noop()
             assert response == 250
     >       assert 0  # for demo purposes
     E       assert 0
@@ -618,7 +657,7 @@ So let's just do another run::
     4 failed in 0.12 seconds
 
 We see that our two test functions each ran twice, against the different
-``smtp`` instances.  Note also, that with the ``mail.python.org``
+``smtp_connection`` instances.  Note also, that with the ``mail.python.org``
 connection the second test fails in ``test_ehlo`` because a
 different server string is expected than what arrived.
 
@@ -663,26 +702,29 @@ a function which will be called with the fixture value and then
 has to return a string to use.  In the latter case if the function
 return ``None`` then pytest's auto-generated ID will be used.
 
-Running the above tests results in the following test IDs being used::
+Running the above tests results in the following test IDs being used:
+
+.. code-block:: pytest
 
    $ pytest --collect-only
    =========================== test session starts ============================
-   platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-   rootdir: $REGENDOC_TMPDIR, inifile:
+   platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+   cachedir: $PYTHON_PREFIX/.pytest_cache
+   rootdir: $REGENDOC_TMPDIR
    collected 10 items
-   <Module 'test_anothersmtp.py'>
-     <Function 'test_showhelo[smtp.gmail.com]'>
-     <Function 'test_showhelo[mail.python.org]'>
-   <Module 'test_ids.py'>
-     <Function 'test_a[spam]'>
-     <Function 'test_a[ham]'>
-     <Function 'test_b[eggs]'>
-     <Function 'test_b[1]'>
-   <Module 'test_module.py'>
-     <Function 'test_ehlo[smtp.gmail.com]'>
-     <Function 'test_noop[smtp.gmail.com]'>
-     <Function 'test_ehlo[mail.python.org]'>
-     <Function 'test_noop[mail.python.org]'>
+   <Module test_anothersmtp.py>
+     <Function test_showhelo[smtp.gmail.com]>
+     <Function test_showhelo[mail.python.org]>
+   <Module test_ids.py>
+     <Function test_a[spam]>
+     <Function test_a[ham]>
+     <Function test_b[eggs]>
+     <Function test_b[1]>
+   <Module test_module.py>
+     <Function test_ehlo[smtp.gmail.com]>
+     <Function test_noop[smtp.gmail.com]>
+     <Function test_ehlo[mail.python.org]>
+     <Function test_noop[mail.python.org]>
 
    ======================= no tests ran in 0.12 seconds =======================
 
@@ -705,13 +747,15 @@ Example::
     def test_data(data_set):
         pass
 
-Running this test will *skip* the invocation of ``data_set`` with value ``2``::
+Running this test will *skip* the invocation of ``data_set`` with value ``2``:
+
+.. code-block:: pytest
 
     $ pytest test_fixture_marks.py -v
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.5
-    cachedir: .pytest_cache
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collecting ... collected 3 items
 
     test_fixture_marks.py::test_data[0] PASSED                           [ 33%]
@@ -730,46 +774,48 @@ can use other fixtures themselves.  This contributes to a modular design
 of your fixtures and allows re-use of framework-specific fixtures across
 many projects.  As a simple example, we can extend the previous example
 and instantiate an object ``app`` where we stick the already defined
-``smtp`` resource into it::
+``smtp_connection`` resource into it::
 
     # content of test_appsetup.py
 
     import pytest
 
     class App(object):
-        def __init__(self, smtp):
-            self.smtp = smtp
+        def __init__(self, smtp_connection):
+            self.smtp_connection = smtp_connection
 
     @pytest.fixture(scope="module")
-    def app(smtp):
-        return App(smtp)
+    def app(smtp_connection):
+        return App(smtp_connection)
 
-    def test_smtp_exists(app):
-        assert app.smtp
+    def test_smtp_connection_exists(app):
+        assert app.smtp_connection
 
 Here we declare an ``app`` fixture which receives the previously defined
-``smtp`` fixture and instantiates an ``App`` object with it.  Let's run it::
+``smtp_connection`` fixture and instantiates an ``App`` object with it.  Let's run it:
+
+.. code-block:: pytest
 
     $ pytest -v test_appsetup.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.5
-    cachedir: .pytest_cache
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collecting ... collected 2 items
 
-    test_appsetup.py::test_smtp_exists[smtp.gmail.com] PASSED            [ 50%]
-    test_appsetup.py::test_smtp_exists[mail.python.org] PASSED           [100%]
+    test_appsetup.py::test_smtp_connection_exists[smtp.gmail.com] PASSED [ 50%]
+    test_appsetup.py::test_smtp_connection_exists[mail.python.org] PASSED [100%]
 
     ========================= 2 passed in 0.12 seconds =========================
 
-Due to the parametrization of ``smtp`` the test will run twice with two
+Due to the parametrization of ``smtp_connection``, the test will run twice with two
 different ``App`` instances and respective smtp servers.  There is no
-need for the ``app`` fixture to be aware of the ``smtp`` parametrization
-as pytest will fully analyse the fixture dependency graph.
+need for the ``app`` fixture to be aware of the ``smtp_connection``
+parametrization because pytest will fully analyse the fixture dependency graph.
 
-Note, that the ``app`` fixture has a scope of ``module`` and uses a
-module-scoped ``smtp`` fixture.  The example would still work if ``smtp``
-was cached on a ``session`` scope: it is fine for fixtures to use
+Note that the ``app`` fixture has a scope of ``module`` and uses a
+module-scoped ``smtp_connection`` fixture.  The example would still work if
+``smtp_connection`` was cached on a ``session`` scope: it is fine for fixtures to use
 "broader" scoped fixtures but not the other way round:
 A session-scoped fixture could not use a module-scoped one in a
 meaningful way.
@@ -788,7 +834,7 @@ first execute with one instance and then finalizers are called
 before the next fixture instance is created.  Among other things,
 this eases testing of applications which create and use global state.
 
-The following example uses two parametrized fixture, one of which is
+The following example uses two parametrized fixtures, one of which is
 scoped on a per-module basis, and all the functions perform ``print`` calls
 to show the setup/teardown flow::
 
@@ -798,32 +844,34 @@ to show the setup/teardown flow::
     @pytest.fixture(scope="module", params=["mod1", "mod2"])
     def modarg(request):
         param = request.param
-        print ("  SETUP modarg %s" % param)
+        print("  SETUP modarg %s" % param)
         yield param
-        print ("  TEARDOWN modarg %s" % param)
+        print("  TEARDOWN modarg %s" % param)
 
     @pytest.fixture(scope="function", params=[1,2])
     def otherarg(request):
         param = request.param
-        print ("  SETUP otherarg %s" % param)
+        print("  SETUP otherarg %s" % param)
         yield param
-        print ("  TEARDOWN otherarg %s" % param)
+        print("  TEARDOWN otherarg %s" % param)
 
     def test_0(otherarg):
-        print ("  RUN test0 with otherarg %s" % otherarg)
+        print("  RUN test0 with otherarg %s" % otherarg)
     def test_1(modarg):
-        print ("  RUN test1 with modarg %s" % modarg)
+        print("  RUN test1 with modarg %s" % modarg)
     def test_2(otherarg, modarg):
-        print ("  RUN test2 with otherarg %s and modarg %s" % (otherarg, modarg))
+        print("  RUN test2 with otherarg %s and modarg %s" % (otherarg, modarg))
 
 
-Let's run the tests in verbose mode and with looking at the print-output::
+Let's run the tests in verbose mode and with looking at the print-output:
+
+.. code-block:: pytest
 
     $ pytest -v -s test_module.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.5
-    cachedir: .pytest_cache
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collecting ... collected 8 items
 
     test_module.py::test_0[1]   SETUP otherarg 1
@@ -919,7 +967,9 @@ and declare its use in a test module via a ``usefixtures`` marker::
 Due to the ``usefixtures`` marker, the ``cleandir`` fixture
 will be required for the execution of each test method, just as if
 you specified a "cleandir" function argument to each of them.  Let's run it
-to verify our fixture is activated and the tests pass::
+to verify our fixture is activated and the tests pass:
+
+.. code-block:: pytest
 
     $ pytest -q
     ..                                                                   [100%]
@@ -943,7 +993,7 @@ a generic feature of the mark mechanism:
 Note that the assigned variable *must* be called ``pytestmark``, assigning e.g.
 ``foomark`` will not activate the fixtures.
 
-Lastly you can put fixtures required by all tests in your project
+It is also possible to put fixtures required by all tests in your project
 into an ini-file:
 
 .. code-block:: ini
@@ -953,6 +1003,22 @@ into an ini-file:
     usefixtures = cleandir
 
 
+.. warning::
+
+    Note this mark has no effect in **fixture functions**. For example,
+    this **will not work as expected**:
+
+    .. code-block:: python
+
+        @pytest.mark.usefixtures("my_other_fixture")
+        @pytest.fixture
+        def my_fixture_that_sadly_wont_use_my_other_fixture():
+            ...
+
+    Currently this will not generate any error or warning, but this is intended
+    to be handled by `#3664 <https://github.com/pytest-dev/pytest/issues/3664>`_.
+
+
 .. _`autouse`:
 .. _`autouse fixtures`:
 
@@ -1002,7 +1068,9 @@ which implies that all test methods in the class will use this fixture
 without a need to state it in the test function signature or with a
 class-level ``usefixtures`` decorator.
 
-If we run it, we get two passing tests::
+If we run it, we get two passing tests:
+
+.. code-block:: pytest
 
     $ pytest -q
     ..                                                                   [100%]
@@ -1111,6 +1179,8 @@ Given the tests file structure is:
 
         conftest.py
             # content of tests/conftest.py
+            import pytest
+
             @pytest.fixture
             def username():
                 return 'username'
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/flaky.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/flaky.rst
new file mode 100644
index 00000000000..8e340316ea0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/flaky.rst
@@ -0,0 +1,125 @@
+
+Flaky tests
+-----------
+
+A "flaky" test is one that exhibits intermittent or sporadic failure, that seems to have non-deterministic behaviour. Sometimes it passes, sometimes it fails, and it's not clear why. This page discusses pytest features that can help and other general strategies for identifying, fixing or mitigating them.
+
+Why flaky tests are a problem
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Flaky tests are particularly troublesome when a continuous integration (CI) server is being used, so that all tests must pass before a new code change can be merged. If the test result is not a reliable signal -- that a test failure means the code change broke the test -- developers can become mistrustful of the test results, which can lead to overlooking genuine failures. It is also a source of wasted time as developers must re-run test suites and investigate spurious failures.
+
+
+Potential root causes
+^^^^^^^^^^^^^^^^^^^^^
+
+System state
+~~~~~~~~~~~~
+
+Broadly speaking, a flaky test indicates that the test relies on some system state that is not being appropriately controlled - the test environment is not sufficiently isolated. Higher level tests are more likely to be flaky as they rely on more state.
+
+Flaky tests sometimes appear when a test suite is run in parallel (such as use of pytest-xdist). This can indicate a test is reliant on test ordering.
+
+-  Perhaps a different test is failing to clean up after itself and leaving behind data which causes the flaky test to fail.
+- The flaky test is reliant on data from a previous test that doesn't clean up after itself, and in parallel runs that previous test is not always present
+- Tests that modify global state typically cannot be run in parallel.
+
+
+Overly strict assertion
+~~~~~~~~~~~~~~~~~~~~~~~
+
+Overly strict assertions can cause problems with floating point comparison as well as timing issues. `pytest.approx <https://docs.pytest.org/en/latest/reference.html#pytest-approx>`_ is useful here.
+
+
+Pytest features
+^^^^^^^^^^^^^^^
+
+Xfail strict
+~~~~~~~~~~~~
+
+:ref:`pytest.mark.xfail ref` with ``strict=False`` can be used to mark a test so that its failure does not cause the whole build to break. This could be considered like a manual quarantine, and is rather dangerous to use permanently.
+
+
+PYTEST_CURRENT_TEST
+~~~~~~~~~~~~~~~~~~~
+
+:ref:`pytest current test env` may be useful for figuring out "which test got stuck".
+
+
+Plugins
+~~~~~~~
+
+Rerunning any failed tests can mitigate the negative effects of flaky tests by giving them additional chances to pass, so that the overall build does not fail. Several pytest plugins support this:
+
+* `flaky <https://github.com/box/flaky>`_
+* `pytest-flakefinder <https://github.com/dropbox/pytest-flakefinder>`_ - `blog post <https://blogs.dropbox.com/tech/2016/03/open-sourcing-pytest-tools/>`_
+* `pytest-rerunfailures <https://github.com/pytest-dev/pytest-rerunfailures>`_
+* `pytest-replay <https://github.com/ESSS/pytest-replay>`_: This plugin helps to reproduce locally crashes or flaky tests observed during CI runs.
+
+Plugins to deliberately randomize tests can help expose tests with state problems:
+
+* `pytest-random-order <https://github.com/jbasko/pytest-random-order>`_
+* `pytest-randomly <https://github.com/pytest-dev/pytest-randomly>`_
+
+
+Other general strategies
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+Split up test suites
+~~~~~~~~~~~~~~~~~~~~
+
+It can be common to split a single test suite into two, such as unit vs integration, and only use the unit test suite as a CI gate. This also helps keep build times manageable as high level tests tend to be slower. However, it means it does become possible for code that breaks the build to be merged, so extra vigilance is needed for monitoring the integration test results.
+
+
+Video/screenshot on failure
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+For UI tests these are important for understanding what the state of the UI was when the test failed. pytest-splinter can be used with plugins like pytest-bdd and can `save a screenshot on test failure <https://pytest-splinter.readthedocs.io/en/latest/#automatic-screenshots-on-test-failure>`_, which can help to isolate the cause.
+
+
+Delete or rewrite the test
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If the functionality is covered by other tests, perhaps the test can be removed. If not, perhaps it can be rewritten at a lower level which will remove the flakiness or make its source more apparent.
+
+
+Quarantine
+~~~~~~~~~~
+
+Mark Lapierre discusses the `Pros and Cons of Quarantined Tests <https://dev.to/mlapierre/pros-and-cons-of-quarantined-tests-2emj>`_ in a post from 2018.
+
+
+
+CI tools that rerun on failure
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Azure Pipelines (the Azure cloud CI/CD tool, formerly Visual Studio Team Services or VSTS) has a feature to `identify flaky tests <https://docs.microsoft.com/en-us/azure/devops/release-notes/2017/dec-11-vsts#identify-flaky-tests>`_ and rerun failed tests.
+
+
+
+Research
+^^^^^^^^
+
+This is a limited list, please submit an issue or pull request to expand it!
+
+* Gao, Zebao, Yalan Liang, Myra B. Cohen, Atif M. Memon, and Zhen Wang. "Making system user interactive tests repeatable: When and what should we control?." In *Software Engineering (ICSE), 2015 IEEE/ACM 37th IEEE International Conference on*, vol. 1, pp. 55-65. IEEE, 2015.  `PDF <http://www.cs.umd.edu/~atif/pubs/gao-icse15.pdf>`__
+* Palomba, Fabio, and Andy Zaidman. "Does refactoring of test smells induce fixing flaky tests?." In *Software Maintenance and Evolution (ICSME), 2017 IEEE International Conference on*, pp. 1-12. IEEE, 2017. `PDF in Google Drive <https://drive.google.com/file/d/10HdcCQiuQVgW3yYUJD-TSTq1NbYEprl0/view>`__
+*  Bell, Jonathan, Owolabi Legunsen, Michael Hilton, Lamyaa Eloussi, Tifany Yung, and Darko Marinov. "DeFlaker: Automatically detecting flaky tests." In *Proceedings of the 2018 International Conference on Software Engineering*. 2018. `PDF <https://www.jonbell.net/icse18-deflaker.pdf>`__
+
+
+Resources
+^^^^^^^^^
+
+* `Eradicating Non-Determinism in Tests <https://martinfowler.com/articles/nonDeterminism.html>`_ by Martin Fowler, 2011
+* `No more flaky tests on the Go team <https://www.thoughtworks.com/insights/blog/no-more-flaky-tests-go-team>`_ by Pavan Sudarshan, 2012
+* `The Build That Cried Broken: Building Trust in your Continuous Integration Tests <https://www.youtube.com/embed/VotJqV4n8ig>`_ talk (video) by `Angie Jones <http://angiejones.tech/>`_ at SeleniumConf Austin 2017
+* `Test and Code Podcast: Flaky Tests and How to Deal with Them <https://testandcode.com/50>`_ by Brian Okken and Anthony Shaw, 2018
+* Microsoft:
+
+  * `How we approach testing VSTS to enable continuous delivery <https://blogs.msdn.microsoft.com/bharry/2017/06/28/testing-in-a-cloud-delivery-cadence/>`_ by Brian Harry MS, 2017
+  * `Eliminating Flaky Tests <https://docs.microsoft.com/en-us/azure/devops/learn/devops-at-microsoft/eliminating-flaky-tests>`_ blog and talk (video) by Munil Shah, 2017
+
+* Google:
+
+  * `Flaky Tests at Google and How We Mitigate Them <https://testing.googleblog.com/2016/05/flaky-tests-at-google-and-how-we.html>`_ by John Micco, 2016
+  * `Where do Google's flaky tests come from? <https://docs.google.com/document/d/1mZ0-Kc97DI_F3tf_GBW_NB_aqka-P1jVOsFfufxqUUM/edit#heading=h.ec0r4fypsleh>`_  by Jeff Listfield, 2017
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/funcarg_compare.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/funcarg_compare.rst
index c29ba1f3c35..4fa9b79ae7a 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/funcarg_compare.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/funcarg_compare.rst
@@ -7,7 +7,7 @@ pytest-2.3: reasoning for fixture/funcarg evolution
 
 **Target audience**: Reading this document requires basic knowledge of
 python testing, xUnit setup methods and the (previous) basic pytest
-funcarg mechanism, see http://pytest.org/2.2.4/funcargs.html
+funcarg mechanism, see https://docs.pytest.org/en/latest/historical-notes.html#funcargs-and-pytest-funcarg.
 If you are new to pytest, then you can simply ignore this
 section and read the other sections.
 
@@ -26,9 +26,9 @@ a per-session Database object::
     # content of conftest.py
     class Database(object):
         def __init__(self):
-            print ("database instance created")
+            print("database instance created")
         def destroy(self):
-            print ("database instance destroyed")
+            print("database instance destroyed")
 
     def pytest_funcarg__db(request):
         return request.cached_setup(setup=DataBase,
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/getting-started.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/getting-started.rst
index f2dbec5e932..882385b2960 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/getting-started.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/getting-started.rst
@@ -1,15 +1,12 @@
 Installation and Getting Started
 ===================================
 
-**Pythons**: Python 2.7, 3.4, 3.5, 3.6, Jython, PyPy-2.3
+**Pythons**: Python 2.7, 3.4, 3.5, 3.6, 3.7, Jython, PyPy-2.3
 
 **Platforms**: Unix/Posix and Windows
 
 **PyPI package name**: `pytest <https://pypi.org/project/pytest/>`_
 
-**Dependencies**: `py <https://pypi.org/project/py/>`_,
-`colorama (Windows) <https://pypi.org/project/colorama/>`_,
-
 **Documentation as PDF**: `download latest <https://media.readthedocs.org/pdf/pytest/latest/pytest.pdf>`_
 
 ``pytest`` is a framework that makes building simple and scalable tests easy. Tests are expressive and readable—no boilerplate code required. Get started in minutes with a small unit test or complex functional test for your application or library.
@@ -20,14 +17,18 @@ Installation and Getting Started
 Install ``pytest``
 ----------------------------------------
 
-1. Run the following command in your command line::
+1. Run the following command in your command line:
+
+.. code-block:: bash
 
     pip install -U pytest
 
-2. Check that you installed the correct version::
+2. Check that you installed the correct version:
+
+.. code-block:: bash
 
     $ pytest --version
-    This is pytest version 3.x.y, imported from $PYTHON_PREFIX/lib/python3.5/site-packages/pytest.py
+    This is pytest version 4.x.y, imported from $PYTHON_PREFIX/lib/python3.7/site-packages/pytest.py
 
 .. _`simpletest`:
 
@@ -43,12 +44,15 @@ Create a simple test function with just four lines of code::
     def test_answer():
         assert func(3) == 5
 
-That’s it. You can now execute the test function::
+That’s it. You can now execute the test function:
+
+.. code-block:: pytest
 
     $ pytest
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 1 item
 
     test_sample.py F                                                     [100%]
@@ -79,7 +83,7 @@ Run multiple tests
 Assert that a certain exception is raised
 --------------------------------------------------------------
 
-Use the ``raises`` helper to assert that some code raises an exception::
+Use the :ref:`raises <assertraises>` helper to assert that some code raises an exception::
 
     # content of test_sysexit.py
     import pytest
@@ -90,7 +94,9 @@ Use the ``raises`` helper to assert that some code raises an exception::
         with pytest.raises(SystemExit):
             f()
 
-Execute the test function with “quiet” reporting mode::
+Execute the test function with “quiet” reporting mode:
+
+.. code-block:: pytest
 
     $ pytest -q test_sysexit.py
     .                                                                    [100%]
@@ -111,7 +117,9 @@ Once you develop multiple tests, you may want to group them into a class. pytest
             x = "hello"
             assert hasattr(x, 'check')
 
-``pytest`` discovers all tests following its :ref:`Conventions for Python test discovery <test discovery>`, so it finds both ``test_`` prefixed functions. There is no need to subclass anything. We can simply run the module by passing its filename::
+``pytest`` discovers all tests following its :ref:`Conventions for Python test discovery <test discovery>`, so it finds both ``test_`` prefixed functions. There is no need to subclass anything. We can simply run the module by passing its filename:
+
+.. code-block:: pytest
 
     $ pytest -q test_class.py
     .F                                                                   [100%]
@@ -138,10 +146,12 @@ Request a unique temporary directory for functional tests
 
     # content of test_tmpdir.py
     def test_needsfiles(tmpdir):
-        print (tmpdir)
+        print(tmpdir)
         assert 0
 
-List the name ``tmpdir`` in the test function signature and ``pytest`` will lookup and call a fixture factory to create the resource before performing the test function call. Before the test runs, ``pytest`` creates a unique-per-test-invocation temporary directory::
+List the name ``tmpdir`` in the test function signature and ``pytest`` will lookup and call a fixture factory to create the resource before performing the test function call. Before the test runs, ``pytest`` creates a unique-per-test-invocation temporary directory:
+
+.. code-block:: pytest
 
     $ pytest -q test_tmpdir.py
     F                                                                    [100%]
@@ -151,7 +161,7 @@ List the name ``tmpdir`` in the test function signature and ``pytest`` will look
     tmpdir = local('PYTEST_TMPDIR/test_needsfiles0')
 
         def test_needsfiles(tmpdir):
-            print (tmpdir)
+            print(tmpdir)
     >       assert 0
     E       assert 0
 
@@ -162,7 +172,9 @@ List the name ``tmpdir`` in the test function signature and ``pytest`` will look
 
 More info on tmpdir handling is available at :ref:`Temporary directories and files <tmpdir handling>`.
 
-Find out what kind of builtin :ref:`pytest fixtures <fixtures>` exist with the command::
+Find out what kind of builtin :ref:`pytest fixtures <fixtures>` exist with the command:
+
+.. code-block:: bash
 
     pytest --fixtures   # shows builtin and custom fixtures
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/goodpractices.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/goodpractices.rst
index 2bbd9d0ae58..f08bd5c4078 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/goodpractices.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/goodpractices.rst
@@ -4,6 +4,28 @@
 Good Integration Practices
 =================================================
 
+Install package with pip
+-------------------------------------------------
+
+For development, we recommend you use venv_ for virtual environments
+(or virtualenv_ for Python 2.7) and
+pip_ for installing your application and any dependencies,
+as well as the ``pytest`` package itself.
+This ensures your code and dependencies are isolated from your system Python installation.
+
+Next, place a ``setup.py`` file in the root of your package with the following minimum content::
+
+    from setuptools import setup, find_packages
+
+    setup(name="PACKAGENAME", packages=find_packages())
+
+Where ``PACKAGENAME`` is the name of your package. You can then install your package in "editable" mode by running from the same directory::
+
+     pip install -e .
+
+which lets you change your source code (both tests and application) and rerun tests at will.
+This is similar to running ``python setup.py develop`` or ``conda develop`` in that it installs
+your package using a symlink to your development code.
 
 .. _`test discovery`:
 .. _`Python test discovery`:
@@ -20,8 +42,8 @@ Conventions for Python test discovery
 * In those directories, search for ``test_*.py`` or ``*_test.py`` files, imported by their `test package name`_.
 * From those files, collect test items:
 
-  * ``test_`` prefixed test functions or methods outside of class
-  * ``test_`` prefixed test functions or methods inside ``Test`` prefixed test classes (without an ``__init__`` method)
+  * ``test`` prefixed test functions or methods outside of class
+  * ``test`` prefixed test functions or methods inside ``Test`` prefixed test classes (without an ``__init__`` method)
 
 For examples of how to customize your test discovery :doc:`example/pythoncollection`.
 
@@ -51,8 +73,18 @@ to keep tests separate from actual application code (often a good idea)::
         test_view.py
         ...
 
-This way your tests can run easily against an installed version
-of ``mypkg``.
+This has the following benefits:
+
+* Your tests can run against an installed version after executing ``pip install .``.
+* Your tests can run against the local copy with an editable install after executing ``pip install --editable .``.
+* If you don't have a ``setup.py`` file and are relying on the fact that Python by default puts the current
+  directory in ``sys.path`` to import your package, you can execute ``python -m pytest`` to execute the tests against the
+  local copy directly, without using ``pip``.
+
+.. note::
+
+    See :ref:`pythonpath` for more information about the difference between calling ``pytest`` and
+    ``python -m pytest``.
 
 Note that using this scheme your test files must have **unique names**, because
 ``pytest`` will import them as *top-level* modules since there are no packages
@@ -177,19 +209,6 @@ Note that this layout also works in conjunction with the ``src`` layout mentione
 tox
 ------
 
-For development, we recommend to use virtualenv_ environments and pip_
-for installing your application and any dependencies
-as well as the ``pytest`` package itself. This ensures your code and
-dependencies are isolated from the system Python installation.
-
-You can then install your package in "editable" mode::
-
-     pip install -e .
-
-which lets you change your source code (both tests and application) and rerun tests at will.
-This is similar to running `python setup.py develop` or `conda develop` in that it installs
-your package using a symlink to your development code.
-
 Once you are done with your work and want to make sure that your actual
 package passes all tests you may want to look into `tox`_, the
 virtualenv test automation tool and its `pytest support
@@ -282,7 +301,7 @@ your own setuptools Test command for invoking pytest.
     setup(
         # ...,
         tests_require=["pytest"],
-        cmdclass={"test": PyTest},
+        cmdclass={"pytest": PyTest},
     )
 
 Now if you run::
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/historical-notes.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/historical-notes.rst
index 028ceff9b17..c8403728f2f 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/historical-notes.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/historical-notes.rst
@@ -4,10 +4,121 @@ Historical Notes
 This page lists features or behavior from previous versions of pytest which have changed over the years. They are
 kept here as a historical note so users looking at old code can find documentation related to them.
 
+
+.. _marker-revamp:
+
+Marker revamp and iteration
+---------------------------
+
+.. versionchanged:: 3.6
+
+pytest's marker implementation traditionally worked by simply updating the ``__dict__`` attribute of functions to cumulatively add markers. As a result, markers would unintentionally be passed along class hierarchies in surprising ways. Further, the API for retrieving them was inconsistent, as markers from parameterization would be stored differently than markers applied using the ``@pytest.mark`` decorator and markers added via ``node.add_marker``.
+
+This state of things made it technically next to impossible to use data from markers correctly without having a deep understanding of the internals, leading to subtle and hard to understand bugs in more advanced usages.
+
+Depending on how a marker got declared/changed one would get either a ``MarkerInfo`` which might contain markers from sibling classes,
+``MarkDecorators`` when marks came from parameterization or from a ``node.add_marker`` call, discarding prior marks. Also ``MarkerInfo`` acts like a single mark, when it in fact represents a merged view on multiple marks with the same name.
+
+On top of that markers were not accessible in the same way for modules, classes, and functions/methods.
+In fact, markers were only accessible in functions, even if they were declared on classes/modules.
+
+A new API to access markers has been introduced in pytest 3.6 in order to solve the problems with
+the initial design, providing the :func:`_pytest.nodes.Node.iter_markers` method to iterate over
+markers in a consistent manner and reworking the internals, which solved a great deal of problems
+with the initial design.
+
+
+.. _update marker code:
+
+Updating code
+~~~~~~~~~~~~~
+
+The old ``Node.get_marker(name)`` function is considered deprecated because it returns an internal ``MarkerInfo`` object
+which contains the merged name, ``*args`` and ``**kwargs`` of all the markers which apply to that node.
+
+In general there are two scenarios on how markers should be handled:
+
+1. Marks overwrite each other. Order matters but you only want to think of your mark as a single item. E.g.
+``log_level('info')`` at a module level can be overwritten by ``log_level('debug')`` for a specific test.
+
+    In this case, use ``Node.get_closest_marker(name)``:
+
+    .. code-block:: python
+
+        # replace this:
+        marker = item.get_marker("log_level")
+        if marker:
+            level = marker.args[0]
+
+        # by this:
+        marker = item.get_closest_marker("log_level")
+        if marker:
+            level = marker.args[0]
+
+2. Marks compose in an additive manner. E.g. ``skipif(condition)`` marks mean you just want to evaluate all of them,
+order doesn't even matter. You probably want to think of your marks as a set here.
+
+   In this case iterate over each mark and handle their ``*args`` and ``**kwargs`` individually.
+
+   .. code-block:: python
+
+        # replace this
+        skipif = item.get_marker("skipif")
+        if skipif:
+            for condition in skipif.args:
+                # eval condition
+                ...
+
+        # by this:
+        for skipif in item.iter_markers("skipif"):
+            condition = skipif.args[0]
+            # eval condition
+
+
+If you are unsure or have any questions, please consider opening
+`an issue <https://github.com/pytest-dev/pytest/issues>`_.
+
+Related issues
+~~~~~~~~~~~~~~
+
+Here is a non-exhaustive list of issues fixed by the new implementation:
+
+* Marks don't pick up nested classes (`#199 <https://github.com/pytest-dev/pytest/issues/199>`_).
+
+* Markers stain on all related classes (`#568 <https://github.com/pytest-dev/pytest/issues/568>`_).
+
+* Combining marks - args and kwargs calculation (`#2897 <https://github.com/pytest-dev/pytest/issues/2897>`_).
+
+* ``request.node.get_marker('name')`` returns ``None`` for markers applied in classes (`#902 <https://github.com/pytest-dev/pytest/issues/902>`_).
+
+* Marks applied in parametrize are stored as markdecorator (`#2400 <https://github.com/pytest-dev/pytest/issues/2400>`_).
+
+* Fix marker interaction in a backward incompatible way (`#1670 <https://github.com/pytest-dev/pytest/issues/1670>`_).
+
+* Refactor marks to get rid of the current "marks transfer" mechanism (`#2363 <https://github.com/pytest-dev/pytest/issues/2363>`_).
+
+* Introduce FunctionDefinition node, use it in generate_tests (`#2522 <https://github.com/pytest-dev/pytest/issues/2522>`_).
+
+* Remove named marker attributes and collect markers in items (`#891 <https://github.com/pytest-dev/pytest/issues/891>`_).
+
+* skipif mark from parametrize hides module level skipif mark (`#1540 <https://github.com/pytest-dev/pytest/issues/1540>`_).
+
+* skipif + parametrize not skipping tests (`#1296 <https://github.com/pytest-dev/pytest/issues/1296>`_).
+
+* Marker transfer incompatible with inheritance (`#535 <https://github.com/pytest-dev/pytest/issues/535>`_).
+
+More details can be found in the `original PR <https://github.com/pytest-dev/pytest/pull/3317>`_.
+
+.. note::
+
+    in a future major relase of pytest we will introduce class based markers,
+    at which point markers will no longer be limited to instances of :py:class:`Mark`.
+
+
 cache plugin integrated into the core
 -------------------------------------
 
-.. versionadded:: 2.8
+
 
 The functionality of the :ref:`core cache <cache>` plugin was previously distributed
 as a third party plugin named ``pytest-cache``.  The core plugin
@@ -18,7 +129,7 @@ can only store/receive data between test runs that is json-serializable.
 funcargs and ``pytest_funcarg__``
 ---------------------------------
 
-.. versionchanged:: 2.3
+
 
 In versions prior to 2.3 there was no ``@pytest.fixture`` marker
 and you had to use a magic ``pytest_funcarg__NAME`` prefix
@@ -30,7 +141,7 @@ functions.
 ``@pytest.yield_fixture`` decorator
 -----------------------------------
 
-.. versionchanged:: 2.10
+
 
 Prior to version 2.10, in order to use a ``yield`` statement to execute teardown code one
 had to mark a fixture using the ``yield_fixture`` marker. From 2.10 onward, normal
@@ -41,7 +152,7 @@ and considered deprecated.
 ``[pytest]`` header in ``setup.cfg``
 ------------------------------------
 
-.. versionchanged:: 3.0
+
 
 Prior to 3.0, the supported section name was ``[pytest]``. Due to how
 this may collide with some distutils commands, the recommended
@@ -54,17 +165,19 @@ name is ``[pytest]``.
 Applying marks to ``@pytest.mark.parametrize`` parameters
 ---------------------------------------------------------
 
-.. versionchanged:: 3.1
+
 
 Prior to version 3.1 the supported mechanism for marking values
-used the syntax::
+used the syntax:
+
+.. code-block:: python
 
     import pytest
-    @pytest.mark.parametrize("test_input,expected", [
-        ("3+5", 8),
-        ("2+4", 6),
-        pytest.mark.xfail(("6*9", 42),),
-    ])
+
+
+    @pytest.mark.parametrize(
+        "test_input,expected", [("3+5", 8), ("2+4", 6), pytest.mark.xfail(("6*9", 42))]
+    )
     def test_eval(test_input, expected):
         assert eval(test_input) == expected
 
@@ -78,7 +191,7 @@ The old syntax is planned to be removed in pytest-4.0.
 ``@pytest.mark.parametrize`` argument names as a tuple
 ------------------------------------------------------
 
-.. versionchanged:: 2.4
+
 
 In versions prior to 2.4 one needed to specify the argument
 names as a tuple.  This remains valid but the simpler ``"name1,name2,..."``
@@ -89,7 +202,7 @@ it's easier to write and produces less line noise.
 setup: is now an "autouse fixture"
 ----------------------------------
 
-.. versionchanged:: 2.3
+
 
 During development prior to the pytest-2.3 release the name
 ``pytest.setup`` was used but before the release it was renamed
@@ -102,12 +215,16 @@ namely :ref:`autouse fixtures`
 Conditions as strings instead of booleans
 -----------------------------------------
 
-.. versionchanged:: 2.4
+
 
 Prior to pytest-2.4 the only way to specify skipif/xfail conditions was
-to use strings::
+to use strings:
+
+.. code-block:: python
 
     import sys
+
+
     @pytest.mark.skipif("sys.version_info >= (3,3)")
     def test_function():
         ...
@@ -139,17 +256,20 @@ dictionary which is constructed as follows:
   expression is applied.
 
 The pytest ``config`` object allows you to skip based on a test
-configuration value which you might have added::
+configuration value which you might have added:
+
+.. code-block:: python
 
     @pytest.mark.skipif("not config.getvalue('db')")
-    def test_function(...):
+    def test_function():
         ...
 
-The equivalent with "boolean conditions" is::
+The equivalent with "boolean conditions" is:
 
-    @pytest.mark.skipif(not pytest.config.getvalue("db"),
-                        reason="--db was not specified")
-    def test_function(...):
+.. code-block:: python
+
+    @pytest.mark.skipif(not pytest.config.getvalue("db"), reason="--db was not specified")
+    def test_function():
         pass
 
 .. note::
@@ -162,16 +282,30 @@ The equivalent with "boolean conditions" is::
 ``pytest.set_trace()``
 ----------------------
 
-.. versionchanged:: 2.4
 
-Previous to version 2.4 to set a break point in code one needed to use ``pytest.set_trace()``::
+
+Previous to version 2.4 to set a break point in code one needed to use ``pytest.set_trace()``:
+
+.. code-block:: python
 
     import pytest
+
+
     def test_function():
         ...
-        pytest.set_trace()    # invoke PDB debugger and tracing
+        pytest.set_trace()  # invoke PDB debugger and tracing
 
 
 This is no longer needed and one can use the native ``import pdb;pdb.set_trace()`` call directly.
 
 For more details see :ref:`breakpoints`.
+
+"compat" properties
+-------------------
+
+
+
+Access of ``Module``, ``Function``, ``Class``, ``Instance``, ``File`` and ``Item`` through ``Node`` instances have long
+been documented as deprecated, but started to emit warnings from pytest ``3.9`` and onward.
+
+Users should just ``import pytest`` and access those objects using the ``pytest`` module.
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/index.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/index.rst
index 6a382e57173..edcbbeb84e7 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/index.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/index.rst
@@ -22,12 +22,15 @@ An example of a simple test:
         assert inc(3) == 5
 
 
-To execute it::
+To execute it:
+
+.. code-block:: pytest
 
     $ pytest
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 1 item
 
     test_sample.py F                                                     [100%]
@@ -84,7 +87,7 @@ Consult the :ref:`Changelog <changelog>` page for fixes and enhancements of each
 License
 -------
 
-Copyright Holger Krekel and others, 2004-2017.
+Copyright Holger Krekel and others, 2004-2020.
 
 Distributed under the terms of the `MIT`_ license, pytest is free and open source software.
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/license.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/license.rst
index b8c0dce1bea..c6c10bbf358 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/license.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/license.rst
@@ -5,11 +5,11 @@ License
 
 Distributed under the terms of the `MIT`_ license, pytest is free and open source software.
 
-::
+.. code-block:: text
 
     The MIT License (MIT)
 
-    Copyright (c) 2004-2017 Holger Krekel and others
+    Copyright (c) 2004-2020 Holger Krekel and others
 
     Permission is hereby granted, free of charge, to any person obtaining a copy of
     this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/links.inc b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/links.inc
index 4d5a4b1eebf..1b7cbd05b00 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/links.inc
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/links.inc
@@ -14,6 +14,7 @@
 .. _`distribute docs`:
 .. _`distribute`: https://pypi.org/project/distribute/
 .. _`pip`: https://pypi.org/project/pip/
+.. _`venv`: https://docs.python.org/3/library/venv.html/
 .. _`virtualenv`: https://pypi.org/project/virtualenv/
 .. _hudson: http://hudson-ci.org/
 .. _jenkins: http://jenkins-ci.org/
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/logging.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/logging.rst
index 00829c15eef..a53509184f6 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/logging.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/logging.rst
@@ -3,17 +3,21 @@
 Logging
 -------
 
-.. versionadded:: 3.3
-.. versionchanged:: 3.4
+
+
 
 pytest captures log messages of level ``WARNING`` or above automatically and displays them in their own section
 for each failed test in the same manner as captured stdout and stderr.
 
-Running without options::
+Running without options:
+
+.. code-block:: bash
 
     pytest
 
-Shows failed tests like so::
+Shows failed tests like so:
+
+.. code-block:: pytest
 
     ----------------------- Captured stdlog call ----------------------
     test_reporting.py    26 WARNING  text going to logger
@@ -27,12 +31,16 @@ By default each captured log message shows the module, line number, log level
 and message.
 
 If desired the log and date format can be specified to
-anything that the logging module supports by passing specific formatting options::
+anything that the logging module supports by passing specific formatting options:
+
+.. code-block:: bash
 
     pytest --log-format="%(asctime)s %(levelname)s %(message)s" \
             --log-date-format="%Y-%m-%d %H:%M:%S"
 
-Shows failed tests like so::
+Shows failed tests like so:
+
+.. code-block:: pytest
 
     ----------------------- Captured stdlog call ----------------------
     2010-04-10 14:48:44 WARNING text going to logger
@@ -51,7 +59,9 @@ These options can also be customized through ``pytest.ini`` file:
     log_date_format = %Y-%m-%d %H:%M:%S
 
 Further it is possible to disable reporting of captured content (stdout,
-stderr and logs) on failed tests completely with::
+stderr and logs) on failed tests completely with:
+
+.. code-block:: bash
 
     pytest --show-capture=no
 
@@ -133,7 +143,6 @@ the records for the ``setup`` and ``call`` stages during teardown like so:
 
 .. code-block:: python
 
-
     @pytest.fixture
     def window(caplog):
         window = create_window()
@@ -198,6 +207,9 @@ option names are:
 * ``log_file_format``
 * ``log_file_date_format``
 
+You can call ``set_log_path()`` to customize the log_file path dynamically. This functionality
+is considered **experimental**.
+
 .. _log_release_notes:
 
 Release notes
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/mark.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/mark.rst
index aa1210bb6b5..de6ab78222c 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/mark.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/mark.rst
@@ -1,9 +1,7 @@
-
 .. _mark:
 
 Marking test functions with attributes
-=================================================================
-
+======================================
 
 By using the ``pytest.mark`` helper you can easily set
 metadata on your test functions. There are
@@ -17,8 +15,10 @@ some builtin markers, for example:
   to the same test function.
 
 It's easy to create custom markers or to apply markers
-to whole test classes or modules. See :ref:`mark examples` for examples
-which also serve as documentation.
+to whole test classes or modules. Those markers can be used by plugins, and also
+are commonly used to :ref:`select tests <mark run>` on the command-line with the ``-m`` option.
+
+See :ref:`mark examples` for examples which also serve as documentation.
 
 .. note::
 
@@ -26,134 +26,53 @@ which also serve as documentation.
     :ref:`fixtures <fixtures>`.
 
 
-Raising errors on unknown marks: --strict
------------------------------------------
+Registering marks
+-----------------
 
-When the ``--strict`` command-line flag is passed, any marks not registered in the ``pytest.ini`` file will trigger an error.
-
-Marks can be registered like this:
+You can register custom marks in your ``pytest.ini`` file like this:
 
 .. code-block:: ini
 
     [pytest]
     markers =
-        slow
+        slow: marks tests as slow (deselect with '-m "not slow"')
         serial
 
-This can be used to prevent users mistyping mark names by accident. Test suites that want to enforce this
-should add ``--strict`` to ``addopts``:
+Note that everything after the ``:`` is an optional description.
+
+Alternatively, you can register new markers programatically in a
+:ref:`pytest_configure <initialization-hooks>` hook:
+
+.. code-block:: python
+
+    def pytest_configure(config):
+        config.addinivalue_line(
+            "markers", "env(name): mark test to run only on named environment"
+        )
+
+
+Registered marks appear in pytest's help text and do not emit warnings (see the next section). It
+is recommended that third-party plugins always :ref:`register their markers <registering-markers>`.
+
+.. _unknown-marks:
+
+Raising errors on unknown marks
+-------------------------------
+
+Unregistered marks applied with the ``@pytest.mark.name_of_the_mark`` decorator
+will always emit a warning in order to avoid silently doing something
+surprising due to mis-typed names. As described in the previous section, you can disable
+the warning for custom marks by registering them in your ``pytest.ini`` file or
+using a custom ``pytest_configure`` hook.
+
+When the ``--strict-markers`` command-line flag is passed, any unknown marks applied
+with the ``@pytest.mark.name_of_the_mark`` decorator will trigger an error. You can
+enforce this validation in your project by adding ``--strict-markers`` to ``addopts``:
 
 .. code-block:: ini
 
     [pytest]
-    addopts = --strict
+    addopts = --strict-markers
     markers =
-        slow
+        slow: marks tests as slow (deselect with '-m "not slow"')
         serial
-
-
-.. `marker-iteration`
-
-Marker revamp and iteration
----------------------------
-
-.. versionadded:: 3.6
-
-pytest's marker implementation traditionally worked by simply updating the ``__dict__`` attribute of functions to add markers, in a cumulative manner. As a result of the this, markers would unintendely be passed along class hierarchies in surprising ways plus the API for retriving them was inconsistent, as markers from parameterization would be stored differently than markers applied using the ``@pytest.mark`` decorator and markers added via ``node.add_marker``.
-
-This state of things made it technically next to impossible to use data from markers correctly without having a deep understanding of the internals, leading to subtle and hard to understand bugs in more advanced usages.
-
-Depending on how a marker got declared/changed one would get either a ``MarkerInfo`` which might contain markers from sibling classes,
-``MarkDecorators`` when marks came from parameterization or from a ``node.add_marker`` call, discarding prior marks. Also ``MarkerInfo`` acts like a single mark, when it in fact represents a merged view on multiple marks with the same name.
-
-On top of that markers where not accessible the same way for modules, classes, and functions/methods,
-in fact, markers where only accessible in functions, even if they where declared on classes/modules.
-
-A new API to access markers has been introduced in pytest 3.6 in order to solve the problems with the initial design, providing :func:`_pytest.nodes.Node.iter_markers` method to iterate over markers in a consistent manner and reworking the internals, which solved great deal of problems with the initial design.
-
-
-.. _update marker code:
-
-Updating code
-~~~~~~~~~~~~~
-
-The old ``Node.get_marker(name)`` function is considered deprecated because it returns an internal ``MarkerInfo`` object
-which contains the merged name, ``*args`` and ``**kwargs`` of all the markers which apply to that node.
-
-In general there are two scenarios on how markers should be handled:
-
-1. Marks overwrite each other. Order matters but you only want to think of your mark as a single item. E.g.
-``log_level('info')`` at a module level can be overwritten by ``log_level('debug')`` for a specific test.
-
-    In this case replace use ``Node.get_closest_marker(name)``:
-
-    .. code-block:: python
-
-        # replace this:
-        marker = item.get_marker("log_level")
-        if marker:
-            level = marker.args[0]
-
-        # by this:
-        marker = item.get_closest_marker("log_level")
-        if marker:
-            level = marker.args[0]
-
-2. Marks compose additive. E.g. ``skipif(condition)`` marks means you just want to evaluate all of them,
-order doesn't even matter. You probably want to think of your marks as a set here.
-
-   In this case iterate over each mark and handle their ``*args`` and ``**kwargs`` individually.
-
-   .. code-block:: python
-
-        # replace this
-        skipif = item.get_marker("skipif")
-        if skipif:
-            for condition in skipif.args:
-                # eval condition
-                ...
-
-        # by this:
-        for skipif in item.iter_markers("skipif"):
-            condition = skipif.args[0]
-            # eval condition
-
-
-If you are unsure or have any questions, please consider opening
-`an issue <https://github.com/pytest-dev/pytest/issues>`_.
-
-Related issues
-~~~~~~~~~~~~~~
-
-Here is a non-exhaustive list of issues fixed by the new implementation:
-
-* Marks don't pick up nested classes (`#199 <https://github.com/pytest-dev/pytest/issues/199>`_).
-
-* markers stains on all related classes (`#568 <https://github.com/pytest-dev/pytest/issues/568>`_).
-
-* combining marks - args and kwargs calculation (`#2897 <https://github.com/pytest-dev/pytest/issues/2897>`_).
-
-* ``request.node.get_marker('name')`` returns ``None`` for markers applied in classes (`#902 <https://github.com/pytest-dev/pytest/issues/902>`_).
-
-* marks applied in parametrize are stored as markdecorator (`#2400 <https://github.com/pytest-dev/pytest/issues/2400>`_).
-
-* fix marker interaction in a backward incompatible way (`#1670 <https://github.com/pytest-dev/pytest/issues/1670>`_).
-
-* Refactor marks to get rid of the current "marks transfer" mechanism (`#2363 <https://github.com/pytest-dev/pytest/issues/2363>`_).
-
-* Introduce FunctionDefinition node, use it in generate_tests (`#2522 <https://github.com/pytest-dev/pytest/issues/2522>`_).
-
-* remove named marker attributes and collect markers in items (`#891 <https://github.com/pytest-dev/pytest/issues/891>`_).
-
-* skipif mark from parametrize hides module level skipif mark (`#1540 <https://github.com/pytest-dev/pytest/issues/1540>`_).
-
-* skipif + parametrize not skipping tests (`#1296 <https://github.com/pytest-dev/pytest/issues/1296>`_).
-
-* marker transfer incompatible with inheritance (`#535 <https://github.com/pytest-dev/pytest/issues/535>`_).
-
-More details can be found in the `original PR <https://github.com/pytest-dev/pytest/pull/3317>`_.
-
-.. note::
-
-    in a future major relase of pytest we will introduce class based markers,
-    at which points markers will no longer be limited to instances of :py:class:`Mark`
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/monkeypatch.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/monkeypatch.rst
index 1a69c3a429d..c9304e0fb70 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/monkeypatch.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/monkeypatch.rst
@@ -16,7 +16,7 @@ and a discussion of its motivation.
 
 
 Simple example: monkeypatching functions
----------------------------------------------------
+----------------------------------------
 
 If you want to pretend that ``os.expanduser`` returns a certain
 directory, you can use the :py:meth:`monkeypatch.setattr` method to
@@ -38,8 +38,8 @@ Here our test function monkeypatches ``os.path.expanduser`` and
 then calls into a function that calls it.  After the test function
 finishes the ``os.path.expanduser`` modification will be undone.
 
-example: preventing "requests" from remote operations
-------------------------------------------------------
+Global patch example: preventing "requests" from remote operations
+------------------------------------------------------------------
 
 If you want to prevent the "requests" library from performing http
 requests in all your tests, you can do::
@@ -81,6 +81,80 @@ so that any attempts within tests to create http requests will fail.
     See issue `#3290 <https://github.com/pytest-dev/pytest/issues/3290>`_ for details.
 
 
+Monkeypatching environment variables
+------------------------------------
+
+If you are working with environment variables you often need to safely change the values
+or delete them from the system for testing purposes. ``Monkeypatch`` provides a mechanism
+to do this using the ``setenv`` and ``delenv`` method. Our example code to test:
+
+.. code-block:: python
+
+    # contents of our original code file e.g. code.py
+    import os
+
+
+    def get_os_user_lower():
+        """Simple retrieval function.
+        Returns lowercase USER or raises EnvironmentError."""
+        username = os.getenv("USER")
+
+        if username is None:
+            raise EnvironmentError("USER environment is not set.")
+
+        return username.lower()
+
+There are two potential paths. First, the ``USER`` environment variable is set to a
+value. Second, the ``USER`` environment variable does not exist. Using ``monkeypatch``
+both paths can be safely tested without impacting the running environment:
+
+.. code-block:: python
+
+    # contents of our test file e.g. test_code.py
+    import pytest
+
+
+    def test_upper_to_lower(monkeypatch):
+        """Set the USER env var to assert the behavior."""
+        monkeypatch.setenv("USER", "TestingUser")
+        assert get_os_user_lower() == "testinguser"
+
+
+    def test_raise_exception(monkeypatch):
+        """Remove the USER env var and assert EnvironmentError is raised."""
+        monkeypatch.delenv("USER", raising=False)
+
+        with pytest.raises(EnvironmentError):
+            _ = get_os_user_lower()
+
+This behavior can be moved into ``fixture`` structures and shared across tests:
+
+.. code-block:: python
+
+    import pytest
+
+
+    @pytest.fixture
+    def mock_env_user(monkeypatch):
+        monkeypatch.setenv("USER", "TestingUser")
+
+
+    @pytest.fixture
+    def mock_env_missing(monkeypatch):
+        monkeypatch.delenv("USER", raising=False)
+
+
+    # Notice the tests reference the fixtures for mocks
+    def test_upper_to_lower(mock_env_user):
+        assert get_os_user_lower() == "testinguser"
+
+
+    def test_raise_exception(mock_env_missing):
+        with pytest.raises(EnvironmentError):
+            _ = get_os_user_lower()
+
+
+
 .. currentmodule:: _pytest.monkeypatch
 
 API Reference
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/nose.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/nose.rst
index 1f7b7b63844..701ea44eca1 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/nose.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/nose.rst
@@ -12,7 +12,9 @@ Running tests written for nose
 Usage
 -------------
 
-After :ref:`installation` type::
+After :ref:`installation` type:
+
+.. code-block:: bash
 
     python setup.py develop  # make sure tests can import our package
     pytest  # instead of 'nosetests'
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/parametrize.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/parametrize.rst
index 693cf1913bf..0abe7d70137 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/parametrize.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/parametrize.rst
@@ -29,33 +29,36 @@ pytest enables test parametrization at several levels:
 
 .. regendoc: wipe
 
-.. versionadded:: 2.2
-.. versionchanged:: 2.4
+
+
     Several improvements.
 
 The builtin :ref:`pytest.mark.parametrize ref` decorator enables
 parametrization of arguments for a test function.  Here is a typical example
 of a test function that implements checking that a certain input leads
-to an expected output::
+to an expected output:
+
+.. code-block:: python
 
     # content of test_expectation.py
     import pytest
-    @pytest.mark.parametrize("test_input,expected", [
-        ("3+5", 8),
-        ("2+4", 6),
-        ("6*9", 42),
-    ])
+
+
+    @pytest.mark.parametrize("test_input,expected", [("3+5", 8), ("2+4", 6), ("6*9", 42)])
     def test_eval(test_input, expected):
         assert eval(test_input) == expected
 
 Here, the ``@parametrize`` decorator defines three different ``(test_input,expected)``
 tuples so that the ``test_eval`` function will run three times using
-them in turn::
+them in turn:
+
+.. code-block:: pytest
 
     $ pytest
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 3 items
 
     test_expectation.py ..F                                              [100%]
@@ -65,19 +68,30 @@ them in turn::
 
     test_input = '6*9', expected = 42
 
-        @pytest.mark.parametrize("test_input,expected", [
-            ("3+5", 8),
-            ("2+4", 6),
-            ("6*9", 42),
-        ])
+        @pytest.mark.parametrize("test_input,expected", [("3+5", 8), ("2+4", 6), ("6*9", 42)])
         def test_eval(test_input, expected):
     >       assert eval(test_input) == expected
     E       AssertionError: assert 54 == 42
     E        +  where 54 = eval('6*9')
 
-    test_expectation.py:8: AssertionError
+    test_expectation.py:6: AssertionError
     ==================== 1 failed, 2 passed in 0.12 seconds ====================
 
+.. note::
+
+    pytest by default escapes any non-ascii characters used in unicode strings
+    for the parametrization because it has several downsides.
+    If however you would like to use unicode strings in parametrization and see them in the terminal as is (non-escaped), use this option in your ``pytest.ini``:
+
+    .. code-block:: ini
+
+        [pytest]
+        disable_test_id_escaping_and_forfeit_all_rights_to_community_support = True
+
+    Keep in mind however that this might cause unwanted side effects and
+    even bugs depending on the OS used and plugins currently installed, so use it at your own risk.
+
+
 As designed in this example, only one pair of input/output values fails
 the simple test function.  And as usual with test function arguments,
 you can see the ``input`` and ``output`` values in the traceback.
@@ -86,25 +100,30 @@ Note that you could also use the parametrize marker on a class or a module
 (see :ref:`mark`) which would invoke several functions with the argument sets.
 
 It is also possible to mark individual test instances within parametrize,
-for example with the builtin ``mark.xfail``::
+for example with the builtin ``mark.xfail``:
+
+.. code-block:: python
 
     # content of test_expectation.py
     import pytest
-    @pytest.mark.parametrize("test_input,expected", [
-        ("3+5", 8),
-        ("2+4", 6),
-        pytest.param("6*9", 42,
-                     marks=pytest.mark.xfail),
-    ])
+
+
+    @pytest.mark.parametrize(
+        "test_input,expected",
+        [("3+5", 8), ("2+4", 6), pytest.param("6*9", 42, marks=pytest.mark.xfail)],
+    )
     def test_eval(test_input, expected):
         assert eval(test_input) == expected
 
-Let's run this::
+Let's run this:
+
+.. code-block:: pytest
 
     $ pytest
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 3 items
 
     test_expectation.py ..x                                              [100%]
@@ -114,10 +133,18 @@ Let's run this::
 The one parameter set which caused a failure previously now
 shows up as an "xfailed (expected to fail)" test.
 
+In case the values provided to ``parametrize`` result in an empty list - for
+example, if they're dynamically generated by some function - the behaviour of
+pytest is defined by the :confval:`empty_parameter_set_mark` option.
+
 To get all combinations of multiple parametrized arguments you can stack
-``parametrize`` decorators::
+``parametrize`` decorators:
+
+.. code-block:: python
 
     import pytest
+
+
     @pytest.mark.parametrize("x", [0, 1])
     @pytest.mark.parametrize("y", [2, 3])
     def test_foo(x, y):
@@ -141,34 +168,48 @@ parametrization.
 
 For example, let's say we want to run a test taking string inputs which
 we want to set via a new ``pytest`` command line option.  Let's first write
-a simple test accepting a ``stringinput`` fixture function argument::
+a simple test accepting a ``stringinput`` fixture function argument:
+
+.. code-block:: python
 
     # content of test_strings.py
 
+
     def test_valid_string(stringinput):
         assert stringinput.isalpha()
 
 Now we add a ``conftest.py`` file containing the addition of a
-command line option and the parametrization of our test function::
+command line option and the parametrization of our test function:
+
+.. code-block:: python
 
     # content of conftest.py
 
+
     def pytest_addoption(parser):
-        parser.addoption("--stringinput", action="append", default=[],
-            help="list of stringinputs to pass to test functions")
+        parser.addoption(
+            "--stringinput",
+            action="append",
+            default=[],
+            help="list of stringinputs to pass to test functions",
+        )
+
 
     def pytest_generate_tests(metafunc):
-        if 'stringinput' in metafunc.fixturenames:
-            metafunc.parametrize("stringinput",
-                                 metafunc.config.getoption('stringinput'))
+        if "stringinput" in metafunc.fixturenames:
+            metafunc.parametrize("stringinput", metafunc.config.getoption("stringinput"))
 
-If we now pass two stringinput values, our test will run twice::
+If we now pass two stringinput values, our test will run twice:
+
+.. code-block:: pytest
 
     $ pytest -q --stringinput="hello" --stringinput="world" test_strings.py
     ..                                                                   [100%]
     2 passed in 0.12 seconds
 
-Let's also run with a stringinput that will lead to a failing test::
+Let's also run with a stringinput that will lead to a failing test:
+
+.. code-block:: pytest
 
     $ pytest -q --stringinput="!" test_strings.py
     F                                                                    [100%]
@@ -183,19 +224,21 @@ Let's also run with a stringinput that will lead to a failing test::
     E        +  where False = <built-in method isalpha of str object at 0xdeadbeef>()
     E        +    where <built-in method isalpha of str object at 0xdeadbeef> = '!'.isalpha
 
-    test_strings.py:3: AssertionError
+    test_strings.py:4: AssertionError
     1 failed in 0.12 seconds
 
 As expected our test function fails.
 
 If you don't specify a stringinput it will be skipped because
 ``metafunc.parametrize()`` will be called with an empty parameter
-list::
+list:
+
+.. code-block:: pytest
 
     $ pytest -q -rs test_strings.py
     s                                                                    [100%]
     ========================= short test summary info ==========================
-    SKIP [1] test_strings.py: got empty parameter set ['stringinput'], function test_valid_string at $REGENDOC_TMPDIR/test_strings.py:1
+    SKIPPED [1] test_strings.py: got empty parameter set ['stringinput'], function test_valid_string at $REGENDOC_TMPDIR/test_strings.py:2
     1 skipped in 0.12 seconds
 
 Note that when calling ``metafunc.parametrize`` multiple times with different parameter sets, all parameter names across
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/plugins.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/plugins.rst
index 9ddba5d38ca..e80969193ab 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/plugins.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/plugins.rst
@@ -27,7 +27,7 @@ Here is a little annotated list for some popular plugins:
   for `twisted <http://twistedmatrix.com>`_ apps, starting a reactor and
   processing deferreds from test functions.
 
-* `pytest-cov <https://pypi.org/project/pytest-cov/>`_:
+* `pytest-cov <https://pypi.org/project/pytest-cov/>`__:
   coverage reporting, compatible with distributed testing
 
 * `pytest-xdist <https://pypi.org/project/pytest-xdist/>`_:
@@ -59,9 +59,9 @@ To see a complete list of all plugins with their latest testing
 status against different pytest and Python versions, please visit
 `plugincompat <http://plugincompat.herokuapp.com/>`_.
 
-You may also discover more plugins through a `pytest- pypi.python.org search`_.
+You may also discover more plugins through a `pytest- pypi.org search`_.
 
-.. _`pytest- pypi.python.org search`: https://pypi.org/search/?q=pytest-
+.. _`pytest- pypi.org search`: https://pypi.org/search/?q=pytest-
 
 
 .. _`available installable plugins`:
@@ -69,23 +69,26 @@ You may also discover more plugins through a `pytest- pypi.python.org search`_.
 Requiring/Loading plugins in a test module or conftest file
 -----------------------------------------------------------
 
-You can require plugins in a test module or a conftest file like this::
+You can require plugins in a test module or a conftest file like this:
 
-    pytest_plugins = "myapp.testsupport.myplugin",
+.. code-block:: python
+
+    pytest_plugins = ("myapp.testsupport.myplugin",)
 
 When the test module or conftest plugin is loaded the specified plugins
 will be loaded as well.
 
-    pytest_plugins = "myapp.testsupport.myplugin"
-
-which will import the specified module as a ``pytest`` plugin.
-
 .. note::
     Requiring plugins using a ``pytest_plugins`` variable in non-root
     ``conftest.py`` files is deprecated. See
     :ref:`full explanation <requiring plugins in non-root conftests>`
     in the Writing plugins section.
 
+.. note::
+   The name ``pytest_plugins`` is reserved and should not be used as a
+   name for a custom plugin module.
+
+
 .. _`findpluginname`:
 
 Finding out which plugins are active
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/proposals/parametrize_with_fixtures.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/proposals/parametrize_with_fixtures.rst
index 92e7993f390..b7295f27ab2 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/proposals/parametrize_with_fixtures.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/proposals/parametrize_with_fixtures.rst
@@ -75,7 +75,7 @@ Issues
 ------
 
 * By using ``request.getfuncargvalue()`` we rely on actual fixture function
-  execution to know what fixtures are involved, due to it's dynamic nature
+  execution to know what fixtures are involved, due to its dynamic nature
 * More importantly, ``request.getfuncargvalue()`` cannot be combined with
   parametrized fixtures, such as ``extra_context``
 * This is very inconvenient if you wish to extend an existing test suite by
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/py27-py34-deprecation.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/py27-py34-deprecation.rst
new file mode 100644
index 00000000000..0ca97539c82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/py27-py34-deprecation.rst
@@ -0,0 +1,26 @@
+Python 2.7 and 3.4 support plan
+===============================
+
+Python 2.7 EOL is fast approaching, with
+upstream support `ending in 2020 <https://legacy.python.org/dev/peps/pep-0373/#id4>`__.
+Python 3.4's last release is scheduled for
+`March 2019 <https://www.python.org/dev/peps/pep-0429/#release-schedule>`__. pytest is one of
+the participating projects of the https://python3statement.org.
+
+The **pytest 4.6** series will be the last to support Python 2.7 and 3.4, and is scheduled
+to be released by **mid-2019**. **pytest 5.0** and onwards will support only Python 3.5+.
+
+Thanks to the `python_requires`_ ``setuptools`` option,
+Python 2.7 and Python 3.4 users using a modern ``pip`` version
+will install the last pytest ``4.6`` version automatically even if ``5.0`` or later
+are available on PyPI.
+
+While pytest ``5.0`` will be the new mainstream and development version, until **January 2020**
+the pytest core team plans to make bug-fix releases of the pytest ``4.6`` series by
+back-porting patches to the ``4.6.x`` branch that affect Python 2 users.
+
+**After 2020**, the core team will no longer actively backport patches, but the ``4.6.x``
+branch will continue to exist so the community itself can contribute patches. The core team will
+be happy to accept those patches and make new ``4.6`` releases **until mid-2020**.
+
+.. _`python_requires`: https://packaging.python.org/guides/distributing-packages-using-setuptools/#python-requires>
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/reference.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/reference.rst
index fe9e87042f9..cc5fe8d8bf6 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/reference.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/reference.rst
@@ -1,4 +1,3 @@
-
 Reference
 =========
 
@@ -49,7 +48,7 @@ pytest.main
 .. autofunction:: _pytest.config.main
 
 pytest.param
-~~~~~~~~~~~~~
+~~~~~~~~~~~~
 
 .. autofunction:: pytest.param(*values, [id], [marks])
 
@@ -84,6 +83,12 @@ pytest.warns
 .. autofunction:: pytest.warns(expected_warning: Exception, [match])
     :with:
 
+pytest.freeze_includes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+**Tutorial**: :ref:`freezing-pytest`.
+
+.. autofunction:: pytest.freeze_includes
 
 .. _`marks ref`:
 
@@ -111,6 +116,7 @@ Add warning filters to marked test items.
         A *warning specification string*, which is composed of contents of the tuple ``(action, message, category, module, lineno)``
         as specified in `The Warnings filter <https://docs.python.org/3/library/warnings.html#warning-filter>`_ section of
         the Python documentation, separated by ``":"``. Optional fields can be omitted.
+        Module names passed for filtering are not regex-escaped.
 
         For example:
 
@@ -161,6 +167,25 @@ Skip a test function if a condition is ``True``.
     :keyword str reason: Reason why the test function is being skipped.
 
 
+.. _`pytest.mark.usefixtures ref`:
+
+pytest.mark.usefixtures
+~~~~~~~~~~~~~~~~~~~~~~~
+
+**Tutorial**: :ref:`usefixtures`.
+
+Mark a test function as using the given fixture names.
+
+.. warning::
+
+    This mark has no effect when applied
+    to a **fixture** function.
+
+.. py:function:: pytest.mark.usefixtures(*names)
+
+    :param args: the names of the fixture to use, as strings
+
+
 .. _`pytest.mark.xfail ref`:
 
 pytest.mark.xfail
@@ -173,16 +198,18 @@ Marks a test function as *expected to fail*.
 .. py:function:: pytest.mark.xfail(condition=None, *, reason=None, raises=None, run=True, strict=False)
 
     :type condition: bool or str
-    :param condition: ``True/False`` if the condition should be marked as xfail or a :ref:`condition string <string conditions>`.
+    :param condition:
+        Condition for marking the test function as xfail (``True/False`` or a
+        :ref:`condition string <string conditions>`).
     :keyword str reason: Reason why the test function is marked as xfail.
     :keyword Exception raises: Exception subclass expected to be raised by the test function; other exceptions will fail the test.
     :keyword bool run:
         If the test function should actually be executed. If ``False``, the function will always xfail and will
-        not be executed (useful a function is segfaulting).
+        not be executed (useful if a function is segfaulting).
     :keyword bool strict:
         * If ``False`` (the default) the function will be shown in the terminal output as ``xfailed`` if it fails
           and as ``xpass`` if it passes. In both cases this will not cause the test suite to fail as a whole. This
-          is particularly useful to mark *flaky* tests (tests that random at fail) to be tackled later.
+          is particularly useful to mark *flaky* tests (tests that fail at random) to be tackled later.
         * If ``True``, the function will be shown in the terminal output as ``xfailed`` if it fails, but if it
           unexpectedly passes then it will **fail** the test suite. This is particularly useful to mark functions
           that are always failing and there should be a clear indication if they unexpectedly start to pass (for example
@@ -397,6 +424,14 @@ record_property
 
 .. autofunction:: _pytest.junitxml.record_property()
 
+
+record_testsuite_property
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+**Tutorial**: :ref:`record_testsuite_property example`.
+
+.. autofunction:: _pytest.junitxml.record_testsuite_property()
+
 caplog
 ~~~~~~
 
@@ -441,7 +476,7 @@ To use it, include in your top-most ``conftest.py`` file::
 
 
 .. autoclass:: Testdir()
-    :members: runpytest,runpytest_subprocess,runpytest_inprocess,makeconftest,makepyfile
+    :members:
 
 .. autoclass:: RunResult()
     :members:
@@ -473,6 +508,32 @@ Each recorded warning is an instance of :class:`warnings.WarningMessage`.
     differently; see :ref:`ensuring_function_triggers`.
 
 
+tmp_path
+~~~~~~~~
+
+**Tutorial**: :doc:`tmpdir`
+
+.. currentmodule:: _pytest.tmpdir
+
+.. autofunction:: tmp_path()
+    :no-auto-options:
+
+
+tmp_path_factory
+~~~~~~~~~~~~~~~~
+
+**Tutorial**: :ref:`tmp_path_factory example`
+
+.. _`tmp_path_factory factory api`:
+
+``tmp_path_factory`` instances have the following methods:
+
+.. currentmodule:: _pytest.tmpdir
+
+.. automethod:: TempPathFactory.mktemp
+.. automethod:: TempPathFactory.getbasetemp
+
+
 tmpdir
 ~~~~~~
 
@@ -520,6 +581,8 @@ Bootstrapping hooks called for plugins registered early enough (internal and set
 .. autofunction:: pytest_cmdline_parse
 .. autofunction:: pytest_cmdline_main
 
+.. _`initialization-hooks`:
+
 Initialization hooks
 ~~~~~~~~~~~~~~~~~~~~
 
@@ -532,6 +595,8 @@ Initialization hooks called for plugins and ``conftest.py`` files.
 .. autofunction:: pytest_sessionstart
 .. autofunction:: pytest_sessionfinish
 
+.. autofunction:: pytest_plugin_registered
+
 Test running hooks
 ~~~~~~~~~~~~~~~~~~
 
@@ -555,6 +620,8 @@ into interactive debugging when a test failure occurs.
 The :py:mod:`_pytest.terminal` reported specifically uses
 the reporting hook to print information about a test run.
 
+.. autofunction:: pytest_pyfunc_call
+
 Collection hooks
 ~~~~~~~~~~~~~~~~
 
@@ -564,6 +631,7 @@ Collection hooks
 .. autofunction:: pytest_ignore_collect
 .. autofunction:: pytest_collect_directory
 .. autofunction:: pytest_collect_file
+.. autofunction:: pytest_pycollect_makemodule
 
 For influencing the collection of objects in Python modules
 you can use the following hook:
@@ -577,12 +645,15 @@ items, delete or otherwise amend the test items:
 
 .. autofunction:: pytest_collection_modifyitems
 
+.. autofunction:: pytest_collection_finish
+
 Reporting hooks
 ~~~~~~~~~~~~~~~
 
 Session related reporting hooks:
 
 .. autofunction:: pytest_collectstart
+.. autofunction:: pytest_make_collect_report
 .. autofunction:: pytest_itemcollected
 .. autofunction:: pytest_collectreport
 .. autofunction:: pytest_deselected
@@ -592,6 +663,7 @@ Session related reporting hooks:
 .. autofunction:: pytest_terminal_summary
 .. autofunction:: pytest_fixture_setup
 .. autofunction:: pytest_fixture_post_finalizer
+.. autofunction:: pytest_warning_captured
 
 And here is the central hook for reporting about
 test execution:
@@ -697,13 +769,6 @@ MarkGenerator
     :members:
 
 
-MarkInfo
-~~~~~~~~
-
-.. autoclass:: _pytest.mark.MarkInfo
-    :members:
-
-
 Mark
 ~~~~
 
@@ -768,7 +833,7 @@ TestReport
 _Result
 ~~~~~~~
 
-.. autoclass:: pluggy._Result
+.. autoclass:: pluggy.callers._Result
     :members:
 
 Special Variables
@@ -777,6 +842,33 @@ Special Variables
 pytest treats some global variables in a special manner when defined in a test module.
 
 
+collect_ignore
+~~~~~~~~~~~~~~
+
+**Tutorial**: :ref:`customizing-test-collection`
+
+Can be declared in *conftest.py files* to exclude test directories or modules.
+Needs to be ``list[str]``.
+
+.. code-block:: python
+
+  collect_ignore = ["setup.py"]
+
+
+collect_ignore_glob
+~~~~~~~~~~~~~~~~~~~
+
+**Tutorial**: :ref:`customizing-test-collection`
+
+Can be declared in *conftest.py files* to exclude test directories or modules
+with Unix shell-style wildcards. Needs to be ``list[str]`` where ``str`` can
+contain glob patterns.
+
+.. code-block:: python
+
+  collect_ignore_glob = ["*_ignore.py"]
+
+
 pytest_plugins
 ~~~~~~~~~~~~~~
 
@@ -800,7 +892,7 @@ pytest_mark
 **Tutorial**: :ref:`scoped-marking`
 
 Can be declared at the **global** level in *test modules* to apply one or more :ref:`marks <marks ref>` to all
-test functions and methods. Can be either a single mark or a sequence of marks.
+test functions and methods. Can be either a single mark or a list of marks.
 
 .. code-block:: python
 
@@ -813,7 +905,7 @@ test functions and methods. Can be either a single mark or a sequence of marks.
 
     import pytest
 
-    pytestmark = (pytest.mark.integration, pytest.mark.slow)
+    pytestmark = [pytest.mark.integration, pytest.mark.slow]
 
 PYTEST_DONT_REWRITE (module docstring)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -847,6 +939,11 @@ Contains comma-separated list of modules that should be loaded as plugins:
 
     export PYTEST_PLUGINS=mymodule.plugin,xdist
 
+PYTEST_DISABLE_PLUGIN_AUTOLOAD
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When set, disables plugin auto-loading through setuptools entrypoints. Only explicitly specified plugins will be
+loaded.
 
 PYTEST_CURRENT_TEST
 ~~~~~~~~~~~~~~~~~~~
@@ -864,6 +961,12 @@ Here is a list of builtin configuration options that may be written in a ``pytes
 file, usually located at the root of your repository. All options must be under a ``[pytest]`` section
 (``[tool:pytest]`` for ``setup.cfg`` files).
 
+.. warning::
+    Usage of ``setup.cfg`` is not recommended unless for very simple use cases. ``.cfg``
+    files use a different parser than ``pytest.ini`` and ``tox.ini`` which might cause hard to track
+    down problems.
+    When possible, it is recommended to use the latter files to hold your pytest configuration.
+
 Configuration file options may be overwritten in the command-line by using ``-o/--override``, which can also be
 passed multiple times. The expected format is ``name=value``. For example::
 
@@ -890,7 +993,7 @@ passed multiple times. The expected format is ``name=value``. For example::
 
 .. confval:: cache_dir
 
-   .. versionadded:: 3.2
+
 
    Sets a directory where stores content of cache plugin. Default directory is
    ``.pytest_cache`` which is created in :ref:`rootdir <rootdir>`. Directory may be
@@ -910,12 +1013,13 @@ passed multiple times. The expected format is ``name=value``. For example::
 
 .. confval:: console_output_style
 
-   .. versionadded:: 3.3
+
 
    Sets the console output style while running tests:
 
    * ``classic``: classic pytest output.
    * ``progress``: like classic pytest output, but with a progress indicator.
+   * ``count``: like progress, but shows progress as the number of tests completed instead of a percent.
 
    The default is ``progress``, but you can fallback to ``classic`` if you prefer or
    the new mode is causing unexpected problems:
@@ -929,7 +1033,7 @@ passed multiple times. The expected format is ``name=value``. For example::
 
 .. confval:: doctest_encoding
 
-   .. versionadded:: 3.1
+
 
    Default encoding to use to decode text files with docstrings.
    :doc:`See how pytest handles doctests <doctest>`.
@@ -943,12 +1047,13 @@ passed multiple times. The expected format is ``name=value``. For example::
 
 .. confval:: empty_parameter_set_mark
 
-    .. versionadded:: 3.4
+
 
     Allows to pick the action for empty parametersets in parameterization
 
     * ``skip`` skips tests with an empty parameterset (default)
     * ``xfail`` marks tests with an empty parameterset as xfail(run=False)
+    * ``fail_at_collect`` raises an exception if parametrize collects an empty parameter set
 
     .. code-block:: ini
 
@@ -965,7 +1070,7 @@ passed multiple times. The expected format is ``name=value``. For example::
 
 .. confval:: filterwarnings
 
-   .. versionadded:: 3.1
+
 
    Sets a list of filters and actions that should be taken for matched
    warnings. By default all warnings emitted during the test session
@@ -983,9 +1088,64 @@ passed multiple times. The expected format is ``name=value``. For example::
    into errors. For more information please refer to :ref:`warnings`.
 
 
-.. confval:: junit_suite_name
+.. confval:: junit_duration_report
 
-    .. versionadded:: 3.1
+    .. versionadded:: 4.1
+
+    Configures how durations are recorded into the JUnit XML report:
+
+    * ``total`` (the default): duration times reported include setup, call, and teardown times.
+    * ``call``: duration times reported include only call times, excluding setup and teardown.
+
+    .. code-block:: ini
+
+        [pytest]
+        junit_duration_report = call
+
+
+.. confval:: junit_family
+
+    .. versionadded:: 4.2
+
+    Configures the format of the generated JUnit XML file. The possible options are:
+
+    * ``xunit1`` (or ``legacy``): produces old style output, compatible with the xunit 1.0 format. **This is the default**.
+    * ``xunit2``: produces `xunit 2.0 style output <https://github.com/jenkinsci/xunit-plugin/blob/xunit-2.3.2/src/main/resources/org/jenkinsci/plugins/xunit/types/model/xsd/junit-10.xsd>`__,
+        which should be more compatible with latest Jenkins versions.
+
+    .. code-block:: ini
+
+        [pytest]
+        junit_family = xunit2
+
+
+.. confval:: junit_logging
+
+    .. versionadded:: 3.5
+
+    Configures if stdout/stderr should be written to the JUnit XML file. Valid values are
+    ``system-out``, ``system-err``, and ``no`` (the default).
+
+    .. code-block:: ini
+
+        [pytest]
+        junit_logging = system-out
+
+
+.. confval:: junit_log_passing_tests
+
+    .. versionadded:: 4.6
+
+    If ``junit_logging != "no"``, configures if the captured output should be written
+    to the JUnit XML file for **passing** tests. Default is ``True``.
+
+    .. code-block:: ini
+
+        [pytest]
+        junit_log_passing_tests = False
+
+
+.. confval:: junit_suite_name
 
     To set the name of the root test suite xml item, you can configure the ``junit_suite_name`` option in your config file:
 
@@ -997,7 +1157,7 @@ passed multiple times. The expected format is ``name=value``. For example::
 
 .. confval:: log_cli_date_format
 
-    .. versionadded:: 3.3
+
 
     Sets a :py:func:`time.strftime`-compatible string that will be used when formatting dates for live logging.
 
@@ -1010,7 +1170,7 @@ passed multiple times. The expected format is ``name=value``. For example::
 
 .. confval:: log_cli_format
 
-    .. versionadded:: 3.3
+
 
     Sets a :py:mod:`logging`-compatible string used to format live logging messages.
 
@@ -1024,7 +1184,7 @@ passed multiple times. The expected format is ``name=value``. For example::
 
 .. confval:: log_cli_level
 
-    .. versionadded:: 3.3
+
 
     Sets the minimum log message level that should be captured for live logging. The integer value or
     the names of the levels can be used.
@@ -1039,7 +1199,7 @@ passed multiple times. The expected format is ``name=value``. For example::
 
 .. confval:: log_date_format
 
-    .. versionadded:: 3.3
+
 
     Sets a :py:func:`time.strftime`-compatible string that will be used when formatting dates for logging capture.
 
@@ -1053,7 +1213,7 @@ passed multiple times. The expected format is ``name=value``. For example::
 
 .. confval:: log_file
 
-    .. versionadded:: 3.3
+
 
     Sets a file name relative to the ``pytest.ini`` file where log messages should be written to, in addition
     to the other logging facilities that are active.
@@ -1068,7 +1228,7 @@ passed multiple times. The expected format is ``name=value``. For example::
 
 .. confval:: log_file_date_format
 
-    .. versionadded:: 3.3
+
 
     Sets a :py:func:`time.strftime`-compatible string that will be used when formatting dates for the logging file.
 
@@ -1081,7 +1241,7 @@ passed multiple times. The expected format is ``name=value``. For example::
 
 .. confval:: log_file_format
 
-    .. versionadded:: 3.3
+
 
     Sets a :py:mod:`logging`-compatible string used to format logging messages redirected to the logging file.
 
@@ -1094,7 +1254,7 @@ passed multiple times. The expected format is ``name=value``. For example::
 
 .. confval:: log_file_level
 
-    .. versionadded:: 3.3
+
 
     Sets the minimum log message level that should be captured for the logging file. The integer value or
     the names of the levels can be used.
@@ -1109,7 +1269,7 @@ passed multiple times. The expected format is ``name=value``. For example::
 
 .. confval:: log_format
 
-    .. versionadded:: 3.3
+
 
     Sets a :py:mod:`logging`-compatible string used to format captured logging messages.
 
@@ -1123,7 +1283,7 @@ passed multiple times. The expected format is ``name=value``. For example::
 
 .. confval:: log_level
 
-    .. versionadded:: 3.3
+
 
     Sets the minimum log message level that should be captured for logging capture. The integer value or
     the names of the levels can be used.
@@ -1138,7 +1298,7 @@ passed multiple times. The expected format is ``name=value``. For example::
 
 .. confval:: log_print
 
-    .. versionadded:: 3.3
+
 
     If set to ``False``, will disable displaying captured logging messages for failed tests.
 
@@ -1152,12 +1312,17 @@ passed multiple times. The expected format is ``name=value``. For example::
 
 .. confval:: markers
 
-    List of markers that are allowed in test functions, enforced when ``--strict`` command-line argument is used.
-    You can use a marker name per line, indented from the option name.
+    When the ``--strict-markers`` or ``--strict`` command-line arguments are used,
+    only known markers - defined in code by core pytest or some plugin - are allowed.
+
+    You can list additional markers in this setting to add them to the whitelist,
+    in which case you probably want to add ``--strict-markers`` to ``addopts``
+    to avoid future regressions:
 
     .. code-block:: ini
 
         [pytest]
+        addopts = --strict-markers
         markers =
             slow
             serial
@@ -1210,7 +1375,8 @@ passed multiple times. The expected format is ``name=value``. For example::
 .. confval:: python_classes
 
    One or more name prefixes or glob-style patterns determining which classes
-   are considered for test collection. By default, pytest will consider any
+   are considered for test collection. Search for multiple glob patterns by
+   adding a space between patterns. By default, pytest will consider any
    class prefixed with ``Test`` as a test collection.  Here is an example of how
    to collect tests from classes that end in ``Suite``:
 
@@ -1227,15 +1393,33 @@ passed multiple times. The expected format is ``name=value``. For example::
 .. confval:: python_files
 
    One or more Glob-style file patterns determining which python files
-   are considered as test modules. By default, pytest will consider
-   any file matching with ``test_*.py`` and ``*_test.py`` globs as a test
-   module.
+   are considered as test modules. Search for multiple glob patterns by
+   adding a space between patterns:
+
+   .. code-block:: ini
+
+        [pytest]
+        python_files = test_*.py check_*.py example_*.py
+
+   Or one per line:
+
+   .. code-block:: ini
+
+        [pytest]
+        python_files =
+            test_*.py
+            check_*.py
+            example_*.py
+
+   By default, files matching ``test_*.py`` and ``*_test.py`` will be considered
+   test modules.
 
 
 .. confval:: python_functions
 
    One or more name prefixes or glob-patterns determining which test functions
-   and methods are considered tests. By default, pytest will consider any
+   and methods are considered tests. Search for multiple glob patterns by
+   adding a space between patterns. By default, pytest will consider any
    function prefixed with ``test`` as a test.  Here is an example of how
    to collect test functions and methods that end in ``_test``:
 
@@ -1253,7 +1437,7 @@ passed multiple times. The expected format is ``name=value``. For example::
 
 .. confval:: testpaths
 
-   .. versionadded:: 2.8
+
 
    Sets list of directories that should be searched for tests when
    no specific directories, files or test ids are given in the command line when
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/requirements.txt b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/requirements.txt
index e3cc47ed5a5..be22b7db872 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/requirements.txt
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/requirements.txt
@@ -1,4 +1,4 @@
-# pinning sphinx to 1.4.* due to search issues with rtd:
-# https://github.com/rtfd/readthedocs-sphinx-ext/issues/25
-sphinx ==1.4.*
+pygments-pytest>=1.1.0
+sphinx>=1.8.2,<2.1
 sphinxcontrib-trio
+sphinx-removed-in>=0.2.0
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/skipping.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/skipping.rst
index bfa6f3e75a6..8d0c499b328 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/skipping.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/skipping.rst
@@ -22,7 +22,9 @@ it's an **xpass** and will be reported in the test summary.
 ``pytest`` counts and lists *skip* and *xfail* tests separately. Detailed
 information about skipped/xfailed tests is not shown by default to avoid
 cluttering the output.  You can use the ``-r`` option to see details
-corresponding to the "short" letters shown in the test progress::
+corresponding to the "short" letters shown in the test progress:
+
+.. code-block:: bash
 
     pytest -rxXs  # show extra info on xfailed, xpassed, and skipped tests
 
@@ -37,7 +39,7 @@ More details on the ``-r`` option can be found by running ``pytest -h``.
 Skipping test functions
 -----------------------
 
-.. versionadded:: 2.9
+
 
 The simplest way to skip a test function is to mark it with the ``skip`` decorator
 which may be passed an optional ``reason``:
@@ -58,54 +60,68 @@ by calling the ``pytest.skip(reason)`` function:
         if not valid_config():
             pytest.skip("unsupported configuration")
 
+The imperative method is useful when it is not possible to evaluate the skip condition
+during import time.
+
 It is also possible to skip the whole module using
 ``pytest.skip(reason, allow_module_level=True)`` at the module level:
 
 .. code-block:: python
 
+    import sys
     import pytest
 
-    if not pytest.config.getoption("--custom-flag"):
-        pytest.skip("--custom-flag is missing, skipping tests", allow_module_level=True)
+    if not sys.platform.startswith("win"):
+        pytest.skip("skipping windows-only tests", allow_module_level=True)
 
-The imperative method is useful when it is not possible to evaluate the skip condition
-during import time.
 
 **Reference**: :ref:`pytest.mark.skip ref`
 
 ``skipif``
 ~~~~~~~~~~
 
-.. versionadded:: 2.0
+
 
 If you wish to skip something conditionally then you can use ``skipif`` instead.
 Here is an example of marking a test function to be skipped
-when run on a Python3.6 interpreter::
+when run on an interpreter earlier than Python3.6:
+
+.. code-block:: python
 
     import sys
-    @pytest.mark.skipif(sys.version_info < (3,6),
-                        reason="requires python3.6")
+
+
+    @pytest.mark.skipif(sys.version_info < (3, 6), reason="requires python3.6 or higher")
     def test_function():
         ...
 
 If the condition evaluates to ``True`` during collection, the test function will be skipped,
 with the specified reason appearing in the summary when using ``-rs``.
 
-You can share ``skipif`` markers between modules.  Consider this test module::
+You can share ``skipif`` markers between modules.  Consider this test module:
+
+.. code-block:: python
 
     # content of test_mymodule.py
     import mymodule
-    minversion = pytest.mark.skipif(mymodule.__versioninfo__ < (1,1),
-                                    reason="at least mymodule-1.1 required")
+
+    minversion = pytest.mark.skipif(
+        mymodule.__versioninfo__ < (1, 1), reason="at least mymodule-1.1 required"
+    )
+
+
     @minversion
     def test_function():
         ...
 
-You can import the marker and reuse it in another test module::
+You can import the marker and reuse it in another test module:
+
+.. code-block:: python
 
     # test_myothermodule.py
     from test_mymodule import minversion
 
+
     @minversion
     def test_anotherfunction():
         ...
@@ -124,24 +140,18 @@ so they are supported mainly for backward compatibility reasons.
 Skip all test functions of a class or module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-You can use the ``skipif`` marker (as any other marker) on classes::
+You can use the ``skipif`` marker (as any other marker) on classes:
 
-    @pytest.mark.skipif(sys.platform == 'win32',
-                        reason="does not run on windows")
+.. code-block:: python
+
+    @pytest.mark.skipif(sys.platform == "win32", reason="does not run on windows")
     class TestPosixCalls(object):
-
         def test_function(self):
             "will not be setup or run under 'win32' platform"
 
 If the condition is ``True``, this marker will produce a skip result for
 each of the test methods of that class.
 
-.. warning::
-
-   The use of ``skipif`` on classes that use inheritance is strongly
-   discouraged. `A Known bug <https://github.com/pytest-dev/pytest/issues/568>`_
-   in pytest's markers may cause unexpected behavior in super classes.
-
 If you want to skip all test functions of a module, you may use
 the ``pytestmark`` name on the global level:
 
@@ -198,7 +208,7 @@ Here's a quick guide on how to skip tests in a module in different situations:
 
   .. code-block:: python
 
-        pytestmark = pytest.mark.skipif(sys.platform == "win32", "tests for linux only")
+        pytestmark = pytest.mark.skipif(sys.platform == "win32", reason="tests for linux only")
 
 3. Skip all tests in a module if some import is missing:
 
@@ -244,7 +254,7 @@ internally by raising a known exception.
 ``strict`` parameter
 ~~~~~~~~~~~~~~~~~~~~
 
-.. versionadded:: 2.9
+
 
 Both ``XFAIL`` and ``XPASS`` don't fail the test suite, unless the ``strict`` keyword-only
 parameter is passed as ``True``:
@@ -271,10 +281,11 @@ You can change the default value of the ``strict`` parameter using the
 ~~~~~~~~~~~~~~~~~~~~
 
 As with skipif_ you can also mark your expectation of a failure
-on a particular platform::
+on a particular platform:
 
-    @pytest.mark.xfail(sys.version_info >= (3,6),
-                       reason="python3.6 api changes")
+.. code-block:: python
+
+    @pytest.mark.xfail(sys.version_info >= (3, 6), reason="python3.6 api changes")
     def test_function():
         ...
 
@@ -283,7 +294,7 @@ on a particular platform::
 ~~~~~~~~~~~~~~~~~~~~
 
 If you want to be more specific as to why the test is failing, you can specify
-a single exception, or a list of exceptions, in the ``raises`` argument.
+a single exception, or a tuple of exceptions, in the ``raises`` argument.
 
 .. code-block:: python
 
@@ -313,7 +324,9 @@ investigated later.
 Ignoring xfail
 ~~~~~~~~~~~~~~
 
-By specifying on the commandline::
+By specifying on the commandline:
+
+.. code-block:: bash
 
     pytest --runxfail
 
@@ -327,15 +340,19 @@ Here is a simple test file with the several usages:
 
 .. literalinclude:: example/xfail_demo.py
 
-Running it with the report-on-xfail option gives this output::
+Running it with the report-on-xfail option gives this output:
+
+.. code-block:: pytest
 
     example $ pytest -rx xfail_demo.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR/example, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR/example
     collected 7 items
 
     xfail_demo.py xxxxxxx                                                [100%]
+
     ========================= short test summary info ==========================
     XFAIL xfail_demo.py::test_hello
     XFAIL xfail_demo.py::test_hello2
@@ -349,7 +366,6 @@ Running it with the report-on-xfail option gives this output::
     XFAIL xfail_demo.py::test_hello6
       reason: reason
     XFAIL xfail_demo.py::test_hello7
-
     ======================== 7 xfailed in 0.12 seconds =========================
 
 .. _`skip/xfail with parametrize`:
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/talks.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/talks.rst
index 79534ea6e9a..be0c6fb9fd4 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/talks.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/talks.rst
@@ -14,12 +14,20 @@ Talks and Tutorials
 Books
 ---------------------------------------------
 
+- `pytest Quick Start Guide, by Bruno Oliveira (2018)
+  <https://www.packtpub.com/web-development/pytest-quick-start-guide>`_.
+
 - `Python Testing with pytest, by Brian Okken (2017)
   <https://pragprog.com/book/bopytest/python-testing-with-pytest>`_.
 
 Talks and blog postings
 ---------------------------------------------
 
+- pytest: recommendations, basic packages for testing in Python and Django, Andreu Vallbona, PyconES 2017 (`slides in english <http://talks.apsl.io/testing-pycones-2017/>`_, `video in spanish <https://www.youtube.com/watch?v=K20GeR-lXDk>`_)
+
+- `pytest advanced, Andrew Svetlov (Russian, PyCon Russia, 2016)
+  <https://www.youtube.com/watch?v=7KgihdKTWY4>`_.
+
 - `Pythonic testing, Igor Starikov (Russian, PyNsk, November 2016)
   <https://www.youtube.com/watch?v=_92nfdd5nK8>`_.
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/tidelift.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/tidelift.rst
new file mode 100644
index 00000000000..728bf221905
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/tidelift.rst
@@ -0,0 +1,4 @@
+
+
+
+.. include:: ../../TIDELIFT.rst
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/tmpdir.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/tmpdir.rst
index 421b4c898c5..330011bb348 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/tmpdir.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/tmpdir.rst
@@ -5,6 +5,83 @@
 Temporary directories and files
 ================================================
 
+The ``tmp_path`` fixture
+------------------------
+
+
+
+
+You can use the ``tmp_path`` fixture which will
+provide a temporary directory unique to the test invocation,
+created in the `base temporary directory`_.
+
+``tmp_path`` is a ``pathlib/pathlib2.Path`` object. Here is an example test usage:
+
+.. code-block:: python
+
+    # content of test_tmp_path.py
+    import os
+
+    CONTENT = u"content"
+
+
+    def test_create_file(tmp_path):
+        d = tmp_path / "sub"
+        d.mkdir()
+        p = d / "hello.txt"
+        p.write_text(CONTENT)
+        assert p.read_text() == CONTENT
+        assert len(list(tmp_path.iterdir())) == 1
+        assert 0
+
+Running this would result in a passed test except for the last
+``assert 0`` line which we use to look at values:
+
+.. code-block:: pytest
+
+    $ pytest test_tmp_path.py
+    =========================== test session starts ============================
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
+    collected 1 item
+
+    test_tmp_path.py F                                                   [100%]
+
+    ================================= FAILURES =================================
+    _____________________________ test_create_file _____________________________
+
+    tmp_path = PosixPath('PYTEST_TMPDIR/test_create_file0')
+
+        def test_create_file(tmp_path):
+            d = tmp_path / "sub"
+            d.mkdir()
+            p = d / "hello.txt"
+            p.write_text(CONTENT)
+            assert p.read_text() == CONTENT
+            assert len(list(tmp_path.iterdir())) == 1
+    >       assert 0
+    E       assert 0
+
+    test_tmp_path.py:13: AssertionError
+    ========================= 1 failed in 0.12 seconds =========================
+
+.. _`tmp_path_factory example`:
+
+The ``tmp_path_factory`` fixture
+--------------------------------
+
+
+
+
+The ``tmp_path_factory`` is a session-scoped fixture which can be used
+to create arbitrary temporary directories from any other fixture or test.
+
+It is intended to replace ``tmpdir_factory``, and returns :class:`pathlib.Path` instances.
+
+See :ref:`tmp_path_factory API <tmp_path_factory factory api>` for details.
+
+
 The 'tmpdir' fixture
 --------------------
 
@@ -25,12 +102,15 @@ and more.  Here is an example test usage::
         assert 0
 
 Running this would result in a passed test except for the last
-``assert 0`` line which we use to look at values::
+``assert 0`` line which we use to look at values:
+
+.. code-block:: pytest
 
     $ pytest test_tmpdir.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 1 item
 
     test_tmpdir.py F                                                     [100%]
@@ -56,7 +136,7 @@ Running this would result in a passed test except for the last
 The 'tmpdir_factory' fixture
 ----------------------------
 
-.. versionadded:: 2.8
+
 
 The ``tmpdir_factory`` is a session-scoped fixture which can be used
 to create arbitrary temporary directories from any other fixture or test.
@@ -98,7 +178,9 @@ the system temporary directory.  The base name will be ``pytest-NUM`` where
 ``NUM`` will be incremented with each test run.  Moreover, entries older
 than 3 temporary directories will be removed.
 
-You can override the default temporary directory setting like this::
+You can override the default temporary directory setting like this:
+
+.. code-block:: bash
 
     pytest --basetemp=mydir
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/unittest.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/unittest.rst
index 53192b3469d..05632aef4b2 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/unittest.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/unittest.rst
@@ -22,16 +22,15 @@ Almost all ``unittest`` features are supported:
 
 * ``@unittest.skip`` style decorators;
 * ``setUp/tearDown``;
-* ``setUpClass/tearDownClass()``;
+* ``setUpClass/tearDownClass``;
+* ``setUpModule/tearDownModule``;
 
 .. _`load_tests protocol`: https://docs.python.org/3/library/unittest.html#load-tests-protocol
-.. _`setUpModule/tearDownModule`: https://docs.python.org/3/library/unittest.html#setupmodule-and-teardownmodule
 .. _`subtests`: https://docs.python.org/3/library/unittest.html#distinguishing-test-iterations-using-subtests
 
 Up to this point pytest does not have support for the following features:
 
 * `load_tests protocol`_;
-* `setUpModule/tearDownModule`_;
 * `subtests`_;
 
 Benefits out of the box
@@ -123,12 +122,15 @@ fixture definition::
 The ``@pytest.mark.usefixtures("db_class")`` class-decorator makes sure that
 the pytest fixture function ``db_class`` is called once per class.
 Due to the deliberately failing assert statements, we can take a look at
-the ``self.db`` values in the traceback::
+the ``self.db`` values in the traceback:
+
+.. code-block:: pytest
 
     $ pytest test_unittest_db.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 2 items
 
     test_unittest_db.py FF                                               [100%]
@@ -200,7 +202,9 @@ used for all methods of the class where it is defined.  This is a
 shortcut for using a ``@pytest.mark.usefixtures("initdir")`` marker
 on the class like in the previous example.
 
-Running this test module ...::
+Running this test module ...:
+
+.. code-block:: pytest
 
     $ pytest -q test_unittest_cleandir.py
     .                                                                    [100%]
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/usage.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/usage.rst
index 25be54395af..acf736f211e 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/usage.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/usage.rst
@@ -10,9 +10,11 @@ Usage and Invocations
 Calling pytest through ``python -m pytest``
 -----------------------------------------------------
 
-.. versionadded:: 2.0
 
-You can invoke testing through the Python interpreter from the command line::
+
+You can invoke testing through the Python interpreter from the command line:
+
+.. code-block:: text
 
     python -m pytest [...]
 
@@ -34,7 +36,7 @@ Running ``pytest`` can result in six different exit codes:
 Getting help on version, option names, environment variables
 --------------------------------------------------------------
 
-::
+.. code-block:: bash
 
     pytest --version   # shows where pytest was imported from
     pytest --fixtures  # show available builtin function arguments
@@ -46,7 +48,9 @@ Getting help on version, option names, environment variables
 Stopping after the first (or N) failures
 ---------------------------------------------------
 
-To stop the testing process after the first (N) failures::
+To stop the testing process after the first (N) failures:
+
+.. code-block:: bash
 
     pytest -x            # stop after first failure
     pytest --maxfail=2    # stop after two failures
@@ -60,19 +64,19 @@ Pytest supports several ways to run and select tests from the command-line.
 
 **Run tests in a module**
 
-::
+.. code-block:: bash
 
     pytest test_mod.py
 
 **Run tests in a directory**
 
-::
+.. code-block:: bash
 
     pytest testing/
 
 **Run tests by keyword expressions**
 
-::
+.. code-block:: bash
 
     pytest -k "MyClass and not method"
 
@@ -87,18 +91,22 @@ The example above will run ``TestMyClass.test_something``  but not ``TestMyClass
 Each collected test is assigned a unique ``nodeid`` which consist of the module filename followed
 by specifiers like class names, function names and parameters from parametrization, separated by ``::`` characters.
 
-To run a specific test within a module::
+To run a specific test within a module:
+
+.. code-block:: bash
 
     pytest test_mod.py::test_func
 
 
-Another example specifying a test method in the command line::
+Another example specifying a test method in the command line:
+
+.. code-block:: bash
 
     pytest test_mod.py::TestClass::test_method
 
 **Run tests by marker expressions**
 
-::
+.. code-block:: bash
 
     pytest -m slow
 
@@ -108,7 +116,7 @@ For more information see :ref:`marks <mark>`.
 
 **Run tests from packages**
 
-::
+.. code-block:: bash
 
     pytest --pyargs pkg.testing
 
@@ -118,7 +126,9 @@ This will import ``pkg.testing`` and use its filesystem location to find and run
 Modifying Python traceback printing
 ----------------------------------------------
 
-Examples for modifying traceback printing::
+Examples for modifying traceback printing:
+
+.. code-block:: bash
 
     pytest --showlocals # show local variables in tracebacks
     pytest -l           # show local variables (shortcut)
@@ -140,6 +150,180 @@ will be shown (because KeyboardInterrupt is caught by pytest). By using this
 option you make sure a trace is shown.
 
 
+.. _`pytest.detailed_failed_tests_usage`:
+
+Detailed summary report
+-----------------------
+
+
+
+The ``-r`` flag can be used to display a "short test summary info" at the end of the test session,
+making it easy in large test suites to get a clear picture of all failures, skips, xfails, etc.
+
+Example:
+
+.. code-block:: python
+
+    # content of test_example.py
+    import pytest
+
+
+    @pytest.fixture
+    def error_fixture():
+        assert 0
+
+
+    def test_ok():
+        print("ok")
+
+
+    def test_fail():
+        assert 0
+
+
+    def test_error(error_fixture):
+        pass
+
+
+    def test_skip():
+        pytest.skip("skipping this test")
+
+
+    def test_xfail():
+        pytest.xfail("xfailing this test")
+
+
+    @pytest.mark.xfail(reason="always xfail")
+    def test_xpass():
+        pass
+
+
+.. code-block:: pytest
+
+    $ pytest -ra
+    =========================== test session starts ============================
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
+    collected 6 items
+
+    test_example.py .FEsxX                                               [100%]
+
+    ================================== ERRORS ==================================
+    _______________________ ERROR at setup of test_error _______________________
+
+        @pytest.fixture
+        def error_fixture():
+    >       assert 0
+    E       assert 0
+
+    test_example.py:6: AssertionError
+    ================================= FAILURES =================================
+    ________________________________ test_fail _________________________________
+
+        def test_fail():
+    >       assert 0
+    E       assert 0
+
+    test_example.py:14: AssertionError
+    ========================= short test summary info ==========================
+    SKIPPED [1] $REGENDOC_TMPDIR/test_example.py:23: skipping this test
+    XFAIL test_example.py::test_xfail
+      reason: xfailing this test
+    XPASS test_example.py::test_xpass always xfail
+    ERROR test_example.py::test_error - assert 0
+    FAILED test_example.py::test_fail - assert 0
+    = 1 failed, 1 passed, 1 skipped, 1 xfailed, 1 xpassed, 1 error in 0.12 seconds =
+
+The ``-r`` options accepts a number of characters after it, with ``a`` used
+above meaning "all except passes".
+
+Here is the full list of available characters that can be used:
+
+ - ``f`` - failed
+ - ``E`` - error
+ - ``s`` - skipped
+ - ``x`` - xfailed
+ - ``X`` - xpassed
+ - ``p`` - passed
+ - ``P`` - passed with output
+ - ``a`` - all except ``pP``
+ - ``A`` - all
+
+More than one character can be used, so for example to only see failed and skipped tests, you can execute:
+
+.. code-block:: pytest
+
+    $ pytest -rfs
+    =========================== test session starts ============================
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
+    collected 6 items
+
+    test_example.py .FEsxX                                               [100%]
+
+    ================================== ERRORS ==================================
+    _______________________ ERROR at setup of test_error _______________________
+
+        @pytest.fixture
+        def error_fixture():
+    >       assert 0
+    E       assert 0
+
+    test_example.py:6: AssertionError
+    ================================= FAILURES =================================
+    ________________________________ test_fail _________________________________
+
+        def test_fail():
+    >       assert 0
+    E       assert 0
+
+    test_example.py:14: AssertionError
+    ========================= short test summary info ==========================
+    FAILED test_example.py::test_fail - assert 0
+    SKIPPED [1] $REGENDOC_TMPDIR/test_example.py:23: skipping this test
+    = 1 failed, 1 passed, 1 skipped, 1 xfailed, 1 xpassed, 1 error in 0.12 seconds =
+
+Using ``p`` lists the passing tests, whilst ``P`` adds an extra section "PASSES" with those tests that passed but had
+captured output:
+
+.. code-block:: pytest
+
+    $ pytest -rpP
+    =========================== test session starts ============================
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
+    collected 6 items
+
+    test_example.py .FEsxX                                               [100%]
+
+    ================================== ERRORS ==================================
+    _______________________ ERROR at setup of test_error _______________________
+
+        @pytest.fixture
+        def error_fixture():
+    >       assert 0
+    E       assert 0
+
+    test_example.py:6: AssertionError
+    ================================= FAILURES =================================
+    ________________________________ test_fail _________________________________
+
+        def test_fail():
+    >       assert 0
+    E       assert 0
+
+    test_example.py:14: AssertionError
+    ================================== PASSES ==================================
+    _________________________________ test_ok __________________________________
+    --------------------------- Captured stdout call ---------------------------
+    ok
+    ========================= short test summary info ==========================
+    PASSED test_example.py::test_ok
+    = 1 failed, 1 passed, 1 skipped, 1 xfailed, 1 xpassed, 1 error in 0.12 seconds =
+
 .. _pdb-option:
 
 Dropping to PDB_ (Python Debugger) on failures
@@ -148,13 +332,17 @@ Dropping to PDB_ (Python Debugger) on failures
 .. _PDB: http://docs.python.org/library/pdb.html
 
 Python comes with a builtin Python debugger called PDB_.  ``pytest``
-allows one to drop into the PDB_ prompt via a command line option::
+allows one to drop into the PDB_ prompt via a command line option:
+
+.. code-block:: bash
 
     pytest --pdb
 
 This will invoke the Python debugger on every failure (or KeyboardInterrupt).
 Often you might only want to do this for the first failing test to understand
-a certain failure situation::
+a certain failure situation:
+
+.. code-block:: bash
 
     pytest -x --pdb   # drop to PDB on first failure, then end test session
     pytest --pdb --maxfail=3  # drop to PDB for first three failures
@@ -171,6 +359,20 @@ for example::
     >>> sys.last_value
     AssertionError('assert result == "ok"',)
 
+.. _trace-option:
+
+Dropping to PDB_ (Python Debugger) at the start of a test
+----------------------------------------------------------
+
+
+``pytest`` allows one to drop into the PDB_ prompt immediately at the start of each test via a command line option:
+
+.. code-block:: bash
+
+    pytest --trace
+
+This will invoke the Python debugger at the start of every test.
+
 .. _breakpoints:
 
 Setting breakpoints
@@ -184,10 +386,8 @@ in your code and pytest automatically disables its output capture for that test:
 * Output capture in other tests is not affected.
 * Any prior test output that has already been captured and will be processed as
   such.
-* Any later output produced within the same test will not be captured and will
-  instead get sent directly to ``sys.stdout``. Note that this holds true even
-  for test output occurring after you exit the interactive PDB_ tracing session
-  and continue with the regular test run.
+* Output capture gets resumed when ending the debugger session (via the
+  ``continue`` command).
 
 
 .. _`breakpoint-builtin`:
@@ -200,8 +400,8 @@ Pytest supports the use of ``breakpoint()`` with the following behaviours:
 
  - When ``breakpoint()`` is called and ``PYTHONBREAKPOINT`` is set to the default value, pytest will use the custom internal PDB trace UI instead of the system default ``Pdb``.
  - When tests are complete, the system will default back to the system ``Pdb`` trace UI.
- - If ``--pdb`` is called on execution of pytest, the custom internal Pdb trace UI is used on ``bothbreakpoint()`` and failed tests/unhandled exceptions.
- - If ``--pdbcls`` is used, the custom class debugger will be executed when a test fails (as expected within existing behaviour), but also when ``breakpoint()`` is called from within a test, the custom class debugger will be instantiated.
+ - With ``--pdb`` passed to pytest, the custom internal Pdb trace UI is used with both ``breakpoint()`` and failed tests/unhandled exceptions.
+ - ``--pdbcls`` can be used to specify a custom debugger class.
 
 .. _durations:
 
@@ -210,22 +410,27 @@ Profiling test execution duration
 
 .. versionadded: 2.2
 
-To get a list of the slowest 10 test durations::
+To get a list of the slowest 10 test durations:
+
+.. code-block:: bash
 
     pytest --durations=10
 
+By default, pytest will not show test durations that are too small (<0.01s) unless ``-vv`` is passed on the command-line.
 
 Creating JUnitXML format files
 ----------------------------------------------------
 
 To create result files which can be read by Jenkins_ or other Continuous
-integration servers, use this invocation::
+integration servers, use this invocation:
+
+.. code-block:: bash
 
     pytest --junitxml=path
 
 to create an XML file at ``path``.
 
-.. versionadded:: 3.1
+
 
 To set the name of the root test suite xml item, you can configure the ``junit_suite_name`` option in your config file:
 
@@ -234,18 +439,25 @@ To set the name of the root test suite xml item, you can configure the ``junit_s
     [pytest]
     junit_suite_name = my_suite
 
+.. versionadded:: 4.0
+
+JUnit XML specification seems to indicate that ``"time"`` attribute
+should report total test execution times, including setup and teardown
+(`1 <http://windyroad.com.au/dl/Open%20Source/JUnit.xsd>`_, `2
+<https://www.ibm.com/support/knowledgecenter/en/SSQ2R2_14.1.0/com.ibm.rsar.analysis.codereview.cobol.doc/topics/cac_useresults_junit.html>`_).
+It is the default pytest behavior. To report just call durations
+instead, configure the ``junit_duration_report`` option like this:
+
+.. code-block:: ini
+
+    [pytest]
+    junit_duration_report = call
+
 .. _record_property example:
 
 record_property
 ^^^^^^^^^^^^^^^
 
-.. versionadded:: 2.8
-.. versionchanged:: 3.5
-
-   Fixture renamed from ``record_xml_property`` to ``record_property`` as user
-   properties are now available to all reporters.
-   ``record_xml_property`` is now deprecated.
-
 If you want to log additional information for a test, you can use the
 ``record_property`` fixture:
 
@@ -303,15 +515,13 @@ Will result in:
 
 .. warning::
 
-    ``record_property`` is an experimental feature and may change in the future.
-
-    Also please note that using this feature will break any schema verification.
+    Please note that using this feature will break schema verifications for the latest JUnitXML schema.
     This might be a problem when used with some CI servers.
 
 record_xml_attribute
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. versionadded:: 3.4
+
 
 To add an additional xml attribute to a testcase element, you can use
 ``record_xml_attribute`` fixture. This can also be used to override existing values:
@@ -368,43 +578,45 @@ Instead, this will add an attribute ``assertions="REQ-1234"`` inside the generat
             </xs:complexType>
         </xs:element>
 
-LogXML: add_global_property
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+.. warning::
 
-.. versionadded:: 3.0
+    Please note that using this feature will break schema verifications for the latest JUnitXML schema.
+    This might be a problem when used with some CI servers.
 
-If you want to add a properties node in the testsuite level, which may contains properties that are relevant
-to all testcases you can use ``LogXML.add_global_properties``
+.. _record_testsuite_property example:
+
+record_testsuite_property
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. versionadded:: 4.5
+
+If you want to add a properties node at the test-suite level, which may contains properties
+that are relevant to all tests, you can use the ``record_testsuite_property`` session-scoped fixture:
+
+The ``record_testsuite_property`` session-scoped fixture can be used to add properties relevant
+to all tests.
 
 .. code-block:: python
 
     import pytest
 
 
-    @pytest.fixture(scope="session")
-    def log_global_env_facts(f):
-
-        if pytest.config.pluginmanager.hasplugin("junitxml"):
-            my_junit = getattr(pytest.config, "_xml", None)
-
-        my_junit.add_global_property("ARCH", "PPC")
-        my_junit.add_global_property("STORAGE_TYPE", "CEPH")
-
-
-    @pytest.mark.usefixtures(log_global_env_facts.__name__)
-    def start_and_prepare_env():
-        pass
+    @pytest.fixture(scope="session", autouse=True)
+    def log_global_env_facts(record_testsuite_property):
+        record_testsuite_property("ARCH", "PPC")
+        record_testsuite_property("STORAGE_TYPE", "CEPH")
 
 
     class TestMe(object):
         def test_foo(self):
             assert True
 
-This will add a property node below the testsuite node to the generated xml:
+The fixture is a callable which receives ``name`` and ``value`` of a ``<property>`` tag
+added at the test-suite level of the generated xml:
 
 .. code-block:: xml
 
-    <testsuite errors="0" failures="0" name="pytest" skips="0" tests="1" time="0.006">
+    <testsuite errors="0" failures="0" name="pytest" skipped="0" tests="1" time="0.006">
       <properties>
         <property name="ARCH" value="PPC"/>
         <property name="STORAGE_TYPE" value="CEPH"/>
@@ -412,27 +624,25 @@ This will add a property node below the testsuite node to the generated xml:
       <testcase classname="test_me.TestMe" file="test_me.py" line="16" name="test_foo" time="0.000243663787842"/>
     </testsuite>
 
-.. warning::
+``name`` must be a string, ``value`` will be converted to a string and properly xml-escaped.
+
+The generated XML is compatible with the latest ``xunit`` standard, contrary to `record_property`_
+and `record_xml_attribute`_.
 
-    This is an experimental feature, and its interface might be replaced
-    by something more powerful and general in future versions. The
-    functionality per-se will be kept.
 
 Creating resultlog format files
 ----------------------------------------------------
 
-.. deprecated:: 3.0
 
-    This option is rarely used and is scheduled for removal in 4.0.
 
-    An alternative for users which still need similar functionality is to use the
-    `pytest-tap <https://pypi.org/project/pytest-tap/>`_ plugin which provides
-    a stream of test data.
+    This option is rarely used and is scheduled for removal in 5.0.
 
-    If you have any concerns, please don't hesitate to
-    `open an issue <https://github.com/pytest-dev/pytest/issues>`_.
+    See `the deprecation docs <https://docs.pytest.org/en/latest/deprecations.html#result-log-result-log>`__
+    for more information.
 
-To create plain-text machine-readable result files you can issue::
+To create plain-text machine-readable result files you can issue:
+
+.. code-block:: bash
 
     pytest --resultlog=path
 
@@ -445,7 +655,9 @@ by the `PyPy-test`_ web page to show test results over several revisions.
 Sending test report to online pastebin service
 -----------------------------------------------------
 
-**Creating a URL for each test failure**::
+**Creating a URL for each test failure**:
+
+.. code-block:: bash
 
     pytest --pastebin=failed
 
@@ -453,12 +665,30 @@ This will submit test run information to a remote Paste service and
 provide a URL for each failure.  You may select tests as usual or add
 for example ``-x`` if you only want to send one particular failure.
 
-**Creating a URL for a whole test session log**::
+**Creating a URL for a whole test session log**:
+
+.. code-block:: bash
 
     pytest --pastebin=all
 
 Currently only pasting to the http://bpaste.net service is implemented.
 
+Early loading plugins
+---------------------
+
+You can early-load plugins (internal and external) explicitly in the command-line with the ``-p`` option::
+
+    pytest -p mypluginmodule
+
+The option receives a ``name`` parameter, which can be:
+
+* A full module dotted name, for example ``myproject.plugins``. This dotted name must be importable.
+* The entry-point name of a plugin. This is the name passed to ``setuptools`` when the plugin is
+  registered. For example to early-load the `pytest-cov <https://pypi.org/project/pytest-cov/>`__ plugin you can use::
+
+    pytest -p pytest_cov
+
+
 Disabling plugins
 -----------------
 
@@ -466,7 +696,9 @@ To disable loading specific plugins at invocation time, use the ``-p`` option
 together with the prefix ``no:``.
 
 Example: to disable loading the plugin ``doctest``, which is responsible for
-executing doctest tests from text files, invoke pytest like this::
+executing doctest tests from text files, invoke pytest like this:
+
+.. code-block:: bash
 
     pytest -p no:doctest
 
@@ -475,7 +707,7 @@ executing doctest tests from text files, invoke pytest like this::
 Calling pytest from Python code
 ----------------------------------------------------
 
-.. versionadded:: 2.0
+
 
 You can invoke ``pytest`` from Python code directly::
 
@@ -498,11 +730,30 @@ You can specify additional plugins to ``pytest.main``::
     pytest.main(["-qq"], plugins=[MyPlugin()])
 
 Running it will show that ``MyPlugin`` was added and its
-hook was invoked::
+hook was invoked:
+
+.. code-block:: pytest
 
     $ python myinvoke.py
-    .                                                                    [100%]*** test run reporting finishing
+    .FEsxX.                                                              [100%]*** test run reporting finishing
 
+    ================================== ERRORS ==================================
+    _______________________ ERROR at setup of test_error _______________________
+
+        @pytest.fixture
+        def error_fixture():
+    >       assert 0
+    E       assert 0
+
+    test_example.py:6: AssertionError
+    ================================= FAILURES =================================
+    ________________________________ test_fail _________________________________
+
+        def test_fail():
+    >       assert 0
+    E       assert 0
+
+    test_example.py:14: AssertionError
 
 .. note::
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/warnings.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/warnings.rst
index df93a02b540..8f8d6f3e1c6 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/warnings.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/warnings.rst
@@ -3,43 +3,50 @@
 Warnings Capture
 ================
 
-.. versionadded:: 3.1
+
 
 Starting from version ``3.1``, pytest now automatically catches warnings during test execution
-and displays them at the end of the session::
+and displays them at the end of the session:
+
+.. code-block:: python
 
     # content of test_show_warnings.py
     import warnings
 
+
     def api_v1():
         warnings.warn(UserWarning("api v1, should use functions from v2"))
         return 1
 
+
     def test_one():
         assert api_v1() == 1
 
-Running pytest now produces this output::
+Running pytest now produces this output:
+
+.. code-block:: pytest
 
     $ pytest test_show_warnings.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
-    rootdir: $REGENDOC_TMPDIR, inifile:
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR
     collected 1 item
 
     test_show_warnings.py .                                              [100%]
 
     ============================= warnings summary =============================
     test_show_warnings.py::test_one
-      $REGENDOC_TMPDIR/test_show_warnings.py:4: UserWarning: api v1, should use functions from v2
+      $REGENDOC_TMPDIR/test_show_warnings.py:5: UserWarning: api v1, should use functions from v2
         warnings.warn(UserWarning("api v1, should use functions from v2"))
 
-    -- Docs: http://doc.pytest.org/en/latest/warnings.html
+    -- Docs: https://docs.pytest.org/en/latest/warnings.html
     =================== 1 passed, 1 warnings in 0.12 seconds ===================
 
-Pytest by default catches all warnings except for ``DeprecationWarning`` and ``PendingDeprecationWarning``.
-
 The ``-W`` flag can be passed to control which warnings will be displayed or even turn
-them into errors::
+them into errors:
+
+.. code-block:: pytest
 
     $ pytest -q test_show_warnings.py -W error::UserWarning
     F                                                                    [100%]
@@ -49,14 +56,14 @@ them into errors::
         def test_one():
     >       assert api_v1() == 1
 
-    test_show_warnings.py:8:
+    test_show_warnings.py:10:
     _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
 
         def api_v1():
     >       warnings.warn(UserWarning("api v1, should use functions from v2"))
     E       UserWarning: api v1, should use functions from v2
 
-    test_show_warnings.py:4: UserWarning
+    test_show_warnings.py:5: UserWarning
     1 failed in 0.12 seconds
 
 The same option can be set in the ``pytest.ini`` file using the ``filterwarnings`` ini option.
@@ -78,13 +85,12 @@ Both ``-W`` command-line option and ``filterwarnings`` ini option are based on P
 `-W option`_ and `warnings.simplefilter`_, so please refer to those sections in the Python
 documentation for other examples and advanced usage.
 
-
 .. _`filterwarnings`:
 
 ``@pytest.mark.filterwarnings``
 -------------------------------
 
-.. versionadded:: 3.2
+
 
 You can use the ``@pytest.mark.filterwarnings`` to add warning filters to specific test items,
 allowing you to have finer control of which warnings should be captured at test, class or
@@ -117,24 +123,6 @@ decorator or to all tests in a module by setting the ``pytestmark`` variable:
     pytestmark = pytest.mark.filterwarnings("error")
 
 
-.. note::
-
-    Except for these features, pytest does not change the python warning filter; it only captures
-    and displays the warnings which are issued with respect to the currently configured filter,
-    including changes to the filter made by test functions or by the system under test.
-
-.. note::
-
-    ``DeprecationWarning`` and ``PendingDeprecationWarning`` are hidden by the standard library
-    by default so you have to explicitly configure them to be displayed in your ``pytest.ini``:
-
-    .. code-block:: ini
-
-        [pytest]
-        filterwarnings =
-            once::DeprecationWarning
-            once::PendingDeprecationWarning
-
 
 *Credits go to Florian Schulze for the reference implementation in the* `pytest-warnings`_
 *plugin.*
@@ -143,18 +131,110 @@ decorator or to all tests in a module by setting the ``pytestmark`` variable:
 .. _warnings.simplefilter: https://docs.python.org/3/library/warnings.html#warnings.simplefilter
 .. _`pytest-warnings`: https://github.com/fschulze/pytest-warnings
 
+Disabling warnings summary
+--------------------------
 
-Disabling warning capture
--------------------------
+Although not recommended, you can use the ``--disable-warnings`` command-line option to suppress the
+warning summary entirely from the test run output.
 
-This feature is enabled by default but can be disabled entirely in your ``pytest.ini`` file with:
+Disabling warning capture entirely
+----------------------------------
+
+This plugin is enabled by default but can be disabled entirely in your ``pytest.ini`` file with:
 
     .. code-block:: ini
 
         [pytest]
         addopts = -p no:warnings
 
-Or passing ``-p no:warnings`` in the command-line.
+Or passing ``-p no:warnings`` in the command-line. This might be useful if your test suites handles warnings
+using an external system.
+
+
+.. _`deprecation-warnings`:
+
+DeprecationWarning and PendingDeprecationWarning
+------------------------------------------------
+
+
+
+
+By default pytest will display ``DeprecationWarning`` and ``PendingDeprecationWarning`` warnings from
+user code and third-party libraries, as recommended by `PEP-0565 <https://www.python.org/dev/peps/pep-0565>`_.
+This helps users keep their code modern and avoid breakages when deprecated warnings are effectively removed.
+
+Sometimes it is useful to hide some specific deprecation warnings that happen in code that you have no control over
+(such as third-party libraries), in which case you might use the warning filters options (ini or marks) to ignore
+those warnings.
+
+For example:
+
+.. code-block:: ini
+
+    [pytest]
+    filterwarnings =
+        ignore:.*U.*mode is deprecated:DeprecationWarning
+
+
+This will ignore all warnings of type ``DeprecationWarning`` where the start of the message matches
+the regular expression ``".*U.*mode is deprecated"``.
+
+.. note::
+    If warnings are configured at the interpreter level, using
+    the `PYTHONWARNINGS <https://docs.python.org/3/using/cmdline.html#envvar-PYTHONWARNINGS>`_ environment variable or the
+    ``-W`` command-line option, pytest will not configure any filters by default.
+
+    Also pytest doesn't follow ``PEP-0506`` suggestion of resetting all warning filters because
+    it might break test suites that configure warning filters themselves
+    by calling ``warnings.simplefilter`` (see issue `#2430 <https://github.com/pytest-dev/pytest/issues/2430>`_
+    for an example of that).
+
+
+.. _`ensuring a function triggers a deprecation warning`:
+
+.. _ensuring_function_triggers:
+
+Ensuring code triggers a deprecation warning
+--------------------------------------------
+
+You can also call a global helper for checking
+that a certain function call triggers a ``DeprecationWarning`` or
+``PendingDeprecationWarning``:
+
+.. code-block:: python
+
+    import pytest
+
+
+    def test_global():
+        pytest.deprecated_call(myfunction, 17)
+
+By default, ``DeprecationWarning`` and ``PendingDeprecationWarning`` will not be
+caught when using ``pytest.warns`` or ``recwarn`` because default Python warnings filters hide
+them. If you wish to record them in your own code, use the
+command ``warnings.simplefilter('always')``:
+
+.. code-block:: python
+
+    import warnings
+    import pytest
+
+
+    def test_deprecation(recwarn):
+        warnings.simplefilter("always")
+        warnings.warn("deprecated", DeprecationWarning)
+        assert len(recwarn) == 1
+        assert recwarn.pop(DeprecationWarning)
+
+You can also use it as a contextmanager:
+
+.. code-block:: python
+
+    def test_global():
+        with pytest.deprecated_call():
+            myobject.deprecated_method()
+
+
 
 .. _`asserting warnings`:
 
@@ -165,16 +245,19 @@ Or passing ``-p no:warnings`` in the command-line.
 .. _warns:
 
 Asserting warnings with the warns function
------------------------------------------------
+------------------------------------------
+
 
-.. versionadded:: 2.8
 
 You can check that code raises a particular warning using ``pytest.warns``,
-which works in a similar manner to :ref:`raises <assertraises>`::
+which works in a similar manner to :ref:`raises <assertraises>`:
+
+.. code-block:: python
 
     import warnings
     import pytest
 
+
     def test_warning():
         with pytest.warns(UserWarning):
             warnings.warn("my warning", UserWarning)
@@ -201,7 +284,9 @@ You can also call ``pytest.warns`` on a function or code string::
 
 The function also returns a list of all raised warnings (as
 ``warnings.WarningMessage`` objects), which you can query for
-additional information::
+additional information:
+
+.. code-block:: python
 
     with pytest.warns(RuntimeWarning) as record:
         warnings.warn("another warning", RuntimeWarning)
@@ -223,13 +308,15 @@ Alternatively, you can examine raised warnings in detail using the
 .. _recwarn:
 
 Recording warnings
-------------------------
+------------------
 
 You can record raised warnings either using ``pytest.warns`` or with
 the ``recwarn`` fixture.
 
 To record with ``pytest.warns`` without asserting anything about the warnings,
-pass ``None`` as the expected warning type::
+pass ``None`` as the expected warning type:
+
+.. code-block:: python
 
     with pytest.warns(None) as record:
         warnings.warn("user", UserWarning)
@@ -239,10 +326,13 @@ pass ``None`` as the expected warning type::
     assert str(record[0].message) == "user"
     assert str(record[1].message) == "runtime"
 
-The ``recwarn`` fixture will record warnings for the whole function::
+The ``recwarn`` fixture will record warnings for the whole function:
+
+.. code-block:: python
 
     import warnings
 
+
     def test_hello(recwarn):
         warnings.warn("hello", UserWarning)
         assert len(recwarn) == 1
@@ -261,38 +351,84 @@ warnings, or index into it to get a particular recorded warning.
 
 Full API: :class:`WarningsRecorder`.
 
-.. _`ensuring a function triggers a deprecation warning`:
+.. _custom_failure_messages:
 
-.. _ensuring_function_triggers:
+Custom failure messages
+-----------------------
 
-Ensuring a function triggers a deprecation warning
--------------------------------------------------------
+Recording warnings provides an opportunity to produce custom test
+failure messages for when no warnings are issued or other conditions
+are met.
 
-You can also call a global helper for checking
-that a certain function call triggers a ``DeprecationWarning`` or
-``PendingDeprecationWarning``::
+.. code-block:: python
 
-    import pytest
+    def test():
+        with pytest.warns(Warning) as record:
+            f()
+            if not record:
+                pytest.fail("Expected a warning!")
 
-    def test_global():
-        pytest.deprecated_call(myfunction, 17)
+If no warnings are issued when calling ``f``, then ``not record`` will
+evaluate to ``True``.  You can then call ``pytest.fail`` with a
+custom error message.
 
-By default, ``DeprecationWarning`` and ``PendingDeprecationWarning`` will not be
-caught when using ``pytest.warns`` or ``recwarn`` because default Python warnings filters hide
-them. If you wish to record them in your own code, use the
-command ``warnings.simplefilter('always')``::
+.. _internal-warnings:
 
-    import warnings
-    import pytest
+Internal pytest warnings
+------------------------
 
-    def test_deprecation(recwarn):
-        warnings.simplefilter('always')
-        warnings.warn("deprecated", DeprecationWarning)
-        assert len(recwarn) == 1
-        assert recwarn.pop(DeprecationWarning)
 
-You can also use it as a contextmanager::
 
-    def test_global():
-        with pytest.deprecated_call():
-            myobject.deprecated_method()
+pytest may generate its own warnings in some situations, such as improper usage or deprecated features.
+
+For example, pytest will emit a warning if it encounters a class that matches :confval:`python_classes` but also
+defines an ``__init__`` constructor, as this prevents the class from being instantiated:
+
+.. code-block:: python
+
+    # content of test_pytest_warnings.py
+    class Test:
+        def __init__(self):
+            pass
+
+        def test_foo(self):
+            assert 1 == 1
+
+.. code-block:: pytest
+
+    $ pytest test_pytest_warnings.py -q
+
+    ============================= warnings summary =============================
+    test_pytest_warnings.py:1
+      $REGENDOC_TMPDIR/test_pytest_warnings.py:1: PytestCollectionWarning: cannot collect test class 'Test' because it has a __init__ constructor (from: test_pytest_warnings.py)
+        class Test:
+
+    -- Docs: https://docs.pytest.org/en/latest/warnings.html
+    1 warnings in 0.12 seconds
+
+These warnings might be filtered using the same builtin mechanisms used to filter other types of warnings.
+
+Please read our :ref:`backwards-compatibility` to learn how we proceed about deprecating and eventually removing
+features.
+
+The following warning types ares used by pytest and are part of the public API:
+
+.. autoclass:: pytest.PytestWarning
+
+.. autoclass:: pytest.PytestAssertRewriteWarning
+
+.. autoclass:: pytest.PytestCacheWarning
+
+.. autoclass:: pytest.PytestCollectionWarning
+
+.. autoclass:: pytest.PytestConfigWarning
+
+.. autoclass:: pytest.PytestDeprecationWarning
+
+.. autoclass:: pytest.PytestExperimentalApiWarning
+
+.. autoclass:: pytest.PytestUnhandledCoroutineWarning
+
+.. autoclass:: pytest.PytestUnknownMarkWarning
+
+.. autoclass:: pytest.RemovedInPytest4Warning
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/writing_plugins.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/writing_plugins.rst
index 95b810bcb36..04dc68b642d 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/writing_plugins.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/writing_plugins.rst
@@ -73,7 +73,7 @@ sub directory but not for other directories::
     a/conftest.py:
         def pytest_runtest_setup(item):
             # called for running each test in 'a' directory
-            print ("setting up", item)
+            print("setting up", item)
 
     a/test_sub.py:
         def test_sub():
@@ -223,7 +223,6 @@ import ``helper.py`` normally.  The contents of
    pytest.register_assert_rewrite("pytest_foo.helper")
 
 
-
 Requiring/Loading plugins in a test module or conftest file
 -----------------------------------------------------------
 
@@ -286,6 +285,26 @@ the plugin manager like this:
 If you want to look at the names of existing plugins, use
 the ``--trace-config`` option.
 
+
+.. _registering-markers:
+
+Registering custom markers
+--------------------------
+
+If your plugin uses any markers, you should register them so that they appear in
+pytest's help text and do not :ref:`cause spurious warnings <unknown-marks>`.
+For example, the following plugin would register ``cool_marker`` and
+``mark_with`` for all users:
+
+.. code-block:: python
+
+    def pytest_configure(config):
+        config.addinivalue_line("markers", "cool_marker: this one is for cool tests.")
+        config.addinivalue_line(
+            "markers", "mark_with(arg, arg2): this marker takes arguments."
+        )
+
+
 Testing plugins
 ---------------
 
@@ -386,11 +405,54 @@ return a result object, with which we can assert the tests' outcomes.
         result.assert_outcomes(passed=4)
 
 
+additionally it is possible to copy examples for an example folder before running pytest on it
+
+.. code-block:: ini
+
+  # content of pytest.ini
+  [pytest]
+  pytester_example_dir = .
+
+
+.. code-block:: python
+
+    # content of test_example.py
+
+
+    def test_plugin(testdir):
+        testdir.copy_example("test_example.py")
+        testdir.runpytest("-k", "test_example")
+
+
+    def test_example():
+        pass
+
+.. code-block:: pytest
+
+    $ pytest
+    =========================== test session starts ============================
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
+    cachedir: $PYTHON_PREFIX/.pytest_cache
+    rootdir: $REGENDOC_TMPDIR, inifile: pytest.ini
+    collected 2 items
+
+    test_example.py ..                                                   [100%]
+
+    ============================= warnings summary =============================
+    test_example.py::test_plugin
+      $REGENDOC_TMPDIR/test_example.py:4: PytestExperimentalApiWarning: testdir.copy_example is an experimental api that may change over time
+        testdir.copy_example("test_example.py")
+
+    -- Docs: https://docs.pytest.org/en/latest/warnings.html
+    =================== 2 passed, 1 warnings in 0.12 seconds ===================
+
 For more information about the result object that ``runpytest()`` returns, and
 the methods that it provides please check out the :py:class:`RunResult
 <_pytest.pytester.RunResult>` documentation.
 
 
+
+
 .. _`writinghooks`:
 
 Writing hook functions
@@ -453,7 +515,7 @@ hookwrapper: executing around other hooks
 
 .. currentmodule:: _pytest.core
 
-.. versionadded:: 2.7
+
 
 pytest plugins can implement hook wrappers which wrap the execution
 of other hook implementations.  A hook wrapper is a generator function
@@ -466,10 +528,13 @@ a :py:class:`Result <pluggy._Result>` instance which encapsulates a result or
 exception info.  The yield point itself will thus typically not raise
 exceptions (unless there are bugs).
 
-Here is an example definition of a hook wrapper::
+Here is an example definition of a hook wrapper:
+
+.. code-block:: python
 
     import pytest
 
+
     @pytest.hookimpl(hookwrapper=True)
     def pytest_pyfunc_call(pyfuncitem):
         do_something_before_next_hook_executes()
@@ -574,10 +639,13 @@ if you depend on a plugin that is not installed, validation will fail and
 the error message will not make much sense to your users.
 
 One approach is to defer the hook implementation to a new plugin instead of
-declaring the hook functions directly in your plugin module, for example::
+declaring the hook functions directly in your plugin module, for example:
+
+.. code-block:: python
 
     # contents of myplugin.py
 
+
     class DeferPlugin(object):
         """Simple plugin to defer pytest-xdist hook functions."""
 
@@ -585,8 +653,9 @@ declaring the hook functions directly in your plugin module, for example::
             """standard xdist hook function.
             """
 
+
     def pytest_configure(config):
-        if config.pluginmanager.hasplugin('xdist'):
+        if config.pluginmanager.hasplugin("xdist"):
             config.pluginmanager.register(DeferPlugin())
 
 This has the added benefit of allowing you to conditionally install hooks
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/xunit_setup.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/xunit_setup.rst
index 7a6c099f559..46687330255 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/xunit_setup.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/xunit_setup.rst
@@ -93,7 +93,15 @@ Remarks:
 
 * It is possible for setup/teardown pairs to be invoked multiple times
   per testing process.
+
 * teardown functions are not called if the corresponding setup function existed
   and failed/was skipped.
 
+* Prior to pytest-4.2, xunit-style functions did not obey the scope rules of fixtures, so
+  it was possible, for example, for a ``setup_method`` to be called before a
+  session-scoped autouse fixture.
+
+  Now the xunit-style functions are integrated with the fixture mechanism and obey the proper
+  scope rules of fixtures involved in the call.
+
 .. _`unittest.py module`: http://docs.python.org/library/unittest.html
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/yieldfixture.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/yieldfixture.rst
index 6fd1edac2f5..47590f9db96 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/yieldfixture.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/yieldfixture.rst
@@ -5,9 +5,9 @@
 "yield_fixture" functions
 ---------------------------------------------------------------
 
-.. deprecated:: 3.0
 
-.. versionadded:: 2.4
+
+
 
 .. important::
     Since pytest-3.0, fixtures using the normal ``fixture`` decorator can use a ``yield``
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/extra/get_issues.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/extra/get_issues.py
index c026972b145..598a1af409f 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/extra/get_issues.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/extra/get_issues.py
@@ -1,4 +1,6 @@
+# -*- coding: utf-8 -*-
 import json
+
 import py
 import requests
 
@@ -64,9 +66,9 @@ def report(issues):
         print(title)
         # print()
         # lines = body.split("\n")
-        # print ("\n".join(lines[:3]))
+        # print("\n".join(lines[:3]))
         # if len(lines) > 3 or len(body) > 240:
-        #    print ("...")
+        #    print("...")
     print("\n\nFound %s open issues" % len(issues))
 
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/extra/setup-py.test/setup.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/extra/setup-py.test/setup.py
index d0560ce1f5f..cfe18c28f52 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/extra/setup-py.test/setup.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/extra/setup-py.test/setup.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import sys
 from distutils.core import setup
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/pyproject.toml b/tests/wpt/web-platform-tests/tools/third_party/pytest/pyproject.toml
index 65e6bf59bf1..2a4cd65c118 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/pyproject.toml
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/pyproject.toml
@@ -1,20 +1,28 @@
 [build-system]
 requires = [
-  "setuptools",
+  # sync with setup.py until we discard non-pep-517/518
+  "setuptools>=40.0",
   "setuptools-scm",
   "wheel",
 ]
+build-backend = "setuptools.build_meta"
 
 [tool.towncrier]
 package = "pytest"
 package_dir = "src"
 filename = "CHANGELOG.rst"
 directory = "changelog/"
+title_format = "pytest {version} ({project_date})"
 template = "changelog/_template.rst"
 
   [[tool.towncrier.type]]
   directory = "removal"
-  name = "Deprecations and Removals"
+  name = "Removals"
+  showcontent = true
+
+  [[tool.towncrier.type]]
+  directory = "deprecation"
+  name = "Deprecations"
   showcontent = true
 
   [[tool.towncrier.type]]
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/append_codecov_token.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/append_codecov_token.py
new file mode 100644
index 00000000000..b3a82075fa1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/append_codecov_token.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+"""
+Appends the codecov token to the 'codecov.yml' file at the root of the repository.
+This is done by CI during PRs and builds on the pytest-dev repository so we can upload coverage, at least
+until codecov grows some native integration like it has with Travis and AppVeyor.
+See discussion in https://github.com/pytest-dev/pytest/pull/6441 for more information.
+"""
+import os.path
+from textwrap import dedent
+
+
+def main():
+    this_dir = os.path.dirname(__file__)
+    cov_file = os.path.join(this_dir, "..", "codecov.yml")
+
+    assert os.path.isfile(cov_file), "{cov_file} does not exist".format(
+        cov_file=cov_file
+    )
+
+    with open(cov_file, "a") as f:
+        # token from: https://codecov.io/gh/pytest-dev/pytest/settings
+        # use same URL to regenerate it if needed
+        text = dedent(
+            """
+            codecov:
+              token: "1eca3b1f-31a2-4fb8-a8c3-138b441b50a7"
+        """
+        )
+        f.write(text)
+
+    print("Token updated:", cov_file)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/call-tox.bat b/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/call-tox.bat
deleted file mode 100644
index 86fb25c1df1..00000000000
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/call-tox.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-REM skip "coveralls" run in PRs or forks
-if "%TOXENV%" == "coveralls" (
-    if not defined COVERALLS_REPO_TOKEN (
-        echo skipping coveralls run because COVERALLS_REPO_TOKEN is not defined
-        exit /b 0
-    )
-)
-C:\Python36\python -m tox
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/install-pypy.bat b/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/install-pypy.bat
deleted file mode 100644
index 8012ea46aca..00000000000
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/install-pypy.bat
+++ /dev/null
@@ -1,6 +0,0 @@
-REM install pypy using choco
-REM redirect to a file because choco install python.pypy is too noisy. If the command fails, write output to console
-choco install python.pypy > pypy-inst.log 2>&1 || (type pypy-inst.log & exit /b 1)
-set PATH=C:\tools\pypy\pypy;%PATH% # so tox can find pypy
-echo PyPy installed
-pypy --version
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/publish_gh_release_notes.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/publish_gh_release_notes.py
new file mode 100644
index 00000000000..3ff946b58a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/publish_gh_release_notes.py
@@ -0,0 +1,96 @@
+# -*- coding: utf-8 -*-
+"""
+Script used to publish GitHub release notes extracted from CHANGELOG.rst.
+
+This script is meant to be executed after a successful deployment in Travis.
+
+Uses the following environment variables:
+
+* GIT_TAG: the name of the tag of the current commit.
+* GH_RELEASE_NOTES_TOKEN: a personal access token with 'repo' permissions. It should be encrypted using:
+
+    $travis encrypt GH_RELEASE_NOTES_TOKEN=<token> -r pytest-dev/pytest
+
+  And the contents pasted in the ``deploy.env.secure`` section in the ``travis.yml`` file.
+
+The script also requires ``pandoc`` to be previously installed in the system.
+
+Requires Python3.6+.
+"""
+import os
+import re
+import sys
+from pathlib import Path
+
+import github3
+import pypandoc
+
+
+def publish_github_release(slug, token, tag_name, body):
+    github = github3.login(token=token)
+    owner, repo = slug.split("/")
+    repo = github.repository(owner, repo)
+    return repo.create_release(tag_name=tag_name, body=body)
+
+
+def parse_changelog(tag_name):
+    p = Path(__file__).parent.parent / "CHANGELOG.rst"
+    changelog_lines = p.read_text(encoding="UTF-8").splitlines()
+
+    title_regex = re.compile(r"pytest (\d\.\d+\.\d+) \(\d{4}-\d{2}-\d{2}\)")
+    consuming_version = False
+    version_lines = []
+    for line in changelog_lines:
+        m = title_regex.match(line)
+        if m:
+            # found the version we want: start to consume lines until we find the next version title
+            if m.group(1) == tag_name:
+                consuming_version = True
+            # found a new version title while parsing the version we want: break out
+            elif consuming_version:
+                break
+        if consuming_version:
+            version_lines.append(line)
+
+    return "\n".join(version_lines)
+
+
+def convert_rst_to_md(text):
+    return pypandoc.convert_text(text, "md", format="rst")
+
+
+def main(argv):
+    if len(argv) > 1:
+        tag_name = argv[1]
+    else:
+        tag_name = os.environ.get("TRAVIS_TAG")
+        if not tag_name:
+            print("tag_name not given and $TRAVIS_TAG not set", file=sys.stderr)
+            return 1
+
+    token = os.environ.get("GH_RELEASE_NOTES_TOKEN")
+    if not token:
+        print("GH_RELEASE_NOTES_TOKEN not set", file=sys.stderr)
+        return 1
+
+    slug = os.environ.get("TRAVIS_REPO_SLUG")
+    if not slug:
+        print("TRAVIS_REPO_SLUG not set", file=sys.stderr)
+        return 1
+
+    rst_body = parse_changelog(tag_name)
+    md_body = convert_rst_to_md(rst_body)
+    if not publish_github_release(slug, token, tag_name, md_body):
+        print("Could not publish release notes:", file=sys.stderr)
+        print(md_body, file=sys.stderr)
+        return 5
+
+    print()
+    print(f"Release notes for {tag_name} published successfully:")
+    print(f"https://github.com/{slug}/releases/tag/{tag_name}")
+    print()
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv))
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/tasks/release.minor.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/release.minor.rst
similarity index 86%
rename from tests/wpt/web-platform-tests/tools/third_party/pytest/tasks/release.minor.rst
rename to tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/release.minor.rst
index bdd8282cfad..9a488edbc52 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/tasks/release.minor.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/release.minor.rst
@@ -9,11 +9,11 @@ against itself, passing on many different interpreters and platforms.
 This release contains a number of bugs fixes and improvements, so users are encouraged
 to take a look at the CHANGELOG:
 
-    http://doc.pytest.org/en/latest/changelog.html
+    https://docs.pytest.org/en/latest/changelog.html
 
 For complete documentation, please visit:
 
-    http://docs.pytest.org
+    https://docs.pytest.org/en/latest/
 
 As usual, you can upgrade from pypi via:
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/tasks/release.patch.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/release.patch.rst
similarity index 79%
rename from tests/wpt/web-platform-tests/tools/third_party/pytest/tasks/release.patch.rst
rename to tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/release.patch.rst
index 1982dc353c4..b1ad2dbd775 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/tasks/release.patch.rst
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/release.patch.rst
@@ -7,7 +7,7 @@ This is a bug-fix release, being a drop-in replacement. To upgrade::
 
   pip install --upgrade pytest
 
-The full changelog is available at http://doc.pytest.org/en/latest/changelog.html.
+The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
 
 Thanks to all who contributed to this release, among them:
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/release.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/release.py
new file mode 100644
index 00000000000..32178fcf674
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/release.py
@@ -0,0 +1,116 @@
+# -*- coding: utf-8 -*-
+"""
+Invoke development tasks.
+"""
+import argparse
+from pathlib import Path
+from subprocess import call
+from subprocess import check_call
+from subprocess import check_output
+
+from colorama import Fore
+from colorama import init
+
+
+def announce(version):
+    """Generates a new release announcement entry in the docs."""
+    # Get our list of authors
+    stdout = check_output(["git", "describe", "--abbrev=0", "--tags"])
+    stdout = stdout.decode("utf-8")
+    last_version = stdout.strip()
+
+    stdout = check_output(
+        ["git", "log", "{}..HEAD".format(last_version), "--format=%aN"]
+    )
+    stdout = stdout.decode("utf-8")
+
+    contributors = set(stdout.splitlines())
+
+    template_name = (
+        "release.minor.rst" if version.endswith(".0") else "release.patch.rst"
+    )
+    template_text = (
+        Path(__file__).parent.joinpath(template_name).read_text(encoding="UTF-8")
+    )
+
+    contributors_text = (
+        "\n".join("* {}".format(name) for name in sorted(contributors)) + "\n"
+    )
+    text = template_text.format(version=version, contributors=contributors_text)
+
+    target = Path(__file__).parent.joinpath(
+        "../doc/en/announce/release-{}.rst".format(version)
+    )
+    target.write_text(text, encoding="UTF-8")
+    print(f"{Fore.CYAN}[generate.announce] {Fore.RESET}Generated {target.name}")
+
+    # Update index with the new release entry
+    index_path = Path(__file__).parent.joinpath("../doc/en/announce/index.rst")
+    lines = index_path.read_text(encoding="UTF-8").splitlines()
+    indent = "   "
+    for index, line in enumerate(lines):
+        if line.startswith("{}release-".format(indent)):
+            new_line = indent + target.stem
+            if line != new_line:
+                lines.insert(index, new_line)
+                index_path.write_text("\n".join(lines) + "\n", encoding="UTF-8")
+                print(
+                    f"{Fore.CYAN}[generate.announce] {Fore.RESET}Updated {index_path.name}"
+                )
+            else:
+                print(
+                    f"{Fore.CYAN}[generate.announce] {Fore.RESET}Skip {index_path.name} (already contains release)"
+                )
+            break
+
+    check_call(["git", "add", str(target)])
+
+
+def regen():
+    """Call regendoc tool to update examples and pytest output in the docs."""
+    print(f"{Fore.CYAN}[generate.regen] {Fore.RESET}Updating docs")
+    check_call(["tox", "-e", "regen"])
+
+
+def fix_formatting():
+    """Runs pre-commit in all files to ensure they are formatted correctly"""
+    print(
+        f"{Fore.CYAN}[generate.fix linting] {Fore.RESET}Fixing formatting using pre-commit"
+    )
+    call(["pre-commit", "run", "--all-files"])
+
+
+def pre_release(version):
+    """Generates new docs, release announcements and creates a local tag."""
+    announce(version)
+    regen()
+    changelog(version, write_out=True)
+    fix_formatting()
+
+    msg = "Preparing release version {}".format(version)
+    check_call(["git", "commit", "-a", "-m", msg])
+
+    print()
+    print(f"{Fore.CYAN}[generate.pre_release] {Fore.GREEN}All done!")
+    print()
+    print(f"Please push your branch and open a PR.")
+
+
+def changelog(version, write_out=False):
+    if write_out:
+        addopts = []
+    else:
+        addopts = ["--draft"]
+    check_call(["towncrier", "--yes", "--version", version] + addopts)
+
+
+def main():
+    init(autoreset=True)
+    parser = argparse.ArgumentParser()
+    parser.add_argument("version", help="Release version")
+    options = parser.parse_args()
+    pre_release(options.version)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/report-coverage.sh b/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/report-coverage.sh
new file mode 100755
index 00000000000..fbcf20ca929
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/report-coverage.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+set -e
+set -x
+
+if [ -z "$TOXENV" ]; then
+  python -m pip install coverage
+else
+  # Add last TOXENV to $PATH.
+  PATH="$PWD/.tox/${TOXENV##*,}/bin:$PATH"
+fi
+
+python -m coverage combine
+python -m coverage xml
+python -m coverage report -m
+# Set --connect-timeout to work around https://github.com/curl/curl/issues/4461
+curl -S -L --connect-timeout 5 --retry 6 -s https://codecov.io/bash -o codecov-upload.sh
+bash codecov-upload.sh -Z -X fix -f coverage.xml "$@"
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/retry.cmd b/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/retry.cmd
new file mode 100644
index 00000000000..ac383650857
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/retry.cmd
@@ -0,0 +1,21 @@
+@echo off
+rem Source: https://github.com/appveyor/ci/blob/master/scripts/appveyor-retry.cmd
+rem initiate the retry number
+set retryNumber=0
+set maxRetries=3
+
+:RUN
+%*
+set LastErrorLevel=%ERRORLEVEL%
+IF %LastErrorLevel% == 0 GOTO :EOF
+set /a retryNumber=%retryNumber%+1
+IF %reTryNumber% == %maxRetries% (GOTO :FAILED)
+
+:RETRY
+set /a retryNumberDisp=%retryNumber%+1
+@echo Command "%*" failed with exit code %LastErrorLevel%. Retrying %retryNumberDisp% of %maxRetries%
+GOTO :RUN
+
+: FAILED
+@echo Sorry, we tried running command for %maxRetries% times and all attempts were unsuccessful!
+EXIT /B %LastErrorLevel%
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/setup-coverage-vars.bat b/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/setup-coverage-vars.bat
new file mode 100644
index 00000000000..7a4a6d4deb8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/setup-coverage-vars.bat
@@ -0,0 +1,7 @@
+if "%PYTEST_COVERAGE%" == "1" (
+  set "_PYTEST_TOX_COVERAGE_RUN=coverage run -m"
+  set "_PYTEST_TOX_EXTRA_DEP=coverage-enable-subprocess"
+  echo Coverage vars configured, PYTEST_COVERAGE=%PYTEST_COVERAGE%
+) else (
+  echo Skipping coverage vars setup, PYTEST_COVERAGE=%PYTEST_COVERAGE%
+)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/upload-coverage.bat b/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/upload-coverage.bat
new file mode 100644
index 00000000000..08ed5779122
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/upload-coverage.bat
@@ -0,0 +1,16 @@
+REM script called by Azure to combine and upload coverage information to codecov
+if "%PYTEST_COVERAGE%" == "1" (
+    echo Prepare to upload coverage information
+    if defined CODECOV_TOKEN (
+        echo CODECOV_TOKEN defined
+    ) else (
+        echo CODECOV_TOKEN NOT defined
+    )
+    python -m pip install codecov
+    python -m coverage combine
+    python -m coverage xml
+    python -m coverage report -m
+    scripts\retry python -m codecov --required -X gcov pycov search -f coverage.xml --name %PYTEST_CODECOV_NAME%
+) else (
+    echo Skipping coverage upload, PYTEST_COVERAGE=%PYTEST_COVERAGE%
+)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/setup.cfg b/tests/wpt/web-platform-tests/tools/third_party/pytest/setup.cfg
index 816539e2ec6..368df1e1ac0 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/setup.cfg
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/setup.cfg
@@ -1,3 +1,58 @@
+[metadata]
+
+name = pytest
+description = pytest: simple powerful testing with Python
+long_description = file: README.rst
+url = https://docs.pytest.org/en/latest/
+project_urls =
+    Source=https://github.com/pytest-dev/pytest
+    Tracker=https://github.com/pytest-dev/pytest/issues
+
+author = Holger Krekel, Bruno Oliveira, Ronny Pfannschmidt, Floris Bruynooghe, Brianna Laugher, Florian Bruhin and others
+
+license = MIT license
+license_file = LICENSE
+keywords = test, unittest
+classifiers =
+    Development Status :: 6 - Mature
+    Intended Audience :: Developers
+    License :: OSI Approved :: MIT License
+    Operating System :: POSIX
+    Operating System :: Microsoft :: Windows
+    Operating System :: MacOS :: MacOS X
+    Topic :: Software Development :: Testing
+    Topic :: Software Development :: Libraries
+    Topic :: Utilities
+    Programming Language :: Python :: 2
+    Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.4
+    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
+platforms = unix, linux, osx, cygwin, win32
+
+[options]
+zip_safe = no
+packages =
+    _pytest
+    _pytest._code
+    _pytest._io
+    _pytest.assertion
+    _pytest.config
+    _pytest.mark
+
+py_modules = pytest
+python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*
+
+
+[options.entry_points]
+console_scripts =
+	pytest=pytest:main
+	py.test=pytest:main
+
 [build_sphinx]
 source-dir = doc/en/
 build-dir = doc/build
@@ -13,8 +68,6 @@ universal = 1
 ignore =
   _pytest/_version.py
 
-[metadata]
-license_file = LICENSE
 
 [devpi:upload]
 formats = sdist.tgz,bdist_wheel
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/setup.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/setup.py
index 3d60d6becf8..1053bce4a5a 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/setup.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/setup.py
@@ -1,122 +1,43 @@
-import os
-import sys
-import setuptools
-import pkg_resources
+# -*- coding: utf-8 -*-
 from setuptools import setup
 
-classifiers = [
-    "Development Status :: 6 - Mature",
-    "Intended Audience :: Developers",
-    "License :: OSI Approved :: MIT License",
-    "Operating System :: POSIX",
-    "Operating System :: Microsoft :: Windows",
-    "Operating System :: MacOS :: MacOS X",
-    "Topic :: Software Development :: Testing",
-    "Topic :: Software Development :: Libraries",
-    "Topic :: Utilities",
-] + [
-    ("Programming Language :: Python :: %s" % x)
-    for x in "2 2.7 3 3.4 3.5 3.6 3.7".split()
+# TODO: if py gets upgrade to >=1.6,
+#       remove _width_of_current_line in terminal.py
+INSTALL_REQUIRES = [
+    "py>=1.5.0",
+    "six>=1.10.0",
+    "packaging",
+    "attrs>=17.4.0",
+    'more-itertools>=4.0.0,<6.0.0;python_version<="2.7"',
+    'more-itertools>=4.0.0;python_version>"2.7"',
+    "atomicwrites>=1.0",
+    'funcsigs>=1.0;python_version<"3.0"',
+    'pathlib2>=2.2.0;python_version<"3.6"',
+    'colorama<=0.4.1;sys_platform=="win32" and python_version=="3.4"',
+    'colorama;sys_platform=="win32" and python_version!="3.4"',
+    "pluggy>=0.12,<1.0",
+    'importlib-metadata>=0.12;python_version<"3.8"',
+    "wcwidth",
 ]
 
-with open("README.rst") as fd:
-    long_description = fd.read()
-
-
-def get_environment_marker_support_level():
-    """
-    Tests how well setuptools supports PEP-426 environment marker.
-
-    The first known release to support it is 0.7 (and the earliest on PyPI seems to be 0.7.2
-    so we're using that), see: https://setuptools.readthedocs.io/en/latest/history.html#id350
-
-    The support is later enhanced to allow direct conditional inclusions inside install_requires,
-    which is now recommended by setuptools. It first appeared in 36.2.0, went broken with 36.2.1, and
-    again worked since 36.2.2, so we're using that. See:
-    https://setuptools.readthedocs.io/en/latest/history.html#v36-2-2
-    https://github.com/pypa/setuptools/issues/1099
-
-    References:
-
-    * https://wheel.readthedocs.io/en/latest/index.html#defining-conditional-dependencies
-    * https://www.python.org/dev/peps/pep-0426/#environment-markers
-    * https://setuptools.readthedocs.io/en/latest/setuptools.html#declaring-platform-specific-dependencies
-    """
-    try:
-        version = pkg_resources.parse_version(setuptools.__version__)
-        if version >= pkg_resources.parse_version("36.2.2"):
-            return 2
-        if version >= pkg_resources.parse_version("0.7.2"):
-            return 1
-    except Exception as exc:
-        sys.stderr.write("Could not test setuptool's version: %s\n" % exc)
-
-    # as of testing on 2018-05-26 fedora was on version 37* and debian was on version 33+
-    # we should consider erroring on those
-    return 0
-
 
 def main():
-    extras_require = {}
-    install_requires = [
-        "py>=1.5.0",
-        "six>=1.10.0",
-        "setuptools",
-        "attrs>=17.4.0",
-        "more-itertools>=4.0.0",
-        "atomicwrites>=1.0",
-    ]
-    # if _PYTEST_SETUP_SKIP_PLUGGY_DEP is set, skip installing pluggy;
-    # used by tox.ini to test with pluggy master
-    if "_PYTEST_SETUP_SKIP_PLUGGY_DEP" not in os.environ:
-        install_requires.append("pluggy>=0.5,<0.7")
-    environment_marker_support_level = get_environment_marker_support_level()
-    if environment_marker_support_level >= 2:
-        install_requires.append('funcsigs;python_version<"3.0"')
-        install_requires.append('colorama;sys_platform=="win32"')
-    elif environment_marker_support_level == 1:
-        extras_require[':python_version<"3.0"'] = ["funcsigs"]
-        extras_require[':sys_platform=="win32"'] = ["colorama"]
-    else:
-        if sys.platform == "win32":
-            install_requires.append("colorama")
-        if sys.version_info < (3, 0):
-            install_requires.append("funcsigs")
-
     setup(
-        name="pytest",
-        description="pytest: simple powerful testing with Python",
-        long_description=long_description,
         use_scm_version={"write_to": "src/_pytest/_version.py"},
-        url="http://pytest.org",
-        project_urls={
-            "Source": "https://github.com/pytest-dev/pytest",
-            "Tracker": "https://github.com/pytest-dev/pytest/issues",
-        },
-        license="MIT license",
-        platforms=["unix", "linux", "osx", "cygwin", "win32"],
-        author=(
-            "Holger Krekel, Bruno Oliveira, Ronny Pfannschmidt, "
-            "Floris Bruynooghe, Brianna Laugher, Florian Bruhin and others"
-        ),
-        entry_points={"console_scripts": ["pytest=pytest:main", "py.test=pytest:main"]},
-        classifiers=classifiers,
-        keywords="test unittest",
-        # the following should be enabled for release
-        setup_requires=["setuptools-scm"],
+        setup_requires=["setuptools-scm", "setuptools>=40.0"],
         package_dir={"": "src"},
-        python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
-        install_requires=install_requires,
-        extras_require=extras_require,
-        packages=[
-            "_pytest",
-            "_pytest.assertion",
-            "_pytest._code",
-            "_pytest.mark",
-            "_pytest.config",
-        ],
-        py_modules=["pytest"],
-        zip_safe=False,
+        # fmt: off
+        extras_require={
+            "testing": [
+                "argcomplete",
+                "hypothesis>=3.56",
+                "nose",
+                "requests",
+                "mock;python_version=='2.7'",
+            ],
+        },
+        # fmt: on
+        install_requires=INSTALL_REQUIRES,
     )
 
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/__init__.py
index 46c7827ed5e..17cc20b615a 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/__init__.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/__init__.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 __all__ = ["__version__"]
 
 try:
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_argcomplete.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_argcomplete.py
index 8f480d71d79..c6cf1d8fddd 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_argcomplete.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_argcomplete.py
@@ -1,4 +1,4 @@
-
+# -*- coding: utf-8 -*-
 """allow bash-completion for argparse with argcomplete if installed
 needs argcomplete>=0.5.6 for python 3.2/3.3 (older versions fail
 to find the magic string, so _ARGCOMPLETE env. var is never set, and
@@ -54,9 +54,12 @@ If things do not work right away:
   which should throw a KeyError: 'COMPLINE' (which is properly set by the
   global argcomplete script).
 """
-from __future__ import absolute_import, division, print_function
-import sys
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import os
+import sys
 from glob import glob
 
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_code/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_code/__init__.py
index 815c13b42c2..1394b2b10e6 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_code/__init__.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_code/__init__.py
@@ -1,10 +1,15 @@
+# -*- coding: utf-8 -*-
 """ python inspection/code generation API """
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 from .code import Code  # noqa
 from .code import ExceptionInfo  # noqa
+from .code import filter_traceback  # noqa
 from .code import Frame  # noqa
-from .code import Traceback  # noqa
 from .code import getrawcode  # noqa
-from .source import Source  # noqa
+from .code import Traceback  # noqa
 from .source import compile_ as compile  # noqa
 from .source import getfslineno  # noqa
+from .source import Source  # noqa
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_code/_py2traceback.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_code/_py2traceback.py
index 2dd100c33bd..faacc02166e 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_code/_py2traceback.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_code/_py2traceback.py
@@ -1,9 +1,15 @@
+# -*- coding: utf-8 -*-
 # copied from python-2.7.3's traceback.py
 # CHANGES:
 # - some_str is replaced, trying to create unicode strings
 #
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
 import types
+
 from six import text_type
 
 
@@ -51,17 +57,17 @@ def format_exception_only(etype, value):
         pass
     else:
         filename = filename or "<string>"
-        lines.append('  File "%s", line %d\n' % (filename, lineno))
+        lines.append('  File "{}", line {}\n'.format(filename, lineno))
         if badline is not None:
             if isinstance(badline, bytes):  # python 2 only
                 badline = badline.decode("utf-8", "replace")
-            lines.append(u"    %s\n" % badline.strip())
+            lines.append("    {}\n".format(badline.strip()))
             if offset is not None:
                 caretspace = badline.rstrip("\n")[:offset].lstrip()
                 # non-space whitespace (likes tabs) must be kept for alignment
                 caretspace = ((c.isspace() and c or " ") for c in caretspace)
                 # only three spaces to account for offset1 == pos 0
-                lines.append("   %s^\n" % "".join(caretspace))
+                lines.append("   {}^\n".format("".join(caretspace)))
         value = msg
 
     lines.append(_format_final_exc_line(stype, value))
@@ -72,9 +78,9 @@ def _format_final_exc_line(etype, value):
     """Return a list of a single line -- normal case for format_exception_only"""
     valuestr = _some_str(value)
     if value is None or not valuestr:
-        line = "%s\n" % etype
+        line = "{}\n".format(etype)
     else:
-        line = "%s: %s\n" % (etype, valuestr)
+        line = "{}: {}\n".format(etype, valuestr)
     return line
 
 
@@ -83,7 +89,7 @@ def _some_str(value):
         return text_type(value)
     except Exception:
         try:
-            return str(value)
+            return bytes(value).decode("UTF-8", "replace")
         except Exception:
             pass
-    return "<unprintable %s object>" % type(value).__name__
+    return "<unprintable {} object>".format(type(value).__name__)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_code/code.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_code/code.py
index cb788c17f04..175d6fda01d 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_code/code.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_code/code.py
@@ -1,17 +1,28 @@
-from __future__ import absolute_import, division, print_function
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import inspect
+import re
 import sys
 import traceback
-from inspect import CO_VARARGS, CO_VARKEYWORDS
+from inspect import CO_VARARGS
+from inspect import CO_VARKEYWORDS
+from weakref import ref
 
 import attr
-import re
-from weakref import ref
-from _pytest.compat import _PY2, _PY3, PY35, safe_str
-from six import text_type
+import pluggy
 import py
+from six import text_type
 
-builtin_repr = repr
+import _pytest
+from _pytest._io.saferepr import safeformat
+from _pytest._io.saferepr import saferepr
+from _pytest.compat import _PY2
+from _pytest.compat import _PY3
+from _pytest.compat import PY35
+from _pytest.compat import safe_str
 
 if _PY3:
     from traceback import format_exception_only
@@ -127,12 +138,12 @@ class Frame(object):
         """
         f_locals = self.f_locals.copy()
         f_locals.update(vars)
-        py.builtin.exec_(code, self.f_globals, f_locals)
+        exec(code, self.f_globals, f_locals)
 
     def repr(self, object):
         """ return a 'safe' (non-recursive, one-line) string repr for 'object'
         """
-        return py.io.saferepr(object)
+        return saferepr(object)
 
     def is_true(self, object):
         return object
@@ -230,25 +241,20 @@ class TracebackEntry(object):
 
     def ishidden(self):
         """ return True if the current frame has a var __tracebackhide__
-            resolving to True
+            resolving to True.
 
             If __tracebackhide__ is a callable, it gets called with the
             ExceptionInfo instance and can decide whether to hide the traceback.
 
             mostly for internal use
         """
-        try:
-            tbh = self.frame.f_locals["__tracebackhide__"]
-        except KeyError:
-            try:
-                tbh = self.frame.f_globals["__tracebackhide__"]
-            except KeyError:
-                return False
-
-        if callable(tbh):
+        f = self.frame
+        tbh = f.f_locals.get(
+            "__tracebackhide__", f.f_globals.get("__tracebackhide__", False)
+        )
+        if tbh and callable(tbh):
             return tbh(None if self._excinfo is None else self._excinfo())
-        else:
-            return tbh
+        return tbh
 
     def __str__(self):
         try:
@@ -274,6 +280,7 @@ class Traceback(list):
     """ Traceback objects encapsulate and offer higher level
         access to Traceback entries.
     """
+
     Entry = TracebackEntry
 
     def __init__(self, tb, excinfo=None):
@@ -378,37 +385,85 @@ co_equal = compile(
 )
 
 
+@attr.s(repr=False)
 class ExceptionInfo(object):
     """ wraps sys.exc_info() objects and offers
         help for navigating the traceback.
     """
-    _striptext = ""
-    _assert_start_repr = "AssertionError(u'assert " if _PY2 else "AssertionError('assert "
 
-    def __init__(self, tup=None, exprinfo=None):
-        import _pytest._code
+    _assert_start_repr = (
+        "AssertionError(u'assert " if _PY2 else "AssertionError('assert "
+    )
 
-        if tup is None:
-            tup = sys.exc_info()
-            if exprinfo is None and isinstance(tup[1], AssertionError):
-                exprinfo = getattr(tup[1], "msg", None)
-                if exprinfo is None:
-                    exprinfo = py.io.saferepr(tup[1])
-                if exprinfo and exprinfo.startswith(self._assert_start_repr):
-                    self._striptext = "AssertionError: "
-        self._excinfo = tup
-        #: the exception class
-        self.type = tup[0]
-        #: the exception instance
-        self.value = tup[1]
-        #: the exception raw traceback
-        self.tb = tup[2]
-        #: the exception type name
-        self.typename = self.type.__name__
-        #: the exception traceback (_pytest._code.Traceback instance)
-        self.traceback = _pytest._code.Traceback(self.tb, excinfo=ref(self))
+    _excinfo = attr.ib()
+    _striptext = attr.ib(default="")
+    _traceback = attr.ib(default=None)
+
+    @classmethod
+    def from_current(cls, exprinfo=None):
+        """returns an ExceptionInfo matching the current traceback
+
+        .. warning::
+
+            Experimental API
+
+
+        :param exprinfo: a text string helping to determine if we should
+                         strip ``AssertionError`` from the output, defaults
+                         to the exception message/``__str__()``
+        """
+        tup = sys.exc_info()
+        assert tup[0] is not None, "no current exception"
+        _striptext = ""
+        if exprinfo is None and isinstance(tup[1], AssertionError):
+            exprinfo = getattr(tup[1], "msg", None)
+            if exprinfo is None:
+                exprinfo = saferepr(tup[1])
+            if exprinfo and exprinfo.startswith(cls._assert_start_repr):
+                _striptext = "AssertionError: "
+
+        return cls(tup, _striptext)
+
+    @classmethod
+    def for_later(cls):
+        """return an unfilled ExceptionInfo
+        """
+        return cls(None)
+
+    @property
+    def type(self):
+        """the exception class"""
+        return self._excinfo[0]
+
+    @property
+    def value(self):
+        """the exception value"""
+        return self._excinfo[1]
+
+    @property
+    def tb(self):
+        """the exception raw traceback"""
+        return self._excinfo[2]
+
+    @property
+    def typename(self):
+        """the type name of the exception"""
+        return self.type.__name__
+
+    @property
+    def traceback(self):
+        """the traceback"""
+        if self._traceback is None:
+            self._traceback = Traceback(self.tb, excinfo=ref(self))
+        return self._traceback
+
+    @traceback.setter
+    def traceback(self, value):
+        self._traceback = value
 
     def __repr__(self):
+        if self._excinfo is None:
+            return "<ExceptionInfo for raises contextmanager>"
         return "<ExceptionInfo %s tblen=%d>" % (self.typename, len(self.traceback))
 
     def exconly(self, tryshort=False):
@@ -424,7 +479,7 @@ class ExceptionInfo(object):
         text = text.rstrip()
         if tryshort:
             if text.startswith(self._striptext):
-                text = text[len(self._striptext):]
+                text = text[len(self._striptext) :]
         return text
 
     def errisinstance(self, exc):
@@ -444,13 +499,36 @@ class ExceptionInfo(object):
         abspath=False,
         tbfilter=True,
         funcargs=False,
+        truncate_locals=True,
+        chain=True,
     ):
-        """ return str()able representation of this exception info.
-            showlocals: show locals per traceback entry
-            style: long|short|no|native traceback style
-            tbfilter: hide entries (where __tracebackhide__ is true)
+        """
+        Return str()able representation of this exception info.
 
-            in case of style==native, tbfilter and showlocals is ignored.
+        :param bool showlocals:
+            Show locals per traceback entry.
+            Ignored if ``style=="native"``.
+
+        :param str style: long|short|no|native traceback style
+
+        :param bool abspath:
+            If paths should be changed to absolute or left unchanged.
+
+        :param bool tbfilter:
+            Hide entries that contain a local variable ``__tracebackhide__==True``.
+            Ignored if ``style=="native"``.
+
+        :param bool funcargs:
+            Show fixtures ("funcargs" for legacy purposes) per traceback entry.
+
+        :param bool truncate_locals:
+            With ``showlocals==True``, make sure locals can be safely represented as strings.
+
+        :param bool chain: if chained exceptions in Python 3 should be shown.
+
+        .. versionchanged:: 3.9
+
+            Added the ``chain`` parameter.
         """
         if style == "native":
             return ReprExceptionInfo(
@@ -468,10 +546,14 @@ class ExceptionInfo(object):
             abspath=abspath,
             tbfilter=tbfilter,
             funcargs=funcargs,
+            truncate_locals=truncate_locals,
+            chain=chain,
         )
         return fmt.repr_excinfo(self)
 
     def __str__(self):
+        if self._excinfo is None:
+            return repr(self)
         entry = self.traceback[-1]
         loc = ReprFileLocation(entry.path, entry.lineno + 1, self.exconly())
         return str(loc)
@@ -483,20 +565,27 @@ class ExceptionInfo(object):
 
     def match(self, regexp):
         """
-        Match the regular expression 'regexp' on the string representation of
-        the exception. If it matches then True is returned (so that it is
-        possible to write 'assert excinfo.match()'). If it doesn't match an
-        AssertionError is raised.
+        Check whether the regular expression 'regexp' is found in the string
+        representation of the exception using ``re.search``. If it matches
+        then True is returned (so that it is possible to write
+        ``assert excinfo.match()``). If it doesn't match an AssertionError is
+        raised.
         """
         __tracebackhide__ = True
-        if not re.search(regexp, str(self.value)):
-            assert 0, "Pattern '{!s}' not found in '{!s}'".format(regexp, self.value)
+        value = (
+            text_type(self.value) if isinstance(regexp, text_type) else str(self.value)
+        )
+        if not re.search(regexp, value):
+            raise AssertionError(
+                u"Pattern {!r} not found in {!r}".format(regexp, value)
+            )
         return True
 
 
 @attr.s
 class FormattedExcinfo(object):
     """ presenting information about failing Functions and Generators. """
+
     # for traceback entries
     flow_marker = ">"
     fail_marker = "E"
@@ -506,6 +595,8 @@ class FormattedExcinfo(object):
     abspath = attr.ib(default=True)
     tbfilter = attr.ib(default=True)
     funcargs = attr.ib(default=False)
+    truncate_locals = attr.ib(default=True)
+    chain = attr.ib(default=True)
     astcache = attr.ib(default=attr.Factory(dict), init=False, repr=False)
 
     def _getindent(self, source):
@@ -529,14 +620,11 @@ class FormattedExcinfo(object):
             source = source.deindent()
         return source
 
-    def _saferepr(self, obj):
-        return py.io.saferepr(obj)
-
     def repr_args(self, entry):
         if self.funcargs:
             args = []
             for argname, argvalue in entry.frame.getargs(var=True):
-                args.append((argname, self._saferepr(argvalue)))
+                args.append((argname, saferepr(argvalue)))
             return ReprFuncArgs(args)
 
     def get_source(self, source, line_index=-1, excinfo=None, short=False):
@@ -556,7 +644,7 @@ class FormattedExcinfo(object):
             for line in source.lines[:line_index]:
                 lines.append(space_prefix + line)
             lines.append(self.flow_marker + "   " + source.lines[line_index])
-            for line in source.lines[line_index + 1:]:
+            for line in source.lines[line_index + 1 :]:
                 lines.append(space_prefix + line)
         if excinfo is not None:
             indent = 4 if short else self._getindent(source)
@@ -588,7 +676,10 @@ class FormattedExcinfo(object):
                     # This formatting could all be handled by the
                     # _repr() function, which is only reprlib.Repr in
                     # disguise, so is very configurable.
-                    str_repr = self._saferepr(value)
+                    if self.truncate_locals:
+                        str_repr = saferepr(value)
+                    else:
+                        str_repr = safeformat(value)
                     # if len(str_repr) < 70 or not isinstance(value,
                     #                            (list, tuple, dict)):
                     lines.append("%-10s = %s" % (name, str_repr))
@@ -691,7 +782,7 @@ class FormattedExcinfo(object):
         else:
             if recursionindex is not None:
                 extraline = "!!! Recursion detected (same locals & position)"
-                traceback = traceback[:recursionindex + 1]
+                traceback = traceback[: recursionindex + 1]
             else:
                 extraline = None
 
@@ -707,7 +798,9 @@ class FormattedExcinfo(object):
             repr_chain = []
             e = excinfo.value
             descr = None
-            while e is not None:
+            seen = set()
+            while e is not None and id(e) not in seen:
+                seen.add(id(e))
                 if excinfo:
                     reprtraceback = self.repr_traceback(excinfo)
                     reprcrash = excinfo._getreprcrash()
@@ -720,17 +813,25 @@ class FormattedExcinfo(object):
                     reprcrash = None
 
                 repr_chain += [(reprtraceback, reprcrash, descr)]
-                if e.__cause__ is not None:
+                if e.__cause__ is not None and self.chain:
                     e = e.__cause__
-                    excinfo = ExceptionInfo(
-                        (type(e), e, e.__traceback__)
-                    ) if e.__traceback__ else None
+                    excinfo = (
+                        ExceptionInfo((type(e), e, e.__traceback__))
+                        if e.__traceback__
+                        else None
+                    )
                     descr = "The above exception was the direct cause of the following exception:"
-                elif (e.__context__ is not None and not e.__suppress_context__):
+                elif (
+                    e.__context__ is not None
+                    and not e.__suppress_context__
+                    and self.chain
+                ):
                     e = e.__context__
-                    excinfo = ExceptionInfo(
-                        (type(e), e, e.__traceback__)
-                    ) if e.__traceback__ else None
+                    excinfo = (
+                        ExceptionInfo((type(e), e, e.__traceback__))
+                        if e.__traceback__
+                        else None
+                    )
                     descr = "During handling of the above exception, another exception occurred:"
                 else:
                     e = None
@@ -739,7 +840,6 @@ class FormattedExcinfo(object):
 
 
 class TerminalRepr(object):
-
     def __str__(self):
         s = self.__unicode__()
         if _PY2:
@@ -759,7 +859,6 @@ class TerminalRepr(object):
 
 
 class ExceptionRepr(TerminalRepr):
-
     def __init__(self):
         self.sections = []
 
@@ -773,7 +872,6 @@ class ExceptionRepr(TerminalRepr):
 
 
 class ExceptionChainRepr(ExceptionRepr):
-
     def __init__(self, chain):
         super(ExceptionChainRepr, self).__init__()
         self.chain = chain
@@ -792,7 +890,6 @@ class ExceptionChainRepr(ExceptionRepr):
 
 
 class ReprExceptionInfo(ExceptionRepr):
-
     def __init__(self, reprtraceback, reprcrash):
         super(ReprExceptionInfo, self).__init__()
         self.reprtraceback = reprtraceback
@@ -831,7 +928,6 @@ class ReprTraceback(TerminalRepr):
 
 
 class ReprTracebackNative(ReprTraceback):
-
     def __init__(self, tblines):
         self.style = "native"
         self.reprentries = [ReprEntryNative(tblines)]
@@ -849,8 +945,6 @@ class ReprEntryNative(TerminalRepr):
 
 
 class ReprEntry(TerminalRepr):
-    localssep = "_ "
-
     def __init__(self, lines, reprfuncargs, reprlocals, filelocrepr, style):
         self.lines = lines
         self.reprfuncargs = reprfuncargs
@@ -872,7 +966,6 @@ class ReprEntry(TerminalRepr):
             red = line.startswith("E   ")
             tw.line(line, bold=True, red=red)
         if self.reprlocals:
-            # tw.sep(self.localssep, "Locals")
             tw.line("")
             self.reprlocals.toterminal(tw)
         if self.reprfileloc:
@@ -885,7 +978,6 @@ class ReprEntry(TerminalRepr):
 
 
 class ReprFileLocation(TerminalRepr):
-
     def __init__(self, path, lineno, message):
         self.path = str(path)
         self.lineno = lineno
@@ -903,7 +995,6 @@ class ReprFileLocation(TerminalRepr):
 
 
 class ReprLocals(TerminalRepr):
-
     def __init__(self, lines):
         self.lines = lines
 
@@ -913,7 +1004,6 @@ class ReprLocals(TerminalRepr):
 
 
 class ReprFuncArgs(TerminalRepr):
-
     def __init__(self, args):
         self.args = args
 
@@ -968,3 +1058,36 @@ else:
             return "maximum recursion depth exceeded" in str(excinfo.value)
         except UnicodeError:
             return False
+
+
+# relative paths that we use to filter traceback entries from appearing to the user;
+# see filter_traceback
+# note: if we need to add more paths than what we have now we should probably use a list
+# for better maintenance
+
+_PLUGGY_DIR = py.path.local(pluggy.__file__.rstrip("oc"))
+# pluggy is either a package or a single module depending on the version
+if _PLUGGY_DIR.basename == "__init__.py":
+    _PLUGGY_DIR = _PLUGGY_DIR.dirpath()
+_PYTEST_DIR = py.path.local(_pytest.__file__).dirpath()
+_PY_DIR = py.path.local(py.__file__).dirpath()
+
+
+def filter_traceback(entry):
+    """Return True if a TracebackEntry instance should be removed from tracebacks:
+    * dynamically generated code (no code to show up for it);
+    * internal traceback from pytest or its internal libraries, py and pluggy.
+    """
+    # entry.path might sometimes return a str object when the entry
+    # points to dynamically generated code
+    # see https://bitbucket.org/pytest-dev/py/issues/71
+    raw_filename = entry.frame.code.raw.co_filename
+    is_generated = "<" in raw_filename and ">" in raw_filename
+    if is_generated:
+        return False
+    # entry.path might point to a non-existing file, in which case it will
+    # also return a str object. see #1133
+    p = py.path.local(entry.path)
+    return (
+        not p.relto(_PLUGGY_DIR) and not p.relto(_PYTEST_DIR) and not p.relto(_PY_DIR)
+    )
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_code/source.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_code/source.py
index 6b982a4cac4..b35e97b9cec 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_code/source.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_code/source.py
@@ -1,28 +1,32 @@
-from __future__ import absolute_import, division, generators, print_function
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import ast
-from ast import PyCF_ONLY_AST as _AST_FLAG
-from bisect import bisect_right
+import inspect
 import linecache
 import sys
-import six
-import inspect
+import textwrap
 import tokenize
-import py
+import warnings
+from ast import PyCF_ONLY_AST as _AST_FLAG
+from bisect import bisect_right
 
-cpy_compile = compile
+import py
+import six
 
 
 class Source(object):
     """ an immutable object holding a source code fragment,
         possibly deindenting it.
     """
+
     _compilecounter = 0
 
     def __init__(self, *parts, **kwargs):
         self.lines = lines = []
         de = kwargs.get("deindent", True)
-        rstrip = kwargs.get("rstrip", True)
         for part in parts:
             if not part:
                 partlines = []
@@ -32,11 +36,6 @@ class Source(object):
                 partlines = [x.rstrip("\n") for x in part]
             elif isinstance(part, six.string_types):
                 partlines = part.split("\n")
-                if rstrip:
-                    while partlines:
-                        if partlines[-1].strip():
-                            break
-                        partlines.pop()
             else:
                 partlines = getsource(part, deindent=de).lines
             if de:
@@ -60,7 +59,7 @@ class Source(object):
             if key.step not in (None, 1):
                 raise IndexError("cannot slice a Source with a step")
             newsource = Source()
-            newsource.lines = self.lines[key.start:key.stop]
+            newsource.lines = self.lines[key.start : key.stop]
             return newsource
 
     def __len__(self):
@@ -114,35 +113,23 @@ class Source(object):
         ast, start, end = getstatementrange_ast(lineno, self)
         return start, end
 
-    def deindent(self, offset=None):
-        """ return a new source object deindented by offset.
-            If offset is None then guess an indentation offset from
-            the first non-blank line.  Subsequent lines which have a
-            lower indentation offset will be copied verbatim as
-            they are assumed to be part of multilines.
-        """
-        # XXX maybe use the tokenizer to properly handle multiline
-        #     strings etc.pp?
+    def deindent(self):
+        """return a new source object deindented."""
         newsource = Source()
-        newsource.lines[:] = deindent(self.lines, offset)
+        newsource.lines[:] = deindent(self.lines)
         return newsource
 
     def isparseable(self, deindent=True):
         """ return True if source is parseable, heuristically
             deindenting it by default.
         """
-        from parser import suite as syntax_checker
-
         if deindent:
             source = str(self.deindent())
         else:
             source = str(self)
         try:
-            # compile(source+'\n', "x", "exec")
-            syntax_checker(source + "\n")
-        except KeyboardInterrupt:
-            raise
-        except Exception:
+            ast.parse(source)
+        except (SyntaxError, ValueError, TypeError):
             return False
         else:
             return True
@@ -151,12 +138,7 @@ class Source(object):
         return "\n".join(self.lines)
 
     def compile(
-        self,
-        filename=None,
-        mode="exec",
-        flag=generators.compiler_flag,
-        dont_inherit=0,
-        _genframe=None,
+        self, filename=None, mode="exec", flag=0, dont_inherit=0, _genframe=None
     ):
         """ return compiled code object. if filename is None
             invent an artificial filename which displays
@@ -174,11 +156,11 @@ class Source(object):
                 filename = base + "%r %s:%d>" % (filename, fn, lineno)
         source = "\n".join(self.lines) + "\n"
         try:
-            co = cpy_compile(source, filename, mode, flag)
+            co = compile(source, filename, mode, flag)
         except SyntaxError:
             ex = sys.exc_info()[1]
             # re-represent syntax errors from parsing python strings
-            msglines = self.lines[:ex.lineno]
+            msglines = self.lines[: ex.lineno]
             if ex.offset:
                 msglines.append(" " * ex.offset + "^")
             msglines.append("(code was compiled probably from here: %s)" % filename)
@@ -200,9 +182,7 @@ class Source(object):
 #
 
 
-def compile_(
-    source, filename=None, mode="exec", flags=generators.compiler_flag, dont_inherit=0
-):
+def compile_(source, filename=None, mode="exec", flags=0, dont_inherit=0):
     """ compile the given source to a raw code object,
         and maintain an internal cache which allows later
         retrieval of the source code for the code object
@@ -210,7 +190,7 @@ def compile_(
     """
     if isinstance(source, ast.AST):
         # XXX should Source support having AST?
-        return cpy_compile(source, filename, mode, flags, dont_inherit)
+        return compile(source, filename, mode, flags, dont_inherit)
     _genframe = sys._getframe(1)  # the caller
     s = Source(source)
     co = s.compile(filename, mode, flags, _genframe=_genframe)
@@ -219,7 +199,9 @@ def compile_(
 
 def getfslineno(obj):
     """ Return source location (path, lineno) for the given object.
-    If the source cannot be determined return ("", -1)
+    If the source cannot be determined return ("", -1).
+
+    The line number is 0-based.
     """
     from .code import Code
 
@@ -253,9 +235,7 @@ def getfslineno(obj):
 def findsource(obj):
     try:
         sourcelines, lineno = inspect.findsource(obj)
-    except py.builtin._sysex:
-        raise
-    except:  # noqa
+    except Exception:
         return None, -1
     source = Source()
     source.lines = [line.rstrip() for line in sourcelines]
@@ -274,47 +254,8 @@ def getsource(obj, **kwargs):
     return Source(strsrc, **kwargs)
 
 
-def deindent(lines, offset=None):
-    if offset is None:
-        for line in lines:
-            line = line.expandtabs()
-            s = line.lstrip()
-            if s:
-                offset = len(line) - len(s)
-                break
-        else:
-            offset = 0
-    if offset == 0:
-        return list(lines)
-    newlines = []
-
-    def readline_generator(lines):
-        for line in lines:
-            yield line + "\n"
-
-    it = readline_generator(lines)
-
-    try:
-        for _, _, (sline, _), (eline, _), _ in tokenize.generate_tokens(
-            lambda: next(it)
-        ):
-            if sline > len(lines):
-                break  # End of input reached
-            if sline > len(newlines):
-                line = lines[sline - 1].expandtabs()
-                if line.lstrip() and line[:offset].isspace():
-                    line = line[offset:]  # Deindent
-                newlines.append(line)
-
-            for i in range(sline, eline):
-                # Don't deindent continuing lines of
-                # multiline tokens (i.e. multiline strings)
-                newlines.append(lines[i])
-    except (IndentationError, tokenize.TokenError):
-        pass
-    # Add any lines we didn't see. E.g. if an exception was raised.
-    newlines.extend(lines[len(newlines):])
-    return newlines
+def deindent(lines):
+    return textwrap.dedent("\n".join(lines)).splitlines()
 
 
 def get_statement_startend2(lineno, node):
@@ -344,7 +285,11 @@ def get_statement_startend2(lineno, node):
 def getstatementrange_ast(lineno, source, assertion=False, astnode=None):
     if astnode is None:
         content = str(source)
-        astnode = compile(content, "source", "exec", 1024)  # 1024 for AST
+        # See #4260:
+        # don't produce duplicate warnings when compiling source to find ast
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore")
+            astnode = compile(content, "source", "exec", _AST_FLAG)
 
     start, end = get_statement_startend2(lineno, astnode)
     # we need to correct the end:
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_io/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_io/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_io/saferepr.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_io/saferepr.py
new file mode 100644
index 00000000000..9b412dccad9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_io/saferepr.py
@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+import pprint
+
+from six.moves import reprlib
+
+
+def _call_and_format_exception(call, x, *args):
+    try:
+        # Try the vanilla repr and make sure that the result is a string
+        return call(x, *args)
+    except Exception as exc:
+        exc_name = type(exc).__name__
+        try:
+            exc_info = str(exc)
+        except Exception:
+            exc_info = "unknown"
+        return '<[%s("%s") raised in repr()] %s object at 0x%x>' % (
+            exc_name,
+            exc_info,
+            x.__class__.__name__,
+            id(x),
+        )
+
+
+class SafeRepr(reprlib.Repr):
+    """subclass of repr.Repr that limits the resulting size of repr()
+    and includes information on exceptions raised during the call.
+    """
+
+    def repr(self, x):
+        return self._callhelper(reprlib.Repr.repr, self, x)
+
+    def repr_unicode(self, x, level):
+        # Strictly speaking wrong on narrow builds
+        def repr(u):
+            if "'" not in u:
+                return u"'%s'" % u
+            elif '"' not in u:
+                return u'"%s"' % u
+            else:
+                return u"'%s'" % u.replace("'", r"\'")
+
+        s = repr(x[: self.maxstring])
+        if len(s) > self.maxstring:
+            i = max(0, (self.maxstring - 3) // 2)
+            j = max(0, self.maxstring - 3 - i)
+            s = repr(x[:i] + x[len(x) - j :])
+            s = s[:i] + "..." + s[len(s) - j :]
+        return s
+
+    def repr_instance(self, x, level):
+        return self._callhelper(repr, x)
+
+    def _callhelper(self, call, x, *args):
+        s = _call_and_format_exception(call, x, *args)
+        if len(s) > self.maxsize:
+            i = max(0, (self.maxsize - 3) // 2)
+            j = max(0, self.maxsize - 3 - i)
+            s = s[:i] + "..." + s[len(s) - j :]
+        return s
+
+
+def safeformat(obj):
+    """return a pretty printed string for the given object.
+    Failing __repr__ functions of user instances will be represented
+    with a short exception info.
+    """
+    return _call_and_format_exception(pprint.pformat, obj)
+
+
+def saferepr(obj, maxsize=240):
+    """return a size-limited safe repr-string for the given object.
+    Failing __repr__ functions of user instances will be represented
+    with a short exception info and 'saferepr' generally takes
+    care to never raise exceptions itself.  This function is a wrapper
+    around the Repr/reprlib functionality of the standard 2.6 lib.
+    """
+    # review exception handling
+    srepr = SafeRepr()
+    srepr.maxstring = maxsize
+    srepr.maxsize = maxsize
+    srepr.maxother = 160
+    return srepr.repr(obj)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/assertion/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/assertion/__init__.py
index 2c9a8890c9a..6b6abb863a3 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/assertion/__init__.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/assertion/__init__.py
@@ -1,13 +1,18 @@
+# -*- coding: utf-8 -*-
 """
 support for presenting detailed information in failing assertions.
 """
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import sys
+
 import six
 
-from _pytest.assertion import util
 from _pytest.assertion import rewrite
 from _pytest.assertion import truncate
+from _pytest.assertion import util
 
 
 def pytest_addoption(parser):
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/assertion/rewrite.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/assertion/rewrite.py
index eceed611ffb..1c6161b212d 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/assertion/rewrite.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/assertion/rewrite.py
@@ -1,22 +1,33 @@
+# -*- coding: utf-8 -*-
 """Rewrite assertion AST to produce nice error messages"""
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import ast
 import errno
-import itertools
 import imp
+import itertools
 import marshal
 import os
 import re
-import six
+import string
 import struct
 import sys
 import types
 
 import atomicwrites
 import py
+import six
 
+from _pytest._io.saferepr import saferepr
 from _pytest.assertion import util
-
+from _pytest.assertion.util import (  # noqa: F401
+    format_explanation as _format_explanation,
+)
+from _pytest.compat import spec_from_file_location
+from _pytest.pathlib import fnmatch_ex
+from _pytest.pathlib import PurePath
 
 # pytest caches rewritten pycs in __pycache__.
 if hasattr(imp, "get_tag"):
@@ -50,18 +61,35 @@ class AssertionRewritingHook(object):
 
     def __init__(self, config):
         self.config = config
-        self.fnpats = config.getini("python_files")
+        try:
+            self.fnpats = config.getini("python_files")
+        except ValueError:
+            self.fnpats = ["test_*.py", "*_test.py"]
         self.session = None
         self.modules = {}
         self._rewritten_names = set()
-        self._register_with_pkg_resources()
         self._must_rewrite = set()
+        # flag to guard against trying to rewrite a pyc file while we are already writing another pyc file,
+        # which might result in infinite recursion (#3506)
+        self._writing_pyc = False
+        self._basenames_to_check_rewrite = {"conftest"}
+        self._marked_for_rewrite_cache = {}
+        self._session_paths_checked = False
 
     def set_session(self, session):
         self.session = session
+        self._session_paths_checked = False
+
+    def _imp_find_module(self, name, path=None):
+        """Indirection so we can mock calls to find_module originated from the hook during testing"""
+        return imp.find_module(name, path)
 
     def find_module(self, name, path=None):
+        if self._writing_pyc:
+            return None
         state = self.config._assertstate
+        if self._early_rewrite_bailout(name, state):
+            return None
         state.trace("find_module called for: %s" % name)
         names = name.rsplit(".", 1)
         lastname = names[-1]
@@ -74,7 +102,7 @@ class AssertionRewritingHook(object):
                 pth = path[0]
         if pth is None:
             try:
-                fd, fn, desc = imp.find_module(lastname, path)
+                fd, fn, desc = self._imp_find_module(lastname, path)
             except ImportError:
                 return None
             if fd is not None:
@@ -143,12 +171,54 @@ class AssertionRewritingHook(object):
                 # Probably a SyntaxError in the test.
                 return None
             if write:
-                _write_pyc(state, co, source_stat, pyc)
+                self._writing_pyc = True
+                try:
+                    _write_pyc(state, co, source_stat, pyc)
+                finally:
+                    self._writing_pyc = False
         else:
             state.trace("found cached rewritten pyc for %r" % (fn,))
         self.modules[name] = co, pyc
         return self
 
+    def _early_rewrite_bailout(self, name, state):
+        """
+        This is a fast way to get out of rewriting modules. Profiling has
+        shown that the call to imp.find_module (inside of the find_module
+        from this class) is a major slowdown, so, this method tries to
+        filter what we're sure won't be rewritten before getting to it.
+        """
+        if self.session is not None and not self._session_paths_checked:
+            self._session_paths_checked = True
+            for path in self.session._initialpaths:
+                # Make something as c:/projects/my_project/path.py ->
+                #     ['c:', 'projects', 'my_project', 'path.py']
+                parts = str(path).split(os.path.sep)
+                # add 'path' to basenames to be checked.
+                self._basenames_to_check_rewrite.add(os.path.splitext(parts[-1])[0])
+
+        # Note: conftest already by default in _basenames_to_check_rewrite.
+        parts = name.split(".")
+        if parts[-1] in self._basenames_to_check_rewrite:
+            return False
+
+        # For matching the name it must be as if it was a filename.
+        path = PurePath(os.path.sep.join(parts) + ".py")
+
+        for pat in self.fnpats:
+            # if the pattern contains subdirectories ("tests/**.py" for example) we can't bail out based
+            # on the name alone because we need to match against the full path
+            if os.path.dirname(pat):
+                return False
+            if fnmatch_ex(pat, path):
+                return False
+
+        if self._is_marked_for_rewrite(name, state):
+            return False
+
+        state.trace("early skip of rewriting module: %s" % (name,))
+        return True
+
     def _should_rewrite(self, name, fn_pypath, state):
         # always rewrite conftest files
         fn = str(fn_pypath)
@@ -168,12 +238,20 @@ class AssertionRewritingHook(object):
                 state.trace("matched test file %r" % (fn,))
                 return True
 
-        for marked in self._must_rewrite:
-            if name == marked or name.startswith(marked + "."):
-                state.trace("matched marked file %r (from %r)" % (name, marked))
-                return True
+        return self._is_marked_for_rewrite(name, state)
 
-        return False
+    def _is_marked_for_rewrite(self, name, state):
+        try:
+            return self._marked_for_rewrite_cache[name]
+        except KeyError:
+            for marked in self._must_rewrite:
+                if name == marked or name.startswith(marked + "."):
+                    state.trace("matched marked file %r (from %r)" % (name, marked))
+                    self._marked_for_rewrite_cache[name] = True
+                    return True
+
+            self._marked_for_rewrite_cache[name] = False
+            return False
 
     def mark_rewrite(self, *names):
         """Mark import names as needing to be rewritten.
@@ -190,30 +268,40 @@ class AssertionRewritingHook(object):
             ):
                 self._warn_already_imported(name)
         self._must_rewrite.update(names)
+        self._marked_for_rewrite_cache.clear()
 
     def _warn_already_imported(self, name):
-        self.config.warn(
-            "P1", "Module already imported so cannot be rewritten: %s" % name
+        from _pytest.warning_types import PytestAssertRewriteWarning
+        from _pytest.warnings import _issue_warning_captured
+
+        _issue_warning_captured(
+            PytestAssertRewriteWarning(
+                "Module already imported so cannot be rewritten: %s" % name
+            ),
+            self.config.hook,
+            stacklevel=5,
         )
 
     def load_module(self, name):
-        # If there is an existing module object named 'fullname' in
-        # sys.modules, the loader must use that existing module. (Otherwise,
-        # the reload() builtin will not work correctly.)
-        if name in sys.modules:
-            return sys.modules[name]
-
         co, pyc = self.modules.pop(name)
-        # I wish I could just call imp.load_compiled here, but __file__ has to
-        # be set properly. In Python 3.2+, this all would be handled correctly
-        # by load_compiled.
-        mod = sys.modules[name] = imp.new_module(name)
+        if name in sys.modules:
+            # If there is an existing module object named 'fullname' in
+            # sys.modules, the loader must use that existing module. (Otherwise,
+            # the reload() builtin will not work correctly.)
+            mod = sys.modules[name]
+        else:
+            # I wish I could just call imp.load_compiled here, but __file__ has to
+            # be set properly. In Python 3.2+, this all would be handled correctly
+            # by load_compiled.
+            mod = sys.modules[name] = imp.new_module(name)
         try:
             mod.__file__ = co.co_filename
             # Normally, this attribute is 3.2+.
             mod.__cached__ = pyc
             mod.__loader__ = self
-            py.builtin.exec_(co, mod.__dict__)
+            # Normally, this attribute is 3.4+
+            mod.__spec__ = spec_from_file_location(name, co.co_filename, loader=self)
+            exec(co, mod.__dict__)
         except:  # noqa
             if name in sys.modules:
                 del sys.modules[name]
@@ -222,7 +310,7 @@ class AssertionRewritingHook(object):
 
     def is_package(self, name):
         try:
-            fd, fn, desc = imp.find_module(name)
+            fd, fn, desc = self._imp_find_module(name)
         except ImportError:
             return False
         if fd is not None:
@@ -230,24 +318,6 @@ class AssertionRewritingHook(object):
         tp = desc[2]
         return tp == imp.PKG_DIRECTORY
 
-    @classmethod
-    def _register_with_pkg_resources(cls):
-        """
-        Ensure package resources can be loaded from this loader. May be called
-        multiple times, as the operation is idempotent.
-        """
-        try:
-            import pkg_resources
-
-            # access an attribute in case a deferred importer is present
-            pkg_resources.__name__
-        except ImportError:
-            return
-
-        # Since pytest tests are always located in the file system, the
-        #  DefaultProvider is appropriate.
-        pkg_resources.register_loader_type(cls, pkg_resources.DefaultProvider)
-
     def get_data(self, pathname):
         """Optional PEP302 get_data API.
         """
@@ -264,9 +334,11 @@ def _write_pyc(state, co, source_stat, pyc):
     try:
         with atomicwrites.atomic_write(pyc, mode="wb", overwrite=True) as fp:
             fp.write(imp.get_magic())
-            mtime = int(source_stat.mtime)
+            # as of now, bytecode header expects 32-bit numbers for size and mtime (#4903)
+            mtime = int(source_stat.mtime) & 0xFFFFFFFF
             size = source_stat.size & 0xFFFFFFFF
-            fp.write(struct.pack("<ll", mtime, size))
+            # "<LL" stands for 2 unsigned longs, little-ending
+            fp.write(struct.pack("<LL", mtime, size))
             fp.write(marshal.dumps(co))
     except EnvironmentError as e:
         state.trace("error writing pyc file at %s: errno=%s" % (pyc, e.errno))
@@ -309,7 +381,7 @@ def _rewrite_test(config, fn):
         if (
             not source.startswith(BOM_UTF8)
             and cookie_re.match(source[0:end1]) is None
-            and cookie_re.match(source[end1 + 1:end2]) is None
+            and cookie_re.match(source[end1 + 1 : end2]) is None
         ):
             if hasattr(state, "_indecode"):
                 # encodings imported us again, so don't rewrite.
@@ -324,7 +396,7 @@ def _rewrite_test(config, fn):
             finally:
                 del state._indecode
     try:
-        tree = ast.parse(source)
+        tree = ast.parse(source, filename=fn.strpath)
     except SyntaxError:
         # Let this pop up again in the real import.
         state.trace("failed to parse: %r" % (fn,))
@@ -361,7 +433,7 @@ def _read_pyc(source, pyc, trace=lambda x: None):
         if (
             len(data) != 12
             or data[:4] != imp.get_magic()
-            or struct.unpack("<ll", data[4:]) != (mtime, size)
+            or struct.unpack("<LL", data[4:]) != (mtime & 0xFFFFFFFF, size & 0xFFFFFFFF)
         ):
             trace("_read_pyc(%s): invalid or out of date pyc" % source)
             return None
@@ -392,15 +464,15 @@ def _saferepr(obj):
     JSON reprs.
 
     """
-    repr = py.io.saferepr(obj)
-    if isinstance(repr, six.text_type):
-        t = six.text_type
-    else:
-        t = six.binary_type
-    return repr.replace(t("\n"), t("\\n"))
-
-
-from _pytest.assertion.util import format_explanation as _format_explanation  # noqa
+    r = saferepr(obj)
+    # only occurs in python2.x, repr must return text in python3+
+    if isinstance(r, bytes):
+        # Represent unprintable bytes as `\x##`
+        r = u"".join(
+            u"\\x{:x}".format(ord(c)) if c not in string.printable else c.decode()
+            for c in r
+        )
+    return r.replace(u"\n", u"\\n")
 
 
 def _format_assertmsg(obj):
@@ -408,40 +480,43 @@ def _format_assertmsg(obj):
 
     For strings this simply replaces newlines with '\n~' so that
     util.format_explanation() will preserve them instead of escaping
-    newlines.  For other objects py.io.saferepr() is used first.
+    newlines.  For other objects saferepr() is used first.
 
     """
     # reprlib appears to have a bug which means that if a string
     # contains a newline it gets escaped, however if an object has a
     # .__repr__() which contains newlines it does not get escaped.
     # However in either case we want to preserve the newline.
-    if isinstance(obj, six.text_type) or isinstance(obj, six.binary_type):
-        s = obj
-        is_repr = False
-    else:
-        s = py.io.saferepr(obj)
-        is_repr = True
-    if isinstance(s, six.text_type):
-        t = six.text_type
-    else:
-        t = six.binary_type
-    s = s.replace(t("\n"), t("\n~")).replace(t("%"), t("%%"))
-    if is_repr:
-        s = s.replace(t("\\n"), t("\n~"))
-    return s
+    replaces = [(u"\n", u"\n~"), (u"%", u"%%")]
+    if not isinstance(obj, six.string_types):
+        obj = saferepr(obj)
+        replaces.append((u"\\n", u"\n~"))
+
+    if isinstance(obj, bytes):
+        replaces = [(r1.encode(), r2.encode()) for r1, r2 in replaces]
+
+    for r1, r2 in replaces:
+        obj = obj.replace(r1, r2)
+
+    return obj
 
 
 def _should_repr_global_name(obj):
-    return not hasattr(obj, "__name__") and not callable(obj)
+    if callable(obj):
+        return False
+
+    try:
+        return not hasattr(obj, "__name__")
+    except Exception:
+        return True
 
 
 def _format_boolop(explanations, is_or):
     explanation = "(" + (is_or and " or " or " and ").join(explanations) + ")"
     if isinstance(explanation, six.text_type):
-        t = six.text_type
+        return explanation.replace(u"%", u"%%")
     else:
-        t = six.binary_type
-    return explanation.replace(t("%"), t("%%"))
+        return explanation.replace(b"%", b"%%")
 
 
 def _call_reprcompare(ops, results, expls, each_obj):
@@ -580,7 +655,7 @@ class AssertionRewriter(ast.NodeVisitor):
         # Insert some special imports at the top of the module but after any
         # docstrings and __future__ imports.
         aliases = [
-            ast.alias(py.builtin.builtins.__name__, "@py_builtins"),
+            ast.alias(six.moves.builtins.__name__, "@py_builtins"),
             ast.alias("_pytest.assertion.rewrite", "@pytest_ar"),
         ]
         doc = getattr(mod, "docstring", None)
@@ -631,10 +706,9 @@ class AssertionRewriter(ast.NodeVisitor):
                     setattr(node, name, new)
                 elif (
                     isinstance(field, ast.AST)
-                    and
                     # Don't recurse into expressions as they can't contain
                     # asserts.
-                    not isinstance(field, ast.expr)
+                    and not isinstance(field, ast.expr)
                 ):
                     nodes.append(field)
 
@@ -656,13 +730,13 @@ class AssertionRewriter(ast.NodeVisitor):
         return ast.Name(name, ast.Load())
 
     def display(self, expr):
-        """Call py.io.saferepr on the expression."""
-        return self.helper("saferepr", expr)
+        """Call saferepr on the expression."""
+        return self.helper("_saferepr", expr)
 
     def helper(self, name, *args):
         """Call a helper in this module."""
         py_name = ast.Name("@pytest_ar", ast.Load())
-        attr = ast.Attribute(py_name, "_" + name, ast.Load())
+        attr = ast.Attribute(py_name, name, ast.Load())
         return ast_Call(attr, list(args), [])
 
     def builtin(self, name):
@@ -731,13 +805,19 @@ class AssertionRewriter(ast.NodeVisitor):
         the expression is false.
 
         """
-        if isinstance(assert_.test, ast.Tuple) and self.config is not None:
-            fslocation = (self.module_path, assert_.lineno)
-            self.config.warn(
-                "R1",
-                "assertion is always true, perhaps " "remove parentheses?",
-                fslocation=fslocation,
+        if isinstance(assert_.test, ast.Tuple) and len(assert_.test.elts) >= 1:
+            from _pytest.warning_types import PytestAssertRewriteWarning
+            import warnings
+
+            warnings.warn_explicit(
+                PytestAssertRewriteWarning(
+                    "assertion is always true, perhaps remove parentheses?"
+                ),
+                category=None,
+                filename=str(self.module_path),
+                lineno=assert_.lineno,
             )
+
         self.statements = []
         self.variables = []
         self.variable_counter = itertools.count()
@@ -746,19 +826,26 @@ class AssertionRewriter(ast.NodeVisitor):
         self.push_format_context()
         # Rewrite assert into a bunch of statements.
         top_condition, explanation = self.visit(assert_.test)
+        # If in a test module, check if directly asserting None, in order to warn [Issue #3191]
+        if self.module_path is not None:
+            self.statements.append(
+                self.warn_about_none_ast(
+                    top_condition, module_path=self.module_path, lineno=assert_.lineno
+                )
+            )
         # Create failure message.
         body = self.on_failure
         negation = ast.UnaryOp(ast.Not(), top_condition)
         self.statements.append(ast.If(negation, body, []))
         if assert_.msg:
-            assertmsg = self.helper("format_assertmsg", assert_.msg)
+            assertmsg = self.helper("_format_assertmsg", assert_.msg)
             explanation = "\n>assert " + explanation
         else:
             assertmsg = ast.Str("")
             explanation = "assert " + explanation
         template = ast.BinOp(assertmsg, ast.Add(), ast.Str(explanation))
         msg = self.pop_format_context(template)
-        fmt = self.helper("format_explanation", msg)
+        fmt = self.helper("_format_explanation", msg)
         err_name = ast.Name("AssertionError", ast.Load())
         exc = ast_Call(err_name, [fmt], [])
         if sys.version_info[0] >= 3:
@@ -776,12 +863,39 @@ class AssertionRewriter(ast.NodeVisitor):
             set_location(stmt, assert_.lineno, assert_.col_offset)
         return self.statements
 
+    def warn_about_none_ast(self, node, module_path, lineno):
+        """
+        Returns an AST issuing a warning if the value of node is `None`.
+        This is used to warn the user when asserting a function that asserts
+        internally already.
+        See issue #3191 for more details.
+        """
+
+        # Using parse because it is different between py2 and py3.
+        AST_NONE = ast.parse("None").body[0].value
+        val_is_none = ast.Compare(node, [ast.Is()], [AST_NONE])
+        send_warning = ast.parse(
+            """
+from _pytest.warning_types import PytestAssertRewriteWarning
+from warnings import warn_explicit
+warn_explicit(
+    PytestAssertRewriteWarning('asserting the value None, please use "assert is None"'),
+    category=None,
+    filename={filename!r},
+    lineno={lineno},
+)
+            """.format(
+                filename=module_path.strpath, lineno=lineno
+            )
+        ).body
+        return ast.If(val_is_none, send_warning, [])
+
     def visit_Name(self, name):
         # Display the repr of the name if it's a local variable or
         # _should_repr_global_name() thinks it's acceptable.
         locs = ast_Call(self.builtin("locals"), [], [])
         inlocs = ast.Compare(ast.Str(name.id), [ast.In()], [locs])
-        dorepr = self.helper("should_repr_global_name", name)
+        dorepr = self.helper("_should_repr_global_name", name)
         test = ast.BoolOp(ast.Or(), [inlocs, dorepr])
         expr = ast.IfExp(test, self.display(name), ast.Str(name.id))
         return name, self.explanation_param(expr)
@@ -817,7 +931,7 @@ class AssertionRewriter(ast.NodeVisitor):
                 self.statements = body = inner
         self.statements = save
         self.on_failure = fail_save
-        expl_template = self.helper("format_boolop", expl_list, ast.Num(is_or))
+        expl_template = self.helper("_format_boolop", expl_list, ast.Num(is_or))
         expl = self.pop_format_context(expl_template)
         return ast.Name(res_var, ast.Load()), self.explanation_param(expl)
 
@@ -865,7 +979,8 @@ class AssertionRewriter(ast.NodeVisitor):
     def visit_Starred(self, starred):
         # From Python 3.5, a Starred node can appear in a function call
         res, expl = self.visit(starred.value)
-        return starred, "*" + expl
+        new_starred = ast.Starred(res, starred.ctx)
+        return new_starred, "*" + expl
 
     def visit_Call_legacy(self, call):
         """
@@ -941,7 +1056,7 @@ class AssertionRewriter(ast.NodeVisitor):
             left_res, left_expl = next_res, next_expl
         # Use pytest.assertion.util._reprcompare if that's available.
         expl_call = self.helper(
-            "call_reprcompare",
+            "_call_reprcompare",
             ast.Tuple(syms, ast.Load()),
             ast.Tuple(load_names, ast.Load()),
             ast.Tuple(expls, ast.Load()),
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/assertion/truncate.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/assertion/truncate.py
index 79adeca6a9a..525896ea9ad 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/assertion/truncate.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/assertion/truncate.py
@@ -1,15 +1,18 @@
+# -*- coding: utf-8 -*-
 """
 Utilities for truncating assertion output.
 
 Current default behaviour is to truncate assertion explanations at
 ~8 terminal lines, unless running in "-vv" mode or running on CI.
 """
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import os
 
 import six
 
-
 DEFAULT_MAX_LINES = 8
 DEFAULT_MAX_CHARS = 8 * 80
 USAGE_MSG = "use '-vv' to show"
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/assertion/util.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/assertion/util.py
index bcb800a4a07..c382f1c6091 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/assertion/util.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/assertion/util.py
@@ -1,13 +1,18 @@
+# -*- coding: utf-8 -*-
 """Utilities for assertion debugging"""
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import pprint
 
-import _pytest._code
-import py
 import six
-from ..compat import Sequence
 
-u = six.text_type
+import _pytest._code
+from ..compat import Sequence
+from _pytest import outcomes
+from _pytest._io.saferepr import saferepr
+from _pytest.compat import ATTRS_EQ_FIELD
 
 # The _reprcompare attribute on the util module is used by the new assertion
 # interpretation code and assertion rewriter to detect this plugin was
@@ -19,9 +24,9 @@ _reprcompare = None
 # the re-encoding is needed for python2 repr
 # with non-ascii characters (see issue 877 and 1379)
 def ecu(s):
-    try:
-        return u(s, "utf-8", "replace")
-    except TypeError:
+    if isinstance(s, bytes):
+        return s.decode("UTF-8", "replace")
+    else:
         return s
 
 
@@ -38,7 +43,7 @@ def format_explanation(explanation):
     explanation = ecu(explanation)
     lines = _split_explanation(explanation)
     result = _format_lines(lines)
-    return u("\n").join(result)
+    return u"\n".join(result)
 
 
 def _split_explanation(explanation):
@@ -48,7 +53,7 @@ def _split_explanation(explanation):
     Any other newlines will be escaped and appear in the line as the
     literal '\n' characters.
     """
-    raw_lines = (explanation or u("")).split("\n")
+    raw_lines = (explanation or u"").split("\n")
     lines = [raw_lines[0]]
     for values in raw_lines[1:]:
         if values and values[0] in ["{", "}", "~", ">"]:
@@ -73,13 +78,13 @@ def _format_lines(lines):
     for line in lines[1:]:
         if line.startswith("{"):
             if stackcnt[-1]:
-                s = u("and   ")
+                s = u"and   "
             else:
-                s = u("where ")
+                s = u"where "
             stack.append(len(result))
             stackcnt[-1] += 1
             stackcnt.append(0)
-            result.append(u(" +") + u("  ") * (len(stack) - 1) + s + line[1:])
+            result.append(u" +" + u"  " * (len(stack) - 1) + s + line[1:])
         elif line.startswith("}"):
             stack.pop()
             stackcnt.pop()
@@ -88,7 +93,7 @@ def _format_lines(lines):
             assert line[0] in ["~", ">"]
             stack[-1] += 1
             indent = len(stack) if line.startswith("~") else len(stack) - 1
-            result.append(u("  ") * indent + line[1:])
+            result.append(u"  " * indent + line[1:])
     assert len(stack) == 1
     return result
 
@@ -100,32 +105,45 @@ except NameError:
     basestring = str
 
 
+def issequence(x):
+    return isinstance(x, Sequence) and not isinstance(x, basestring)
+
+
+def istext(x):
+    return isinstance(x, basestring)
+
+
+def isdict(x):
+    return isinstance(x, dict)
+
+
+def isset(x):
+    return isinstance(x, (set, frozenset))
+
+
+def isdatacls(obj):
+    return getattr(obj, "__dataclass_fields__", None) is not None
+
+
+def isattrs(obj):
+    return getattr(obj, "__attrs_attrs__", None) is not None
+
+
+def isiterable(obj):
+    try:
+        iter(obj)
+        return not istext(obj)
+    except TypeError:
+        return False
+
+
 def assertrepr_compare(config, op, left, right):
     """Return specialised explanations for some operators/operands"""
     width = 80 - 15 - len(op) - 2  # 15 chars indentation, 1 space around op
-    left_repr = py.io.saferepr(left, maxsize=int(width // 2))
-    right_repr = py.io.saferepr(right, maxsize=width - len(left_repr))
+    left_repr = saferepr(left, maxsize=int(width // 2))
+    right_repr = saferepr(right, maxsize=width - len(left_repr))
 
-    summary = u("%s %s %s") % (ecu(left_repr), op, ecu(right_repr))
-
-    def issequence(x):
-        return isinstance(x, Sequence) and not isinstance(x, basestring)
-
-    def istext(x):
-        return isinstance(x, basestring)
-
-    def isdict(x):
-        return isinstance(x, dict)
-
-    def isset(x):
-        return isinstance(x, (set, frozenset))
-
-    def isiterable(obj):
-        try:
-            iter(obj)
-            return not istext(obj)
-        except TypeError:
-            return False
+    summary = u"%s %s %s" % (ecu(left_repr), op, ecu(right_repr))
 
     verbose = config.getoption("verbose")
     explanation = None
@@ -140,6 +158,11 @@ def assertrepr_compare(config, op, left, right):
                     explanation = _compare_eq_set(left, right, verbose)
                 elif isdict(left) and isdict(right):
                     explanation = _compare_eq_dict(left, right, verbose)
+                elif type(left) == type(right) and (isdatacls(left) or isattrs(left)):
+                    type_fn = (isdatacls, isattrs)
+                    explanation = _compare_eq_cls(left, right, verbose, type_fn)
+                elif verbose > 0:
+                    explanation = _compare_eq_verbose(left, right)
                 if isiterable(left) and isiterable(right):
                     expl = _compare_eq_iterable(left, right, verbose)
                     if explanation is not None:
@@ -149,13 +172,13 @@ def assertrepr_compare(config, op, left, right):
         elif op == "not in":
             if istext(left) and istext(right):
                 explanation = _notin_text(left, right, verbose)
+    except outcomes.Exit:
+        raise
     except Exception:
         explanation = [
-            u(
-                "(pytest_assertion plugin: representation of details failed.  "
-                "Probably an object has a faulty __repr__.)"
-            ),
-            u(_pytest._code.ExceptionInfo()),
+            u"(pytest_assertion plugin: representation of details failed.  "
+            u"Probably an object has a faulty __repr__.)",
+            six.text_type(_pytest._code.ExceptionInfo.from_current()),
         ]
 
     if not explanation:
@@ -164,8 +187,8 @@ def assertrepr_compare(config, op, left, right):
     return [summary] + explanation
 
 
-def _diff_text(left, right, verbose=False):
-    """Return the explanation for the diff between text or bytes
+def _diff_text(left, right, verbose=0):
+    """Return the explanation for the diff between text or bytes.
 
     Unless --verbose is used this will skip leading and trailing
     characters which are identical to keep the diff minimal.
@@ -187,11 +210,11 @@ def _diff_text(left, right, verbose=False):
         r = r.replace(r"\r", "\r")
         return r
 
-    if isinstance(left, six.binary_type):
+    if isinstance(left, bytes):
         left = escape_for_readable_diff(left)
-    if isinstance(right, six.binary_type):
+    if isinstance(right, bytes):
         right = escape_for_readable_diff(right)
-    if not verbose:
+    if verbose < 1:
         i = 0  # just in case left or right has zero length
         for i in range(min(len(left), len(right))):
             if left[i] != right[i]:
@@ -199,8 +222,7 @@ def _diff_text(left, right, verbose=False):
         if i > 42:
             i -= 10  # Provide some context
             explanation = [
-                u("Skipping %s identical leading " "characters in diff, use -v to show")
-                % i
+                u"Skipping %s identical leading characters in diff, use -v to show" % i
             ]
             left = left[i:]
             right = right[i:]
@@ -211,11 +233,8 @@ def _diff_text(left, right, verbose=False):
             if i > 42:
                 i -= 10  # Provide some context
                 explanation += [
-                    u(
-                        "Skipping %s identical trailing "
-                        "characters in diff, use -v to show"
-                    )
-                    % i
+                    u"Skipping {} identical trailing "
+                    u"characters in diff, use -v to show".format(i)
                 ]
                 left = left[:-i]
                 right = right[:-i]
@@ -231,108 +250,172 @@ def _diff_text(left, right, verbose=False):
     return explanation
 
 
-def _compare_eq_iterable(left, right, verbose=False):
+def _compare_eq_verbose(left, right):
+    keepends = True
+    left_lines = repr(left).splitlines(keepends)
+    right_lines = repr(right).splitlines(keepends)
+
+    explanation = []
+    explanation += [u"-" + line for line in left_lines]
+    explanation += [u"+" + line for line in right_lines]
+
+    return explanation
+
+
+def _compare_eq_iterable(left, right, verbose=0):
     if not verbose:
-        return [u("Use -v to get the full diff")]
+        return [u"Use -v to get the full diff"]
     # dynamic import to speedup pytest
     import difflib
 
     try:
         left_formatting = pprint.pformat(left).splitlines()
         right_formatting = pprint.pformat(right).splitlines()
-        explanation = [u("Full diff:")]
+        explanation = [u"Full diff:"]
     except Exception:
         # hack: PrettyPrinter.pformat() in python 2 fails when formatting items that can't be sorted(), ie, calling
         # sorted() on a list would raise. See issue #718.
         # As a workaround, the full diff is generated by using the repr() string of each item of each container.
         left_formatting = sorted(repr(x) for x in left)
         right_formatting = sorted(repr(x) for x in right)
-        explanation = [u("Full diff (fallback to calling repr on each item):")]
+        explanation = [u"Full diff (fallback to calling repr on each item):"]
     explanation.extend(
         line.strip() for line in difflib.ndiff(left_formatting, right_formatting)
     )
     return explanation
 
 
-def _compare_eq_sequence(left, right, verbose=False):
+def _compare_eq_sequence(left, right, verbose=0):
     explanation = []
-    for i in range(min(len(left), len(right))):
+    len_left = len(left)
+    len_right = len(right)
+    for i in range(min(len_left, len_right)):
         if left[i] != right[i]:
-            explanation += [u("At index %s diff: %r != %r") % (i, left[i], right[i])]
+            explanation += [u"At index %s diff: %r != %r" % (i, left[i], right[i])]
             break
-    if len(left) > len(right):
-        explanation += [
-            u("Left contains more items, first extra item: %s")
-            % py.io.saferepr(left[len(right)])
-        ]
-    elif len(left) < len(right):
-        explanation += [
-            u("Right contains more items, first extra item: %s")
-            % py.io.saferepr(right[len(left)])
-        ]
+    len_diff = len_left - len_right
+
+    if len_diff:
+        if len_diff > 0:
+            dir_with_more = "Left"
+            extra = saferepr(left[len_right])
+        else:
+            len_diff = 0 - len_diff
+            dir_with_more = "Right"
+            extra = saferepr(right[len_left])
+
+        if len_diff == 1:
+            explanation += [u"%s contains one more item: %s" % (dir_with_more, extra)]
+        else:
+            explanation += [
+                u"%s contains %d more items, first extra item: %s"
+                % (dir_with_more, len_diff, extra)
+            ]
     return explanation
 
 
-def _compare_eq_set(left, right, verbose=False):
+def _compare_eq_set(left, right, verbose=0):
     explanation = []
     diff_left = left - right
     diff_right = right - left
     if diff_left:
-        explanation.append(u("Extra items in the left set:"))
+        explanation.append(u"Extra items in the left set:")
         for item in diff_left:
-            explanation.append(py.io.saferepr(item))
+            explanation.append(saferepr(item))
     if diff_right:
-        explanation.append(u("Extra items in the right set:"))
+        explanation.append(u"Extra items in the right set:")
         for item in diff_right:
-            explanation.append(py.io.saferepr(item))
+            explanation.append(saferepr(item))
     return explanation
 
 
-def _compare_eq_dict(left, right, verbose=False):
+def _compare_eq_dict(left, right, verbose=0):
     explanation = []
-    common = set(left).intersection(set(right))
+    set_left = set(left)
+    set_right = set(right)
+    common = set_left.intersection(set_right)
     same = {k: left[k] for k in common if left[k] == right[k]}
     if same and verbose < 2:
-        explanation += [u("Omitting %s identical items, use -vv to show") % len(same)]
+        explanation += [u"Omitting %s identical items, use -vv to show" % len(same)]
     elif same:
-        explanation += [u("Common items:")]
+        explanation += [u"Common items:"]
         explanation += pprint.pformat(same).splitlines()
     diff = {k for k in common if left[k] != right[k]}
     if diff:
-        explanation += [u("Differing items:")]
+        explanation += [u"Differing items:"]
         for k in diff:
-            explanation += [
-                py.io.saferepr({k: left[k]}) + " != " + py.io.saferepr({k: right[k]})
-            ]
-    extra_left = set(left) - set(right)
-    if extra_left:
-        explanation.append(u("Left contains more items:"))
+            explanation += [saferepr({k: left[k]}) + " != " + saferepr({k: right[k]})]
+    extra_left = set_left - set_right
+    len_extra_left = len(extra_left)
+    if len_extra_left:
+        explanation.append(
+            u"Left contains %d more item%s:"
+            % (len_extra_left, "" if len_extra_left == 1 else "s")
+        )
         explanation.extend(
             pprint.pformat({k: left[k] for k in extra_left}).splitlines()
         )
-    extra_right = set(right) - set(left)
-    if extra_right:
-        explanation.append(u("Right contains more items:"))
+    extra_right = set_right - set_left
+    len_extra_right = len(extra_right)
+    if len_extra_right:
+        explanation.append(
+            u"Right contains %d more item%s:"
+            % (len_extra_right, "" if len_extra_right == 1 else "s")
+        )
         explanation.extend(
             pprint.pformat({k: right[k] for k in extra_right}).splitlines()
         )
     return explanation
 
 
-def _notin_text(term, text, verbose=False):
+def _compare_eq_cls(left, right, verbose, type_fns):
+    isdatacls, isattrs = type_fns
+    if isdatacls(left):
+        all_fields = left.__dataclass_fields__
+        fields_to_check = [field for field, info in all_fields.items() if info.compare]
+    elif isattrs(left):
+        all_fields = left.__attrs_attrs__
+        fields_to_check = [
+            field.name for field in all_fields if getattr(field, ATTRS_EQ_FIELD)
+        ]
+
+    same = []
+    diff = []
+    for field in fields_to_check:
+        if getattr(left, field) == getattr(right, field):
+            same.append(field)
+        else:
+            diff.append(field)
+
+    explanation = []
+    if same and verbose < 2:
+        explanation.append(u"Omitting %s identical items, use -vv to show" % len(same))
+    elif same:
+        explanation += [u"Matching attributes:"]
+        explanation += pprint.pformat(same).splitlines()
+    if diff:
+        explanation += [u"Differing attributes:"]
+        for field in diff:
+            explanation += [
+                (u"%s: %r != %r") % (field, getattr(left, field), getattr(right, field))
+            ]
+    return explanation
+
+
+def _notin_text(term, text, verbose=0):
     index = text.find(term)
     head = text[:index]
-    tail = text[index + len(term):]
+    tail = text[index + len(term) :]
     correct_text = head + tail
     diff = _diff_text(correct_text, text, verbose)
-    newdiff = [u("%s is contained here:") % py.io.saferepr(term, maxsize=42)]
+    newdiff = [u"%s is contained here:" % saferepr(term, maxsize=42)]
     for line in diff:
-        if line.startswith(u("Skipping")):
+        if line.startswith(u"Skipping"):
             continue
-        if line.startswith(u("- ")):
+        if line.startswith(u"- "):
             continue
-        if line.startswith(u("+ ")):
-            newdiff.append(u("  ") + line[2:])
+        if line.startswith(u"+ "):
+            newdiff.append(u"  " + line[2:])
         else:
             newdiff.append(line)
     return newdiff
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/cacheprovider.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/cacheprovider.py
index eb0fcc06f9b..f5c55454849 100755
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/cacheprovider.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/cacheprovider.py
@@ -1,43 +1,73 @@
+# -*- coding: utf-8 -*-
 """
 merged implementation of the cache provider
 
 the name cache was not chosen to ensure pluggy automatically
 ignores the external pytest-cache
 """
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
+import json
+import os
 from collections import OrderedDict
 
+import attr
 import py
 import six
 
 import pytest
-import json
-import os
-from os.path import sep as _sep, altsep as _altsep
+from .compat import _PY2 as PY2
+from .pathlib import Path
+from .pathlib import resolve_from_str
+from .pathlib import rm_rf
+
+README_CONTENT = u"""\
+# pytest cache directory #
+
+This directory contains data from the pytest's cache plugin,
+which provides the `--lf` and `--ff` options, as well as the `cache` fixture.
+
+**Do not** commit this to version control.
+
+See [the docs](https://docs.pytest.org/en/latest/cache.html) for more information.
+"""
+
+CACHEDIR_TAG_CONTENT = b"""\
+Signature: 8a477f597d28d172789f06886806bc55
+# This file is a cache directory tag created by pytest.
+# For information about cache directory tags, see:
+#	http://www.bford.info/cachedir/spec.html
+"""
 
 
+@attr.s
 class Cache(object):
+    _cachedir = attr.ib(repr=False)
+    _config = attr.ib(repr=False)
 
-    def __init__(self, config):
-        self.config = config
-        self._cachedir = Cache.cache_dir_from_config(config)
-        self.trace = config.trace.root.get("cache")
-        if config.getoption("cacheclear"):
-            self.trace("clearing cachedir")
-            if self._cachedir.check():
-                self._cachedir.remove()
-            self._cachedir.mkdir()
+    @classmethod
+    def for_config(cls, config):
+        cachedir = cls.cache_dir_from_config(config)
+        if config.getoption("cacheclear") and cachedir.exists():
+            rm_rf(cachedir)
+            cachedir.mkdir()
+        return cls(cachedir, config)
 
     @staticmethod
     def cache_dir_from_config(config):
-        cache_dir = config.getini("cache_dir")
-        cache_dir = os.path.expanduser(cache_dir)
-        cache_dir = os.path.expandvars(cache_dir)
-        if os.path.isabs(cache_dir):
-            return py.path.local(cache_dir)
-        else:
-            return config.rootdir.join(cache_dir)
+        return resolve_from_str(config.getini("cache_dir"), config.rootdir)
+
+    def warn(self, fmt, **args):
+        from _pytest.warnings import _issue_warning_captured
+        from _pytest.warning_types import PytestCacheWarning
+
+        _issue_warning_captured(
+            PytestCacheWarning(fmt.format(**args) if args else fmt),
+            self._config.hook,
+            stacklevel=3,
+        )
 
     def makedir(self, name):
         """ return a directory path object with the given name.  If the
@@ -49,12 +79,15 @@ class Cache(object):
              Make sure the name contains your plugin or application
              identifiers to prevent clashes with other cache users.
         """
-        if _sep in name or _altsep is not None and _altsep in name:
+        name = Path(name)
+        if len(name.parts) > 1:
             raise ValueError("name is not allowed to contain path separators")
-        return self._cachedir.ensure_dir("d", name)
+        res = self._cachedir.joinpath("d", name)
+        res.mkdir(exist_ok=True, parents=True)
+        return py.path.local(res)
 
     def _getvaluepath(self, key):
-        return self._cachedir.join("v", *key.split("/"))
+        return self._cachedir.joinpath("v", Path(key))
 
     def get(self, key, default):
         """ return cached value for the given key.  If no value
@@ -68,13 +101,11 @@ class Cache(object):
 
         """
         path = self._getvaluepath(key)
-        if path.check():
-            try:
-                with path.open("r") as f:
-                    return json.load(f)
-            except ValueError:
-                self.trace("cache-invalid at %s" % (path,))
-        return default
+        try:
+            with path.open("r") as f:
+                return json.load(f)
+        except (ValueError, IOError, OSError):
+            return default
 
     def set(self, key, value):
         """ save value for the given key.
@@ -87,23 +118,36 @@ class Cache(object):
         """
         path = self._getvaluepath(key)
         try:
-            path.dirpath().ensure_dir()
-        except (py.error.EEXIST, py.error.EACCES):
-            self.config.warn(
-                code="I9", message="could not create cache path %s" % (path,)
-            )
+            if path.parent.is_dir():
+                cache_dir_exists_already = True
+            else:
+                cache_dir_exists_already = self._cachedir.exists()
+                path.parent.mkdir(exist_ok=True, parents=True)
+        except (IOError, OSError):
+            self.warn("could not create cache path {path}", path=path)
             return
+        if not cache_dir_exists_already:
+            self._ensure_supporting_files()
         try:
-            f = path.open("w")
-        except py.error.ENOTDIR:
-            self.config.warn(
-                code="I9", message="cache could not write path %s" % (path,)
-            )
+            f = path.open("wb" if PY2 else "w")
+        except (IOError, OSError):
+            self.warn("cache could not write path {path}", path=path)
         else:
             with f:
-                self.trace("cache-write %s: %r" % (key, value))
                 json.dump(value, f, indent=2, sort_keys=True)
 
+    def _ensure_supporting_files(self):
+        """Create supporting files in the cache dir that are not really part of the cache."""
+        readme_path = self._cachedir / "README.md"
+        readme_path.write_text(README_CONTENT)
+
+        gitignore_path = self._cachedir.joinpath(".gitignore")
+        msg = u"# Created by pytest automatically.\n*"
+        gitignore_path.write_text(msg, encoding="UTF-8")
+
+        cachedir_tag_path = self._cachedir.joinpath("CACHEDIR.TAG")
+        cachedir_tag_path.write_bytes(CACHEDIR_TAG_CONTENT)
+
 
 class LFPlugin(object):
     """ Plugin which implements the --lf (run last-failing) option """
@@ -114,21 +158,37 @@ class LFPlugin(object):
         self.active = any(config.getoption(key) for key in active_keys)
         self.lastfailed = config.cache.get("cache/lastfailed", {})
         self._previously_failed_count = None
-        self._no_failures_behavior = self.config.getoption("last_failed_no_failures")
+        self._report_status = None
+        self._skipped_files = 0  # count skipped files during collection due to --lf
+
+    def last_failed_paths(self):
+        """Returns a set with all Paths()s of the previously failed nodeids (cached).
+        """
+        try:
+            return self._last_failed_paths
+        except AttributeError:
+            rootpath = Path(self.config.rootdir)
+            result = {rootpath / nodeid.split("::")[0] for nodeid in self.lastfailed}
+            result = {x for x in result if x.exists()}
+            self._last_failed_paths = result
+            return result
+
+    def pytest_ignore_collect(self, path):
+        """
+        Ignore this file path if we are in --lf mode and it is not in the list of
+        previously failed files.
+        """
+        if self.active and self.config.getoption("lf") and path.isfile():
+            last_failed_paths = self.last_failed_paths()
+            if last_failed_paths:
+                skip_it = Path(path) not in self.last_failed_paths()
+                if skip_it:
+                    self._skipped_files += 1
+                return skip_it
 
     def pytest_report_collectionfinish(self):
-        if self.active:
-            if not self._previously_failed_count:
-                mode = "run {} (no recorded failures)".format(
-                    self._no_failures_behavior
-                )
-            else:
-                noun = "failure" if self._previously_failed_count == 1 else "failures"
-                suffix = " first" if self.config.getoption("failedfirst") else ""
-                mode = "rerun previous {count} {noun}{suffix}".format(
-                    count=self._previously_failed_count, suffix=suffix, noun=noun
-                )
-            return "run-last-failure: %s" % mode
+        if self.active and self.config.getoption("verbose") >= 0:
+            return "run-last-failure: %s" % self._report_status
 
     def pytest_runtest_logreport(self, report):
         if (report.when == "call" and report.passed) or report.skipped:
@@ -146,28 +206,51 @@ class LFPlugin(object):
             self.lastfailed[report.nodeid] = True
 
     def pytest_collection_modifyitems(self, session, config, items):
-        if self.active:
-            if self.lastfailed:
-                previously_failed = []
-                previously_passed = []
-                for item in items:
-                    if item.nodeid in self.lastfailed:
-                        previously_failed.append(item)
-                    else:
-                        previously_passed.append(item)
-                self._previously_failed_count = len(previously_failed)
-                if not previously_failed:
-                    # running a subset of all tests with recorded failures outside
-                    # of the set of tests currently executing
-                    return
+        if not self.active:
+            return
+
+        if self.lastfailed:
+            previously_failed = []
+            previously_passed = []
+            for item in items:
+                if item.nodeid in self.lastfailed:
+                    previously_failed.append(item)
+                else:
+                    previously_passed.append(item)
+            self._previously_failed_count = len(previously_failed)
+
+            if not previously_failed:
+                # Running a subset of all tests with recorded failures
+                # only outside of it.
+                self._report_status = "%d known failures not in selected tests" % (
+                    len(self.lastfailed),
+                )
+            else:
                 if self.config.getoption("lf"):
                     items[:] = previously_failed
                     config.hook.pytest_deselected(items=previously_passed)
-                else:
+                else:  # --failedfirst
                     items[:] = previously_failed + previously_passed
-            elif self._no_failures_behavior == "none":
+
+                noun = "failure" if self._previously_failed_count == 1 else "failures"
+                suffix = " first" if self.config.getoption("failedfirst") else ""
+                self._report_status = "rerun previous {count} {noun}{suffix}".format(
+                    count=self._previously_failed_count, suffix=suffix, noun=noun
+                )
+
+            if self._skipped_files > 0:
+                files_noun = "file" if self._skipped_files == 1 else "files"
+                self._report_status += " (skipped {files} {files_noun})".format(
+                    files=self._skipped_files, files_noun=files_noun
+                )
+        else:
+            self._report_status = "no previously failed tests, "
+            if self.config.getoption("last_failed_no_failures") == "none":
+                self._report_status += "deselecting all items."
                 config.hook.pytest_deselected(items=items)
                 items[:] = []
+            else:
+                self._report_status += "not deselecting items."
 
     def pytest_sessionfinish(self, session):
         config = self.config
@@ -199,9 +282,7 @@ class NFPlugin(object):
 
             items[:] = self._get_increasing_order(
                 six.itervalues(new_items)
-            ) + self._get_increasing_order(
-                six.itervalues(other_items)
-            )
+            ) + self._get_increasing_order(six.itervalues(other_items))
         self.cached_nodeids = [x.nodeid for x in items if isinstance(x, pytest.Item)]
 
     def _get_increasing_order(self, items):
@@ -244,9 +325,13 @@ def pytest_addoption(parser):
     )
     group.addoption(
         "--cache-show",
-        action="store_true",
+        action="append",
+        nargs="?",
         dest="cacheshow",
-        help="show cache contents, don't perform collection or tests",
+        help=(
+            "show cache contents, don't perform collection or tests. "
+            "Optional argument: glob (default: '*')."
+        ),
     )
     group.addoption(
         "--cache-clear",
@@ -254,7 +339,10 @@ def pytest_addoption(parser):
         dest="cacheclear",
         help="remove all cache contents at start of test run.",
     )
-    parser.addini("cache_dir", default=".pytest_cache", help="cache directory path.")
+    cache_dir_default = ".pytest_cache"
+    if "TOX_ENV_DIR" in os.environ:
+        cache_dir_default = os.path.join(os.environ["TOX_ENV_DIR"], cache_dir_default)
+    parser.addini("cache_dir", default=cache_dir_default, help="cache directory path.")
     group.addoption(
         "--lfnf",
         "--last-failed-no-failures",
@@ -262,8 +350,7 @@ def pytest_addoption(parser):
         dest="last_failed_no_failures",
         choices=("all", "none"),
         default="all",
-        help="change the behavior when no test failed in the last run or no "
-        "information about the last failures was found in the cache",
+        help="which tests to run with no previously (known) failures.",
     )
 
 
@@ -276,7 +363,7 @@ def pytest_cmdline_main(config):
 
 @pytest.hookimpl(tryfirst=True)
 def pytest_configure(config):
-    config.cache = Cache(config)
+    config.cache = Cache.for_config(config)
     config.pluginmanager.register(LFPlugin(config), "lfplugin")
     config.pluginmanager.register(NFPlugin(config), "nfplugin")
 
@@ -298,42 +385,54 @@ def cache(request):
 
 
 def pytest_report_header(config):
-    if config.option.verbose:
-        relpath = py.path.local().bestrelpath(config.cache._cachedir)
-        return "cachedir: %s" % relpath
+    """Display cachedir with --cache-show and if non-default."""
+    if config.option.verbose > 0 or config.getini("cache_dir") != ".pytest_cache":
+        cachedir = config.cache._cachedir
+        # TODO: evaluate generating upward relative paths
+        # starting with .., ../.. if sensible
+
+        try:
+            displaypath = cachedir.relative_to(config.rootdir)
+        except ValueError:
+            displaypath = cachedir
+        return "cachedir: {}".format(displaypath)
 
 
 def cacheshow(config, session):
-    from pprint import pprint
+    from pprint import pformat
 
     tw = py.io.TerminalWriter()
     tw.line("cachedir: " + str(config.cache._cachedir))
-    if not config.cache._cachedir.check():
+    if not config.cache._cachedir.is_dir():
         tw.line("cache is empty")
         return 0
+
+    glob = config.option.cacheshow[0]
+    if glob is None:
+        glob = "*"
+
     dummy = object()
     basedir = config.cache._cachedir
-    vdir = basedir.join("v")
-    tw.sep("-", "cache values")
-    for valpath in sorted(vdir.visit(lambda x: x.isfile())):
-        key = valpath.relto(vdir).replace(valpath.sep, "/")
+    vdir = basedir / "v"
+    tw.sep("-", "cache values for %r" % glob)
+    for valpath in sorted(x for x in vdir.rglob(glob) if x.is_file()):
+        key = valpath.relative_to(vdir)
         val = config.cache.get(key, dummy)
         if val is dummy:
-            tw.line("%s contains unreadable content, " "will be ignored" % key)
+            tw.line("%s contains unreadable content, will be ignored" % key)
         else:
             tw.line("%s contains:" % key)
-            stream = py.io.TextIO()
-            pprint(val, stream=stream)
-            for line in stream.getvalue().splitlines():
+            for line in pformat(val).splitlines():
                 tw.line("  " + line)
 
-    ddir = basedir.join("d")
-    if ddir.isdir() and ddir.listdir():
-        tw.sep("-", "cache directories")
-        for p in sorted(basedir.join("d").visit()):
+    ddir = basedir / "d"
+    if ddir.is_dir():
+        contents = sorted(ddir.rglob(glob))
+        tw.sep("-", "cache directories for %r" % glob)
+        for p in contents:
             # if p.check(dir=1):
             #    print("%s/" % p.relto(basedir))
-            if p.isfile():
-                key = p.relto(basedir)
-                tw.line("%s is a file of length %d" % (key, p.size()))
+            if p.is_file():
+                key = p.relative_to(basedir)
+                tw.line("{} is a file of length {:d}".format(key, p.stat().st_size))
     return 0
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/capture.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/capture.py
index 7a57adb752a..68c17772f39 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/capture.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/capture.py
@@ -1,21 +1,25 @@
+# -*- coding: utf-8 -*-
 """
 per-test stdout/stderr capturing mechanism.
 
 """
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import collections
 import contextlib
-import sys
-import os
 import io
+import os
+import sys
 from io import UnsupportedOperation
 from tempfile import TemporaryFile
 
 import six
-import pytest
-from _pytest.compat import CaptureIO
 
+import pytest
+from _pytest.compat import _PY3
+from _pytest.compat import CaptureIO
 
 patchsysdict = {0: "stdin", 1: "stdout", 2: "stderr"}
 
@@ -53,18 +57,12 @@ def pytest_load_initial_conftests(early_config, parser, args):
     # make sure that capturemanager is properly reset at final shutdown
     early_config.add_cleanup(capman.stop_global_capturing)
 
-    # make sure logging does not raise exceptions at the end
-    def silence_logging_at_shutdown():
-        if "logging" in sys.modules:
-            sys.modules["logging"].raiseExceptions = False
-
-    early_config.add_cleanup(silence_logging_at_shutdown)
-
     # finally trigger conftest loading but while capturing (issue93)
     capman.start_global_capturing()
     outcome = yield
-    out, err = capman.suspend_global_capture()
+    capman.suspend_global_capture()
     if outcome.excinfo is not None:
+        out, err = capman.read_global_capture()
         sys.stdout.write(out)
         sys.stderr.write(err)
 
@@ -85,6 +83,14 @@ class CaptureManager(object):
     def __init__(self, method):
         self._method = method
         self._global_capturing = None
+        self._current_item = None
+
+    def __repr__(self):
+        return "<CaptureManager _method=%r _global_capturing=%r _current_item=%r>" % (
+            self._method,
+            self._global_capturing,
+            self._current_item,
+        )
 
     def _getcapture(self, method):
         if method == "fd":
@@ -93,8 +99,22 @@ class CaptureManager(object):
             return MultiCapture(out=True, err=True, Capture=SysCapture)
         elif method == "no":
             return MultiCapture(out=False, err=False, in_=False)
-        else:
-            raise ValueError("unknown capturing method: %r" % method)
+        raise ValueError("unknown capturing method: %r" % method)  # pragma: no cover
+
+    def is_capturing(self):
+        if self.is_globally_capturing():
+            return "global"
+        capture_fixture = getattr(self._current_item, "_capture_fixture", None)
+        if capture_fixture is not None:
+            return (
+                "fixture %s" % self._current_item._capture_fixture.request.fixturename
+            )
+        return False
+
+    # Global capturing control
+
+    def is_globally_capturing(self):
+        return self._method != "no"
 
     def start_global_capturing(self):
         assert self._global_capturing is None
@@ -108,18 +128,29 @@ class CaptureManager(object):
             self._global_capturing = None
 
     def resume_global_capture(self):
-        self._global_capturing.resume_capturing()
+        # During teardown of the python process, and on rare occasions, capture
+        # attributes can be `None` while trying to resume global capture.
+        if self._global_capturing is not None:
+            self._global_capturing.resume_capturing()
 
-    def suspend_global_capture(self, item=None, in_=False):
-        if item is not None:
-            self.deactivate_fixture(item)
+    def suspend_global_capture(self, in_=False):
         cap = getattr(self, "_global_capturing", None)
         if cap is not None:
-            try:
-                outerr = cap.readouterr()
-            finally:
-                cap.suspend_capturing(in_=in_)
-            return outerr
+            cap.suspend_capturing(in_=in_)
+
+    def suspend(self, in_=False):
+        # Need to undo local capsys-et-al if it exists before disabling global capture.
+        self.suspend_fixture(self._current_item)
+        self.suspend_global_capture(in_)
+
+    def resume(self):
+        self.resume_global_capture()
+        self.resume_fixture(self._current_item)
+
+    def read_global_capture(self):
+        return self._global_capturing.readouterr()
+
+    # Fixture Control (it's just forwarding, think about removing this later)
 
     def activate_fixture(self, item):
         """If the current item is using ``capsys`` or ``capfd``, activate them so they take precedence over
@@ -135,12 +166,50 @@ class CaptureManager(object):
         if fixture is not None:
             fixture.close()
 
+    def suspend_fixture(self, item):
+        fixture = getattr(item, "_capture_fixture", None)
+        if fixture is not None:
+            fixture._suspend()
+
+    def resume_fixture(self, item):
+        fixture = getattr(item, "_capture_fixture", None)
+        if fixture is not None:
+            fixture._resume()
+
+    # Helper context managers
+
+    @contextlib.contextmanager
+    def global_and_fixture_disabled(self):
+        """Context manager to temporarily disable global and current fixture capturing."""
+        self.suspend()
+        try:
+            yield
+        finally:
+            self.resume()
+
+    @contextlib.contextmanager
+    def item_capture(self, when, item):
+        self.resume_global_capture()
+        self.activate_fixture(item)
+        try:
+            yield
+        finally:
+            self.deactivate_fixture(item)
+            self.suspend_global_capture(in_=False)
+
+        out, err = self.read_global_capture()
+        item.add_report_section(when, "stdout", out)
+        item.add_report_section(when, "stderr", err)
+
+    # Hooks
+
     @pytest.hookimpl(hookwrapper=True)
     def pytest_make_collect_report(self, collector):
         if isinstance(collector, pytest.File):
             self.resume_global_capture()
             outcome = yield
-            out, err = self.suspend_global_capture()
+            self.suspend_global_capture()
+            out, err = self.read_global_capture()
             rep = outcome.get_result()
             if out:
                 rep.sections.append(("Captured stdout", out))
@@ -150,29 +219,25 @@ class CaptureManager(object):
             yield
 
     @pytest.hookimpl(hookwrapper=True)
-    def pytest_runtest_setup(self, item):
-        self.resume_global_capture()
-        # no need to activate a capture fixture because they activate themselves during creation; this
-        # only makes sense when a fixture uses a capture fixture, otherwise the capture fixture will
-        # be activated during pytest_runtest_call
+    def pytest_runtest_protocol(self, item):
+        self._current_item = item
         yield
-        self.suspend_capture_item(item, "setup")
+        self._current_item = None
+
+    @pytest.hookimpl(hookwrapper=True)
+    def pytest_runtest_setup(self, item):
+        with self.item_capture("setup", item):
+            yield
 
     @pytest.hookimpl(hookwrapper=True)
     def pytest_runtest_call(self, item):
-        self.resume_global_capture()
-        # it is important to activate this fixture during the call phase so it overwrites the "global"
-        # capture
-        self.activate_fixture(item)
-        yield
-        self.suspend_capture_item(item, "call")
+        with self.item_capture("call", item):
+            yield
 
     @pytest.hookimpl(hookwrapper=True)
     def pytest_runtest_teardown(self, item):
-        self.resume_global_capture()
-        self.activate_fixture(item)
-        yield
-        self.suspend_capture_item(item, "teardown")
+        with self.item_capture("teardown", item):
+            yield
 
     @pytest.hookimpl(tryfirst=True)
     def pytest_keyboard_interrupt(self, excinfo):
@@ -182,11 +247,6 @@ class CaptureManager(object):
     def pytest_internalerror(self, excinfo):
         self.stop_global_capturing()
 
-    def suspend_capture_item(self, item, when, in_=False):
-        out, err = self.suspend_global_capture(item, in_=in_)
-        item.add_report_section(when, "stdout", out)
-        item.add_report_section(when, "stderr", err)
-
 
 capture_fixtures = {"capfd", "capfdbinary", "capsys", "capsysbinary"}
 
@@ -203,10 +263,11 @@ def _ensure_only_one_capture_fixture(request, name):
 
 @pytest.fixture
 def capsys(request):
-    """Enable capturing of writes to ``sys.stdout`` and ``sys.stderr`` and make
-    captured output available via ``capsys.readouterr()`` method calls
-    which return a ``(out, err)`` namedtuple.  ``out`` and ``err`` will be ``text``
-    objects.
+    """Enable text capturing of writes to ``sys.stdout`` and ``sys.stderr``.
+
+    The captured output is made available via ``capsys.readouterr()`` method
+    calls, which return a ``(out, err)`` namedtuple.
+    ``out`` and ``err`` will be ``text`` objects.
     """
     _ensure_only_one_capture_fixture(request, "capsys")
     with _install_capture_fixture_on_item(request, SysCapture) as fixture:
@@ -215,26 +276,28 @@ def capsys(request):
 
 @pytest.fixture
 def capsysbinary(request):
-    """Enable capturing of writes to ``sys.stdout`` and ``sys.stderr`` and make
-    captured output available via ``capsys.readouterr()`` method calls
-    which return a ``(out, err)`` tuple.  ``out`` and ``err`` will be ``bytes``
-    objects.
+    """Enable bytes capturing of writes to ``sys.stdout`` and ``sys.stderr``.
+
+    The captured output is made available via ``capsysbinary.readouterr()``
+    method calls, which return a ``(out, err)`` namedtuple.
+    ``out`` and ``err`` will be ``bytes`` objects.
     """
     _ensure_only_one_capture_fixture(request, "capsysbinary")
     # Currently, the implementation uses the python3 specific `.buffer`
     # property of CaptureIO.
     if sys.version_info < (3,):
-        raise request.raiseerror("capsysbinary is only supported on python 3")
+        raise request.raiseerror("capsysbinary is only supported on Python 3")
     with _install_capture_fixture_on_item(request, SysCaptureBinary) as fixture:
         yield fixture
 
 
 @pytest.fixture
 def capfd(request):
-    """Enable capturing of writes to file descriptors ``1`` and ``2`` and make
-    captured output available via ``capfd.readouterr()`` method calls
-    which return a ``(out, err)`` tuple.  ``out`` and ``err`` will be ``text``
-    objects.
+    """Enable text capturing of writes to file descriptors ``1`` and ``2``.
+
+    The captured output is made available via ``capfd.readouterr()`` method
+    calls, which return a ``(out, err)`` namedtuple.
+    ``out`` and ``err`` will be ``text`` objects.
     """
     _ensure_only_one_capture_fixture(request, "capfd")
     if not hasattr(os, "dup"):
@@ -247,10 +310,11 @@ def capfd(request):
 
 @pytest.fixture
 def capfdbinary(request):
-    """Enable capturing of write to file descriptors 1 and 2 and make
-    captured output available via ``capfdbinary.readouterr`` method calls
-    which return a ``(out, err)`` tuple.  ``out`` and ``err`` will be
-    ``bytes`` objects.
+    """Enable bytes capturing of writes to file descriptors ``1`` and ``2``.
+
+    The captured output is made available via ``capfd.readouterr()`` method
+    calls, which return a ``(out, err)`` namedtuple.
+    ``out`` and ``err`` will be ``byte`` objects.
     """
     _ensure_only_one_capture_fixture(request, "capfdbinary")
     if not hasattr(os, "dup"):
@@ -272,9 +336,9 @@ def _install_capture_fixture_on_item(request, capture_class):
     """
     request.node._capture_fixture = fixture = CaptureFixture(capture_class, request)
     capmanager = request.config.pluginmanager.getplugin("capturemanager")
-    # need to active this fixture right away in case it is being used by another fixture (setup phase)
-    # if this fixture is being used only by a test function (call phase), then we wouldn't need this
-    # activation, but it doesn't hurt
+    # Need to active this fixture right away in case it is being used by another fixture (setup phase).
+    # If this fixture is being used only by a test function (call phase), then we wouldn't need this
+    # activation, but it doesn't hurt.
     capmanager.activate_fixture(request.node)
     yield fixture
     fixture.close()
@@ -290,40 +354,55 @@ class CaptureFixture(object):
     def __init__(self, captureclass, request):
         self.captureclass = captureclass
         self.request = request
+        self._capture = None
+        self._captured_out = self.captureclass.EMPTY_BUFFER
+        self._captured_err = self.captureclass.EMPTY_BUFFER
 
     def _start(self):
-        self._capture = MultiCapture(
-            out=True, err=True, in_=False, Capture=self.captureclass
-        )
-        self._capture.start_capturing()
+        if self._capture is None:
+            self._capture = MultiCapture(
+                out=True, err=True, in_=False, Capture=self.captureclass
+            )
+            self._capture.start_capturing()
 
     def close(self):
-        cap = self.__dict__.pop("_capture", None)
-        if cap is not None:
-            self._outerr = cap.pop_outerr_to_orig()
-            cap.stop_capturing()
+        if self._capture is not None:
+            out, err = self._capture.pop_outerr_to_orig()
+            self._captured_out += out
+            self._captured_err += err
+            self._capture.stop_capturing()
+            self._capture = None
 
     def readouterr(self):
         """Read and return the captured output so far, resetting the internal buffer.
 
-        :return: captured content as a namedtuple with  ``out`` and ``err`` string attributes
+        :return: captured content as a namedtuple with ``out`` and ``err`` string attributes
         """
-        try:
-            return self._capture.readouterr()
-        except AttributeError:
-            return self._outerr
+        captured_out, captured_err = self._captured_out, self._captured_err
+        if self._capture is not None:
+            out, err = self._capture.readouterr()
+            captured_out += out
+            captured_err += err
+        self._captured_out = self.captureclass.EMPTY_BUFFER
+        self._captured_err = self.captureclass.EMPTY_BUFFER
+        return CaptureResult(captured_out, captured_err)
+
+    def _suspend(self):
+        """Suspends this fixture's own capturing temporarily."""
+        if self._capture is not None:
+            self._capture.suspend_capturing()
+
+    def _resume(self):
+        """Resumes this fixture's own capturing temporarily."""
+        if self._capture is not None:
+            self._capture.resume_capturing()
 
     @contextlib.contextmanager
     def disabled(self):
         """Temporarily disables capture while inside the 'with' block."""
-        self._capture.suspend_capturing()
         capmanager = self.request.config.pluginmanager.getplugin("capturemanager")
-        capmanager.suspend_global_capture(item=None, in_=False)
-        try:
+        with capmanager.global_and_fixture_disabled():
             yield
-        finally:
-            capmanager.resume_global_capture()
-            self._capture.resume_capturing()
 
 
 def safe_text_dupfile(f, mode, default_encoding="UTF8"):
@@ -355,6 +434,10 @@ class EncodedFile(object):
     def write(self, obj):
         if isinstance(obj, six.text_type):
             obj = obj.encode(self.encoding, "replace")
+        elif _PY3:
+            raise TypeError(
+                "write() argument must be str, not {}".format(type(obj).__name__)
+            )
         self.buffer.write(obj)
 
     def writelines(self, linelist):
@@ -366,6 +449,10 @@ class EncodedFile(object):
         """Ensure that file.name is a string."""
         return repr(self.buffer)
 
+    @property
+    def mode(self):
+        return self.buffer.mode.replace("b", "")
+
     def __getattr__(self, name):
         return getattr(object.__getattribute__(self, "buffer"), name)
 
@@ -375,6 +462,7 @@ CaptureResult = collections.namedtuple("CaptureResult", ["out", "err"])
 
 class MultiCapture(object):
     out = err = in_ = None
+    _state = None
 
     def __init__(self, out=True, err=True, in_=True, Capture=None):
         if in_:
@@ -384,7 +472,17 @@ class MultiCapture(object):
         if err:
             self.err = Capture(2)
 
+    def __repr__(self):
+        return "<MultiCapture out=%r err=%r in_=%r _state=%r _in_suspended=%r>" % (
+            self.out,
+            self.err,
+            self.in_,
+            self._state,
+            getattr(self, "_in_suspended", "<UNSET>"),
+        )
+
     def start_capturing(self):
+        self._state = "started"
         if self.in_:
             self.in_.start()
         if self.out:
@@ -402,6 +500,7 @@ class MultiCapture(object):
         return out, err
 
     def suspend_capturing(self, in_=False):
+        self._state = "suspended"
         if self.out:
             self.out.suspend()
         if self.err:
@@ -411,6 +510,7 @@ class MultiCapture(object):
             self._in_suspended = True
 
     def resume_capturing(self):
+        self._state = "resumed"
         if self.out:
             self.out.resume()
         if self.err:
@@ -421,9 +521,9 @@ class MultiCapture(object):
 
     def stop_capturing(self):
         """ stop capturing and reset capturing streams """
-        if hasattr(self, "_reset"):
+        if self._state == "stopped":
             raise ValueError("was already stopped")
-        self._reset = True
+        self._state = "stopped"
         if self.out:
             self.out.done()
         if self.err:
@@ -440,6 +540,7 @@ class MultiCapture(object):
 
 
 class NoCapture(object):
+    EMPTY_BUFFER = None
     __init__ = start = done = suspend = resume = lambda *args: None
 
 
@@ -449,6 +550,9 @@ class FDCaptureBinary(object):
     snap() produces `bytes`
     """
 
+    EMPTY_BUFFER = b""
+    _state = None
+
     def __init__(self, targetfd, tmpfile=None):
         self.targetfd = targetfd
         try:
@@ -474,7 +578,11 @@ class FDCaptureBinary(object):
             self.tmpfile_fd = tmpfile.fileno()
 
     def __repr__(self):
-        return "<FDCapture %s oldfd=%s>" % (self.targetfd, self.targetfd_save)
+        return "<FDCapture %s oldfd=%s _state=%r>" % (
+            self.targetfd,
+            getattr(self, "targetfd_save", None),
+            self._state,
+        )
 
     def start(self):
         """ Start capturing on targetfd using memorized tmpfile. """
@@ -484,6 +592,7 @@ class FDCaptureBinary(object):
             raise ValueError("saved filedescriptor not valid anymore")
         os.dup2(self.tmpfile_fd, self.targetfd)
         self.syscapture.start()
+        self._state = "started"
 
     def snap(self):
         self.tmpfile.seek(0)
@@ -500,14 +609,17 @@ class FDCaptureBinary(object):
         os.close(targetfd_save)
         self.syscapture.done()
         _attempt_to_close_capture_file(self.tmpfile)
+        self._state = "done"
 
     def suspend(self):
         self.syscapture.suspend()
         os.dup2(self.targetfd_save, self.targetfd)
+        self._state = "suspended"
 
     def resume(self):
         self.syscapture.resume()
         os.dup2(self.tmpfile_fd, self.targetfd)
+        self._state = "resumed"
 
     def writeorg(self, data):
         """ write to original file descriptor. """
@@ -522,8 +634,10 @@ class FDCapture(FDCaptureBinary):
     snap() produces text
     """
 
+    EMPTY_BUFFER = str()
+
     def snap(self):
-        res = FDCaptureBinary.snap(self)
+        res = super(FDCapture, self).snap()
         enc = getattr(self.tmpfile, "encoding", None)
         if enc and isinstance(res, bytes):
             res = six.text_type(res, enc, "replace")
@@ -532,6 +646,9 @@ class FDCapture(FDCaptureBinary):
 
 class SysCapture(object):
 
+    EMPTY_BUFFER = str()
+    _state = None
+
     def __init__(self, fd, tmpfile=None):
         name = patchsysdict[fd]
         self._old = getattr(sys, name)
@@ -543,8 +660,17 @@ class SysCapture(object):
                 tmpfile = CaptureIO()
         self.tmpfile = tmpfile
 
+    def __repr__(self):
+        return "<SysCapture %s _old=%r, tmpfile=%r _state=%r>" % (
+            self.name,
+            self._old,
+            self.tmpfile,
+            self._state,
+        )
+
     def start(self):
         setattr(sys, self.name, self.tmpfile)
+        self._state = "started"
 
     def snap(self):
         res = self.tmpfile.getvalue()
@@ -556,12 +682,15 @@ class SysCapture(object):
         setattr(sys, self.name, self._old)
         del self._old
         _attempt_to_close_capture_file(self.tmpfile)
+        self._state = "done"
 
     def suspend(self):
         setattr(sys, self.name, self._old)
+        self._state = "suspended"
 
     def resume(self):
         setattr(sys, self.name, self.tmpfile)
+        self._state = "resumed"
 
     def writeorg(self, data):
         self._old.write(data)
@@ -569,6 +698,7 @@ class SysCapture(object):
 
 
 class SysCaptureBinary(SysCapture):
+    EMPTY_BUFFER = b""
 
     def snap(self):
         res = self.tmpfile.buffer.getvalue()
@@ -598,7 +728,7 @@ class DontReadFromInput(six.Iterator):
         return self
 
     def fileno(self):
-        raise UnsupportedOperation("redirected stdin is pseudofile, " "has no fileno()")
+        raise UnsupportedOperation("redirected stdin is pseudofile, has no fileno()")
 
     def isatty(self):
         return False
@@ -623,13 +753,11 @@ def _colorama_workaround():
     first import of colorama while I/O capture is active, colorama will
     fail in various ways.
     """
-
-    if not sys.platform.startswith("win32"):
-        return
-    try:
-        import colorama  # noqa
-    except ImportError:
-        pass
+    if sys.platform.startswith("win32"):
+        try:
+            import colorama  # noqa: F401
+        except ImportError:
+            pass
 
 
 def _readline_workaround():
@@ -650,13 +778,11 @@ def _readline_workaround():
 
     See https://github.com/pytest-dev/pytest/pull/1281
     """
-
-    if not sys.platform.startswith("win32"):
-        return
-    try:
-        import readline  # noqa
-    except ImportError:
-        pass
+    if sys.platform.startswith("win32"):
+        try:
+            import readline  # noqa: F401
+        except ImportError:
+            pass
 
 
 def _py36_windowsconsoleio_workaround(stream):
@@ -708,9 +834,9 @@ def _py36_windowsconsoleio_workaround(stream):
             f.line_buffering,
         )
 
-    sys.__stdin__ = sys.stdin = _reopen_stdio(sys.stdin, "rb")
-    sys.__stdout__ = sys.stdout = _reopen_stdio(sys.stdout, "wb")
-    sys.__stderr__ = sys.stderr = _reopen_stdio(sys.stderr, "wb")
+    sys.stdin = _reopen_stdio(sys.stdin, "rb")
+    sys.stdout = _reopen_stdio(sys.stdout, "wb")
+    sys.stderr = _reopen_stdio(sys.stderr, "wb")
 
 
 def _attempt_to_close_capture_file(f):
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/compat.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/compat.py
index 7abd3d53ff9..d0add530268 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/compat.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/compat.py
@@ -1,20 +1,27 @@
+# -*- coding: utf-8 -*-
 """
 python version compatibility code
 """
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import codecs
 import functools
 import inspect
 import re
 import sys
+from contextlib import contextmanager
 
+import attr
 import py
+import six
+from six import text_type
 
 import _pytest
+from _pytest._io.saferepr import saferepr
+from _pytest.outcomes import fail
 from _pytest.outcomes import TEST_OUTCOME
-from six import text_type
-import six
 
 try:
     import enum
@@ -22,7 +29,6 @@ except ImportError:  # pragma: no cover
     # Only available in Python 3.4+ or as a backport
     enum = None
 
-
 _PY3 = sys.version_info > (3, 0)
 _PY2 = not _PY3
 
@@ -32,21 +38,34 @@ if _PY3:
 else:
     from funcsigs import signature, Parameter as Parameter
 
-
-NoneType = type(None)
 NOTSET = object()
 
 PY35 = sys.version_info[:2] >= (3, 5)
 PY36 = sys.version_info[:2] >= (3, 6)
 MODULE_NOT_FOUND_ERROR = "ModuleNotFoundError" if PY36 else "ImportError"
 
+
 if _PY3:
-    from collections.abc import MutableMapping as MappingMixin  # noqa
-    from collections.abc import Mapping, Sequence  # noqa
+    from collections.abc import MutableMapping as MappingMixin
+    from collections.abc import Iterable, Mapping, Sequence, Sized
 else:
     # those raise DeprecationWarnings in Python >=3.7
     from collections import MutableMapping as MappingMixin  # noqa
-    from collections import Mapping, Sequence  # noqa
+    from collections import Iterable, Mapping, Sequence, Sized  # noqa
+
+
+if sys.version_info >= (3, 4):
+    from importlib.util import spec_from_file_location
+else:
+
+    def spec_from_file_location(*_, **__):
+        return None
+
+
+if sys.version_info >= (3, 8):
+    from importlib import metadata as importlib_metadata  # noqa
+else:
+    import importlib_metadata  # noqa
 
 
 def _format_args(func):
@@ -72,16 +91,13 @@ def iscoroutinefunction(func):
     Note: copied and modified from Python 3.5's builtin couroutines.py to avoid import asyncio directly,
     which in turns also initializes the "logging" module as side-effect (see issue #8).
     """
-    return (
-        getattr(func, "_is_coroutine", False)
-        or (
-            hasattr(inspect, "iscoroutinefunction")
-            and inspect.iscoroutinefunction(func)
-        )
+    return getattr(func, "_is_coroutine", False) or (
+        hasattr(inspect, "iscoroutinefunction") and inspect.iscoroutinefunction(func)
     )
 
 
 def getlocation(function, curdir):
+    function = get_real_func(function)
     fn = py.path.local(inspect.getfile(function))
     lineno = function.__code__.co_firstlineno
     if fn.relto(curdir):
@@ -126,9 +142,17 @@ def getfuncargnames(function, is_method=False, cls=None):
     # ordered mapping of parameter names to Parameter instances.  This
     # creates a tuple of the names of the parameters that don't have
     # defaults.
+    try:
+        parameters = signature(function).parameters
+    except (ValueError, TypeError) as e:
+        fail(
+            "Could not determine arguments of {!r}: {}".format(function, e),
+            pytrace=False,
+        )
+
     arg_names = tuple(
         p.name
-        for p in signature(function).parameters.values()
+        for p in parameters.values()
         if (
             p.kind is Parameter.POSITIONAL_OR_KEYWORD
             or p.kind is Parameter.KEYWORD_ONLY
@@ -138,20 +162,23 @@ def getfuncargnames(function, is_method=False, cls=None):
     # If this function should be treated as a bound method even though
     # it's passed as an unbound method or function, remove the first
     # parameter name.
-    if (
-        is_method
-        or (
-            cls
-            and not isinstance(cls.__dict__.get(function.__name__, None), staticmethod)
-        )
+    if is_method or (
+        cls and not isinstance(cls.__dict__.get(function.__name__, None), staticmethod)
     ):
         arg_names = arg_names[1:]
     # Remove any names that will be replaced with mocks.
     if hasattr(function, "__wrapped__"):
-        arg_names = arg_names[num_mock_patch_args(function):]
+        arg_names = arg_names[num_mock_patch_args(function) :]
     return arg_names
 
 
+@contextmanager
+def dummy_context_manager():
+    """Context manager that does nothing, useful in situations where you might need an actual context manager or not
+    depending on some condition. Using this allow to keep the same code"""
+    yield
+
+
 def get_default_arg_names(function):
     # Note: this code intentionally mirrors the code at the beginning of getfuncargnames,
     # to get the arguments which were excluded from its result because they had default values
@@ -163,6 +190,18 @@ def get_default_arg_names(function):
     )
 
 
+_non_printable_ascii_translate_table = {
+    i: u"\\x{:02x}".format(i) for i in range(128) if i not in range(32, 127)
+}
+_non_printable_ascii_translate_table.update(
+    {ord("\t"): u"\\t", ord("\r"): u"\\r", ord("\n"): u"\\n"}
+)
+
+
+def _translate_non_printable(s):
+    return s.translate(_non_printable_ascii_translate_table)
+
+
 if _PY3:
     STRING_TYPES = bytes, str
     UNICODE_TYPES = six.text_type
@@ -202,9 +241,10 @@ if _PY3:
 
         """
         if isinstance(val, bytes):
-            return _bytes_to_ascii(val)
+            ret = _bytes_to_ascii(val)
         else:
-            return val.encode("unicode_escape").decode("ascii")
+            ret = val.encode("unicode_escape").decode("ascii")
+        return _translate_non_printable(ret)
 
 
 else:
@@ -222,11 +262,24 @@ else:
         """
         if isinstance(val, bytes):
             try:
-                return val.encode("ascii")
+                ret = val.decode("ascii")
             except UnicodeDecodeError:
-                return val.encode("string-escape")
+                ret = val.encode("string-escape").decode("ascii")
         else:
-            return val.encode("unicode-escape")
+            ret = val.encode("unicode-escape").decode("ascii")
+        return _translate_non_printable(ret)
+
+
+class _PytestWrapper(object):
+    """Dummy wrapper around a function object for internal use only.
+
+    Used to correctly unwrap the underlying function object
+    when we are creating fixtures, because we wrap the function object ourselves with a decorator
+    to issue warnings when the fixture function is called directly.
+    """
+
+    def __init__(self, obj):
+        self.obj = obj
 
 
 def get_real_func(obj):
@@ -235,14 +288,21 @@ def get_real_func(obj):
     """
     start_obj = obj
     for i in range(100):
+        # __pytest_wrapped__ is set by @pytest.fixture when wrapping the fixture function
+        # to trigger a warning if it gets called directly instead of by pytest: we don't
+        # want to unwrap further than this otherwise we lose useful wrappings like @mock.patch (#3774)
+        new_obj = getattr(obj, "__pytest_wrapped__", None)
+        if isinstance(new_obj, _PytestWrapper):
+            obj = new_obj.obj
+            break
         new_obj = getattr(obj, "__wrapped__", None)
         if new_obj is None:
             break
         obj = new_obj
     else:
         raise ValueError(
-            ("could not find real function of {start}" "\nstopped at {current}").format(
-                start=py.io.saferepr(start_obj), current=py.io.saferepr(obj)
+            ("could not find real function of {start}\nstopped at {current}").format(
+                start=saferepr(start_obj), current=saferepr(obj)
             )
         )
     if isinstance(obj, functools.partial):
@@ -250,6 +310,21 @@ def get_real_func(obj):
     return obj
 
 
+def get_real_method(obj, holder):
+    """
+    Attempts to obtain the real function object that might be wrapping ``obj``, while at the same time
+    returning a bound method to ``holder`` if the original object was a bound method.
+    """
+    try:
+        is_method = hasattr(obj, "__func__")
+        obj = get_real_func(obj)
+    except Exception:
+        return obj
+    if is_method and hasattr(obj, "__get__") and callable(obj.__get__):
+        obj = obj.__get__(holder)
+    return obj
+
+
 def getfslineno(obj):
     # xxx let decorators etc specify a sane ordering
     obj = get_real_func(obj)
@@ -281,6 +356,14 @@ def safe_getattr(object, name, default):
         return default
 
 
+def safe_isclass(obj):
+    """Ignore any exception via isinstance on Python 3."""
+    try:
+        return isclass(obj)
+    except Exception:
+        return False
+
+
 def _is_unittest_unexpected_success_a_failure():
     """Return if the test suite should fail if an @expectedFailure unittest test PASSES.
 
@@ -301,7 +384,7 @@ if _PY3:
 else:
 
     def safe_str(v):
-        """returns v as string, converting to ascii if necessary"""
+        """returns v as string, converting to utf-8 if necessary"""
         try:
             return str(v)
         except UnicodeError:
@@ -314,7 +397,6 @@ else:
 COLLECT_FAKEMODULE_ATTRIBUTES = (
     "Collector",
     "Module",
-    "Generator",
     "Function",
     "Instance",
     "Session",
@@ -331,8 +413,8 @@ def _setup_collect_fakemodule():
 
     pytest.collect = ModuleType("pytest.collect")
     pytest.collect.__all__ = []  # used for setns
-    for attr in COLLECT_FAKEMODULE_ATTRIBUTES:
-        setattr(pytest.collect, attr, getattr(pytest, attr))
+    for attribute in COLLECT_FAKEMODULE_ATTRIBUTES:
+        setattr(pytest.collect, attribute, getattr(pytest, attribute))
 
 
 if _PY2:
@@ -340,7 +422,6 @@ if _PY2:
     from py.io import TextIO
 
     class CaptureIO(TextIO):
-
         @property
         def encoding(self):
             return getattr(self, "_encoding", "UTF-8")
@@ -350,7 +431,6 @@ else:
     import io
 
     class CaptureIO(io.TextIOWrapper):
-
         def __init__(self):
             super(CaptureIO, self).__init__(
                 io.BytesIO(), encoding="UTF-8", newline="", write_through=True
@@ -369,3 +449,22 @@ class FuncargnamesCompatAttr(object):
     def funcargnames(self):
         """ alias attribute for ``fixturenames`` for pre-2.3 compatibility"""
         return self.fixturenames
+
+
+if six.PY2:
+
+    def lru_cache(*_, **__):
+        def dec(fn):
+            return fn
+
+        return dec
+
+
+else:
+    from functools import lru_cache  # noqa: F401
+
+
+if getattr(attr, "__version_info__", ()) >= (19, 2):
+    ATTRS_EQ_FIELD = "eq"
+else:
+    ATTRS_EQ_FIELD = "cmp"
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/config/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/config/__init__.py
index 11348b80d0f..0737ff9d51c 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/config/__init__.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/config/__init__.py
@@ -1,47 +1,54 @@
+# -*- coding: utf-8 -*-
 """ command line options, ini-file and conftest.py processing. """
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import argparse
+import copy
+import inspect
+import os
 import shlex
-import traceback
+import sys
 import types
 import warnings
-import copy
-import six
-import py
 
-# DON't import pytest here because it causes import cycle troubles
-import sys
-import os
-from _pytest.outcomes import Skipped
+import attr
+import py
+import six
+from packaging.version import Version
+from pluggy import HookimplMarker
+from pluggy import HookspecMarker
+from pluggy import PluginManager
 
 import _pytest._code
-import _pytest.hookspec  # the extension point definitions
 import _pytest.assertion
-from pluggy import PluginManager, HookimplMarker, HookspecMarker
+import _pytest.hookspec  # the extension point definitions
+from .exceptions import PrintHelp
+from .exceptions import UsageError
+from .findpaths import determine_setup
+from .findpaths import exists
+from _pytest import deprecated
+from _pytest._code import ExceptionInfo
+from _pytest._code import filter_traceback
+from _pytest.compat import importlib_metadata
+from _pytest.compat import lru_cache
 from _pytest.compat import safe_str
-from .exceptions import UsageError, PrintHelp
-from .findpaths import determine_setup, exists
+from _pytest.outcomes import fail
+from _pytest.outcomes import Skipped
+from _pytest.pathlib import Path
+from _pytest.warning_types import PytestConfigWarning
 
 hookimpl = HookimplMarker("pytest")
 hookspec = HookspecMarker("pytest")
 
-# pytest startup
-#
-
 
 class ConftestImportFailure(Exception):
-
     def __init__(self, path, excinfo):
         Exception.__init__(self, path, excinfo)
         self.path = path
         self.excinfo = excinfo
 
-    def __str__(self):
-        etype, evalue, etb = self.excinfo
-        formatted = traceback.format_tb(etb)
-        # The level of the tracebacks we want to print is hand crafted :(
-        return repr(evalue) + "\n" + "".join(formatted[2:])
-
 
 def main(args=None, plugins=None):
     """ return exit code, after performing an in-process test run.
@@ -51,14 +58,26 @@ def main(args=None, plugins=None):
     :arg plugins: list of plugin objects to be auto-registered during
                   initialization.
     """
+    from _pytest.main import EXIT_USAGEERROR
+
     try:
         try:
             config = _prepareconfig(args, plugins)
         except ConftestImportFailure as e:
+            exc_info = ExceptionInfo(e.excinfo)
             tw = py.io.TerminalWriter(sys.stderr)
-            for line in traceback.format_exception(*e.excinfo):
+            tw.line(
+                "ImportError while loading conftest '{e.path}'.".format(e=e), red=True
+            )
+            exc_info.traceback = exc_info.traceback.filter(filter_traceback)
+            exc_repr = (
+                exc_info.getrepr(style="short", chain=False)
+                if exc_info.traceback
+                else exc_info.exconly()
+            )
+            formatted_tb = safe_str(exc_repr)
+            for line in formatted_tb.splitlines():
                 tw.line(line.rstrip(), red=True)
-            tw.line("ERROR: could not load %s\n" % (e.path,), red=True)
             return 4
         else:
             try:
@@ -69,10 +88,10 @@ def main(args=None, plugins=None):
         tw = py.io.TerminalWriter(sys.stderr)
         for msg in e.args:
             tw.line("ERROR: {}\n".format(msg), red=True)
-        return 4
+        return EXIT_USAGEERROR
 
 
-class cmdline(object):  # NOQA compatibility namespace
+class cmdline(object):  # compatibility namespace
     main = staticmethod(main)
 
 
@@ -98,13 +117,18 @@ def directory_arg(path, optname):
     return path
 
 
-default_plugins = (
+# Plugins that cannot be disabled via "-p no:X" currently.
+essential_plugins = (
     "mark",
     "main",
-    "terminal",
     "runner",
-    "python",
     "fixtures",
+    "helpconfig",  # Provides -p.
+)
+
+default_plugins = essential_plugins + (
+    "python",
+    "terminal",
     "debugging",
     "unittest",
     "capture",
@@ -113,7 +137,6 @@ default_plugins = (
     "monkeypatch",
     "recwarn",
     "pastebin",
-    "helpconfig",
     "nose",
     "assertion",
     "junitxml",
@@ -123,19 +146,30 @@ default_plugins = (
     "freeze_support",
     "setuponly",
     "setupplan",
+    "stepwise",
     "warnings",
     "logging",
+    "reports",
 )
 
-
 builtin_plugins = set(default_plugins)
 builtin_plugins.add("pytester")
 
 
-def get_config():
+def get_config(args=None, plugins=None):
     # subsequent calls to main will create a fresh instance
     pluginmanager = PytestPluginManager()
-    config = Config(pluginmanager)
+    config = Config(
+        pluginmanager,
+        invocation_params=Config.InvocationParams(
+            args=args, plugins=plugins, dir=Path().resolve()
+        ),
+    )
+
+    if args is not None:
+        # Handle any "-p no:plugin" args.
+        pluginmanager.consider_preparse(args)
+
     for spec in default_plugins:
         pluginmanager.import_plugin(spec)
     return config
@@ -160,13 +194,10 @@ def _prepareconfig(args=None, plugins=None):
     elif isinstance(args, py.path.local):
         args = [str(args)]
     elif not isinstance(args, (tuple, list)):
-        if not isinstance(args, str):
-            raise ValueError("not a string or argument list: %r" % (args,))
-        args = shlex.split(args, posix=sys.platform != "win32")
-        from _pytest import deprecated
+        msg = "`args` parameter expected to be a list or tuple of strings, got: {!r} (type: {})"
+        raise TypeError(msg.format(args, type(args)))
 
-        warning = deprecated.MAIN_STR_ARGS
-    config = get_config()
+    config = get_config(args, plugins)
     pluginmanager = config.pluginmanager
     try:
         if plugins:
@@ -176,7 +207,9 @@ def _prepareconfig(args=None, plugins=None):
                 else:
                     pluginmanager.register(plugin)
         if warning:
-            config.warn("C1", warning)
+            from _pytest.warnings import _issue_warning_captured
+
+            _issue_warning_captured(warning, hook=config.hook, stacklevel=4)
         return pluginmanager.hook.pytest_cmdline_parse(
             pluginmanager=pluginmanager, args=args
         )
@@ -200,7 +233,7 @@ class PytestPluginManager(PluginManager):
         self._conftest_plugins = set()
 
         # state related to local conftest plugins
-        self._path2confmods = {}
+        self._dirpath2confmods = {}
         self._conftestpath2mod = {}
         self._confcutdir = None
         self._noconftest = False
@@ -230,14 +263,7 @@ class PytestPluginManager(PluginManager):
         Use :py:meth:`pluggy.PluginManager.add_hookspecs <PluginManager.add_hookspecs>`
         instead.
         """
-        warning = dict(
-            code="I2",
-            fslocation=_pytest._code.getfslineno(sys._getframe(1)),
-            nodeid=None,
-            message="use pluginmanager.add_hookspecs instead of "
-            "deprecated addhooks() method.",
-        )
-        self._warn(warning)
+        warnings.warn(deprecated.PLUGIN_MANAGER_ADDHOOKS, stacklevel=2)
         return self.add_hookspecs(module_or_class)
 
     def parse_hookimpl_opts(self, plugin, name):
@@ -246,20 +272,27 @@ class PytestPluginManager(PluginManager):
         # (see issue #1073)
         if not name.startswith("pytest_"):
             return
-        # ignore some historic special names which can not be hooks anyway
-        if name == "pytest_plugins" or name.startswith("pytest_funcarg__"):
+        # ignore names which can not be hooks
+        if name == "pytest_plugins":
             return
 
         method = getattr(plugin, name)
         opts = super(PytestPluginManager, self).parse_hookimpl_opts(plugin, name)
 
+        # consider only actual functions for hooks (#3775)
+        if not inspect.isroutine(method):
+            return
+
         # collect unmarked hooks as long as they have the `pytest_' prefix
         if opts is None and name.startswith("pytest_"):
             opts = {}
-
         if opts is not None:
+            # TODO: DeprecationWarning, people should use hookimpl
+            # https://github.com/pytest-dev/pytest/issues/4562
+            known_marks = {m.name for m in getattr(method, "pytestmark", [])}
+
             for name in ("tryfirst", "trylast", "optionalhook", "hookwrapper"):
-                opts.setdefault(name, hasattr(method, name))
+                opts.setdefault(name, hasattr(method, name) or name in known_marks)
         return opts
 
     def parse_hookspec_opts(self, module_or_class, name):
@@ -268,19 +301,27 @@ class PytestPluginManager(PluginManager):
         )
         if opts is None:
             method = getattr(module_or_class, name)
+
             if name.startswith("pytest_"):
+                # todo: deprecate hookspec hacks
+                # https://github.com/pytest-dev/pytest/issues/4562
+                known_marks = {m.name for m in getattr(method, "pytestmark", [])}
                 opts = {
-                    "firstresult": hasattr(method, "firstresult"),
-                    "historic": hasattr(method, "historic"),
+                    "firstresult": hasattr(method, "firstresult")
+                    or "firstresult" in known_marks,
+                    "historic": hasattr(method, "historic")
+                    or "historic" in known_marks,
                 }
         return opts
 
     def register(self, plugin, name=None):
         if name in ["pytest_catchlog", "pytest_capturelog"]:
-            self._warn(
-                "{} plugin has been merged into the core, "
-                "please remove it from your requirements.".format(
-                    name.replace("_", "-")
+            warnings.warn(
+                PytestConfigWarning(
+                    "{} plugin has been merged into the core, "
+                    "please remove it from your requirements.".format(
+                        name.replace("_", "-")
+                    )
                 )
             )
             return
@@ -317,12 +358,6 @@ class PytestPluginManager(PluginManager):
         )
         self._configured = True
 
-    def _warn(self, message):
-        kwargs = message if isinstance(message, dict) else {
-            "code": "I1", "message": message, "fslocation": None, "nodeid": None
-        }
-        self.hook.pytest_logwarning.call_historic(kwargs=kwargs)
-
     #
     # internal API for local conftest plugin handling
     #
@@ -335,10 +370,13 @@ class PytestPluginManager(PluginManager):
             here.
         """
         current = py.path.local()
-        self._confcutdir = current.join(
-            namespace.confcutdir, abs=True
-        ) if namespace.confcutdir else None
+        self._confcutdir = (
+            current.join(namespace.confcutdir, abs=True)
+            if namespace.confcutdir
+            else None
+        )
         self._noconftest = namespace.noconftest
+        self._using_pyargs = namespace.pyargs
         testpaths = namespace.file_or_dir
         foundanchor = False
         for path in testpaths:
@@ -362,29 +400,38 @@ class PytestPluginManager(PluginManager):
                 if x.check(dir=1):
                     self._getconftestmodules(x)
 
+    @lru_cache(maxsize=128)
     def _getconftestmodules(self, path):
         if self._noconftest:
             return []
-        try:
-            return self._path2confmods[path]
-        except KeyError:
-            if path.isfile():
-                clist = self._getconftestmodules(path.dirpath())
-            else:
-                # XXX these days we may rather want to use config.rootdir
-                # and allow users to opt into looking into the rootdir parent
-                # directories instead of requiring to specify confcutdir
-                clist = []
-                for parent in path.parts():
-                    if self._confcutdir and self._confcutdir.relto(parent):
-                        continue
-                    conftestpath = parent.join("conftest.py")
-                    if conftestpath.isfile():
-                        mod = self._importconftest(conftestpath)
-                        clist.append(mod)
 
-            self._path2confmods[path] = clist
-            return clist
+        if path.isfile():
+            directory = path.dirpath()
+        else:
+            directory = path
+
+        if six.PY2:  # py2 is not using lru_cache.
+            try:
+                return self._dirpath2confmods[directory]
+            except KeyError:
+                pass
+
+        # XXX these days we may rather want to use config.rootdir
+        # and allow users to opt into looking into the rootdir parent
+        # directories instead of requiring to specify confcutdir
+        clist = []
+        for parent in directory.realpath().parts():
+            if self._confcutdir and self._confcutdir.relto(parent):
+                continue
+            conftestpath = parent.join("conftest.py")
+            if conftestpath.isfile():
+                # Use realpath to avoid loading the same conftest twice
+                # with build systems that create build directories containing
+                # symlinks to actual files.
+                mod = self._importconftest(conftestpath.realpath())
+                clist.append(mod)
+        self._dirpath2confmods[directory] = clist
+        return clist
 
     def _rget_with_confmod(self, name, path):
         modules = self._getconftestmodules(path)
@@ -404,18 +451,29 @@ class PytestPluginManager(PluginManager):
                 _ensure_removed_sysmodule(conftestpath.purebasename)
             try:
                 mod = conftestpath.pyimport()
-                if hasattr(mod, "pytest_plugins") and self._configured:
-                    from _pytest.deprecated import PYTEST_PLUGINS_FROM_NON_TOP_LEVEL_CONFTEST
+                if (
+                    hasattr(mod, "pytest_plugins")
+                    and self._configured
+                    and not self._using_pyargs
+                ):
+                    from _pytest.deprecated import (
+                        PYTEST_PLUGINS_FROM_NON_TOP_LEVEL_CONFTEST,
+                    )
 
-                    warnings.warn(PYTEST_PLUGINS_FROM_NON_TOP_LEVEL_CONFTEST)
+                    fail(
+                        PYTEST_PLUGINS_FROM_NON_TOP_LEVEL_CONFTEST.format(
+                            conftestpath, self._confcutdir
+                        ),
+                        pytrace=False,
+                    )
             except Exception:
                 raise ConftestImportFailure(conftestpath, sys.exc_info())
 
             self._conftest_plugins.add(mod)
             self._conftestpath2mod[conftestpath] = mod
             dirpath = conftestpath.dirpath()
-            if dirpath in self._path2confmods:
-                for path, mods in self._path2confmods.items():
+            if dirpath in self._dirpath2confmods:
+                for path, mods in self._dirpath2confmods.items():
                     if path and path.relto(dirpath) or path == dirpath:
                         assert mod not in mods
                         mods.append(mod)
@@ -429,18 +487,48 @@ class PytestPluginManager(PluginManager):
     #
 
     def consider_preparse(self, args):
-        for opt1, opt2 in zip(args, args[1:]):
-            if opt1 == "-p":
-                self.consider_pluginarg(opt2)
+        i = 0
+        n = len(args)
+        while i < n:
+            opt = args[i]
+            i += 1
+            if isinstance(opt, six.string_types):
+                if opt == "-p":
+                    try:
+                        parg = args[i]
+                    except IndexError:
+                        return
+                    i += 1
+                elif opt.startswith("-p"):
+                    parg = opt[2:]
+                else:
+                    continue
+                self.consider_pluginarg(parg)
 
     def consider_pluginarg(self, arg):
         if arg.startswith("no:"):
             name = arg[3:]
+            if name in essential_plugins:
+                raise UsageError("plugin %s cannot be disabled" % name)
+
+            # PR #4304 : remove stepwise if cacheprovider is blocked
+            if name == "cacheprovider":
+                self.set_blocked("stepwise")
+                self.set_blocked("pytest_stepwise")
+
             self.set_blocked(name)
             if not name.startswith("pytest_"):
                 self.set_blocked("pytest_" + name)
         else:
-            self.import_plugin(arg)
+            name = arg
+            # Unblock the plugin.  None indicates that it has been blocked.
+            # There is no interface with pluggy for this.
+            if self._name2plugin.get(name, -1) is None:
+                del self._name2plugin[name]
+            if not name.startswith("pytest_"):
+                if self._name2plugin.get("pytest_" + name, -1) is None:
+                    del self._name2plugin["pytest_" + name]
+            self.import_plugin(arg, consider_entry_points=True)
 
     def consider_conftest(self, conftestmodule):
         self.register(conftestmodule, name=conftestmodule.__file__)
@@ -456,35 +544,50 @@ class PytestPluginManager(PluginManager):
         for import_spec in plugins:
             self.import_plugin(import_spec)
 
-    def import_plugin(self, modname):
+    def import_plugin(self, modname, consider_entry_points=False):
+        """
+        Imports a plugin with ``modname``. If ``consider_entry_points`` is True, entry point
+        names are also considered to find a plugin.
+        """
         # most often modname refers to builtin modules, e.g. "pytester",
         # "terminal" or "capture".  Those plugins are registered under their
         # basename for historic purposes but must be imported with the
         # _pytest prefix.
-        assert isinstance(modname, (six.text_type, str)), (
+        assert isinstance(modname, six.string_types), (
             "module name as text required, got %r" % modname
         )
         modname = str(modname)
         if self.is_blocked(modname) or self.get_plugin(modname) is not None:
             return
-        if modname in builtin_plugins:
-            importspec = "_pytest." + modname
-        else:
-            importspec = modname
+
+        importspec = "_pytest." + modname if modname in builtin_plugins else modname
         self.rewrite_hook.mark_rewrite(importspec)
+
+        if consider_entry_points:
+            loaded = self.load_setuptools_entrypoints("pytest11", name=modname)
+            if loaded:
+                return
+
         try:
             __import__(importspec)
         except ImportError as e:
-            new_exc_type = ImportError
             new_exc_message = 'Error importing plugin "%s": %s' % (
-                modname, safe_str(e.args[0])
+                modname,
+                safe_str(e.args[0]),
             )
-            new_exc = new_exc_type(new_exc_message)
+            new_exc = ImportError(new_exc_message)
+            tb = sys.exc_info()[2]
 
-            six.reraise(new_exc_type, new_exc, sys.exc_info()[2])
+            six.reraise(ImportError, new_exc, tb)
 
         except Skipped as e:
-            self._warn("skipped plugin %r: %s" % ((modname, e.msg)))
+            from _pytest.warnings import _issue_warning_captured
+
+            _issue_warning_captured(
+                PytestConfigWarning("skipped plugin %r: %s" % (modname, e.msg)),
+                self.hook,
+                stacklevel=1,
+            )
         else:
             mod = sys.modules[importspec]
             self.register(mod, modname)
@@ -498,8 +601,8 @@ def _get_plugin_specs_as_list(specs):
     which case it is returned as a list. Specs can also be `None` in which case an
     empty list is returned.
     """
-    if specs is not None:
-        if isinstance(specs, str):
+    if specs is not None and not isinstance(specs, types.ModuleType):
+        if isinstance(specs, six.string_types):
             specs = specs.split(",") if specs else []
         if not isinstance(specs, (list, tuple)):
             raise UsageError(
@@ -518,7 +621,6 @@ def _ensure_removed_sysmodule(modname):
 
 
 class Notset(object):
-
     def __repr__(self):
         return "<NOTSET>"
 
@@ -527,25 +629,116 @@ notset = Notset()
 
 
 def _iter_rewritable_modules(package_files):
+    """
+    Given an iterable of file names in a source distribution, return the "names" that should
+    be marked for assertion rewrite (for example the package "pytest_mock/__init__.py" should
+    be added as "pytest_mock" in the assertion rewrite mechanism.
+
+    This function has to deal with dist-info based distributions and egg based distributions
+    (which are still very much in use for "editable" installs).
+
+    Here are the file names as seen in a dist-info based distribution:
+
+        pytest_mock/__init__.py
+        pytest_mock/_version.py
+        pytest_mock/plugin.py
+        pytest_mock.egg-info/PKG-INFO
+
+    Here are the file names as seen in an egg based distribution:
+
+        src/pytest_mock/__init__.py
+        src/pytest_mock/_version.py
+        src/pytest_mock/plugin.py
+        src/pytest_mock.egg-info/PKG-INFO
+        LICENSE
+        setup.py
+
+    We have to take in account those two distribution flavors in order to determine which
+    names should be considered for assertion rewriting.
+
+    More information:
+        https://github.com/pytest-dev/pytest-mock/issues/167
+    """
+    package_files = list(package_files)
+    seen_some = False
     for fn in package_files:
         is_simple_module = "/" not in fn and fn.endswith(".py")
         is_package = fn.count("/") == 1 and fn.endswith("__init__.py")
         if is_simple_module:
             module_name, _ = os.path.splitext(fn)
-            yield module_name
+            # we ignore "setup.py" at the root of the distribution
+            if module_name != "setup":
+                seen_some = True
+                yield module_name
         elif is_package:
             package_name = os.path.dirname(fn)
+            seen_some = True
             yield package_name
 
+    if not seen_some:
+        # at this point we did not find any packages or modules suitable for assertion
+        # rewriting, so we try again by stripping the first path component (to account for
+        # "src" based source trees for example)
+        # this approach lets us have the common case continue to be fast, as egg-distributions
+        # are rarer
+        new_package_files = []
+        for fn in package_files:
+            parts = fn.split("/")
+            new_fn = "/".join(parts[1:])
+            if new_fn:
+                new_package_files.append(new_fn)
+        if new_package_files:
+            for _module in _iter_rewritable_modules(new_package_files):
+                yield _module
+
 
 class Config(object):
-    """ access to configuration values, pluginmanager and plugin hooks.  """
+    """
+    Access to configuration values, pluginmanager and plugin hooks.
+
+    :ivar PytestPluginManager pluginmanager: the plugin manager handles plugin registration and hook invocation.
+
+    :ivar argparse.Namespace option: access to command line option as attributes.
+
+    :ivar InvocationParams invocation_params:
+
+        Object containing the parameters regarding the ``pytest.main``
+        invocation.
+        Contains the followinig read-only attributes:
+        * ``args``: list of command-line arguments as passed to ``pytest.main()``.
+        * ``plugins``: list of extra plugins, might be None
+        * ``dir``: directory where ``pytest.main()`` was invoked from.
+    """
+
+    @attr.s(frozen=True)
+    class InvocationParams(object):
+        """Holds parameters passed during ``pytest.main()``
+
+        .. note::
+
+            Currently the environment variable PYTEST_ADDOPTS is also handled by
+            pytest implicitly, not being part of the invocation.
+
+            Plugins accessing ``InvocationParams`` must be aware of that.
+        """
+
+        args = attr.ib()
+        plugins = attr.ib()
+        dir = attr.ib()
+
+    def __init__(self, pluginmanager, invocation_params=None, *args):
+        from .argparsing import Parser, FILE_OR_DIR
+
+        if invocation_params is None:
+            invocation_params = self.InvocationParams(
+                args=(), plugins=None, dir=Path().resolve()
+            )
 
-    def __init__(self, pluginmanager):
         #: access to command line option as attributes.
         #: (deprecated), use :py:func:`getoption() <_pytest.config.Config.getoption>` instead
         self.option = argparse.Namespace()
-        from .argparsing import Parser, FILE_OR_DIR
+
+        self.invocation_params = invocation_params
 
         _a = FILE_OR_DIR
         self._parser = Parser(
@@ -560,18 +753,15 @@ class Config(object):
         self._override_ini = ()
         self._opt2dest = {}
         self._cleanup = []
-        self._warn = self.pluginmanager._warn
         self.pluginmanager.register(self, "pytestconfig")
         self._configured = False
-
-        def do_setns(dic):
-            import pytest
-
-            setns(pytest, dic)
-
-        self.hook.pytest_namespace.call_historic(do_setns, {})
         self.hook.pytest_addoption.call_historic(kwargs=dict(parser=self._parser))
 
+    @property
+    def invocation_dir(self):
+        """Backward compatibility"""
+        return py.path.local(str(self.invocation_params.dir))
+
     def add_cleanup(self, func):
         """ Add a function to be called when the config object gets out of
         use (usually coninciding with pytest_unconfigure)."""
@@ -591,24 +781,35 @@ class Config(object):
             fin = self._cleanup.pop()
             fin()
 
-    def warn(self, code, message, fslocation=None, nodeid=None):
-        """ generate a warning for this test session. """
-        self.hook.pytest_logwarning.call_historic(
-            kwargs=dict(
-                code=code, message=message, fslocation=fslocation, nodeid=nodeid
-            )
-        )
-
     def get_terminal_writer(self):
         return self.pluginmanager.get_plugin("terminalreporter")._tw
 
     def pytest_cmdline_parse(self, pluginmanager, args):
-        # REF1 assert self == pluginmanager.config, (self, pluginmanager.config)
-        self.parse(args)
+        try:
+            self.parse(args)
+        except UsageError:
+
+            # Handle --version and --help here in a minimal fashion.
+            # This gets done via helpconfig normally, but its
+            # pytest_cmdline_main is not called in case of errors.
+            if getattr(self.option, "version", False) or "--version" in args:
+                from _pytest.helpconfig import showversion
+
+                showversion(self)
+            elif (
+                getattr(self.option, "help", False) or "--help" in args or "-h" in args
+            ):
+                self._parser._getparser().print_help()
+                sys.stdout.write(
+                    "\nNOTE: displaying only minimal help due to UsageError.\n\n"
+                )
+
+            raise
+
         return self
 
     def notify_exception(self, excinfo, option=None):
-        if option and option.fulltrace:
+        if option and getattr(option, "fulltrace", False):
             style = "long"
         else:
             style = "native"
@@ -631,7 +832,7 @@ class Config(object):
     @classmethod
     def fromdictargs(cls, option_dict, args):
         """ constructor useable for subprocesses. """
-        config = get_config()
+        config = get_config(args)
         config.option.__dict__.update(option_dict)
         config.parse(args, addopts=False)
         for x in config.option.plugins:
@@ -657,13 +858,12 @@ class Config(object):
         r = determine_setup(
             ns.inifilename,
             ns.file_or_dir + unknown_args,
-            warnfunc=self.warn,
             rootdir_cmd_arg=ns.rootdir or None,
+            config=self,
         )
         self.rootdir, self.inifile, self.inicfg = r
         self._parser.extra_info["rootdir"] = self.rootdir
         self._parser.extra_info["inifile"] = self.inifile
-        self.invocation_dir = py.path.local()
         self._parser.addini("addopts", "extra command line options", "args")
         self._parser.addini("minversion", "minimally required pytest version")
         self._override_ini = ns.override_ini or ()
@@ -676,7 +876,7 @@ class Config(object):
         by the importhook.
         """
         ns, unknown_args = self._parser.parse_known_and_unknown_args(args)
-        mode = ns.assertmode
+        mode = getattr(ns, "assertmode", "plain")
         if mode == "rewrite":
             try:
                 hook = _pytest.assertion.install_importhook(self)
@@ -692,36 +892,55 @@ class Config(object):
         modules or packages in the distribution package for
         all pytest plugins.
         """
-        import pkg_resources
-
         self.pluginmanager.rewrite_hook = hook
 
-        # 'RECORD' available for plugins installed normally (pip install)
-        # 'SOURCES.txt' available for plugins installed in dev mode (pip install -e)
-        # for installed plugins 'SOURCES.txt' returns an empty list, and vice-versa
-        # so it shouldn't be an issue
-        metadata_files = "RECORD", "SOURCES.txt"
+        if os.environ.get("PYTEST_DISABLE_PLUGIN_AUTOLOAD"):
+            # We don't autoload from setuptools entry points, no need to continue.
+            return
 
         package_files = (
-            entry.split(",")[0]
-            for entrypoint in pkg_resources.iter_entry_points("pytest11")
-            for metadata in metadata_files
-            for entry in entrypoint.dist._get_metadata(metadata)
+            str(file)
+            for dist in importlib_metadata.distributions()
+            if any(ep.group == "pytest11" for ep in dist.entry_points)
+            for file in dist.files or []
         )
 
         for name in _iter_rewritable_modules(package_files):
             hook.mark_rewrite(name)
 
+    def _validate_args(self, args, via):
+        """Validate known args."""
+        self._parser._config_source_hint = via
+        try:
+            self._parser.parse_known_and_unknown_args(
+                args, namespace=copy.copy(self.option)
+            )
+        finally:
+            del self._parser._config_source_hint
+
+        return args
+
     def _preparse(self, args, addopts=True):
         if addopts:
-            args[:] = shlex.split(os.environ.get("PYTEST_ADDOPTS", "")) + args
+            env_addopts = os.environ.get("PYTEST_ADDOPTS", "")
+            if len(env_addopts):
+                args[:] = (
+                    self._validate_args(shlex.split(env_addopts), "via PYTEST_ADDOPTS")
+                    + args
+                )
         self._initini(args)
         if addopts:
-            args[:] = self.getini("addopts") + args
+            args[:] = (
+                self._validate_args(self.getini("addopts"), "via addopts config") + args
+            )
+
         self._checkversion()
         self._consider_importhook(args)
         self.pluginmanager.consider_preparse(args)
-        self.pluginmanager.load_setuptools_entrypoints("pytest11")
+        if not os.environ.get("PYTEST_DISABLE_PLUGIN_AUTOLOAD"):
+            # Don't autoload from setuptools entry point. Only explicitly specified
+            # plugins are going to be loaded.
+            self.pluginmanager.load_setuptools_entrypoints("pytest11")
         self.pluginmanager.consider_env()
         self.known_args_namespace = ns = self._parser.parse_known_args(
             args, namespace=copy.copy(self.option)
@@ -738,7 +957,15 @@ class Config(object):
             if ns.help or ns.version:
                 # we don't want to prevent --help/--version to work
                 # so just let is pass and print a warning at the end
-                self._warn("could not load initial conftests (%s)\n" % e.path)
+                from _pytest.warnings import _issue_warning_captured
+
+                _issue_warning_captured(
+                    PytestConfigWarning(
+                        "could not load initial conftests: {}".format(e.path)
+                    ),
+                    self.hook,
+                    stacklevel=2,
+                )
             else:
                 raise
 
@@ -747,9 +974,7 @@ class Config(object):
 
         minver = self.inicfg.get("minversion", None)
         if minver:
-            ver = minver.split(".")
-            myver = pytest.__version__.split(".")
-            if myver < ver:
+            if Version(minver) > Version(pytest.__version__):
                 raise pytest.UsageError(
                     "%s:%d: requires pytest-%s, actual pytest-%s'"
                     % (
@@ -778,11 +1003,10 @@ class Config(object):
                 args, self.option, namespace=self.option
             )
             if not args:
-                cwd = os.getcwd()
-                if cwd == self.rootdir:
+                if self.invocation_dir == self.rootdir:
                     args = self.getini("testpaths")
                 if not args:
-                    args = [cwd]
+                    args = [str(self.invocation_dir)]
             self.args = args
         except PrintHelp:
             pass
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/config/argparsing.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/config/argparsing.py
index 781d8e8c4ee..37fb772db99 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/config/argparsing.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/config/argparsing.py
@@ -1,6 +1,11 @@
-import six
-import warnings
+# -*- coding: utf-8 -*-
 import argparse
+import warnings
+
+import py
+import six
+
+from _pytest.config.exceptions import UsageError
 
 FILE_OR_DIR = "file_or_dir"
 
@@ -12,6 +17,8 @@ class Parser(object):
         there's an error processing the command line arguments.
     """
 
+    prog = None
+
     def __init__(self, usage=None, processopt=None):
         self._anonymous = OptionGroup("custom options", parser=self)
         self._groups = []
@@ -70,12 +77,13 @@ class Parser(object):
 
         self.optparser = self._getparser()
         try_argcomplete(self.optparser)
-        return self.optparser.parse_args([str(x) for x in args], namespace=namespace)
+        args = [str(x) if isinstance(x, py.path.local) else x for x in args]
+        return self.optparser.parse_args(args, namespace=namespace)
 
     def _getparser(self):
         from _pytest._argcomplete import filescompleter
 
-        optparser = MyOptionParser(self, self.extra_info)
+        optparser = MyOptionParser(self, self.extra_info, prog=self.prog)
         groups = self._groups + [self._anonymous]
         for group in groups:
             if group.options:
@@ -106,7 +114,7 @@ class Parser(object):
         the remaining arguments unknown at this point.
         """
         optparser = self._getparser()
-        args = [str(x) for x in args]
+        args = [str(x) if isinstance(x, py.path.local) else x for x in args]
         return optparser.parse_known_args(args, namespace=namespace)
 
     def addini(self, name, help, type=None, default=None):
@@ -145,10 +153,11 @@ class ArgumentError(Exception):
 class Argument(object):
     """class that mimics the necessary behaviour of optparse.Option
 
-    its currently a least effort implementation
+    it's currently a least effort implementation
     and ignoring choices and integer prefixes
     https://docs.python.org/3/library/optparse.html#optparse-standard-option-types
     """
+
     _typ_map = {"int": int, "string": str, "float": float, "complex": complex}
 
     def __init__(self, *names, **attrs):
@@ -173,23 +182,23 @@ class Argument(object):
             if isinstance(typ, six.string_types):
                 if typ == "choice":
                     warnings.warn(
-                        "type argument to addoption() is a string %r."
-                        " For parsearg this is optional and when supplied"
-                        " should be a type."
+                        "`type` argument to addoption() is the string %r."
+                        " For choices this is optional and can be omitted, "
+                        " but when supplied should be a type (for example `str` or `int`)."
                         " (options: %s)" % (typ, names),
                         DeprecationWarning,
-                        stacklevel=3,
+                        stacklevel=4,
                     )
                     # argparse expects a type here take it from
                     # the type of the first element
                     attrs["type"] = type(attrs["choices"][0])
                 else:
                     warnings.warn(
-                        "type argument to addoption() is a string %r."
-                        " For parsearg this should be a type."
+                        "`type` argument to addoption() is the string %r, "
+                        " but when supplied should be a type (for example `str` or `int`)."
                         " (options: %s)" % (typ, names),
                         DeprecationWarning,
-                        stacklevel=3,
+                        stacklevel=4,
                     )
                     attrs["type"] = Argument._typ_map[typ]
                 # used in test_parseopt -> test_parse_defaultgetter
@@ -274,7 +283,6 @@ class Argument(object):
 
 
 class OptionGroup(object):
-
     def __init__(self, name, description="", parser=None):
         self.name = name
         self.description = description
@@ -312,13 +320,13 @@ class OptionGroup(object):
 
 
 class MyOptionParser(argparse.ArgumentParser):
-
-    def __init__(self, parser, extra_info=None):
+    def __init__(self, parser, extra_info=None, prog=None):
         if not extra_info:
             extra_info = {}
         self._parser = parser
         argparse.ArgumentParser.__init__(
             self,
+            prog=prog,
             usage=parser._usage,
             add_help=False,
             formatter_class=DropShorterLongHelpFormatter,
@@ -327,6 +335,15 @@ class MyOptionParser(argparse.ArgumentParser):
         # an usage error to provide more contextual information to the user
         self.extra_info = extra_info
 
+    def error(self, message):
+        """Transform argparse error message into UsageError."""
+        msg = "%s: error: %s" % (self.prog, message)
+
+        if hasattr(self._parser, "_config_source_hint"):
+            msg = "%s (%s)" % (msg, self._parser._config_source_hint)
+
+        raise UsageError(self.format_usage() + msg)
+
     def parse_args(self, args=None, namespace=None):
         """allow splitting of positional arguments"""
         args, argv = self.parse_known_args(args, namespace)
@@ -378,9 +395,8 @@ class DropShorterLongHelpFormatter(argparse.HelpFormatter):
             xxoption = option[2:]
             if xxoption.split()[0] not in option_map:
                 shortened = xxoption.replace("-", "")
-                if (
-                    shortened not in short_long
-                    or len(short_long[shortened]) < len(xxoption)
+                if shortened not in short_long or len(short_long[shortened]) < len(
+                    xxoption
                 ):
                     short_long[shortened] = xxoption
         # now short_long has been filled out to the longest with dashes
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/config/exceptions.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/config/exceptions.py
index 64bae834d1c..bf58fde5dbf 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/config/exceptions.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/config/exceptions.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 class UsageError(Exception):
     """ error in pytest usage or invocation"""
 
@@ -5,4 +6,5 @@ class UsageError(Exception):
 class PrintHelp(Exception):
     """Raised when pytest should print it's help to skip the rest of the
     argument parsing and validation."""
+
     pass
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/config/findpaths.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/config/findpaths.py
index fde7bddb939..e6779b289bc 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/config/findpaths.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/config/findpaths.py
@@ -1,6 +1,10 @@
-import py
+# -*- coding: utf-8 -*-
 import os
+
+import py
+
 from .exceptions import UsageError
+from _pytest.outcomes import fail
 
 
 def exists(path, ignore=EnvironmentError):
@@ -10,15 +14,12 @@ def exists(path, ignore=EnvironmentError):
         return False
 
 
-def getcfg(args, warnfunc=None):
+def getcfg(args, config=None):
     """
     Search the list of arguments for a valid ini-file for pytest,
     and return a tuple of (rootdir, inifile, cfg-dict).
 
-    note: warnfunc is an optional function used to warn
-        about ini-files that use deprecated features.
-        This parameter should be removed when pytest
-        adopts standard deprecation warnings (#1804).
+    note: config is optional and used only to issue warnings explicitly (#2891).
     """
     from _pytest.deprecated import CFG_PYTEST_SECTION
 
@@ -32,18 +33,24 @@ def getcfg(args, warnfunc=None):
             for inibasename in inibasenames:
                 p = base.join(inibasename)
                 if exists(p):
-                    iniconfig = py.iniconfig.IniConfig(p)
-                    if "pytest" in iniconfig.sections:
-                        if inibasename == "setup.cfg" and warnfunc:
-                            warnfunc(
-                                "C1", CFG_PYTEST_SECTION.format(filename=inibasename)
-                            )
-                        return base, p, iniconfig["pytest"]
+                    try:
+                        iniconfig = py.iniconfig.IniConfig(p)
+                    except py.iniconfig.ParseError as exc:
+                        raise UsageError(str(exc))
+
                     if (
                         inibasename == "setup.cfg"
                         and "tool:pytest" in iniconfig.sections
                     ):
                         return base, p, iniconfig["tool:pytest"]
+                    elif "pytest" in iniconfig.sections:
+                        if inibasename == "setup.cfg" and config is not None:
+
+                            fail(
+                                CFG_PYTEST_SECTION.format(filename=inibasename),
+                                pytrace=False,
+                            )
+                        return base, p, iniconfig["pytest"]
                     elif inibasename == "pytest.ini":
                         # allowed to be empty
                         return base, p, {}
@@ -74,7 +81,6 @@ def get_common_ancestor(paths):
 
 
 def get_dirs_from_args(args):
-
     def is_option(x):
         return str(x).startswith("-")
 
@@ -96,45 +102,52 @@ def get_dirs_from_args(args):
     return [get_dir_from_path(path) for path in possible_paths if path.exists()]
 
 
-def determine_setup(inifile, args, warnfunc=None, rootdir_cmd_arg=None):
+def determine_setup(inifile, args, rootdir_cmd_arg=None, config=None):
     dirs = get_dirs_from_args(args)
     if inifile:
         iniconfig = py.iniconfig.IniConfig(inifile)
         is_cfg_file = str(inifile).endswith(".cfg")
-        # TODO: [pytest] section in *.cfg files is depricated. Need refactoring.
         sections = ["tool:pytest", "pytest"] if is_cfg_file else ["pytest"]
         for section in sections:
             try:
                 inicfg = iniconfig[section]
-                if is_cfg_file and section == "pytest" and warnfunc:
+                if is_cfg_file and section == "pytest" and config is not None:
                     from _pytest.deprecated import CFG_PYTEST_SECTION
 
-                    warnfunc("C1", CFG_PYTEST_SECTION.format(filename=str(inifile)))
+                    fail(
+                        CFG_PYTEST_SECTION.format(filename=str(inifile)), pytrace=False
+                    )
                 break
             except KeyError:
                 inicfg = None
-        rootdir = get_common_ancestor(dirs)
+        if rootdir_cmd_arg is None:
+            rootdir = get_common_ancestor(dirs)
     else:
         ancestor = get_common_ancestor(dirs)
-        rootdir, inifile, inicfg = getcfg([ancestor], warnfunc=warnfunc)
-        if rootdir is None:
-            for rootdir in ancestor.parts(reverse=True):
-                if rootdir.join("setup.py").exists():
+        rootdir, inifile, inicfg = getcfg([ancestor], config=config)
+        if rootdir is None and rootdir_cmd_arg is None:
+            for possible_rootdir in ancestor.parts(reverse=True):
+                if possible_rootdir.join("setup.py").exists():
+                    rootdir = possible_rootdir
                     break
             else:
-                rootdir, inifile, inicfg = getcfg(dirs, warnfunc=warnfunc)
+                if dirs != [ancestor]:
+                    rootdir, inifile, inicfg = getcfg(dirs, config=config)
                 if rootdir is None:
-                    rootdir = get_common_ancestor([py.path.local(), ancestor])
+                    if config is not None:
+                        cwd = config.invocation_dir
+                    else:
+                        cwd = py.path.local()
+                    rootdir = get_common_ancestor([cwd, ancestor])
                     is_fs_root = os.path.splitdrive(str(rootdir))[1] == "/"
                     if is_fs_root:
                         rootdir = ancestor
     if rootdir_cmd_arg:
-        rootdir_abs_path = py.path.local(os.path.expandvars(rootdir_cmd_arg))
-        if not os.path.isdir(str(rootdir_abs_path)):
+        rootdir = py.path.local(os.path.expandvars(rootdir_cmd_arg))
+        if not rootdir.isdir():
             raise UsageError(
                 "Directory '{}' not found. Check your '--rootdir' option.".format(
-                    rootdir_abs_path
+                    rootdir
                 )
             )
-        rootdir = rootdir_abs_path
     return rootdir, inifile, inicfg or {}
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/debugging.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/debugging.py
index 2e253aaa2af..99d35a5ab77 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/debugging.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/debugging.py
@@ -1,16 +1,28 @@
+# -*- coding: utf-8 -*-
 """ interactive debugging with PDB, the Python Debugger. """
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import argparse
 import pdb
 import sys
-import os
 from doctest import UnexpectedException
 
-try:
-    from builtins import breakpoint  # noqa
+from _pytest import outcomes
+from _pytest.config import hookimpl
+from _pytest.config.exceptions import UsageError
 
-    SUPPORTS_BREAKPOINT_BUILTIN = True
-except ImportError:
-    SUPPORTS_BREAKPOINT_BUILTIN = False
+
+def _validate_usepdb_cls(value):
+    """Validate syntax of --pdbcls option."""
+    try:
+        modname, classname = value.split(":")
+    except ValueError:
+        raise argparse.ArgumentTypeError(
+            "{!r} is not in the format 'modname:classname'".format(value)
+        )
+    return (modname, classname)
 
 
 def pytest_addoption(parser):
@@ -25,85 +37,257 @@ def pytest_addoption(parser):
         "--pdbcls",
         dest="usepdb_cls",
         metavar="modulename:classname",
+        type=_validate_usepdb_cls,
         help="start a custom interactive Python debugger on errors. "
         "For example: --pdbcls=IPython.terminal.debugger:TerminalPdb",
     )
+    group._addoption(
+        "--trace",
+        dest="trace",
+        action="store_true",
+        help="Immediately break when running each test.",
+    )
 
 
 def pytest_configure(config):
-    if config.getvalue("usepdb_cls"):
-        modname, classname = config.getvalue("usepdb_cls").split(":")
-        __import__(modname)
-        pdb_cls = getattr(sys.modules[modname], classname)
-    else:
-        pdb_cls = pdb.Pdb
-
+    if config.getvalue("trace"):
+        config.pluginmanager.register(PdbTrace(), "pdbtrace")
     if config.getvalue("usepdb"):
         config.pluginmanager.register(PdbInvoke(), "pdbinvoke")
 
-    # Use custom Pdb class set_trace instead of default Pdb on breakpoint() call
-    if SUPPORTS_BREAKPOINT_BUILTIN:
-        _environ_pythonbreakpoint = os.environ.get("PYTHONBREAKPOINT", "")
-        if _environ_pythonbreakpoint == "":
-            sys.breakpointhook = pytestPDB.set_trace
-
-    old = (pdb.set_trace, pytestPDB._pluginmanager)
-
-    def fin():
-        pdb.set_trace, pytestPDB._pluginmanager = old
-        pytestPDB._config = None
-        pytestPDB._pdb_cls = pdb.Pdb
-        if SUPPORTS_BREAKPOINT_BUILTIN:
-            sys.breakpointhook = sys.__breakpointhook__
-
+    pytestPDB._saved.append(
+        (pdb.set_trace, pytestPDB._pluginmanager, pytestPDB._config)
+    )
     pdb.set_trace = pytestPDB.set_trace
     pytestPDB._pluginmanager = config.pluginmanager
     pytestPDB._config = config
-    pytestPDB._pdb_cls = pdb_cls
+
+    # NOTE: not using pytest_unconfigure, since it might get called although
+    #       pytest_configure was not (if another plugin raises UsageError).
+    def fin():
+        (
+            pdb.set_trace,
+            pytestPDB._pluginmanager,
+            pytestPDB._config,
+        ) = pytestPDB._saved.pop()
+
     config._cleanup.append(fin)
 
 
 class pytestPDB(object):
     """ Pseudo PDB that defers to the real pdb. """
+
     _pluginmanager = None
     _config = None
-    _pdb_cls = pdb.Pdb
+    _saved = []
+    _recursive_debug = 0
+    _wrapped_pdb_cls = None
 
     @classmethod
-    def set_trace(cls):
-        """ invoke PDB set_trace debugging, dropping any IO capturing. """
+    def _is_capturing(cls, capman):
+        if capman:
+            return capman.is_capturing()
+        return False
+
+    @classmethod
+    def _import_pdb_cls(cls, capman):
+        if not cls._config:
+            # Happens when using pytest.set_trace outside of a test.
+            return pdb.Pdb
+
+        usepdb_cls = cls._config.getvalue("usepdb_cls")
+
+        if cls._wrapped_pdb_cls and cls._wrapped_pdb_cls[0] == usepdb_cls:
+            return cls._wrapped_pdb_cls[1]
+
+        if usepdb_cls:
+            modname, classname = usepdb_cls
+
+            try:
+                __import__(modname)
+                mod = sys.modules[modname]
+
+                # Handle --pdbcls=pdb:pdb.Pdb (useful e.g. with pdbpp).
+                parts = classname.split(".")
+                pdb_cls = getattr(mod, parts[0])
+                for part in parts[1:]:
+                    pdb_cls = getattr(pdb_cls, part)
+            except Exception as exc:
+                value = ":".join((modname, classname))
+                raise UsageError(
+                    "--pdbcls: could not import {!r}: {}".format(value, exc)
+                )
+        else:
+            pdb_cls = pdb.Pdb
+
+        wrapped_cls = cls._get_pdb_wrapper_class(pdb_cls, capman)
+        cls._wrapped_pdb_cls = (usepdb_cls, wrapped_cls)
+        return wrapped_cls
+
+    @classmethod
+    def _get_pdb_wrapper_class(cls, pdb_cls, capman):
+        import _pytest.config
+
+        class PytestPdbWrapper(pdb_cls, object):
+            _pytest_capman = capman
+            _continued = False
+
+            def do_debug(self, arg):
+                cls._recursive_debug += 1
+                ret = super(PytestPdbWrapper, self).do_debug(arg)
+                cls._recursive_debug -= 1
+                return ret
+
+            def do_continue(self, arg):
+                ret = super(PytestPdbWrapper, self).do_continue(arg)
+                if cls._recursive_debug == 0:
+                    tw = _pytest.config.create_terminal_writer(cls._config)
+                    tw.line()
+
+                    capman = self._pytest_capman
+                    capturing = pytestPDB._is_capturing(capman)
+                    if capturing:
+                        if capturing == "global":
+                            tw.sep(">", "PDB continue (IO-capturing resumed)")
+                        else:
+                            tw.sep(
+                                ">",
+                                "PDB continue (IO-capturing resumed for %s)"
+                                % capturing,
+                            )
+                        capman.resume()
+                    else:
+                        tw.sep(">", "PDB continue")
+                cls._pluginmanager.hook.pytest_leave_pdb(config=cls._config, pdb=self)
+                self._continued = True
+                return ret
+
+            do_c = do_cont = do_continue
+
+            def do_quit(self, arg):
+                """Raise Exit outcome when quit command is used in pdb.
+
+                This is a bit of a hack - it would be better if BdbQuit
+                could be handled, but this would require to wrap the
+                whole pytest run, and adjust the report etc.
+                """
+                ret = super(PytestPdbWrapper, self).do_quit(arg)
+
+                if cls._recursive_debug == 0:
+                    outcomes.exit("Quitting debugger")
+
+                return ret
+
+            do_q = do_quit
+            do_exit = do_quit
+
+            def setup(self, f, tb):
+                """Suspend on setup().
+
+                Needed after do_continue resumed, and entering another
+                breakpoint again.
+                """
+                ret = super(PytestPdbWrapper, self).setup(f, tb)
+                if not ret and self._continued:
+                    # pdb.setup() returns True if the command wants to exit
+                    # from the interaction: do not suspend capturing then.
+                    if self._pytest_capman:
+                        self._pytest_capman.suspend_global_capture(in_=True)
+                return ret
+
+            def get_stack(self, f, t):
+                stack, i = super(PytestPdbWrapper, self).get_stack(f, t)
+                if f is None:
+                    # Find last non-hidden frame.
+                    i = max(0, len(stack) - 1)
+                    while i and stack[i][0].f_locals.get("__tracebackhide__", False):
+                        i -= 1
+                return stack, i
+
+        return PytestPdbWrapper
+
+    @classmethod
+    def _init_pdb(cls, method, *args, **kwargs):
+        """ Initialize PDB debugging, dropping any IO capturing. """
         import _pytest.config
 
-        frame = sys._getframe().f_back
         if cls._pluginmanager is not None:
             capman = cls._pluginmanager.getplugin("capturemanager")
-            if capman:
-                capman.suspend_global_capture(in_=True)
+        else:
+            capman = None
+        if capman:
+            capman.suspend(in_=True)
+
+        if cls._config:
             tw = _pytest.config.create_terminal_writer(cls._config)
             tw.line()
-            tw.sep(">", "PDB set_trace (IO-capturing turned off)")
-            cls._pluginmanager.hook.pytest_enter_pdb(config=cls._config)
-        cls._pdb_cls().set_trace(frame)
+
+            if cls._recursive_debug == 0:
+                # Handle header similar to pdb.set_trace in py37+.
+                header = kwargs.pop("header", None)
+                if header is not None:
+                    tw.sep(">", header)
+                else:
+                    capturing = cls._is_capturing(capman)
+                    if capturing == "global":
+                        tw.sep(">", "PDB %s (IO-capturing turned off)" % (method,))
+                    elif capturing:
+                        tw.sep(
+                            ">",
+                            "PDB %s (IO-capturing turned off for %s)"
+                            % (method, capturing),
+                        )
+                    else:
+                        tw.sep(">", "PDB %s" % (method,))
+
+        _pdb = cls._import_pdb_cls(capman)(**kwargs)
+
+        if cls._pluginmanager:
+            cls._pluginmanager.hook.pytest_enter_pdb(config=cls._config, pdb=_pdb)
+        return _pdb
+
+    @classmethod
+    def set_trace(cls, *args, **kwargs):
+        """Invoke debugging via ``Pdb.set_trace``, dropping any IO capturing."""
+        frame = sys._getframe().f_back
+        _pdb = cls._init_pdb("set_trace", *args, **kwargs)
+        _pdb.set_trace(frame)
 
 
 class PdbInvoke(object):
-
     def pytest_exception_interact(self, node, call, report):
         capman = node.config.pluginmanager.getplugin("capturemanager")
         if capman:
-            out, err = capman.suspend_global_capture(in_=True)
+            capman.suspend_global_capture(in_=True)
+            out, err = capman.read_global_capture()
             sys.stdout.write(out)
             sys.stdout.write(err)
         _enter_pdb(node, call.excinfo, report)
 
     def pytest_internalerror(self, excrepr, excinfo):
-        for line in str(excrepr).split("\n"):
-            sys.stderr.write("INTERNALERROR> %s\n" % line)
-            sys.stderr.flush()
         tb = _postmortem_traceback(excinfo)
         post_mortem(tb)
 
 
+class PdbTrace(object):
+    @hookimpl(hookwrapper=True)
+    def pytest_pyfunc_call(self, pyfuncitem):
+        _test_pytest_function(pyfuncitem)
+        yield
+
+
+def _test_pytest_function(pyfuncitem):
+    _pdb = pytestPDB._init_pdb("runcall")
+    testfunction = pyfuncitem.obj
+    pyfuncitem.obj = _pdb.runcall
+    if "func" in pyfuncitem._fixtureinfo.argnames:  # pragma: no branch
+        raise ValueError("--trace can't be used with a fixture named func!")
+    pyfuncitem.funcargs["func"] = testfunction
+    new_list = list(pyfuncitem._fixtureinfo.argnames)
+    new_list.append("func")
+    pyfuncitem._fixtureinfo.argnames = tuple(new_list)
+
+
 def _enter_pdb(node, excinfo, rep):
     # XXX we re-use the TerminalReporter's terminalwriter
     # because this seems to avoid some encoding related troubles
@@ -114,7 +298,9 @@ def _enter_pdb(node, excinfo, rep):
     showcapture = node.config.option.showcapture
 
     for sectionname, content in (
-        ("stdout", rep.capstdout), ("stderr", rep.capstderr), ("log", rep.caplog)
+        ("stdout", rep.capstdout),
+        ("stderr", rep.capstderr),
+        ("log", rep.caplog),
     ):
         if showcapture in (sectionname, "all") and content:
             tw.sep(">", "captured " + sectionname)
@@ -126,8 +312,8 @@ def _enter_pdb(node, excinfo, rep):
     rep.toterminal(tw)
     tw.sep(">", "entering PDB")
     tb = _postmortem_traceback(excinfo)
-    post_mortem(tb)
     rep._pdbshown = True
+    post_mortem(tb)
     return rep
 
 
@@ -140,23 +326,9 @@ def _postmortem_traceback(excinfo):
         return excinfo._excinfo[2]
 
 
-def _find_last_non_hidden_frame(stack):
-    i = max(0, len(stack) - 1)
-    while i and stack[i][0].f_locals.get("__tracebackhide__", False):
-        i -= 1
-    return i
-
-
 def post_mortem(t):
-
-    class Pdb(pytestPDB._pdb_cls):
-
-        def get_stack(self, f, t):
-            stack, i = pdb.Pdb.get_stack(self, f, t)
-            if f is None:
-                i = _find_last_non_hidden_frame(stack)
-            return stack, i
-
-    p = Pdb()
+    p = pytestPDB._init_pdb("post_mortem")
     p.reset()
     p.interaction(None, t)
+    if p.quitting:
+        outcomes.exit("Quitting debugger")
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/deprecated.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/deprecated.py
index 7ebdcf99972..12394aca3f5 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/deprecated.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/deprecated.py
@@ -1,65 +1,96 @@
+# -*- coding: utf-8 -*-
 """
 This module contains deprecation messages and bits of code used elsewhere in the codebase
 that is planned to be removed in the next pytest release.
 
 Keeping it in a central location makes it easy to track what is deprecated and should
 be removed when the time comes.
+
+All constants defined in this module should be either PytestWarning instances or UnformattedWarning
+in case of warnings which need to format their messages.
 """
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from _pytest.warning_types import PytestDeprecationWarning
+from _pytest.warning_types import RemovedInPytest4Warning
+from _pytest.warning_types import UnformattedWarning
+
+YIELD_TESTS = "yield tests were removed in pytest 4.0 - {name} will be ignored"
 
 
-class RemovedInPytest4Warning(DeprecationWarning):
-    """warning class for features removed in pytest 4.0"""
-
-
-MAIN_STR_ARGS = "passing a string to pytest.main() is deprecated, " "pass a list of arguments instead."
-
-YIELD_TESTS = "yield tests are deprecated, and scheduled to be removed in pytest 4.0"
-
-FUNCARG_PREFIX = (
-    '{name}: declaring fixtures using "pytest_funcarg__" prefix is deprecated '
-    "and scheduled to be removed in pytest 4.0.  "
-    "Please remove the prefix and use the @pytest.fixture decorator instead."
+FIXTURE_FUNCTION_CALL = (
+    'Fixture "{name}" called directly. Fixtures are not meant to be called directly,\n'
+    "but are created automatically when test functions request them as parameters.\n"
+    "See https://docs.pytest.org/en/latest/fixture.html for more information about fixtures, and\n"
+    "https://docs.pytest.org/en/latest/deprecations.html#calling-fixtures-directly about how to update your code."
 )
 
-CFG_PYTEST_SECTION = "[pytest] section in {filename} files is deprecated, use [tool:pytest] instead."
-
-GETFUNCARGVALUE = "use of getfuncargvalue is deprecated, use getfixturevalue"
-
-RESULT_LOG = (
-    "--result-log is deprecated and scheduled for removal in pytest 4.0.\n"
-    "See https://docs.pytest.org/en/latest/usage.html#creating-resultlog-format-files for more information."
+FIXTURE_NAMED_REQUEST = PytestDeprecationWarning(
+    "'request' is a reserved name for fixtures and will raise an error in future versions"
 )
 
-MARK_INFO_ATTRIBUTE = RemovedInPytest4Warning(
-    "MarkInfo objects are deprecated as they contain merged marks which are hard to deal with correctly.\n"
-    "Please use node.get_closest_marker(name) or node.iter_markers(name).\n"
-    "Docs: https://docs.pytest.org/en/latest/mark.html#updating-code"
+CFG_PYTEST_SECTION = "[pytest] section in {filename} files is no longer supported, change to [tool:pytest] instead."
+
+GETFUNCARGVALUE = RemovedInPytest4Warning(
+    "getfuncargvalue is deprecated, use getfixturevalue"
 )
 
-MARK_PARAMETERSET_UNPACKING = RemovedInPytest4Warning(
-    "Applying marks directly to parameters is deprecated,"
-    " please use pytest.param(..., marks=...) instead.\n"
-    "For more details, see: https://docs.pytest.org/en/latest/parametrize.html"
+RAISES_MESSAGE_PARAMETER = PytestDeprecationWarning(
+    "The 'message' parameter is deprecated.\n"
+    "(did you mean to use `match='some regex'` to check the exception message?)\n"
+    "Please see:\n"
+    "  https://docs.pytest.org/en/4.6-maintenance/deprecations.html#message-parameter-of-pytest-raises"
 )
 
-RECORD_XML_PROPERTY = (
-    'Fixture renamed from "record_xml_property" to "record_property" as user '
-    "properties are now available to all reporters.\n"
-    '"record_xml_property" is now deprecated.'
+RESULT_LOG = PytestDeprecationWarning(
+    "--result-log is deprecated and scheduled for removal in pytest 5.0.\n"
+    "See https://docs.pytest.org/en/latest/deprecations.html#result-log-result-log for more information."
 )
 
-COLLECTOR_MAKEITEM = RemovedInPytest4Warning(
-    "pycollector makeitem was removed " "as it is an accidentially leaked internal api"
+RAISES_EXEC = PytestDeprecationWarning(
+    "raises(..., 'code(as_a_string)') is deprecated, use the context manager form or use `exec()` directly\n\n"
+    "See https://docs.pytest.org/en/latest/deprecations.html#raises-warns-exec"
+)
+WARNS_EXEC = PytestDeprecationWarning(
+    "warns(..., 'code(as_a_string)') is deprecated, use the context manager form or use `exec()` directly.\n\n"
+    "See https://docs.pytest.org/en/latest/deprecations.html#raises-warns-exec"
 )
 
-METAFUNC_ADD_CALL = (
-    "Metafunc.addcall is deprecated and scheduled to be removed in pytest 4.0.\n"
-    "Please use Metafunc.parametrize instead."
-)
-
-PYTEST_PLUGINS_FROM_NON_TOP_LEVEL_CONFTEST = RemovedInPytest4Warning(
-    "Defining pytest_plugins in a non-top-level conftest is deprecated, "
+PYTEST_PLUGINS_FROM_NON_TOP_LEVEL_CONFTEST = (
+    "Defining 'pytest_plugins' in a non-top-level conftest is no longer supported "
     "because it affects the entire directory tree in a non-explicit way.\n"
-    "Please move it to the top level conftest file instead."
+    "  {}\n"
+    "Please move it to a top level conftest file at the rootdir:\n"
+    "  {}\n"
+    "For more information, visit:\n"
+    "  https://docs.pytest.org/en/latest/deprecations.html#pytest-plugins-in-non-top-level-conftest-files"
+)
+
+PYTEST_CONFIG_GLOBAL = PytestDeprecationWarning(
+    "the `pytest.config` global is deprecated.  Please use `request.config` "
+    "or `pytest_configure` (if you're a pytest plugin) instead."
+)
+
+PYTEST_ENSURETEMP = RemovedInPytest4Warning(
+    "pytest/tmpdir_factory.ensuretemp is deprecated, \n"
+    "please use the tmp_path fixture or tmp_path_factory.mktemp"
+)
+
+PYTEST_LOGWARNING = PytestDeprecationWarning(
+    "pytest_logwarning is deprecated, no longer being called, and will be removed soon\n"
+    "please use pytest_warning_captured instead"
+)
+
+PYTEST_WARNS_UNKNOWN_KWARGS = UnformattedWarning(
+    PytestDeprecationWarning,
+    "pytest.warns() got unexpected keyword arguments: {args!r}.\n"
+    "This will be an error in future versions.",
+)
+
+PYTEST_PARAM_UNKNOWN_KWARGS = UnformattedWarning(
+    PytestDeprecationWarning,
+    "pytest.param() got unexpected keyword arguments: {args!r}.\n"
+    "This will be an error in future versions.",
 )
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/doctest.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/doctest.py
index b0a3ad08dfc..659d24aeebc 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/doctest.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/doctest.py
@@ -1,14 +1,24 @@
+# -*- coding: utf-8 -*-
 """ discover and run doctests in modules and test files."""
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
-import traceback
-import sys
+import inspect
 import platform
+import sys
+import traceback
+import warnings
+from contextlib import contextmanager
 
 import pytest
-from _pytest._code.code import ExceptionInfo, ReprFileLocation, TerminalRepr
+from _pytest._code.code import ExceptionInfo
+from _pytest._code.code import ReprFileLocation
+from _pytest._code.code import TerminalRepr
+from _pytest.compat import safe_getattr
 from _pytest.fixtures import FixtureRequest
-
+from _pytest.outcomes import Skipped
+from _pytest.warning_types import PytestWarning
 
 DOCTEST_REPORT_CHOICE_NONE = "none"
 DOCTEST_REPORT_CHOICE_CDIFF = "cdiff"
@@ -105,7 +115,6 @@ def _is_doctest(config, path, parent):
 
 
 class ReprFailDoctest(TerminalRepr):
-
     def __init__(self, reprlocation_lines):
         # List of (reprlocation, lines) tuples
         self.reprlocation_lines = reprlocation_lines
@@ -118,7 +127,6 @@ class ReprFailDoctest(TerminalRepr):
 
 
 class MultipleDoctestFailures(Exception):
-
     def __init__(self, failures):
         super(MultipleDoctestFailures, self).__init__()
         self.failures = failures
@@ -149,6 +157,8 @@ def _init_runner_class():
                 raise failure
 
         def report_unexpected_exception(self, out, test, example, exc_info):
+            if isinstance(exc_info[1], Skipped):
+                raise exc_info[1]
             failure = doctest.UnexpectedException(test, example, exc_info)
             if self.continue_on_failure:
                 out.append(failure)
@@ -172,7 +182,6 @@ def _get_runner(checker=None, verbose=None, optionflags=0, continue_on_failure=T
 
 
 class DoctestItem(pytest.Item):
-
     def __init__(self, name, parent, runner=None, dtest=None):
         super(DoctestItem, self).__init__(name, parent)
         self.runner = runner
@@ -206,7 +215,8 @@ class DoctestItem(pytest.Item):
             return
         capman = self.config.pluginmanager.getplugin("capturemanager")
         if capman:
-            out, err = capman.suspend_global_capture(in_=True)
+            capman.suspend_global_capture(in_=True)
+            out, err = capman.read_global_capture()
             sys.stdout.write(out)
             sys.stderr.write(err)
 
@@ -243,7 +253,7 @@ class DoctestItem(pytest.Item):
                         for (i, x) in enumerate(lines)
                     ]
                     # trim docstring error lines to 10
-                    lines = lines[max(example.lineno - 9, 0):example.lineno + 1]
+                    lines = lines[max(example.lineno - 9, 0) : example.lineno + 1]
                 else:
                     lines = [
                         "EXAMPLE LOCATION UNKNOWN, not showing all tests of that example"
@@ -255,9 +265,7 @@ class DoctestItem(pytest.Item):
                 if isinstance(failure, doctest.DocTestFailure):
                     lines += checker.output_difference(
                         example, failure.got, report_choice
-                    ).split(
-                        "\n"
-                    )
+                    ).split("\n")
                 else:
                     inner_excinfo = ExceptionInfo(failure.exc_info)
                     lines += ["UNEXPECTED EXCEPTION: %s" % repr(inner_excinfo.value)]
@@ -346,11 +354,69 @@ def _check_all_skipped(test):
         pytest.skip("all tests skipped by +SKIP option")
 
 
-class DoctestModule(pytest.Module):
+def _is_mocked(obj):
+    """
+    returns if a object is possibly a mock object by checking the existence of a highly improbable attribute
+    """
+    return (
+        safe_getattr(obj, "pytest_mock_example_attribute_that_shouldnt_exist", None)
+        is not None
+    )
 
+
+@contextmanager
+def _patch_unwrap_mock_aware():
+    """
+    contextmanager which replaces ``inspect.unwrap`` with a version
+    that's aware of mock objects and doesn't recurse on them
+    """
+    real_unwrap = getattr(inspect, "unwrap", None)
+    if real_unwrap is None:
+        yield
+    else:
+
+        def _mock_aware_unwrap(obj, stop=None):
+            try:
+                if stop is None or stop is _is_mocked:
+                    return real_unwrap(obj, stop=_is_mocked)
+                return real_unwrap(obj, stop=lambda obj: _is_mocked(obj) or stop(obj))
+            except Exception as e:
+                warnings.warn(
+                    "Got %r when unwrapping %r.  This is usually caused "
+                    "by a violation of Python's object protocol; see e.g. "
+                    "https://github.com/pytest-dev/pytest/issues/5080" % (e, obj),
+                    PytestWarning,
+                )
+                raise
+
+        inspect.unwrap = _mock_aware_unwrap
+        try:
+            yield
+        finally:
+            inspect.unwrap = real_unwrap
+
+
+class DoctestModule(pytest.Module):
     def collect(self):
         import doctest
 
+        class MockAwareDocTestFinder(doctest.DocTestFinder):
+            """
+            a hackish doctest finder that overrides stdlib internals to fix a stdlib bug
+
+            https://github.com/pytest-dev/pytest/issues/3456
+            https://bugs.python.org/issue25532
+            """
+
+            def _find(self, tests, obj, name, module, source_lines, globs, seen):
+                if _is_mocked(obj):
+                    return
+                with _patch_unwrap_mock_aware():
+
+                    doctest.DocTestFinder._find(
+                        self, tests, obj, name, module, source_lines, globs, seen
+                    )
+
         if self.fspath.basename == "conftest.py":
             module = self.config.pluginmanager._importconftest(self.fspath)
         else:
@@ -362,7 +428,7 @@ class DoctestModule(pytest.Module):
                 else:
                     raise
         # uses internal doctest module parsing mechanism
-        finder = doctest.DocTestFinder()
+        finder = MockAwareDocTestFinder()
         optionflags = get_optionflags(self)
         runner = _get_runner(
             verbose=0,
@@ -480,9 +546,7 @@ def _get_report_choice(key):
         DOCTEST_REPORT_CHOICE_NDIFF: doctest.REPORT_NDIFF,
         DOCTEST_REPORT_CHOICE_ONLY_FIRST_FAILURE: doctest.REPORT_ONLY_FIRST_FAILURE,
         DOCTEST_REPORT_CHOICE_NONE: 0,
-    }[
-        key
-    ]
+    }[key]
 
 
 def _fix_spoof_python2(runner, encoding):
@@ -502,7 +566,6 @@ def _fix_spoof_python2(runner, encoding):
     from doctest import _SpoofOut
 
     class UnicodeSpoof(_SpoofOut):
-
         def getvalue(self):
             result = _SpoofOut.getvalue(self)
             if encoding and isinstance(result, bytes):
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/fixtures.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/fixtures.py
index 495e6b9b332..280a48608b6 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/fixtures.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/fixtures.py
@@ -1,36 +1,43 @@
-from __future__ import absolute_import, division, print_function
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import functools
 import inspect
+import itertools
 import sys
 import warnings
-from collections import OrderedDict, deque, defaultdict
-from more_itertools import flatten
+from collections import defaultdict
+from collections import deque
+from collections import OrderedDict
 
 import attr
 import py
-from py._code.code import FormattedExcinfo
+import six
 
 import _pytest
 from _pytest import nodes
+from _pytest._code.code import FormattedExcinfo
 from _pytest._code.code import TerminalRepr
-from _pytest.compat import (
-    NOTSET,
-    exc_clear,
-    _format_args,
-    getfslineno,
-    get_real_func,
-    is_generator,
-    isclass,
-    getimfunc,
-    getlocation,
-    getfuncargnames,
-    safe_getattr,
-    FuncargnamesCompatAttr,
-)
-from _pytest.outcomes import fail, TEST_OUTCOME
-
-FIXTURE_MSG = 'fixtures cannot have "pytest_funcarg__" prefix and be decorated with @pytest.fixture:\n{}'
+from _pytest.compat import _format_args
+from _pytest.compat import _PytestWrapper
+from _pytest.compat import exc_clear
+from _pytest.compat import FuncargnamesCompatAttr
+from _pytest.compat import get_real_func
+from _pytest.compat import get_real_method
+from _pytest.compat import getfslineno
+from _pytest.compat import getfuncargnames
+from _pytest.compat import getimfunc
+from _pytest.compat import getlocation
+from _pytest.compat import is_generator
+from _pytest.compat import isclass
+from _pytest.compat import NOTSET
+from _pytest.compat import safe_getattr
+from _pytest.deprecated import FIXTURE_FUNCTION_CALL
+from _pytest.deprecated import FIXTURE_NAMED_REQUEST
+from _pytest.outcomes import fail
+from _pytest.outcomes import TEST_OUTCOME
 
 
 @attr.s(frozen=True)
@@ -45,6 +52,7 @@ def pytest_sessionstart(session):
 
     scopename2class.update(
         {
+            "package": _pytest.python.Package,
             "class": _pytest.python.Class,
             "module": _pytest.python.Module,
             "function": _pytest.nodes.Item,
@@ -58,6 +66,7 @@ scopename2class = {}
 
 
 scope2props = dict(session=())
+scope2props["package"] = ("fspath",)
 scope2props["module"] = ("fspath", "module")
 scope2props["class"] = scope2props["module"] + ("cls",)
 scope2props["instance"] = scope2props["class"] + ("instance",)
@@ -65,7 +74,6 @@ scope2props["function"] = scope2props["instance"] + ("function", "keywords")
 
 
 def scopeproperty(name=None, doc=None):
-
     def decoratescope(func):
         scopename = name or func.__name__
 
@@ -81,6 +89,21 @@ def scopeproperty(name=None, doc=None):
     return decoratescope
 
 
+def get_scope_package(node, fixturedef):
+    import pytest
+
+    cls = pytest.Package
+    current = node
+    fixture_package_name = "%s/%s" % (fixturedef.baseid, "__init__.py")
+    while current and (
+        type(current) is not cls or fixture_package_name != current.nodeid
+    ):
+        current = current.parent
+    if current is None:
+        return node.session
+    return current
+
+
 def get_scope_node(node, scope):
     cls = scopename2class.get(scope)
     if cls is None:
@@ -174,9 +197,11 @@ def get_parametrized_fixture_keys(item, scopenum):
                 continue
             if scopenum == 0:  # session
                 key = (argname, param_index)
-            elif scopenum == 1:  # module
+            elif scopenum == 1:  # package
+                key = (argname, param_index, item.fspath.dirpath())
+            elif scopenum == 2:  # module
                 key = (argname, param_index, item.fspath)
-            elif scopenum == 2:  # class
+            elif scopenum == 3:  # class
                 key = (argname, param_index, item.fspath, item.cls)
             yield key
 
@@ -275,12 +300,43 @@ def get_direct_param_fixture_func(request):
     return request.param
 
 
+@attr.s(slots=True)
 class FuncFixtureInfo(object):
+    # original function argument names
+    argnames = attr.ib(type=tuple)
+    # argnames that function immediately requires. These include argnames +
+    # fixture names specified via usefixtures and via autouse=True in fixture
+    # definitions.
+    initialnames = attr.ib(type=tuple)
+    names_closure = attr.ib()  # List[str]
+    name2fixturedefs = attr.ib()  # List[str, List[FixtureDef]]
 
-    def __init__(self, argnames, names_closure, name2fixturedefs):
-        self.argnames = argnames
-        self.names_closure = names_closure
-        self.name2fixturedefs = name2fixturedefs
+    def prune_dependency_tree(self):
+        """Recompute names_closure from initialnames and name2fixturedefs
+
+        Can only reduce names_closure, which means that the new closure will
+        always be a subset of the old one. The order is preserved.
+
+        This method is needed because direct parametrization may shadow some
+        of the fixtures that were included in the originally built dependency
+        tree. In this way the dependency tree can get pruned, and the closure
+        of argnames may get reduced.
+        """
+        closure = set()
+        working_set = set(self.initialnames)
+        while working_set:
+            argname = working_set.pop()
+            # argname may be smth not included in the original names_closure,
+            # in which case we ignore it. This currently happens with pseudo
+            # FixtureDefs which wrap 'get_direct_param_fixture_func(request)'.
+            # So they introduce the new dependency 'request' which might have
+            # been missing in the original tree (closure).
+            if argname not in closure and argname in self.names_closure:
+                closure.add(argname)
+                if argname in self.name2fixturedefs:
+                    working_set.update(self.name2fixturedefs[argname][-1].argnames)
+
+        self.names_closure[:] = sorted(closure, key=self.names_closure.index)
 
 
 class FixtureRequest(FuncargnamesCompatAttr):
@@ -305,8 +361,10 @@ class FixtureRequest(FuncargnamesCompatAttr):
 
     @property
     def fixturenames(self):
-        # backward incompatible note: now a readonly property
-        return list(self._pyfuncitem._fixtureinfo.names_closure)
+        """names of all active fixtures in this request"""
+        result = list(self._pyfuncitem._fixtureinfo.names_closure)
+        result.extend(set(self._fixture_defs).difference(result))
+        return result
 
     @property
     def node(self):
@@ -410,40 +468,6 @@ class FixtureRequest(FuncargnamesCompatAttr):
             if argname not in item.funcargs:
                 item.funcargs[argname] = self.getfixturevalue(argname)
 
-    def cached_setup(self, setup, teardown=None, scope="module", extrakey=None):
-        """ (deprecated) Return a testing resource managed by ``setup`` &
-        ``teardown`` calls.  ``scope`` and ``extrakey`` determine when the
-        ``teardown`` function will be called so that subsequent calls to
-        ``setup`` would recreate the resource.  With pytest-2.3 you often
-        do not need ``cached_setup()`` as you can directly declare a scope
-        on a fixture function and register a finalizer through
-        ``request.addfinalizer()``.
-
-        :arg teardown: function receiving a previously setup resource.
-        :arg setup: a no-argument function creating a resource.
-        :arg scope: a string value out of ``function``, ``class``, ``module``
-            or ``session`` indicating the caching lifecycle of the resource.
-        :arg extrakey: added to internal caching key of (funcargname, scope).
-        """
-        if not hasattr(self.config, "_setupcache"):
-            self.config._setupcache = {}  # XXX weakref?
-        cachekey = (self.fixturename, self._getscopeitem(scope), extrakey)
-        cache = self.config._setupcache
-        try:
-            val = cache[cachekey]
-        except KeyError:
-            self._check_scope(self.fixturename, self.scope, scope)
-            val = setup()
-            cache[cachekey] = val
-            if teardown is not None:
-
-                def finalizer():
-                    del cache[cachekey]
-                    teardown(val)
-
-                self._addfinalizer(finalizer, scope=scope)
-        return val
-
     def getfixturevalue(self, argname):
         """ Dynamically run a named fixture function.
 
@@ -458,7 +482,7 @@ class FixtureRequest(FuncargnamesCompatAttr):
         """ Deprecated, use getfixturevalue. """
         from _pytest import deprecated
 
-        warnings.warn(deprecated.GETFUNCARGVALUE, DeprecationWarning, stacklevel=2)
+        warnings.warn(deprecated.GETFUNCARGVALUE, stacklevel=2)
         return self.getfixturevalue(argname)
 
     def _get_active_fixturedef(self, argname):
@@ -508,7 +532,20 @@ class FixtureRequest(FuncargnamesCompatAttr):
         except (AttributeError, ValueError):
             param = NOTSET
             param_index = 0
-            if fixturedef.params is not None:
+            has_params = fixturedef.params is not None
+            fixtures_not_supported = getattr(funcitem, "nofuncargs", False)
+            if has_params and fixtures_not_supported:
+                msg = (
+                    "{name} does not support fixtures, maybe unittest.TestCase subclass?\n"
+                    "Node id: {nodeid}\n"
+                    "Function type: {typename}"
+                ).format(
+                    name=funcitem.name,
+                    nodeid=funcitem.nodeid,
+                    typename=type(funcitem).__name__,
+                )
+                fail(msg, pytrace=False)
+            if has_params:
                 frame = inspect.stack()[3]
                 frameinfo = inspect.getframeinfo(frame[0])
                 source_path = frameinfo.filename
@@ -517,19 +554,20 @@ class FixtureRequest(FuncargnamesCompatAttr):
                 if source_path.relto(funcitem.config.rootdir):
                     source_path = source_path.relto(funcitem.config.rootdir)
                 msg = (
-                    "The requested fixture has no parameter defined for the "
-                    "current test.\n\nRequested fixture '{}' defined in:\n{}"
+                    "The requested fixture has no parameter defined for test:\n"
+                    "    {}\n\n"
+                    "Requested fixture '{}' defined in:\n{}"
                     "\n\nRequested here:\n{}:{}".format(
+                        funcitem.nodeid,
                         fixturedef.argname,
                         getlocation(fixturedef.func, funcitem.config.rootdir),
                         source_path,
                         source_lineno,
                     )
                 )
-                fail(msg)
+                fail(msg, pytrace=False)
         else:
-            # indices might not be set if old-style metafunc.addcall() was used
-            param_index = funcitem.callspec.indices.get(argname, 0)
+            param_index = funcitem.callspec.indices[argname]
             # if a parametrize invocation set a scope it will override
             # the static scope defined with the fixture function
             paramscopenum = funcitem.callspec._arg2scopenum.get(argname)
@@ -542,17 +580,19 @@ class FixtureRequest(FuncargnamesCompatAttr):
         subrequest._check_scope(argname, self.scope, scope)
 
         # clear sys.exc_info before invoking the fixture (python bug?)
-        # if its not explicitly cleared it will leak into the call
+        # if it's not explicitly cleared it will leak into the call
         exc_clear()
         try:
             # call the fixture function
             fixturedef.execute(request=subrequest)
         finally:
-            # if fixture function failed it might have registered finalizers
-            self.session._setupstate.addfinalizer(
-                functools.partial(fixturedef.finish, request=subrequest),
-                subrequest.node,
-            )
+            self._schedule_finalizers(fixturedef, subrequest)
+
+    def _schedule_finalizers(self, fixturedef, subrequest):
+        # if fixture function failed it might have registered finalizers
+        self.session._setupstate.addfinalizer(
+            functools.partial(fixturedef.finish, request=subrequest), subrequest.node
+        )
 
     def _check_scope(self, argname, invoking_scope, requested_scope):
         if argname == "request":
@@ -575,14 +615,17 @@ class FixtureRequest(FuncargnamesCompatAttr):
             fs, lineno = getfslineno(factory)
             p = self._pyfuncitem.session.fspath.bestrelpath(fs)
             args = _format_args(factory)
-            lines.append("%s:%d:  def %s%s" % (p, lineno, factory.__name__, args))
+            lines.append("%s:%d:  def %s%s" % (p, lineno + 1, factory.__name__, args))
         return lines
 
     def _getscopeitem(self, scope):
         if scope == "function":
             # this might also be a non-function Item despite its attribute name
             return self._pyfuncitem
-        node = get_scope_node(self._pyfuncitem, scope)
+        if scope == "package":
+            node = get_scope_package(self._pyfuncitem, self._fixturedef)
+        else:
+            node = get_scope_node(self._pyfuncitem, scope)
         if node is None and scope == "class":
             # fallback to function item itself
             node = self._pyfuncitem
@@ -619,14 +662,18 @@ class SubRequest(FixtureRequest):
     def addfinalizer(self, finalizer):
         self._fixturedef.addfinalizer(finalizer)
 
-
-class ScopeMismatchError(Exception):
-    """ A fixture function tries to use a different fixture function which
-    which has a lower scope (e.g. a Session one calls a function one)
-    """
+    def _schedule_finalizers(self, fixturedef, subrequest):
+        # if the executing fixturedef was not explicitly requested in the argument list (via
+        # getfixturevalue inside the fixture call) then ensure this fixture def will be finished
+        # first
+        if fixturedef.argname not in self.funcargnames:
+            fixturedef.addfinalizer(
+                functools.partial(self._fixturedef.finish, request=self)
+            )
+        super(SubRequest, self)._schedule_finalizers(fixturedef, subrequest)
 
 
-scopes = "session module class function".split()
+scopes = "session package module class function".split()
 scopenum_function = scopes.index("function")
 
 
@@ -641,10 +688,11 @@ def scope2index(scope, descr, where=None):
     try:
         return scopes.index(scope)
     except ValueError:
-        raise ValueError(
-            "{} {}has an unsupported scope value '{}'".format(
+        fail(
+            "{} {}got an unexpected scope value '{}'".format(
                 descr, "from {} ".format(where) if where else "", scope
-            )
+            ),
+            pytrace=False,
         )
 
 
@@ -684,21 +732,25 @@ class FixtureLookupError(LookupError):
 
         if msg is None:
             fm = self.request._fixturemanager
-            available = []
+            available = set()
             parentid = self.request._pyfuncitem.parent.nodeid
             for name, fixturedefs in fm._arg2fixturedefs.items():
                 faclist = list(fm._matchfactories(fixturedefs, parentid))
-                if faclist and name not in available:
-                    available.append(name)
-            msg = "fixture %r not found" % (self.argname,)
-            msg += "\n available fixtures: %s" % (", ".join(sorted(available)),)
+                if faclist:
+                    available.add(name)
+            if self.argname in available:
+                msg = " recursive dependency involving fixture '{}' detected".format(
+                    self.argname
+                )
+            else:
+                msg = "fixture '{}' not found".format(self.argname)
+            msg += "\n available fixtures: {}".format(", ".join(sorted(available)))
             msg += "\n use 'pytest --fixtures [testpath]' for help on them."
 
         return FixtureLookupErrorRepr(fspath, lineno, tblines, msg, self.argname)
 
 
 class FixtureLookupErrorRepr(TerminalRepr):
-
     def __init__(self, filename, firstlineno, tblines, errorstring, argname):
         self.tblines = tblines
         self.errorstring = errorstring
@@ -737,23 +789,26 @@ def call_fixture_func(fixturefunc, request, kwargs):
     if yieldctx:
         it = fixturefunc(**kwargs)
         res = next(it)
-
-        def teardown():
-            try:
-                next(it)
-            except StopIteration:
-                pass
-            else:
-                fail_fixturefunc(
-                    fixturefunc, "yield_fixture function has more than one 'yield'"
-                )
-
-        request.addfinalizer(teardown)
+        finalizer = functools.partial(_teardown_yield_fixture, fixturefunc, it)
+        request.addfinalizer(finalizer)
     else:
         res = fixturefunc(**kwargs)
     return res
 
 
+def _teardown_yield_fixture(fixturefunc, it):
+    """Executes the teardown of a fixture function by advancing the iterator after the
+    yield and ensure the iteration ends (if not it means there is more than one yield in the function)"""
+    try:
+        next(it)
+    except StopIteration:
+        pass
+    else:
+        fail_fixturefunc(
+            fixturefunc, "yield_fixture function has more than one 'yield'"
+        )
+
+
 class FixtureDef(object):
     """ A container for a factory definition. """
 
@@ -775,7 +830,9 @@ class FixtureDef(object):
         self.argname = argname
         self.scope = scope
         self.scopenum = scope2index(
-            scope or "function", descr="fixture {}".format(func.__name__), where=baseid
+            scope or "function",
+            descr="Fixture '{}'".format(func.__name__),
+            where=baseid,
         )
         self.params = params
         self.argnames = getfuncargnames(func, is_method=unittest)
@@ -797,9 +854,9 @@ class FixtureDef(object):
                     exceptions.append(sys.exc_info())
             if exceptions:
                 e = exceptions[0]
-                del exceptions  # ensure we don't keep all frames alive because of the traceback
-                py.builtin._reraise(*e)
-
+                # Ensure to not keep frame references through traceback.
+                del exceptions
+                six.reraise(*e)
         finally:
             hook = self._fixturemanager.session.gethookproxy(request.node.fspath)
             hook.pytest_fixture_post_finalizer(fixturedef=self, request=request)
@@ -825,7 +882,7 @@ class FixtureDef(object):
             result, cache_key, err = cached_result
             if my_cache_key == cache_key:
                 if err is not None:
-                    py.builtin._reraise(*err)
+                    six.reraise(*err)
                 else:
                     return result
             # we have a previous but differently parametrized fixture instance
@@ -837,21 +894,17 @@ class FixtureDef(object):
         return hook.pytest_fixture_setup(fixturedef=self, request=request)
 
     def __repr__(self):
-        return (
-            "<FixtureDef name=%r scope=%r baseid=%r >"
-            % (self.argname, self.scope, self.baseid)
+        return "<FixtureDef argname=%r scope=%r baseid=%r>" % (
+            self.argname,
+            self.scope,
+            self.baseid,
         )
 
 
-def pytest_fixture_setup(fixturedef, request):
-    """ Execution of fixture setup. """
-    kwargs = {}
-    for argname in fixturedef.argnames:
-        fixdef = request._get_active_fixturedef(argname)
-        result, arg_cache_key, exc = fixdef.cached_result
-        request._check_scope(argname, request.scope, fixdef.scope)
-        kwargs[argname] = result
-
+def resolve_fixture_function(fixturedef, request):
+    """Gets the actual callable that can be called to obtain the fixture value, dealing with unittest-specific
+    instances and bound methods.
+    """
     fixturefunc = fixturedef.func
     if fixturedef.unittest:
         if request.instance is not None:
@@ -865,6 +918,19 @@ def pytest_fixture_setup(fixturedef, request):
             fixturefunc = getimfunc(fixturedef.func)
             if fixturefunc != fixturedef.func:
                 fixturefunc = fixturefunc.__get__(request.instance)
+    return fixturefunc
+
+
+def pytest_fixture_setup(fixturedef, request):
+    """ Execution of fixture setup. """
+    kwargs = {}
+    for argname in fixturedef.argnames:
+        fixdef = request._get_active_fixturedef(argname)
+        result, arg_cache_key, exc = fixdef.cached_result
+        request._check_scope(argname, request.scope, fixdef.scope)
+        kwargs[argname] = result
+
+    fixturefunc = resolve_fixture_function(fixturedef, request)
     my_cache_key = request.param_index
     try:
         result = call_fixture_func(fixturefunc, request, kwargs)
@@ -883,6 +949,25 @@ def _ensure_immutable_ids(ids):
     return tuple(ids)
 
 
+def wrap_function_to_error_out_if_called_directly(function, fixture_marker):
+    """Wrap the given fixture function so we can raise an error about it being called directly,
+    instead of used as an argument in a test function.
+    """
+    message = FIXTURE_FUNCTION_CALL.format(
+        name=fixture_marker.name or function.__name__
+    )
+
+    @six.wraps(function)
+    def result(*args, **kwargs):
+        fail(message, pytrace=False)
+
+    # keep reference to the original function in our own custom attribute so we don't unwrap
+    # further than this point and lose useful wrappings like @mock.patch (#3774)
+    result.__pytest_wrapped__ = _PytestWrapper(function)
+
+    return result
+
+
 @attr.s(frozen=True)
 class FixtureFunctionMarker(object):
     scope = attr.ib()
@@ -893,13 +978,18 @@ class FixtureFunctionMarker(object):
 
     def __call__(self, function):
         if isclass(function):
-            raise ValueError("class fixtures not supported (may be in the future)")
+            raise ValueError("class fixtures not supported (maybe in the future)")
 
         if getattr(function, "_pytestfixturefunction", False):
             raise ValueError(
                 "fixture is being applied more than once to the same function"
             )
 
+        function = wrap_function_to_error_out_if_called_directly(function, self)
+
+        name = self.name or function.__name__
+        if name == "request":
+            warnings.warn(FIXTURE_NAMED_REQUEST)
         function._pytestfixturefunction = self
         return function
 
@@ -907,20 +997,32 @@ class FixtureFunctionMarker(object):
 def fixture(scope="function", params=None, autouse=False, ids=None, name=None):
     """Decorator to mark a fixture factory function.
 
-    This decorator can be used (with or without parameters) to define a
-    fixture function.  The name of the fixture function can later be
-    referenced to cause its invocation ahead of running tests: test
-    modules or classes can use the pytest.mark.usefixtures(fixturename)
-    marker.  Test functions can directly use fixture names as input
+    This decorator can be used, with or without parameters, to define a
+    fixture function.
+
+    The name of the fixture function can later be referenced to cause its
+    invocation ahead of running tests: test
+    modules or classes can use the ``pytest.mark.usefixtures(fixturename)``
+    marker.
+
+    Test functions can directly use fixture names as input
     arguments in which case the fixture instance returned from the fixture
     function will be injected.
 
+    Fixtures can provide their values to test functions using ``return`` or ``yield``
+    statements. When using ``yield`` the code block after the ``yield`` statement is executed
+    as teardown code regardless of the test outcome, and must yield exactly once.
+
     :arg scope: the scope for which this fixture is shared, one of
-                "function" (default), "class", "module" or "session".
+                ``"function"`` (default), ``"class"``, ``"module"``,
+                ``"package"`` or ``"session"``.
+
+                ``"package"`` is considered **experimental** at this time.
 
     :arg params: an optional list of parameters which will cause multiple
                 invocations of the fixture function and all of the tests
                 using it.
+                The current parameter is available in ``request.param``.
 
     :arg autouse: if True, the fixture func is activated for all tests that
                 can see it.  If False (the default) then an explicit
@@ -937,10 +1039,6 @@ def fixture(scope="function", params=None, autouse=False, ids=None, name=None):
                 to resolve this is to name the decorated function
                 ``fixture_<fixturename>`` and then use
                 ``@pytest.fixture(name='<fixturename>')``.
-
-    Fixtures can optionally provide their values to test functions using a ``yield`` statement,
-    instead of ``return``. In this case, the code block after the ``yield`` statement is executed
-    as teardown code regardless of the test outcome. A fixture function must yield exactly once.
     """
     if callable(scope) and params is None and autouse is False:
         # direct decoration
@@ -956,13 +1054,7 @@ def yield_fixture(scope="function", params=None, autouse=False, ids=None, name=N
     .. deprecated:: 3.0
         Use :py:func:`pytest.fixture` directly instead.
     """
-    if callable(scope) and params is None and not autouse:
-        # direct decoration
-        return FixtureFunctionMarker("function", params, autouse, ids=ids, name=name)(
-            scope
-        )
-    else:
-        return FixtureFunctionMarker(scope, params, autouse, ids=ids, name=name)
+    return fixture(scope=scope, params=params, autouse=autouse, ids=ids, name=name)
 
 
 defaultfuncargprefixmarker = fixture()
@@ -975,13 +1067,22 @@ def pytestconfig(request):
     Example::
 
         def test_foo(pytestconfig):
-            if pytestconfig.getoption("verbose"):
+            if pytestconfig.getoption("verbose") > 0:
                 ...
 
     """
     return request.config
 
 
+def pytest_addoption(parser):
+    parser.addini(
+        "usefixtures",
+        type="args",
+        default=[],
+        help="list of default fixtures to be used with this project",
+    )
+
+
 class FixtureManager(object):
     """
     pytest fixtures definitions and information is stored and managed
@@ -1014,7 +1115,6 @@ class FixtureManager(object):
     by a lookup of their FuncFixtureInfo.
     """
 
-    _argprefix = "pytest_funcarg__"
     FixtureLookupError = FixtureLookupError
     FixtureLookupErrorRepr = FixtureLookupErrorRepr
 
@@ -1027,24 +1127,47 @@ class FixtureManager(object):
         self._nodeid_and_autousenames = [("", self.config.getini("usefixtures"))]
         session.config.pluginmanager.register(self, "funcmanage")
 
+    def _get_direct_parametrize_args(self, node):
+        """This function returns all the direct parametrization
+        arguments of a node, so we don't mistake them for fixtures
+
+        Check https://github.com/pytest-dev/pytest/issues/5036
+
+        This things are done later as well when dealing with parametrization
+        so this could be improved
+        """
+        from _pytest.mark import ParameterSet
+
+        parametrize_argnames = []
+        for marker in node.iter_markers(name="parametrize"):
+            if not marker.kwargs.get("indirect", False):
+                p_argnames, _ = ParameterSet._parse_parametrize_args(
+                    *marker.args, **marker.kwargs
+                )
+                parametrize_argnames.extend(p_argnames)
+
+        return parametrize_argnames
+
     def getfixtureinfo(self, node, func, cls, funcargs=True):
         if funcargs and not getattr(node, "nofuncargs", False):
             argnames = getfuncargnames(func, cls=cls)
         else:
             argnames = ()
-        usefixtures = flatten(
+
+        usefixtures = itertools.chain.from_iterable(
             mark.args for mark in node.iter_markers(name="usefixtures")
         )
-        initialnames = argnames
-        initialnames = tuple(usefixtures) + initialnames
+        initialnames = tuple(usefixtures) + argnames
         fm = node.session._fixturemanager
-        names_closure, arg2fixturedefs = fm.getfixtureclosure(initialnames, node)
-        return FuncFixtureInfo(argnames, names_closure, arg2fixturedefs)
+        initialnames, names_closure, arg2fixturedefs = fm.getfixtureclosure(
+            initialnames, node, ignore_args=self._get_direct_parametrize_args(node)
+        )
+        return FuncFixtureInfo(argnames, initialnames, names_closure, arg2fixturedefs)
 
     def pytest_plugin_registered(self, plugin):
         nodeid = None
         try:
-            p = py.path.local(plugin.__file__)
+            p = py.path.local(plugin.__file__).realpath()
         except AttributeError:
             pass
         else:
@@ -1055,6 +1178,7 @@ class FixtureManager(object):
                 nodeid = p.dirpath().relto(self.config.rootdir)
                 if p.sep != nodes.SEP:
                     nodeid = nodeid.replace(p.sep, nodes.SEP)
+
         self.parsefactories(plugin, nodeid)
 
     def _getautousenames(self, nodeid):
@@ -1064,13 +1188,13 @@ class FixtureManager(object):
             if nodeid.startswith(baseid):
                 if baseid:
                     i = len(baseid)
-                    nextchar = nodeid[i:i + 1]
+                    nextchar = nodeid[i : i + 1]
                     if nextchar and nextchar not in ":/":
                         continue
                 autousenames.extend(basenames)
         return autousenames
 
-    def getfixtureclosure(self, fixturenames, parentnode):
+    def getfixtureclosure(self, fixturenames, parentnode, ignore_args=()):
         # collect the closure of all fixtures , starting with the given
         # fixturenames as the initial set.  As we have to visit all
         # factory definitions anyway, we also return an arg2fixturedefs
@@ -1087,11 +1211,19 @@ class FixtureManager(object):
                     fixturenames_closure.append(arg)
 
         merge(fixturenames)
+
+        # at this point, fixturenames_closure contains what we call "initialnames",
+        # which is a set of fixturenames the function immediately requests. We
+        # need to return it as well, so save this.
+        initialnames = tuple(fixturenames_closure)
+
         arg2fixturedefs = {}
         lastlen = -1
         while lastlen != len(fixturenames_closure):
             lastlen = len(fixturenames_closure)
             for argname in fixturenames_closure:
+                if argname in ignore_args:
+                    continue
                 if argname in arg2fixturedefs:
                     continue
                 fixturedefs = self.getfixturedefs(argname, parentid)
@@ -1108,7 +1240,7 @@ class FixtureManager(object):
                 return fixturedefs[-1].scopenum
 
         fixturenames_closure.sort(key=sort_by_scope)
-        return fixturenames_closure, arg2fixturedefs
+        return initialnames, fixturenames_closure, arg2fixturedefs
 
     def pytest_generate_tests(self, metafunc):
         for argname in metafunc.fixturenames:
@@ -1116,19 +1248,20 @@ class FixtureManager(object):
             if faclist:
                 fixturedef = faclist[-1]
                 if fixturedef.params is not None:
-                    parametrize_func = getattr(metafunc.function, "parametrize", None)
-                    if parametrize_func is not None:
-                        parametrize_func = parametrize_func.combined
-                    func_params = getattr(parametrize_func, "args", [[None]])
-                    func_kwargs = getattr(parametrize_func, "kwargs", {})
-                    # skip directly parametrized arguments
-                    if "argnames" in func_kwargs:
-                        argnames = parametrize_func.kwargs["argnames"]
+                    markers = list(metafunc.definition.iter_markers("parametrize"))
+                    for parametrize_mark in markers:
+                        if "argnames" in parametrize_mark.kwargs:
+                            argnames = parametrize_mark.kwargs["argnames"]
+                        else:
+                            argnames = parametrize_mark.args[0]
+
+                        if not isinstance(argnames, (tuple, list)):
+                            argnames = [
+                                x.strip() for x in argnames.split(",") if x.strip()
+                            ]
+                        if argname in argnames:
+                            break
                     else:
-                        argnames = func_params[0]
-                    if not isinstance(argnames, (tuple, list)):
-                        argnames = [x.strip() for x in argnames.split(",") if x.strip()]
-                    if argname not in func_params and argname not in argnames:
                         metafunc.parametrize(
                             argname,
                             fixturedef.params,
@@ -1151,35 +1284,30 @@ class FixtureManager(object):
             nodeid = node_or_obj.nodeid
         if holderobj in self._holderobjseen:
             return
+
         self._holderobjseen.add(holderobj)
         autousenames = []
         for name in dir(holderobj):
             # The attribute can be an arbitrary descriptor, so the attribute
             # access below can raise. safe_getatt() ignores such exceptions.
             obj = safe_getattr(holderobj, name, None)
-            # fixture functions have a pytest_funcarg__ prefix (pre-2.3 style)
-            # or are "@pytest.fixture" marked
             marker = getfixturemarker(obj)
-            if marker is None:
-                if not name.startswith(self._argprefix):
-                    continue
-                if not callable(obj):
-                    continue
-                marker = defaultfuncargprefixmarker
-                from _pytest import deprecated
-
-                self.config.warn(
-                    "C1", deprecated.FUNCARG_PREFIX.format(name=name), nodeid=nodeid
-                )
-                name = name[len(self._argprefix):]
-            elif not isinstance(marker, FixtureFunctionMarker):
+            if not isinstance(marker, FixtureFunctionMarker):
                 # magic globals  with __getattr__ might have got us a wrong
                 # fixture attribute
                 continue
+
+            if marker.name:
+                name = marker.name
+
+            # during fixture definition we wrap the original fixture function
+            # to issue a warning if called directly, so here we unwrap it in order to not emit the warning
+            # when pytest itself calls the fixture function
+            if six.PY2 and unittest:
+                # hack on Python 2 because of the unbound methods
+                obj = get_real_func(obj)
             else:
-                if marker.name:
-                    name = marker.name
-                assert not name.startswith(self._argprefix), FIXTURE_MSG.format(name)
+                obj = get_real_method(obj, holderobj)
 
             fixture_def = FixtureDef(
                 self,
@@ -1220,8 +1348,7 @@ class FixtureManager(object):
             fixturedefs = self._arg2fixturedefs[argname]
         except KeyError:
             return None
-        else:
-            return tuple(self._matchfactories(fixturedefs, nodeid))
+        return tuple(self._matchfactories(fixturedefs, nodeid))
 
     def _matchfactories(self, fixturedefs, nodeid):
         for fixturedef in fixturedefs:
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/freeze_support.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/freeze_support.py
index 002e077301f..aeeec2a56b4 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/freeze_support.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/freeze_support.py
@@ -1,8 +1,11 @@
+# -*- coding: utf-8 -*-
 """
 Provides a function to report all internal modules for using freezing tools
 pytest
 """
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 
 def freeze_includes():
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/helpconfig.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/helpconfig.py
index 5514fec404d..56811601608 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/helpconfig.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/helpconfig.py
@@ -1,13 +1,18 @@
+# -*- coding: utf-8 -*-
 """ version info, help messages, tracing configuration.  """
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
-import py
-import pytest
-from _pytest.config import PrintHelp
 import os
 import sys
 from argparse import Action
 
+import py
+
+import pytest
+from _pytest.config import PrintHelp
+
 
 class HelpAction(Action):
     """This is an argparse Action that will raise an exception in
@@ -56,7 +61,7 @@ def pytest_addoption(parser):
         dest="plugins",
         default=[],
         metavar="name",
-        help="early-load given plugin (multi-allowed). "
+        help="early-load given plugin module name or entry point (multi-allowed). "
         "To avoid loading of plugins, use the `no:` prefix, e.g. "
         "`no:doctest`.",
     )
@@ -114,16 +119,20 @@ def pytest_cmdline_parse():
         config.add_cleanup(unset_tracing)
 
 
+def showversion(config):
+    p = py.path.local(pytest.__file__)
+    sys.stderr.write(
+        "This is pytest version %s, imported from %s\n" % (pytest.__version__, p)
+    )
+    plugininfo = getpluginversioninfo(config)
+    if plugininfo:
+        for line in plugininfo:
+            sys.stderr.write(line + "\n")
+
+
 def pytest_cmdline_main(config):
     if config.option.version:
-        p = py.path.local(pytest.__file__)
-        sys.stderr.write(
-            "This is pytest version %s, imported from %s\n" % (pytest.__version__, p)
-        )
-        plugininfo = getpluginversioninfo(config)
-        if plugininfo:
-            for line in plugininfo:
-                sys.stderr.write(line + "\n")
+        showversion(config)
         return 0
     elif config.option.help:
         config._do_configure()
@@ -133,29 +142,55 @@ def pytest_cmdline_main(config):
 
 
 def showhelp(config):
+    import textwrap
+
     reporter = config.pluginmanager.get_plugin("terminalreporter")
     tw = reporter._tw
     tw.write(config._parser.optparser.format_help())
     tw.line()
-    tw.line()
     tw.line(
-        "[pytest] ini-options in the first " "pytest.ini|tox.ini|setup.cfg file found:"
+        "[pytest] ini-options in the first pytest.ini|tox.ini|setup.cfg file found:"
     )
     tw.line()
 
+    columns = tw.fullwidth  # costly call
+    indent_len = 24  # based on argparse's max_help_position=24
+    indent = " " * indent_len
     for name in config._parser._ininames:
         help, type, default = config._parser._inidict[name]
         if type is None:
             type = "string"
-        spec = "%s (%s)" % (name, type)
-        line = "  %-24s %s" % (spec, help)
-        tw.line(line[:tw.fullwidth])
+        spec = "%s (%s):" % (name, type)
+        tw.write("  %s" % spec)
+        spec_len = len(spec)
+        if spec_len > (indent_len - 3):
+            # Display help starting at a new line.
+            tw.line()
+            helplines = textwrap.wrap(
+                help,
+                columns,
+                initial_indent=indent,
+                subsequent_indent=indent,
+                break_on_hyphens=False,
+            )
+
+            for line in helplines:
+                tw.line(line)
+        else:
+            # Display help starting after the spec, following lines indented.
+            tw.write(" " * (indent_len - spec_len - 2))
+            wrapped = textwrap.wrap(help, columns - indent_len, break_on_hyphens=False)
+
+            tw.line(wrapped[0])
+            for line in wrapped[1:]:
+                tw.line(indent + line)
 
     tw.line()
     tw.line("environment variables:")
     vars = [
         ("PYTEST_ADDOPTS", "extra command line options"),
         ("PYTEST_PLUGINS", "comma-separated plugins to load during startup"),
+        ("PYTEST_DISABLE_PLUGIN_AUTOLOAD", "set to disable plugin auto-loading"),
         ("PYTEST_DEBUG", "set to enable debug tracing of pytest's internals"),
     ]
     for name, help in vars:
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/hookspec.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/hookspec.py
index fec43a40099..7ab6154b176 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/hookspec.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/hookspec.py
@@ -1,7 +1,9 @@
+# -*- coding: utf-8 -*-
 """ hook specifications for pytest plugins, invoked from main.py and builtin plugins.  """
-
 from pluggy import HookspecMarker
 
+from _pytest.deprecated import PYTEST_LOGWARNING
+
 hookspec = HookspecMarker("pytest")
 
 # -------------------------------------------------------------------------
@@ -22,20 +24,6 @@ def pytest_addhooks(pluginmanager):
     """
 
 
-@hookspec(historic=True)
-def pytest_namespace():
-    """
-    (**Deprecated**) this hook causes direct monkeypatching on pytest, its use is strongly discouraged
-    return dict of name->object to be made globally available in
-    the pytest namespace.
-
-    This hook is called at plugin registration time.
-
-    .. note::
-        This hook is incompatible with ``hookwrapper=True``.
-    """
-
-
 @hookspec(historic=True)
 def pytest_plugin_registered(plugin, manager):
     """ a new pytest plugin got registered.
@@ -112,7 +100,8 @@ def pytest_cmdline_parse(pluginmanager, args):
     Stops at first non-None result, see :ref:`firstresult`
 
     .. note::
-        This hook will not be called for ``conftest.py`` files, only for setuptools plugins.
+        This hook will only be called for plugin classes passed to the ``plugins`` arg when using `pytest.main`_ to
+        perform an in-process test run.
 
     :param _pytest.config.PytestPluginManager pluginmanager: pytest plugin manager
     :param list[str] args: list of arguments passed on the command line
@@ -200,7 +189,7 @@ def pytest_ignore_collect(path, config):
 
     Stops at first non-None result, see :ref:`firstresult`
 
-    :param str path: the path to analyze
+    :param path: a :py:class:`py.path.local` - the path to analyze
     :param _pytest.config.Config config: pytest config object
     """
 
@@ -211,7 +200,7 @@ def pytest_collect_directory(path, parent):
 
     Stops at first non-None result, see :ref:`firstresult`
 
-    :param str path: the path to analyze
+    :param path: a :py:class:`py.path.local` - the path to analyze
     """
 
 
@@ -219,7 +208,7 @@ def pytest_collect_file(path, parent):
     """ return collection Node or None for the given path. Any new node
     needs to have the specified ``parent`` as a parent.
 
-    :param str path: the path to collect
+    :param path: a :py:class:`py.path.local` - the path to collect
     """
 
 
@@ -239,7 +228,7 @@ def pytest_collectreport(report):
 
 
 def pytest_deselected(items):
-    """ called for test items deselected by keyword. """
+    """ called for test items deselected, e.g. by keyword. """
 
 
 @hookspec(firstresult=True)
@@ -261,7 +250,10 @@ def pytest_pycollect_makemodule(path, parent):
     The pytest_collect_file hook needs to be used if you want to
     create test modules for files that do not match as a test module.
 
-    Stops at first non-None result, see :ref:`firstresult` """
+    Stops at first non-None result, see :ref:`firstresult`
+
+    :param path: a :py:class:`py.path.local` - the path of module to collect
+    """
 
 
 @hookspec(firstresult=True)
@@ -388,6 +380,41 @@ def pytest_runtest_logreport(report):
     the respective phase of executing a test. """
 
 
+@hookspec(firstresult=True)
+def pytest_report_to_serializable(config, report):
+    """
+    .. warning::
+        This hook is experimental and subject to change between pytest releases, even
+        bug fixes.
+
+        The intent is for this to be used by plugins maintained by the core-devs, such
+        as ``pytest-xdist``, ``pytest-subtests``, and as a replacement for the internal
+        'resultlog' plugin.
+
+        In the future it might become part of the public hook API.
+
+    Serializes the given report object into a data structure suitable for sending
+    over the wire, e.g. converted to JSON.
+    """
+
+
+@hookspec(firstresult=True)
+def pytest_report_from_serializable(config, data):
+    """
+    .. warning::
+        This hook is experimental and subject to change between pytest releases, even
+        bug fixes.
+
+        The intent is for this to be used by plugins maintained by the core-devs, such
+        as ``pytest-xdist``, ``pytest-subtests``, and as a replacement for the internal
+        'resultlog' plugin.
+
+        In the future it might become part of the public hook API.
+
+    Restores a report object previously serialized with pytest_report_to_serializable().
+    """
+
+
 # -------------------------------------------------------------------------
 # Fixture related hooks
 # -------------------------------------------------------------------------
@@ -493,26 +520,39 @@ def pytest_report_collectionfinish(config, startdir, items):
 
 
 @hookspec(firstresult=True)
-def pytest_report_teststatus(report):
+def pytest_report_teststatus(report, config):
     """ return result-category, shortletter and verbose word for reporting.
 
+    :param _pytest.config.Config config: pytest config object
+
     Stops at first non-None result, see :ref:`firstresult` """
 
 
-def pytest_terminal_summary(terminalreporter, exitstatus):
+def pytest_terminal_summary(terminalreporter, exitstatus, config):
     """Add a section to terminal summary reporting.
 
     :param _pytest.terminal.TerminalReporter terminalreporter: the internal terminal reporter object
     :param int exitstatus: the exit status that will be reported back to the OS
+    :param _pytest.config.Config config: pytest config object
 
-    .. versionadded:: 3.5
+    .. versionadded:: 4.2
         The ``config`` parameter.
     """
 
 
-@hookspec(historic=True)
+@hookspec(historic=True, warn_on_impl=PYTEST_LOGWARNING)
 def pytest_logwarning(message, code, nodeid, fslocation):
-    """ process a warning specified by a message, a code string,
+    """
+    .. deprecated:: 3.8
+
+        This hook is will stop working in a future release.
+
+        pytest no longer triggers this hook, but the
+        terminal writer still implements it to display warnings issued by
+        :meth:`_pytest.config.Config.warn` and :meth:`_pytest.nodes.Node.warn`. Calling those functions will be
+        an error in future releases.
+
+    process a warning specified by a message, a code string,
     a nodeid and fslocation (both of which may be None
     if the warning is not tied to a particular node/location).
 
@@ -521,6 +561,30 @@ def pytest_logwarning(message, code, nodeid, fslocation):
     """
 
 
+@hookspec(historic=True)
+def pytest_warning_captured(warning_message, when, item):
+    """
+    Process a warning captured by the internal pytest warnings plugin.
+
+    :param warnings.WarningMessage warning_message:
+        The captured warning. This is the same object produced by :py:func:`warnings.catch_warnings`, and contains
+        the same attributes as the parameters of :py:func:`warnings.showwarning`.
+
+    :param str when:
+        Indicates when the warning was captured. Possible values:
+
+        * ``"config"``: during pytest configuration/initialization stage.
+        * ``"collect"``: during test collection.
+        * ``"runtest"``: during test execution.
+
+    :param pytest.Item|None item:
+        **DEPRECATED**: This parameter is incompatible with ``pytest-xdist``, and will always receive ``None``
+        in a future release.
+
+        The item being executed if ``when`` is ``"runtest"``, otherwise ``None``.
+    """
+
+
 # -------------------------------------------------------------------------
 # doctest hooks
 # -------------------------------------------------------------------------
@@ -555,9 +619,21 @@ def pytest_exception_interact(node, call, report):
     """
 
 
-def pytest_enter_pdb(config):
+def pytest_enter_pdb(config, pdb):
     """ called upon pdb.set_trace(), can be used by plugins to take special
     action just before the python debugger enters in interactive mode.
 
     :param _pytest.config.Config config: pytest config object
+    :param pdb.Pdb pdb: Pdb instance
+    """
+
+
+def pytest_leave_pdb(config, pdb):
+    """ called when leaving pdb (e.g. with continue after pdb.set_trace()).
+
+    Can be used by plugins to take special action just after the python
+    debugger leaves interactive mode.
+
+    :param _pytest.config.Config config: pytest config object
+    :param pdb.Pdb pdb: Pdb instance
     """
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/junitxml.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/junitxml.py
index 29da27de7cc..853dcb77449 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/junitxml.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/junitxml.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
     report test results in JUnit-XML format,
     for use with Jenkins and build integration servers.
@@ -8,14 +9,21 @@ Based on initial code from Ross Lawley.
 Output conforms to https://github.com/jenkinsci/xunit-plugin/blob/master/
 src/main/resources/org/jenkinsci/plugins/xunit/types/model/xsd/junit-10.xsd
 """
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import functools
-import py
 import os
+import platform
 import re
 import sys
 import time
+from datetime import datetime
+
+import py
+import six
+
 import pytest
 from _pytest import nodes
 from _pytest.config import filename_arg
@@ -23,10 +31,6 @@ from _pytest.config import filename_arg
 # Python 2.X and 3.X compatibility
 if sys.version_info[0] < 3:
     from codecs import open
-else:
-    unichr = chr
-    unicode = str
-    long = int
 
 
 class Junit(py.xml.Namespace):
@@ -38,15 +42,15 @@ class Junit(py.xml.Namespace):
 # this dynamically instead of hardcoding it.  The spec range of valid
 # chars is: Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD]
 #                    | [#x10000-#x10FFFF]
-_legal_chars = (0x09, 0x0A, 0x0d)
+_legal_chars = (0x09, 0x0A, 0x0D)
 _legal_ranges = ((0x20, 0x7E), (0x80, 0xD7FF), (0xE000, 0xFFFD), (0x10000, 0x10FFFF))
 _legal_xml_re = [
-    unicode("%s-%s") % (unichr(low), unichr(high))
+    u"%s-%s" % (six.unichr(low), six.unichr(high))
     for (low, high) in _legal_ranges
     if low < sys.maxunicode
 ]
-_legal_xml_re = [unichr(x) for x in _legal_chars] + _legal_xml_re
-illegal_xml_re = re.compile(unicode("[^%s]") % unicode("").join(_legal_xml_re))
+_legal_xml_re = [six.unichr(x) for x in _legal_chars] + _legal_xml_re
+illegal_xml_re = re.compile(u"[^%s]" % u"".join(_legal_xml_re))
 del _legal_chars
 del _legal_ranges
 del _legal_xml_re
@@ -55,24 +59,44 @@ _py_ext_re = re.compile(r"\.py$")
 
 
 def bin_xml_escape(arg):
-
     def repl(matchobj):
         i = ord(matchobj.group())
         if i <= 0xFF:
-            return unicode("#x%02X") % i
+            return u"#x%02X" % i
         else:
-            return unicode("#x%04X") % i
+            return u"#x%04X" % i
 
     return py.xml.raw(illegal_xml_re.sub(repl, py.xml.escape(arg)))
 
 
+def merge_family(left, right):
+    result = {}
+    for kl, vl in left.items():
+        for kr, vr in right.items():
+            if not isinstance(vl, list):
+                raise TypeError(type(vl))
+            result[kl] = vl + vr
+    left.update(result)
+
+
+families = {}
+families["_base"] = {"testcase": ["classname", "name"]}
+families["_base_legacy"] = {"testcase": ["file", "line", "url"]}
+
+# xUnit 1.x inherits legacy attributes
+families["xunit1"] = families["_base"].copy()
+merge_family(families["xunit1"], families["_base_legacy"])
+
+# xUnit 2.x uses strict base attributes
+families["xunit2"] = families["_base"]
+
+
 class _NodeReporter(object):
-
     def __init__(self, nodeid, xml):
-
         self.id = nodeid
         self.xml = xml
         self.add_stats = self.xml.add_stats
+        self.family = self.xml.family
         self.duration = 0
         self.properties = []
         self.nodes = []
@@ -120,8 +144,20 @@ class _NodeReporter(object):
         self.attrs = attrs
         self.attrs.update(existing_attrs)  # restore any user-defined attributes
 
+        # Preserve legacy testcase behavior
+        if self.family == "xunit1":
+            return
+
+        # Filter out attributes not permitted by this test family.
+        # Including custom attributes because they are not valid here.
+        temp_attrs = {}
+        for key in self.attrs.keys():
+            if key in families[self.family]["testcase"]:
+                temp_attrs[key] = self.attrs[key]
+        self.attrs = temp_attrs
+
     def to_xml(self):
-        testcase = Junit.testcase(time=self.duration, **self.attrs)
+        testcase = Junit.testcase(time="%.3f" % self.duration, **self.attrs)
         testcase.append(self.make_properties_node())
         for node in self.nodes:
             testcase.append(node)
@@ -133,6 +169,9 @@ class _NodeReporter(object):
         self.append(node)
 
     def write_captured_output(self, report):
+        if not self.xml.log_passing_tests and report.passed:
+            return
+
         content_out = report.capstdout
         content_log = report.caplog
         content_err = report.capstderr
@@ -192,7 +231,7 @@ class _NodeReporter(object):
         else:
             if hasattr(report.longrepr, "reprcrash"):
                 message = report.longrepr.reprcrash.message
-            elif isinstance(report.longrepr, (unicode, str)):
+            elif isinstance(report.longrepr, six.string_types):
                 message = report.longrepr
             else:
                 message = str(report.longrepr)
@@ -211,7 +250,7 @@ class _NodeReporter(object):
         self._add_simple(Junit.skipped, "collection skipped", report.longrepr)
 
     def append_error(self, report):
-        if getattr(report, "when", None) == "teardown":
+        if report.when == "teardown":
             msg = "test teardown failure"
         else:
             msg = "test setup failure"
@@ -219,16 +258,25 @@ class _NodeReporter(object):
 
     def append_skipped(self, report):
         if hasattr(report, "wasxfail"):
-            self._add_simple(Junit.skipped, "expected test failure", report.wasxfail)
+            xfailreason = report.wasxfail
+            if xfailreason.startswith("reason: "):
+                xfailreason = xfailreason[8:]
+            self.append(
+                Junit.skipped(
+                    "", type="pytest.xfail", message=bin_xml_escape(xfailreason)
+                )
+            )
         else:
             filename, lineno, skipreason = report.longrepr
             if skipreason.startswith("Skipped: "):
-                skipreason = bin_xml_escape(skipreason[9:])
+                skipreason = skipreason[9:]
+            details = "%s:%s: %s" % (filename, lineno, skipreason)
+
             self.append(
                 Junit.skipped(
-                    "%s:%s: %s" % (filename, lineno, skipreason),
+                    bin_xml_escape(details),
                     type="pytest.skip",
-                    message=skipreason,
+                    message=bin_xml_escape(skipreason),
                 )
             )
             self.write_captured_output(report)
@@ -239,6 +287,21 @@ class _NodeReporter(object):
         self.to_xml = lambda: py.xml.raw(data)
 
 
+def _warn_incompatibility_with_xunit2(request, fixture_name):
+    """Emits a PytestWarning about the given fixture being incompatible with newer xunit revisions"""
+    from _pytest.warning_types import PytestWarning
+
+    xml = getattr(request.config, "_xml", None)
+    if xml is not None and xml.family not in ("xunit1", "legacy"):
+        request.node.warn(
+            PytestWarning(
+                "{fixture_name} is incompatible with junit_family '{family}' (use 'legacy' or 'xunit1')".format(
+                    fixture_name=fixture_name, family=xml.family
+                )
+            )
+        )
+
+
 @pytest.fixture
 def record_property(request):
     """Add an extra properties the calling test.
@@ -252,6 +315,7 @@ def record_property(request):
         def test_function(record_property):
             record_property("example_key", 1)
     """
+    _warn_incompatibility_with_xunit2(request, "record_property")
 
     def append_property(name, value):
         request.node.user_properties.append((name, value))
@@ -259,36 +323,71 @@ def record_property(request):
     return append_property
 
 
-@pytest.fixture
-def record_xml_property(record_property):
-    """(Deprecated) use record_property."""
-    import warnings
-    from _pytest import deprecated
-
-    warnings.warn(deprecated.RECORD_XML_PROPERTY, DeprecationWarning, stacklevel=2)
-
-    return record_property
-
-
 @pytest.fixture
 def record_xml_attribute(request):
     """Add extra xml attributes to the tag for the calling test.
     The fixture is callable with ``(name, value)``, with value being
     automatically xml-encoded
     """
+    from _pytest.warning_types import PytestExperimentalApiWarning
+
     request.node.warn(
-        code="C3", message="record_xml_attribute is an experimental feature"
+        PytestExperimentalApiWarning("record_xml_attribute is an experimental feature")
     )
+
+    _warn_incompatibility_with_xunit2(request, "record_xml_attribute")
+
+    # Declare noop
+    def add_attr_noop(name, value):
+        pass
+
+    attr_func = add_attr_noop
+
     xml = getattr(request.config, "_xml", None)
     if xml is not None:
         node_reporter = xml.node_reporter(request.node.nodeid)
-        return node_reporter.add_attribute
-    else:
+        attr_func = node_reporter.add_attribute
 
-        def add_attr_noop(name, value):
-            pass
+    return attr_func
 
-        return add_attr_noop
+
+def _check_record_param_type(param, v):
+    """Used by record_testsuite_property to check that the given parameter name is of the proper
+    type"""
+    __tracebackhide__ = True
+    if not isinstance(v, six.string_types):
+        msg = "{param} parameter needs to be a string, but {g} given"
+        raise TypeError(msg.format(param=param, g=type(v).__name__))
+
+
+@pytest.fixture(scope="session")
+def record_testsuite_property(request):
+    """
+    Records a new ``<property>`` tag as child of the root ``<testsuite>``. This is suitable to
+    writing global information regarding the entire test suite, and is compatible with ``xunit2`` JUnit family.
+
+    This is a ``session``-scoped fixture which is called with ``(name, value)``. Example:
+
+    .. code-block:: python
+
+        def test_foo(record_testsuite_property):
+            record_testsuite_property("ARCH", "PPC")
+            record_testsuite_property("STORAGE_TYPE", "CEPH")
+
+    ``name`` must be a string, ``value`` will be converted to a string and properly xml-escaped.
+    """
+
+    __tracebackhide__ = True
+
+    def record_func(name, value):
+        """noop function in case --junitxml was not passed in the command-line"""
+        __tracebackhide__ = True
+        _check_record_param_type("name", name)
+
+    xml = getattr(request.config, "_xml", None)
+    if xml is not None:
+        record_func = xml.add_global_property  # noqa
+    return record_func
 
 
 def pytest_addoption(parser):
@@ -320,6 +419,22 @@ def pytest_addoption(parser):
         "one of no|system-out|system-err",
         default="no",
     )  # choices=['no', 'stdout', 'stderr'])
+    parser.addini(
+        "junit_log_passing_tests",
+        "Capture log information for passing tests to JUnit report: ",
+        type="bool",
+        default=True,
+    )
+    parser.addini(
+        "junit_duration_report",
+        "Duration time to report: one of total|call",
+        default="total",
+    )  # choices=['total', 'call'])
+    parser.addini(
+        "junit_family",
+        "Emit XML for schema: one of legacy|xunit1|xunit2",
+        default="xunit1",
+    )
 
 
 def pytest_configure(config):
@@ -331,6 +446,9 @@ def pytest_configure(config):
             config.option.junitprefix,
             config.getini("junit_suite_name"),
             config.getini("junit_logging"),
+            config.getini("junit_duration_report"),
+            config.getini("junit_family"),
+            config.getini("junit_log_passing_tests"),
         )
         config.pluginmanager.register(config._xml)
 
@@ -358,21 +476,37 @@ def mangle_test_address(address):
 
 
 class LogXML(object):
-
-    def __init__(self, logfile, prefix, suite_name="pytest", logging="no"):
+    def __init__(
+        self,
+        logfile,
+        prefix,
+        suite_name="pytest",
+        logging="no",
+        report_duration="total",
+        family="xunit1",
+        log_passing_tests=True,
+    ):
         logfile = os.path.expanduser(os.path.expandvars(logfile))
         self.logfile = os.path.normpath(os.path.abspath(logfile))
         self.prefix = prefix
         self.suite_name = suite_name
         self.logging = logging
+        self.log_passing_tests = log_passing_tests
+        self.report_duration = report_duration
+        self.family = family
         self.stats = dict.fromkeys(["error", "passed", "failure", "skipped"], 0)
         self.node_reporters = {}  # nodeid -> _NodeReporter
         self.node_reporters_ordered = []
         self.global_properties = []
+
         # List of reports that failed on call but teardown is pending.
         self.open_reports = []
         self.cnt_double_fail_tests = 0
 
+        # Replaces convenience family with real family
+        if self.family == "legacy":
+            self.family = "xunit1"
+
     def finalize(self, report):
         nodeid = getattr(report, "nodeid", report)
         # local hack to handle xdist report order
@@ -463,6 +597,8 @@ class LogXML(object):
             if report.when == "call":
                 reporter.append_failure(report)
                 self.open_reports.append(report)
+                if not self.log_passing_tests:
+                    reporter.write_captured_output(report)
             else:
                 reporter.append_error(report)
         elif report.skipped:
@@ -498,8 +634,9 @@ class LogXML(object):
         """accumulates total duration for nodeid from given report and updates
         the Junit.testcase with the new total if already created.
         """
-        reporter = self.node_reporter(report)
-        reporter.duration += getattr(report, "duration", 0.0)
+        if self.report_duration == "total" or report.when == self.report_duration:
+            reporter = self.node_reporter(report)
+            reporter.duration += getattr(report, "duration", 0.0)
 
     def pytest_collectreport(self, report):
         if not report.passed:
@@ -534,27 +671,28 @@ class LogXML(object):
         )
         logfile.write('<?xml version="1.0" encoding="utf-8"?>')
 
-        logfile.write(
-            Junit.testsuite(
-                self._get_global_properties_node(),
-                [x.to_xml() for x in self.node_reporters_ordered],
-                name=self.suite_name,
-                errors=self.stats["error"],
-                failures=self.stats["failure"],
-                skips=self.stats["skipped"],
-                tests=numtests,
-                time="%.3f" % suite_time_delta,
-            ).unicode(
-                indent=0
-            )
+        suite_node = Junit.testsuite(
+            self._get_global_properties_node(),
+            [x.to_xml() for x in self.node_reporters_ordered],
+            name=self.suite_name,
+            errors=self.stats["error"],
+            failures=self.stats["failure"],
+            skipped=self.stats["skipped"],
+            tests=numtests,
+            time="%.3f" % suite_time_delta,
+            timestamp=datetime.fromtimestamp(self.suite_start_time).isoformat(),
+            hostname=platform.node(),
         )
+        logfile.write(Junit.testsuites([suite_node]).unicode(indent=0))
         logfile.close()
 
     def pytest_terminal_summary(self, terminalreporter):
         terminalreporter.write_sep("-", "generated xml file: %s" % (self.logfile))
 
     def add_global_property(self, name, value):
-        self.global_properties.append((str(name), bin_xml_escape(value)))
+        __tracebackhide__ = True
+        _check_record_param_type("name", name)
+        self.global_properties.append((name, bin_xml_escape(value)))
 
     def _get_global_properties_node(self):
         """Return a Junit node containing custom properties, if any.
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/logging.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/logging.py
index 00bb9aeb54a..2400737ee4e 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/logging.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/logging.py
@@ -1,18 +1,28 @@
+# -*- coding: utf-8 -*-
 """ Access and control log capturing. """
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import logging
-from contextlib import closing, contextmanager
 import re
+from contextlib import contextmanager
+
+import py
 import six
 
-from _pytest.config import create_terminal_writer
 import pytest
-import py
+from _pytest.compat import dummy_context_manager
+from _pytest.config import create_terminal_writer
+from _pytest.pathlib import Path
 
-
-DEFAULT_LOG_FORMAT = "%(filename)-25s %(lineno)4d %(levelname)-8s %(message)s"
+DEFAULT_LOG_FORMAT = "%(levelname)-8s %(name)s:%(filename)s:%(lineno)d %(message)s"
 DEFAULT_LOG_DATE_FORMAT = "%H:%M:%S"
+_ANSI_ESCAPE_SEQ = re.compile(r"\x1b\[[\d;]+m")
+
+
+def _remove_ansi_escape_sequences(text):
+    return _ANSI_ESCAPE_SEQ.sub("", text)
 
 
 class ColoredLevelFormatter(logging.Formatter):
@@ -67,6 +77,36 @@ class ColoredLevelFormatter(logging.Formatter):
         return super(ColoredLevelFormatter, self).format(record)
 
 
+if not six.PY2:
+    # Formatter classes don't support format styles in PY2
+
+    class PercentStyleMultiline(logging.PercentStyle):
+        """A logging style with special support for multiline messages.
+
+        If the message of a record consists of multiple lines, this style
+        formats the message as if each line were logged separately.
+        """
+
+        @staticmethod
+        def _update_message(record_dict, message):
+            tmp = record_dict.copy()
+            tmp["message"] = message
+            return tmp
+
+        def format(self, record):
+            if "\n" in record.message:
+                lines = record.message.splitlines()
+                formatted = self._fmt % self._update_message(record.__dict__, lines[0])
+                # TODO optimize this by introducing an option that tells the
+                # logging framework that the indentation doesn't
+                # change. This allows to compute the indentation only once.
+                indentation = _remove_ansi_escape_sequences(formatted).find(lines[0])
+                lines[0] = formatted
+                return ("\n" + " " * indentation).join(lines)
+            else:
+                return self._fmt % record.__dict__
+
+
 def get_option_ini(config, *names):
     for name in names:
         ret = config.getoption(name)  # 'default' arg won't work as expected
@@ -212,7 +252,8 @@ class LogCaptureFixture(object):
     def __init__(self, item):
         """Creates a new funcarg."""
         self._item = item
-        self._initial_log_levels = {}  # type: Dict[str, int] # dict of log name -> log level
+        # dict of log name -> log level
+        self._initial_log_levels = {}  # Dict[str, int]
 
     def _finalize(self):
         """Finalizes the fixture.
@@ -251,8 +292,8 @@ class LogCaptureFixture(object):
 
     @property
     def text(self):
-        """Returns the log text."""
-        return self.handler.stream.getvalue()
+        """Returns the formatted log text."""
+        return _remove_ansi_escape_sequences(self.handler.stream.getvalue())
 
     @property
     def records(self):
@@ -261,7 +302,7 @@ class LogCaptureFixture(object):
 
     @property
     def record_tuples(self):
-        """Returns a list of a striped down version of log records intended
+        """Returns a list of a stripped down version of log records intended
         for use in assertion comparison.
 
         The format of the tuple is:
@@ -270,6 +311,22 @@ class LogCaptureFixture(object):
         """
         return [(r.name, r.levelno, r.getMessage()) for r in self.records]
 
+    @property
+    def messages(self):
+        """Returns a list of format-interpolated log messages.
+
+        Unlike 'records', which contains the format string and parameters for interpolation, log messages in this list
+        are all interpolated.
+        Unlike 'text', which contains the output from the handler, log messages in this list are unadorned with
+        levels, timestamps, etc, making exact comparisons more reliable.
+
+        Note that traceback or stack info (from :func:`logging.exception` or the `exc_info` or `stack_info` arguments
+        to the logging functions) is not included, as this is added by the formatter in the handler.
+
+        .. versionadded:: 3.7
+        """
+        return [r.getMessage() for r in self.records]
+
     def clear(self):
         """Reset the list of log records and the captured log text."""
         self.handler.reset()
@@ -312,7 +369,7 @@ class LogCaptureFixture(object):
 def caplog(request):
     """Access and control log capturing.
 
-    Captured logs are available through the following methods::
+    Captured logs are available through the following properties/methods::
 
     * caplog.text            -> string containing formatted log output
     * caplog.records         -> list of logging.LogRecord instances
@@ -349,15 +406,12 @@ def get_actual_log_level(config, *setting_names):
         )
 
 
+# run after terminalreporter/capturemanager are configured
+@pytest.hookimpl(trylast=True)
 def pytest_configure(config):
     config.pluginmanager.register(LoggingPlugin(config), "logging-plugin")
 
 
-@contextmanager
-def _dummy_context_manager():
-    yield
-
-
 class LoggingPlugin(object):
     """Attaches to the logging module and captures log messages for each test.
     """
@@ -370,51 +424,131 @@ class LoggingPlugin(object):
         """
         self._config = config
 
-        # enable verbose output automatically if live logging is enabled
-        if self._log_cli_enabled() and not config.getoption("verbose"):
-            # sanity check: terminal reporter should not have been loaded at this point
-            assert self._config.pluginmanager.get_plugin("terminalreporter") is None
-            config.option.verbose = 1
-
         self.print_logs = get_option_ini(config, "log_print")
-        self.formatter = logging.Formatter(
+        self.formatter = self._create_formatter(
             get_option_ini(config, "log_format"),
             get_option_ini(config, "log_date_format"),
         )
         self.log_level = get_actual_log_level(config, "log_level")
 
+        self.log_file_level = get_actual_log_level(config, "log_file_level")
+        self.log_file_format = get_option_ini(config, "log_file_format", "log_format")
+        self.log_file_date_format = get_option_ini(
+            config, "log_file_date_format", "log_date_format"
+        )
+        self.log_file_formatter = logging.Formatter(
+            self.log_file_format, datefmt=self.log_file_date_format
+        )
+
         log_file = get_option_ini(config, "log_file")
         if log_file:
-            self.log_file_level = get_actual_log_level(config, "log_file_level")
-
-            log_file_format = get_option_ini(config, "log_file_format", "log_format")
-            log_file_date_format = get_option_ini(
-                config, "log_file_date_format", "log_date_format"
+            self.log_file_handler = logging.FileHandler(
+                log_file, mode="w", encoding="UTF-8"
             )
-            # Each pytest runtests session will write to a clean logfile
-            self.log_file_handler = logging.FileHandler(log_file, mode="w")
-            log_file_formatter = logging.Formatter(
-                log_file_format, datefmt=log_file_date_format
-            )
-            self.log_file_handler.setFormatter(log_file_formatter)
+            self.log_file_handler.setFormatter(self.log_file_formatter)
         else:
             self.log_file_handler = None
 
-        # initialized during pytest_runtestloop
         self.log_cli_handler = None
 
+        self.live_logs_context = lambda: dummy_context_manager()
+        # Note that the lambda for the live_logs_context is needed because
+        # live_logs_context can otherwise not be entered multiple times due
+        # to limitations of contextlib.contextmanager.
+
+        if self._log_cli_enabled():
+            self._setup_cli_logging()
+
+    def _create_formatter(self, log_format, log_date_format):
+        # color option doesn't exist if terminal plugin is disabled
+        color = getattr(self._config.option, "color", "no")
+        if color != "no" and ColoredLevelFormatter.LEVELNAME_FMT_REGEX.search(
+            log_format
+        ):
+            formatter = ColoredLevelFormatter(
+                create_terminal_writer(self._config), log_format, log_date_format
+            )
+        else:
+            formatter = logging.Formatter(log_format, log_date_format)
+
+        if not six.PY2:
+            formatter._style = PercentStyleMultiline(formatter._style._fmt)
+        return formatter
+
+    def _setup_cli_logging(self):
+        config = self._config
+        terminal_reporter = config.pluginmanager.get_plugin("terminalreporter")
+        if terminal_reporter is None:
+            # terminal reporter is disabled e.g. by pytest-xdist.
+            return
+
+        capture_manager = config.pluginmanager.get_plugin("capturemanager")
+        # if capturemanager plugin is disabled, live logging still works.
+        log_cli_handler = _LiveLoggingStreamHandler(terminal_reporter, capture_manager)
+
+        log_cli_formatter = self._create_formatter(
+            get_option_ini(config, "log_cli_format", "log_format"),
+            get_option_ini(config, "log_cli_date_format", "log_date_format"),
+        )
+
+        log_cli_level = get_actual_log_level(config, "log_cli_level", "log_level")
+        self.log_cli_handler = log_cli_handler
+        self.live_logs_context = lambda: catching_logs(
+            log_cli_handler, formatter=log_cli_formatter, level=log_cli_level
+        )
+
+    def set_log_path(self, fname):
+        """Public method, which can set filename parameter for
+        Logging.FileHandler(). Also creates parent directory if
+        it does not exist.
+
+        .. warning::
+            Please considered as an experimental API.
+        """
+        fname = Path(fname)
+
+        if not fname.is_absolute():
+            fname = Path(self._config.rootdir, fname)
+
+        if not fname.parent.exists():
+            fname.parent.mkdir(exist_ok=True, parents=True)
+
+        self.log_file_handler = logging.FileHandler(
+            str(fname), mode="w", encoding="UTF-8"
+        )
+        self.log_file_handler.setFormatter(self.log_file_formatter)
+
     def _log_cli_enabled(self):
         """Return True if log_cli should be considered enabled, either explicitly
         or because --log-cli-level was given in the command-line.
         """
         return self._config.getoption(
             "--log-cli-level"
-        ) is not None or self._config.getini(
-            "log_cli"
-        )
+        ) is not None or self._config.getini("log_cli")
+
+    @pytest.hookimpl(hookwrapper=True, tryfirst=True)
+    def pytest_collection(self):
+        with self.live_logs_context():
+            if self.log_cli_handler:
+                self.log_cli_handler.set_when("collection")
+
+            if self.log_file_handler is not None:
+                with catching_logs(self.log_file_handler, level=self.log_file_level):
+                    yield
+            else:
+                yield
 
     @contextmanager
     def _runtest_for(self, item, when):
+        with self._runtest_for_main(item, when):
+            if self.log_file_handler is not None:
+                with catching_logs(self.log_file_handler, level=self.log_file_level):
+                    yield
+            else:
+                yield
+
+    @contextmanager
+    def _runtest_for_main(self, item, when):
         """Implements the internals of pytest_runtest_xxx() hook."""
         with catching_logs(
             LogCaptureHandler(), formatter=self.formatter, level=self.log_level
@@ -433,8 +567,8 @@ class LoggingPlugin(object):
             try:
                 yield  # run test
             finally:
-                del item.catch_log_handler
                 if when == "teardown":
+                    del item.catch_log_handler
                     del item.catch_log_handlers
 
             if self.print_logs:
@@ -470,59 +604,58 @@ class LoggingPlugin(object):
             yield
 
     @pytest.hookimpl(hookwrapper=True)
-    def pytest_runtestloop(self, session):
-        """Runs all collected test items."""
-        self._setup_cli_logging()
-        with self.live_logs_context:
+    def pytest_runtest_logreport(self):
+        with self._runtest_for(None, "logreport"):
+            yield
+
+    @pytest.hookimpl(hookwrapper=True, tryfirst=True)
+    def pytest_sessionfinish(self):
+        with self.live_logs_context():
+            if self.log_cli_handler:
+                self.log_cli_handler.set_when("sessionfinish")
             if self.log_file_handler is not None:
-                with closing(self.log_file_handler):
+                try:
                     with catching_logs(
                         self.log_file_handler, level=self.log_file_level
                     ):
-                        yield  # run all the tests
+                        yield
+                finally:
+                    # Close the FileHandler explicitly.
+                    # (logging.shutdown might have lost the weakref?!)
+                    self.log_file_handler.close()
+            else:
+                yield
+
+    @pytest.hookimpl(hookwrapper=True, tryfirst=True)
+    def pytest_sessionstart(self):
+        with self.live_logs_context():
+            if self.log_cli_handler:
+                self.log_cli_handler.set_when("sessionstart")
+            if self.log_file_handler is not None:
+                with catching_logs(self.log_file_handler, level=self.log_file_level):
+                    yield
+            else:
+                yield
+
+    @pytest.hookimpl(hookwrapper=True)
+    def pytest_runtestloop(self, session):
+        """Runs all collected test items."""
+
+        if session.config.option.collectonly:
+            yield
+            return
+
+        if self._log_cli_enabled() and self._config.getoption("verbose") < 1:
+            # setting verbose flag is needed to avoid messy test progress output
+            self._config.option.verbose = 1
+
+        with self.live_logs_context():
+            if self.log_file_handler is not None:
+                with catching_logs(self.log_file_handler, level=self.log_file_level):
+                    yield  # run all the tests
             else:
                 yield  # run all the tests
 
-    def _setup_cli_logging(self):
-        """Sets up the handler and logger for the Live Logs feature, if enabled.
-
-        This must be done right before starting the loop so we can access the terminal reporter plugin.
-        """
-        terminal_reporter = self._config.pluginmanager.get_plugin("terminalreporter")
-        if self._log_cli_enabled() and terminal_reporter is not None:
-            capture_manager = self._config.pluginmanager.get_plugin("capturemanager")
-            log_cli_handler = _LiveLoggingStreamHandler(
-                terminal_reporter, capture_manager
-            )
-            log_cli_format = get_option_ini(
-                self._config, "log_cli_format", "log_format"
-            )
-            log_cli_date_format = get_option_ini(
-                self._config, "log_cli_date_format", "log_date_format"
-            )
-            if (
-                self._config.option.color != "no"
-                and ColoredLevelFormatter.LEVELNAME_FMT_REGEX.search(log_cli_format)
-            ):
-                log_cli_formatter = ColoredLevelFormatter(
-                    create_terminal_writer(self._config),
-                    log_cli_format,
-                    datefmt=log_cli_date_format,
-                )
-            else:
-                log_cli_formatter = logging.Formatter(
-                    log_cli_format, datefmt=log_cli_date_format
-                )
-            log_cli_level = get_actual_log_level(
-                self._config, "log_cli_level", "log_level"
-            )
-            self.log_cli_handler = log_cli_handler
-            self.live_logs_context = catching_logs(
-                log_cli_handler, formatter=log_cli_formatter, level=log_cli_level
-            )
-        else:
-            self.live_logs_context = _dummy_context_manager()
-
 
 class _LiveLoggingStreamHandler(logging.StreamHandler):
     """
@@ -556,9 +689,12 @@ class _LiveLoggingStreamHandler(logging.StreamHandler):
             self._test_outcome_written = False
 
     def emit(self, record):
-        if self.capture_manager is not None:
-            self.capture_manager.suspend_global_capture()
-        try:
+        ctx_manager = (
+            self.capture_manager.global_and_fixture_disabled()
+            if self.capture_manager
+            else dummy_context_manager()
+        )
+        with ctx_manager:
             if not self._first_record_emitted:
                 self.stream.write("\n")
                 self._first_record_emitted = True
@@ -570,6 +706,3 @@ class _LiveLoggingStreamHandler(logging.StreamHandler):
                 self.stream.section("live log " + self._when, sep="-", bold=True)
                 self._section_name_shown = True
             logging.StreamHandler.emit(self, record)
-        finally:
-            if self.capture_manager is not None:
-                self.capture_manager.resume_global_capture()
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/main.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/main.py
index 23562358d7c..a9d310cb62d 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/main.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/main.py
@@ -1,23 +1,30 @@
+# -*- coding: utf-8 -*-
 """ core implementation of testing process: init, session, runtest loop. """
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import contextlib
+import fnmatch
 import functools
 import os
 import pkgutil
-import six
 import sys
+import warnings
 
-import _pytest
-from _pytest import nodes
-import _pytest._code
+import attr
 import py
+import six
 
-from _pytest.config import directory_arg, UsageError, hookimpl
+import _pytest._code
+from _pytest import nodes
+from _pytest.config import directory_arg
+from _pytest.config import hookimpl
+from _pytest.config import UsageError
+from _pytest.deprecated import PYTEST_CONFIG_GLOBAL
 from _pytest.outcomes import exit
 from _pytest.runner import collect_one_node
 
-
 # exitcodes for the command line
 EXIT_OK = 0
 EXIT_TESTSFAILED = 1
@@ -41,11 +48,6 @@ def pytest_addoption(parser):
         type="args",
         default=[],
     )
-    # parser.addini("dirpatterns",
-    #    "patterns specifying possible locations of test files",
-    #    type="linelist", default=["**/test_*.txt",
-    #            "**/test_*.py", "**/*_test.py"]
-    # )
     group = parser.getgroup("general", "running and selection options")
     group._addoption(
         "-x",
@@ -65,9 +67,10 @@ def pytest_addoption(parser):
         help="exit after first num failures or errors.",
     )
     group._addoption(
+        "--strict-markers",
         "--strict",
         action="store_true",
-        help="marks not registered in configuration file raise errors.",
+        help="markers not registered in the `markers` section of the configuration file raise errors.",
     )
     group._addoption(
         "-c",
@@ -111,6 +114,12 @@ def pytest_addoption(parser):
         metavar="path",
         help="ignore path during collection (multi-allowed).",
     )
+    group.addoption(
+        "--ignore-glob",
+        action="append",
+        metavar="path",
+        help="ignore path pattern during collection (multi-allowed).",
+    )
     group.addoption(
         "--deselect",
         action="append",
@@ -156,12 +165,31 @@ def pytest_addoption(parser):
         dest="basetemp",
         default=None,
         metavar="dir",
-        help="base temporary directory for this test run.",
+        help=(
+            "base temporary directory for this test run."
+            "(warning: this directory is removed if it exists)"
+        ),
     )
 
 
+class _ConfigDeprecated(object):
+    def __init__(self, config):
+        self.__dict__["_config"] = config
+
+    def __getattr__(self, attr):
+        warnings.warn(PYTEST_CONFIG_GLOBAL, stacklevel=2)
+        return getattr(self._config, attr)
+
+    def __setattr__(self, attr, val):
+        warnings.warn(PYTEST_CONFIG_GLOBAL, stacklevel=2)
+        return setattr(self._config, attr, val)
+
+    def __repr__(self):
+        return "{}({!r})".format(type(self).__name__, self._config)
+
+
 def pytest_configure(config):
-    __import__("pytest").config = config  # compatibility
+    __import__("pytest").config = _ConfigDeprecated(config)  # compatibility
 
 
 def wrap_session(config, doit):
@@ -177,21 +205,28 @@ def wrap_session(config, doit):
             initstate = 2
             session.exitstatus = doit(config, session) or 0
         except UsageError:
+            session.exitstatus = EXIT_USAGEERROR
             raise
         except Failed:
             session.exitstatus = EXIT_TESTSFAILED
-        except KeyboardInterrupt:
-            excinfo = _pytest._code.ExceptionInfo()
-            if initstate < 2 and isinstance(excinfo.value, exit.Exception):
-                sys.stderr.write("{}: {}\n".format(excinfo.typename, excinfo.value.msg))
+        except (KeyboardInterrupt, exit.Exception):
+            excinfo = _pytest._code.ExceptionInfo.from_current()
+            exitstatus = EXIT_INTERRUPTED
+            if isinstance(excinfo.value, exit.Exception):
+                if excinfo.value.returncode is not None:
+                    exitstatus = excinfo.value.returncode
+                if initstate < 2:
+                    sys.stderr.write(
+                        "{}: {}\n".format(excinfo.typename, excinfo.value.msg)
+                    )
             config.hook.pytest_keyboard_interrupt(excinfo=excinfo)
-            session.exitstatus = EXIT_INTERRUPTED
+            session.exitstatus = exitstatus
         except:  # noqa
-            excinfo = _pytest._code.ExceptionInfo()
+            excinfo = _pytest._code.ExceptionInfo.from_current()
             config.notify_exception(excinfo, config.option)
             session.exitstatus = EXIT_INTERNALERROR
             if excinfo.errisinstance(SystemExit):
-                sys.stderr.write("mainloop: caught Spurious SystemExit!\n")
+                sys.stderr.write("mainloop: caught unexpected SystemExit!\n")
 
     finally:
         excinfo = None  # Explicitly break reference cycle.
@@ -268,18 +303,23 @@ def pytest_ignore_collect(path, config):
     if py.path.local(path) in ignore_paths:
         return True
 
-    allow_in_venv = config.getoption("collect_in_virtualenv")
-    if _in_venv(path) and not allow_in_venv:
+    ignore_globs = config._getconftest_pathlist(
+        "collect_ignore_glob", path=path.dirpath()
+    )
+    ignore_globs = ignore_globs or []
+    excludeglobopt = config.getoption("ignore_glob")
+    if excludeglobopt:
+        ignore_globs.extend([py.path.local(x) for x in excludeglobopt])
+
+    if any(
+        fnmatch.fnmatch(six.text_type(path), six.text_type(glob))
+        for glob in ignore_globs
+    ):
         return True
 
-    # Skip duplicate paths.
-    keepduplicates = config.getoption("keepduplicates")
-    duplicate_paths = config.pluginmanager._duplicatepaths
-    if not keepduplicates:
-        if path in duplicate_paths:
-            return True
-        else:
-            duplicate_paths.add(path)
+    allow_in_venv = config.getoption("collect_in_virtualenv")
+    if not allow_in_venv and _in_venv(path):
+        return True
 
     return False
 
@@ -343,7 +383,6 @@ def _patched_find_module():
 
 
 class FSHookProxy(object):
-
     def __init__(self, fspath, pm, remove_mods):
         self.fspath = fspath
         self.pm = pm
@@ -361,6 +400,7 @@ class NoMatch(Exception):
 
 class Interrupted(KeyboardInterrupt):
     """ signals an interrupted test run. """
+
     __module__ = "builtins"  # for py3
 
 
@@ -368,6 +408,16 @@ class Failed(Exception):
     """ signals a stop as failed test run. """
 
 
+@attr.s
+class _bestrelpath_cache(dict):
+    path = attr.ib()
+
+    def __missing__(self, path):
+        r = self.path.bestrelpath(path)
+        self[path] = r
+        return r
+
+
 class Session(nodes.FSCollector):
     Interrupted = Interrupted
     Failed = Failed
@@ -382,10 +432,29 @@ class Session(nodes.FSCollector):
         self.shouldfail = False
         self.trace = config.trace.root.get("collection")
         self._norecursepatterns = config.getini("norecursedirs")
-        self.startdir = py.path.local()
+        self.startdir = config.invocation_dir
+        self._initialpaths = frozenset()
+        # Keep track of any collected nodes in here, so we don't duplicate fixtures
+        self._node_cache = {}
+        self._bestrelpathcache = _bestrelpath_cache(config.rootdir)
+        # Dirnames of pkgs with dunder-init files.
+        self._pkg_roots = {}
 
         self.config.pluginmanager.register(self, name="session")
 
+    def __repr__(self):
+        return "<%s %s exitstatus=%r testsfailed=%d testscollected=%d>" % (
+            self.__class__.__name__,
+            self.name,
+            getattr(self, "exitstatus", "<UNSET>"),
+            self.testsfailed,
+            self.testscollected,
+        )
+
+    def _node_location_to_relpath(self, node_path):
+        # bestrelpath is a quite slow function
+        return self._bestrelpathcache[node_path]
+
     @hookimpl(tryfirst=True)
     def pytest_collectstart(self):
         if self.shouldfail:
@@ -439,13 +508,14 @@ class Session(nodes.FSCollector):
         self.trace("perform_collect", self, args)
         self.trace.root.indent += 1
         self._notfound = []
-        self._initialpaths = set()
+        initialpaths = []
         self._initialparts = []
         self.items = items = []
         for arg in args:
             parts = self._parsearg(arg)
             self._initialparts.append(parts)
-            self._initialpaths.add(parts[0])
+            initialpaths.append(parts[0])
+        self._initialpaths = frozenset(initialpaths)
         rep = collect_one_node(self)
         self.ihook.pytest_collectreport(report=rep)
         self.trace.root.indent -= 1
@@ -465,8 +535,8 @@ class Session(nodes.FSCollector):
             return items
 
     def collect(self):
-        for parts in self._initialparts:
-            arg = "::".join(map(str, parts))
+        for initialpart in self._initialparts:
+            arg = "::".join(map(str, initialpart))
             self.trace("processing argument", arg)
             self.trace.root.indent += 1
             try:
@@ -480,43 +550,138 @@ class Session(nodes.FSCollector):
             self.trace.root.indent -= 1
 
     def _collect(self, arg):
-        names = self._parsearg(arg)
-        path = names.pop(0)
-        if path.check(dir=1):
-            assert not names, "invalid arg %r" % (arg,)
-            for path in path.visit(
-                fil=lambda x: x.check(file=1), rec=self._recurse, bf=True, sort=True
-            ):
-                for x in self._collectfile(path):
-                    yield x
-        else:
-            assert path.check(file=1)
-            for x in self.matchnodes(self._collectfile(path), names):
-                yield x
+        from _pytest.python import Package
 
-    def _collectfile(self, path):
+        names = self._parsearg(arg)
+        argpath = names.pop(0)
+
+        # Start with a Session root, and delve to argpath item (dir or file)
+        # and stack all Packages found on the way.
+        # No point in finding packages when collecting doctests
+        if not self.config.getoption("doctestmodules", False):
+            pm = self.config.pluginmanager
+            for parent in reversed(argpath.parts()):
+                if pm._confcutdir and pm._confcutdir.relto(parent):
+                    break
+
+                if parent.isdir():
+                    pkginit = parent.join("__init__.py")
+                    if pkginit.isfile():
+                        if pkginit not in self._node_cache:
+                            col = self._collectfile(pkginit, handle_dupes=False)
+                            if col:
+                                if isinstance(col[0], Package):
+                                    self._pkg_roots[parent] = col[0]
+                                # always store a list in the cache, matchnodes expects it
+                                self._node_cache[col[0].fspath] = [col[0]]
+
+        # If it's a directory argument, recurse and look for any Subpackages.
+        # Let the Package collector deal with subnodes, don't collect here.
+        if argpath.check(dir=1):
+            assert not names, "invalid arg %r" % (arg,)
+
+            seen_dirs = set()
+            for path in argpath.visit(
+                fil=self._visit_filter, rec=self._recurse, bf=True, sort=True
+            ):
+                dirpath = path.dirpath()
+                if dirpath not in seen_dirs:
+                    # Collect packages first.
+                    seen_dirs.add(dirpath)
+                    pkginit = dirpath.join("__init__.py")
+                    if pkginit.exists():
+                        for x in self._collectfile(pkginit):
+                            yield x
+                            if isinstance(x, Package):
+                                self._pkg_roots[dirpath] = x
+                if dirpath in self._pkg_roots:
+                    # Do not collect packages here.
+                    continue
+
+                for x in self._collectfile(path):
+                    key = (type(x), x.fspath)
+                    if key in self._node_cache:
+                        yield self._node_cache[key]
+                    else:
+                        self._node_cache[key] = x
+                        yield x
+        else:
+            assert argpath.check(file=1)
+
+            if argpath in self._node_cache:
+                col = self._node_cache[argpath]
+            else:
+                collect_root = self._pkg_roots.get(argpath.dirname, self)
+                col = collect_root._collectfile(argpath, handle_dupes=False)
+                if col:
+                    self._node_cache[argpath] = col
+            m = self.matchnodes(col, names)
+            # If __init__.py was the only file requested, then the matched node will be
+            # the corresponding Package, and the first yielded item will be the __init__
+            # Module itself, so just use that. If this special case isn't taken, then all
+            # the files in the package will be yielded.
+            if argpath.basename == "__init__.py":
+                try:
+                    yield next(m[0].collect())
+                except StopIteration:
+                    # The package collects nothing with only an __init__.py
+                    # file in it, which gets ignored by the default
+                    # "python_files" option.
+                    pass
+                return
+            for y in m:
+                yield y
+
+    def _collectfile(self, path, handle_dupes=True):
+        assert path.isfile(), "%r is not a file (isdir=%r, exists=%r, islink=%r)" % (
+            path,
+            path.isdir(),
+            path.exists(),
+            path.islink(),
+        )
         ihook = self.gethookproxy(path)
         if not self.isinitpath(path):
             if ihook.pytest_ignore_collect(path=path, config=self.config):
                 return ()
+
+        if handle_dupes:
+            keepduplicates = self.config.getoption("keepduplicates")
+            if not keepduplicates:
+                duplicate_paths = self.config.pluginmanager._duplicatepaths
+                if path in duplicate_paths:
+                    return ()
+                else:
+                    duplicate_paths.add(path)
+
         return ihook.pytest_collect_file(path=path, parent=self)
 
-    def _recurse(self, path):
-        ihook = self.gethookproxy(path.dirpath())
-        if ihook.pytest_ignore_collect(path=path, config=self.config):
-            return
+    def _recurse(self, dirpath):
+        if dirpath.basename == "__pycache__":
+            return False
+        ihook = self.gethookproxy(dirpath.dirpath())
+        if ihook.pytest_ignore_collect(path=dirpath, config=self.config):
+            return False
         for pat in self._norecursepatterns:
-            if path.check(fnmatch=pat):
+            if dirpath.check(fnmatch=pat):
                 return False
-        ihook = self.gethookproxy(path)
-        ihook.pytest_collect_directory(path=path, parent=self)
+        ihook = self.gethookproxy(dirpath)
+        ihook.pytest_collect_directory(path=dirpath, parent=self)
         return True
 
+    if six.PY2:
+
+        @staticmethod
+        def _visit_filter(f):
+            return f.check(file=1) and not f.strpath.endswith("*.pyc")
+
+    else:
+
+        @staticmethod
+        def _visit_filter(f):
+            return f.check(file=1)
+
     def _tryconvertpyarg(self, x):
-        """Convert a dotted module name to path.
-
-        """
-
+        """Convert a dotted module name to path."""
         try:
             with _patched_find_module():
                 loader = pkgutil.find_loader(x)
@@ -548,9 +713,8 @@ class Session(nodes.FSCollector):
                 raise UsageError(
                     "file or package not found: " + arg + " (missing __init__.py?)"
                 )
-            else:
-                raise UsageError("file not found: " + arg)
-        parts[0] = path
+            raise UsageError("file not found: " + arg)
+        parts[0] = path.realpath()
         return parts
 
     def matchnodes(self, matching, names):
@@ -577,7 +741,12 @@ class Session(nodes.FSCollector):
                     resultnodes.append(node)
                 continue
             assert isinstance(node, nodes.Collector)
-            rep = collect_one_node(node)
+            key = (type(node), node.nodeid)
+            if key in self._node_cache:
+                rep = self._node_cache[key]
+            else:
+                rep = collect_one_node(node)
+                self._node_cache[key] = rep
             if rep.passed:
                 has_matched = False
                 for x in rep.result:
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/mark/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/mark/__init__.py
index e3918ca6a4f..6bc22fe27da 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/mark/__init__.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/mark/__init__.py
@@ -1,32 +1,21 @@
+# -*- coding: utf-8 -*-
 """ generic mechanism for marking and selecting python functions. """
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from .legacy import matchkeyword
+from .legacy import matchmark
+from .structures import EMPTY_PARAMETERSET_OPTION
+from .structures import get_empty_parameterset_mark
+from .structures import Mark
+from .structures import MARK_GEN
+from .structures import MarkDecorator
+from .structures import MarkGenerator
+from .structures import ParameterSet
 from _pytest.config import UsageError
-from .structures import (
-    ParameterSet,
-    EMPTY_PARAMETERSET_OPTION,
-    MARK_GEN,
-    Mark,
-    MarkInfo,
-    MarkDecorator,
-    MarkGenerator,
-    transfer_markers,
-    get_empty_parameterset_mark,
-)
-from .legacy import matchkeyword, matchmark
 
-__all__ = [
-    "Mark",
-    "MarkInfo",
-    "MarkDecorator",
-    "MarkGenerator",
-    "transfer_markers",
-    "get_empty_parameterset_mark",
-]
-
-
-class MarkerError(Exception):
-
-    """Error in use of a pytest marker/attribute."""
+__all__ = ["Mark", "MarkDecorator", "MarkGenerator", "get_empty_parameterset_mark"]
 
 
 def param(*values, **kw):
@@ -64,6 +53,7 @@ def pytest_addoption(parser):
         "other' matches all test functions and classes whose name "
         "contains 'test_method' or 'test_other', while -k 'not test_method' "
         "matches those that don't contain 'test_method' in their names. "
+        "-k 'not test_method and not test_other' will eliminate the matches. "
         "Additionally keywords are matched to classes and functions "
         "containing extra names in their 'extra_keyword_matches' set, "
         "as well as functions which have names assigned directly to them.",
@@ -111,6 +101,9 @@ pytest_cmdline_main.tryfirst = True
 
 def deselect_by_keyword(items, config):
     keywordexpr = config.option.keyword.lstrip()
+    if not keywordexpr:
+        return
+
     if keywordexpr.startswith("-"):
         keywordexpr = "not " + keywordexpr[1:]
     selectuntil = False
@@ -158,14 +151,13 @@ def pytest_collection_modifyitems(items, config):
 
 def pytest_configure(config):
     config._old_mark_config = MARK_GEN._config
-    if config.option.strict:
-        MARK_GEN._config = config
+    MARK_GEN._config = config
 
     empty_parameterset = config.getini(EMPTY_PARAMETERSET_OPTION)
 
-    if empty_parameterset not in ("skip", "xfail", None, ""):
+    if empty_parameterset not in ("skip", "xfail", "fail_at_collect", None, ""):
         raise UsageError(
-            "{!s} must be one of skip and xfail,"
+            "{!s} must be one of skip, xfail or fail_at_collect"
             " but it is {!r}".format(EMPTY_PARAMETERSET_OPTION, empty_parameterset)
         )
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/mark/evaluate.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/mark/evaluate.py
index a3d11ee0f81..506546e253a 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/mark/evaluate.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/mark/evaluate.py
@@ -1,10 +1,13 @@
+# -*- coding: utf-8 -*-
 import os
-import six
-import sys
 import platform
+import sys
 import traceback
 
-from ..outcomes import fail, TEST_OUTCOME
+import six
+
+from ..outcomes import fail
+from ..outcomes import TEST_OUTCOME
 
 
 def cached_eval(config, expr, d):
@@ -21,7 +24,6 @@ def cached_eval(config, expr, d):
 
 
 class MarkEvaluator(object):
-
     def __init__(self, item, name):
         self.item = item
         self._marks = None
@@ -91,7 +93,10 @@ class MarkEvaluator(object):
                     else:
                         if "reason" not in mark.kwargs:
                             # XXX better be checked at collection time
-                            msg = "you need to specify reason=STRING " "when using booleans as conditions."
+                            msg = (
+                                "you need to specify reason=STRING "
+                                "when using booleans as conditions."
+                            )
                             fail(msg)
                         result = bool(expr)
                     if result:
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/mark/legacy.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/mark/legacy.py
index ab016a0355b..c56482f14d0 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/mark/legacy.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/mark/legacy.py
@@ -1,10 +1,12 @@
+# -*- coding: utf-8 -*-
 """
 this is a place where we put datastructures used by legacy apis
 we hope ot remove
 """
-import attr
 import keyword
 
+import attr
+
 from _pytest.config import UsageError
 
 
@@ -44,13 +46,14 @@ class KeywordMapping(object):
                 mapped_names.add(item.name)
 
         # Add the names added as extra keywords to current or parent items
-        for name in item.listextrakeywords():
-            mapped_names.add(name)
+        mapped_names.update(item.listextrakeywords())
 
         # Add the names attached to the current function through direct assignment
         if hasattr(item, "function"):
-            for name in item.function.__dict__:
-                mapped_names.add(name)
+            mapped_names.update(item.function.__dict__)
+
+        # add the markers to the keywords as we no longer handle them correctly
+        mapped_names.update(mark.name for mark in item.iter_markers())
 
         return cls(mapped_names)
 
@@ -66,7 +69,10 @@ python_keywords_allowed_list = ["or", "and", "not"]
 
 def matchmark(colitem, markexpr):
     """Tries to match on any marker names, attached to the given colitem."""
-    return eval(markexpr, {}, MarkMapping.from_item(colitem))
+    try:
+        return eval(markexpr, {}, MarkMapping.from_item(colitem))
+    except SyntaxError as e:
+        raise SyntaxError(str(e) + "\nMarker expression must be valid Python!")
 
 
 def matchkeyword(colitem, keywordexpr):
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/mark/structures.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/mark/structures.py
index 1a2bd73de56..0ccd8141dd9 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/mark/structures.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/mark/structures.py
@@ -1,14 +1,20 @@
+# -*- coding: utf-8 -*-
 import inspect
 import warnings
 from collections import namedtuple
 from operator import attrgetter
 
 import attr
+import six
 
-from ..deprecated import MARK_PARAMETERSET_UNPACKING, MARK_INFO_ATTRIBUTE
-from ..compat import NOTSET, getfslineno, MappingMixin
-from six.moves import map, reduce
-
+from ..compat import ascii_escaped
+from ..compat import ATTRS_EQ_FIELD
+from ..compat import getfslineno
+from ..compat import MappingMixin
+from ..compat import NOTSET
+from _pytest.deprecated import PYTEST_PARAM_UNKNOWN_KWARGS
+from _pytest.outcomes import fail
+from _pytest.warning_types import PytestUnknownMarkWarning
 
 EMPTY_PARAMETERSET_OPTION = "empty_parameter_set_mark"
 
@@ -24,90 +30,124 @@ def alias(name, warning=None):
 
 
 def istestfunc(func):
-    return hasattr(func, "__call__") and getattr(
-        func, "__name__", "<lambda>"
-    ) != "<lambda>"
+    return (
+        hasattr(func, "__call__")
+        and getattr(func, "__name__", "<lambda>") != "<lambda>"
+    )
 
 
 def get_empty_parameterset_mark(config, argnames, func):
+    from ..nodes import Collector
+
     requested_mark = config.getini(EMPTY_PARAMETERSET_OPTION)
     if requested_mark in ("", None, "skip"):
         mark = MARK_GEN.skip
     elif requested_mark == "xfail":
         mark = MARK_GEN.xfail(run=False)
+    elif requested_mark == "fail_at_collect":
+        f_name = func.__name__
+        _, lineno = getfslineno(func)
+        raise Collector.CollectError(
+            "Empty parameter set in '%s' at line %d" % (f_name, lineno + 1)
+        )
     else:
         raise LookupError(requested_mark)
     fs, lineno = getfslineno(func)
     reason = "got empty parameter set %r, function %s at %s:%d" % (
-        argnames, func.__name__, fs, lineno
+        argnames,
+        func.__name__,
+        fs,
+        lineno,
     )
     return mark(reason=reason)
 
 
 class ParameterSet(namedtuple("ParameterSet", "values, marks, id")):
-
     @classmethod
-    def param(cls, *values, **kw):
-        marks = kw.pop("marks", ())
+    def param(cls, *values, **kwargs):
+        marks = kwargs.pop("marks", ())
         if isinstance(marks, MarkDecorator):
-            marks = marks,
+            marks = (marks,)
         else:
             assert isinstance(marks, (tuple, list, set))
 
-        def param_extract_id(id=None):
-            return id
+        id_ = kwargs.pop("id", None)
+        if id_ is not None:
+            if not isinstance(id_, six.string_types):
+                raise TypeError(
+                    "Expected id to be a string, got {}: {!r}".format(type(id_), id_)
+                )
+            id_ = ascii_escaped(id_)
 
-        id_ = param_extract_id(**kw)
+        if kwargs:
+            warnings.warn(
+                PYTEST_PARAM_UNKNOWN_KWARGS.format(args=sorted(kwargs)), stacklevel=3
+            )
         return cls(values, marks, id_)
 
     @classmethod
-    def extract_from(cls, parameterset, legacy_force_tuple=False):
+    def extract_from(cls, parameterset, force_tuple=False):
         """
         :param parameterset:
             a legacy style parameterset that may or may not be a tuple,
             and may or may not be wrapped into a mess of mark objects
 
-        :param legacy_force_tuple:
+        :param force_tuple:
             enforce tuple wrapping so single argument tuple values
             don't get decomposed and break tests
-
         """
 
         if isinstance(parameterset, cls):
             return parameterset
-        if not isinstance(parameterset, MarkDecorator) and legacy_force_tuple:
+        if force_tuple:
             return cls.param(parameterset)
+        else:
+            return cls(parameterset, marks=[], id=None)
 
-        newmarks = []
-        argval = parameterset
-        while isinstance(argval, MarkDecorator):
-            newmarks.append(
-                MarkDecorator(Mark(argval.markname, argval.args[:-1], argval.kwargs))
-            )
-            argval = argval.args[-1]
-        assert not isinstance(argval, ParameterSet)
-        if legacy_force_tuple:
-            argval = argval,
-
-        if newmarks:
-            warnings.warn(MARK_PARAMETERSET_UNPACKING)
-
-        return cls(argval, marks=newmarks, id=None)
-
-    @classmethod
-    def _for_parametrize(cls, argnames, argvalues, func, config):
+    @staticmethod
+    def _parse_parametrize_args(argnames, argvalues, *args, **kwargs):
         if not isinstance(argnames, (tuple, list)):
             argnames = [x.strip() for x in argnames.split(",") if x.strip()]
             force_tuple = len(argnames) == 1
         else:
             force_tuple = False
-        parameters = [
-            ParameterSet.extract_from(x, legacy_force_tuple=force_tuple)
-            for x in argvalues
+        return argnames, force_tuple
+
+    @staticmethod
+    def _parse_parametrize_parameters(argvalues, force_tuple):
+        return [
+            ParameterSet.extract_from(x, force_tuple=force_tuple) for x in argvalues
         ]
+
+    @classmethod
+    def _for_parametrize(cls, argnames, argvalues, func, config, function_definition):
+        argnames, force_tuple = cls._parse_parametrize_args(argnames, argvalues)
+        parameters = cls._parse_parametrize_parameters(argvalues, force_tuple)
         del argvalues
 
-        if not parameters:
+        if parameters:
+            # check all parameter sets have the correct number of values
+            for param in parameters:
+                if len(param.values) != len(argnames):
+                    msg = (
+                        '{nodeid}: in "parametrize" the number of names ({names_len}):\n'
+                        "  {names}\n"
+                        "must be equal to the number of values ({values_len}):\n"
+                        "  {values}"
+                    )
+                    fail(
+                        msg.format(
+                            nodeid=function_definition.nodeid,
+                            values=param.values,
+                            names=argnames,
+                            names_len=len(argnames),
+                            values_len=len(param.values),
+                        ),
+                        pytrace=False,
+                    )
+        else:
+            # empty parameter set (likely computed at runtime): create a single
+            # parameter set with NOTSET values, with the "empty parameter set" mark applied to it
             mark = get_empty_parameterset_mark(config, argnames, func)
             parameters.append(
                 ParameterSet(values=(NOTSET,) * len(argnames), marks=[mark], id=None)
@@ -120,9 +160,9 @@ class Mark(object):
     #: name of the mark
     name = attr.ib(type=str)
     #: positional arguments of the mark decorator
-    args = attr.ib(type="List[object]")
+    args = attr.ib()  # List[object]
     #: keyword arguments of the mark decorator
-    kwargs = attr.ib(type="Dict[str, object]")
+    kwargs = attr.ib()  # Dict[str, object]
 
     def combined_with(self, other):
         """
@@ -130,7 +170,7 @@ class Mark(object):
         :type other: Mark
         :rtype: Mark
 
-        combines by appending aargs and merging the mappings
+        combines by appending args and merging the mappings
         """
         assert self.name == other.name
         return Mark(
@@ -207,11 +247,7 @@ class MarkDecorator(object):
             func = args[0]
             is_class = inspect.isclass(func)
             if len(args) == 1 and (istestfunc(func) or is_class):
-                if is_class:
-                    store_mark(func, self.mark)
-                else:
-                    store_legacy_markinfo(func, self.mark)
-                    store_mark(func, self.mark)
+                store_mark(func, self.mark)
                 return func
         return self.with_args(*args, **kwargs)
 
@@ -221,10 +257,25 @@ def get_unpacked_marks(obj):
     obtain the unpacked marks that are stored on an object
     """
     mark_list = getattr(obj, "pytestmark", [])
-
     if not isinstance(mark_list, list):
         mark_list = [mark_list]
-    return [getattr(mark, "mark", mark) for mark in mark_list]  # unpack MarkDecorator
+    return normalize_mark_list(mark_list)
+
+
+def normalize_mark_list(mark_list):
+    """
+    normalizes marker decorating helpers to mark objects
+
+    :type mark_list: List[Union[Mark, Markdecorator]]
+    :rtype: List[Mark]
+    """
+    extracted = [
+        getattr(mark, "mark", mark) for mark in mark_list
+    ]  # unpack MarkDecorator
+    for mark in extracted:
+        if not isinstance(mark, Mark):
+            raise TypeError("got {!r} instead of Mark".format(mark))
+    return [x for x in extracted if isinstance(x, Mark)]
 
 
 def store_mark(obj, mark):
@@ -237,90 +288,6 @@ def store_mark(obj, mark):
     obj.pytestmark = get_unpacked_marks(obj) + [mark]
 
 
-def store_legacy_markinfo(func, mark):
-    """create the legacy MarkInfo objects and put them onto the function
-    """
-    if not isinstance(mark, Mark):
-        raise TypeError("got {mark!r} instead of a Mark".format(mark=mark))
-    holder = getattr(func, mark.name, None)
-    if holder is None:
-        holder = MarkInfo.for_mark(mark)
-        setattr(func, mark.name, holder)
-    else:
-        holder.add_mark(mark)
-
-
-def transfer_markers(funcobj, cls, mod):
-    """
-    this function transfers class level markers and module level markers
-    into function level markinfo objects
-
-    this is the main reason why marks are so broken
-    the resolution will involve phasing out function level MarkInfo objects
-
-    """
-    for obj in (cls, mod):
-        for mark in get_unpacked_marks(obj):
-            if not _marked(funcobj, mark):
-                store_legacy_markinfo(funcobj, mark)
-
-
-def _marked(func, mark):
-    """ Returns True if :func: is already marked with :mark:, False otherwise.
-    This can happen if marker is applied to class and the test file is
-    invoked more than once.
-    """
-    try:
-        func_mark = getattr(func, getattr(mark, "combined", mark).name)
-    except AttributeError:
-        return False
-    return any(mark == info.combined for info in func_mark)
-
-
-@attr.s
-class MarkInfo(object):
-    """ Marking object created by :class:`MarkDecorator` instances. """
-
-    _marks = attr.ib(convert=list)
-
-    @_marks.validator
-    def validate_marks(self, attribute, value):
-        for item in value:
-            if not isinstance(item, Mark):
-                raise ValueError(
-                    "MarkInfo expects Mark instances, got {!r} ({!r})".format(
-                        item, type(item)
-                    )
-                )
-
-    combined = attr.ib(
-        repr=False,
-        default=attr.Factory(
-            lambda self: reduce(Mark.combined_with, self._marks), takes_self=True
-        ),
-    )
-
-    name = alias("combined.name", warning=MARK_INFO_ATTRIBUTE)
-    args = alias("combined.args", warning=MARK_INFO_ATTRIBUTE)
-    kwargs = alias("combined.kwargs", warning=MARK_INFO_ATTRIBUTE)
-
-    @classmethod
-    def for_mark(cls, mark):
-        return cls([mark])
-
-    def __repr__(self):
-        return "<MarkInfo {!r}>".format(self.combined)
-
-    def add_mark(self, mark):
-        """ add a MarkInfo with the given args and kwargs. """
-        self._marks.append(mark)
-        self.combined = self.combined.combined_with(mark)
-
-    def __iter__(self):
-        """ yield MarkInfo objects each relating to a marking-call. """
-        return map(MarkInfo.for_mark, self._marks)
-
-
 class MarkGenerator(object):
     """ Factory for :class:`MarkDecorator` objects - exposed as
     a ``pytest.mark`` singleton instance.  Example::
@@ -332,36 +299,49 @@ class MarkGenerator(object):
 
     will set a 'slowtest' :class:`MarkInfo` object
     on the ``test_function`` object. """
+
     _config = None
+    _markers = set()
 
     def __getattr__(self, name):
         if name[0] == "_":
             raise AttributeError("Marker name must NOT start with underscore")
-        if self._config is not None:
-            self._check(name)
-        return MarkDecorator(Mark(name, (), {}))
 
-    def _check(self, name):
-        try:
-            if name in self._markers:
-                return
-        except AttributeError:
-            pass
-        self._markers = values = set()
-        for line in self._config.getini("markers"):
-            marker = line.split(":", 1)[0]
-            marker = marker.rstrip()
-            x = marker.split("(", 1)[0]
-            values.add(x)
-        if name not in self._markers:
-            raise AttributeError("%r not a registered marker" % (name,))
+        if self._config is not None:
+            # We store a set of markers as a performance optimisation - if a mark
+            # name is in the set we definitely know it, but a mark may be known and
+            # not in the set.  We therefore start by updating the set!
+            if name not in self._markers:
+                for line in self._config.getini("markers"):
+                    # example lines: "skipif(condition): skip the given test if..."
+                    # or "hypothesis: tests which use Hypothesis", so to get the
+                    # marker name we split on both `:` and `(`.
+                    marker = line.split(":")[0].split("(")[0].strip()
+                    self._markers.add(marker)
+
+            # If the name is not in the set of known marks after updating,
+            # then it really is time to issue a warning or an error.
+            if name not in self._markers:
+                if self._config.option.strict_markers:
+                    fail(
+                        "{!r} not found in `markers` configuration option".format(name),
+                        pytrace=False,
+                    )
+                else:
+                    warnings.warn(
+                        "Unknown pytest.mark.%s - is this a typo?  You can register "
+                        "custom marks to avoid this warning - for details, see "
+                        "https://docs.pytest.org/en/latest/mark.html" % name,
+                        PytestUnknownMarkWarning,
+                    )
+
+        return MarkDecorator(Mark(name, (), {}))
 
 
 MARK_GEN = MarkGenerator()
 
 
 class NodeKeywords(MappingMixin):
-
     def __init__(self, node):
         self.node = node
         self.parent = node.parent
@@ -398,16 +378,18 @@ class NodeKeywords(MappingMixin):
         return "<NodeKeywords for node %s>" % (self.node,)
 
 
-@attr.s(cmp=False, hash=False)
+# mypy cannot find this overload, remove when on attrs>=19.2
+@attr.s(hash=False, **{ATTRS_EQ_FIELD: False})  # type: ignore
 class NodeMarkers(object):
     """
-    internal strucutre for storing marks belongong to a node
+    internal structure for storing marks belonging to a node
 
     ..warning::
 
         unstable api
 
     """
+
     own_markers = attr.ib(default=attr.Factory(list))
 
     def update(self, add_markers):
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/monkeypatch.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/monkeypatch.py
index 16080b5d5cb..e8671b0c702 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/monkeypatch.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/monkeypatch.py
@@ -1,15 +1,22 @@
+# -*- coding: utf-8 -*-
 """ monkeypatching and mocking functionality.  """
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import os
-import sys
 import re
+import sys
+import warnings
 from contextlib import contextmanager
 
 import six
-from _pytest.fixtures import fixture
 
-RE_IMPORT_ERROR_NAME = re.compile("^No module named (.*)$")
+import pytest
+from _pytest.fixtures import fixture
+from _pytest.pathlib import Path
+
+RE_IMPORT_ERROR_NAME = re.compile(r"^No module named (.*)$")
 
 
 @fixture
@@ -22,7 +29,7 @@ def monkeypatch():
         monkeypatch.setitem(mapping, name, value)
         monkeypatch.delitem(obj, name, raising=True)
         monkeypatch.setenv(name, value, prepend=False)
-        monkeypatch.delenv(name, value, raising=True)
+        monkeypatch.delenv(name, raising=True)
         monkeypatch.syspath_prepend(path)
         monkeypatch.chdir(path)
 
@@ -86,7 +93,6 @@ def derive_importpath(import_path, raising):
 
 
 class Notset(object):
-
     def __repr__(self):
         return "<notset>"
 
@@ -176,6 +182,8 @@ class MonkeyPatch(object):
         attribute is missing.
         """
         __tracebackhide__ = True
+        import inspect
+
         if name is notset:
             if not isinstance(target, six.string_types):
                 raise TypeError(
@@ -189,7 +197,11 @@ class MonkeyPatch(object):
             if raising:
                 raise AttributeError(name)
         else:
-            self._setattr.append((target, name, getattr(target, name, notset)))
+            oldval = getattr(target, name, notset)
+            # Avoid class descriptors like staticmethod/classmethod.
+            if inspect.isclass(target):
+                oldval = target.__dict__.get(name, notset)
+            self._setattr.append((target, name, oldval))
             delattr(target, name)
 
     def setitem(self, dic, name, value):
@@ -210,30 +222,68 @@ class MonkeyPatch(object):
             self._setitem.append((dic, name, dic.get(name, notset)))
             del dic[name]
 
+    def _warn_if_env_name_is_not_str(self, name):
+        """On Python 2, warn if the given environment variable name is not a native str (#4056)"""
+        if six.PY2 and not isinstance(name, str):
+            warnings.warn(
+                pytest.PytestWarning(
+                    "Environment variable name {!r} should be str".format(name)
+                )
+            )
+
     def setenv(self, name, value, prepend=None):
         """ Set environment variable ``name`` to ``value``.  If ``prepend``
         is a character, read the current environment variable value
         and prepend the ``value`` adjoined with the ``prepend`` character."""
-        value = str(value)
+        if not isinstance(value, str):
+            warnings.warn(
+                pytest.PytestWarning(
+                    "Value of environment variable {name} type should be str, but got "
+                    "{value!r} (type: {type}); converted to str implicitly".format(
+                        name=name, value=value, type=type(value).__name__
+                    )
+                ),
+                stacklevel=2,
+            )
+            value = str(value)
         if prepend and name in os.environ:
             value = value + prepend + os.environ[name]
+        self._warn_if_env_name_is_not_str(name)
         self.setitem(os.environ, name, value)
 
     def delenv(self, name, raising=True):
-        """ Delete ``name`` from the environment. Raise KeyError it does not
-        exist.
+        """ Delete ``name`` from the environment. Raise KeyError if it does
+        not exist.
 
         If ``raising`` is set to False, no exception will be raised if the
         environment variable is missing.
         """
+        self._warn_if_env_name_is_not_str(name)
         self.delitem(os.environ, name, raising=raising)
 
     def syspath_prepend(self, path):
         """ Prepend ``path`` to ``sys.path`` list of import locations. """
+        from pkg_resources import fixup_namespace_packages
+
         if self._savesyspath is None:
             self._savesyspath = sys.path[:]
         sys.path.insert(0, str(path))
 
+        # https://github.com/pypa/setuptools/blob/d8b901bc/docs/pkg_resources.txt#L162-L171
+        fixup_namespace_packages(str(path))
+
+        # A call to syspathinsert() usually means that the caller wants to
+        # import some dynamically created files, thus with python3 we
+        # invalidate its import caches.
+        # This is especially important when any namespace package is in used,
+        # since then the mtime based FileFinder cache (that gets created in
+        # this case already) gets not invalidated when writing the new files
+        # quickly afterwards.
+        if sys.version_info >= (3, 3):
+            from importlib import invalidate_caches
+
+            invalidate_caches()
+
     def chdir(self, path):
         """ Change the current working directory to the specified path.
         Path can be a string or a py.path.local object.
@@ -242,6 +292,9 @@ class MonkeyPatch(object):
             self._cwd = os.getcwd()
         if hasattr(path, "chdir"):
             path.chdir()
+        elif isinstance(path, Path):
+            # modern python uses the fspath protocol here LEGACY
+            os.chdir(str(path))
         else:
             os.chdir(path)
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/nodes.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/nodes.py
index ef74c53eba4..206e9ae163e 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/nodes.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/nodes.py
@@ -1,14 +1,18 @@
-from __future__ import absolute_import, division, print_function
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import os
+import warnings
 
-import six
 import py
-import attr
+import six
 
-import _pytest
 import _pytest._code
-
-from _pytest.mark.structures import NodeKeywords, MarkInfo
+from _pytest.compat import getfslineno
+from _pytest.mark.structures import NodeKeywords
+from _pytest.outcomes import fail
 
 SEP = "/"
 
@@ -22,7 +26,7 @@ def _splitnode(nodeid):
         ''
         'testing/code'
         'testing/code/test_excinfo.py'
-        'testing/code/test_excinfo.py::TestFormattedExcinfo::()'
+        'testing/code/test_excinfo.py::TestFormattedExcinfo'
 
     Return values are lists e.g.
         []
@@ -34,7 +38,7 @@ def _splitnode(nodeid):
         # If there is no root node at all, return an empty list so the caller's logic can remain sane
         return []
     parts = nodeid.split(SEP)
-    # Replace single last element 'test_foo.py::Bar::()' with multiple elements 'test_foo.py', 'Bar', '()'
+    # Replace single last element 'test_foo.py::Bar' with multiple elements 'test_foo.py', 'Bar'
     parts[-1:] = parts[-1].split("::")
     return parts
 
@@ -42,29 +46,13 @@ def _splitnode(nodeid):
 def ischildnode(baseid, nodeid):
     """Return True if the nodeid is a child node of the baseid.
 
-    E.g. 'foo/bar::Baz::()' is a child of 'foo', 'foo/bar' and 'foo/bar::Baz', but not of 'foo/blorp'
+    E.g. 'foo/bar::Baz' is a child of 'foo', 'foo/bar' and 'foo/bar::Baz', but not of 'foo/blorp'
     """
     base_parts = _splitnode(baseid)
     node_parts = _splitnode(nodeid)
     if len(node_parts) < len(base_parts):
         return False
-    return node_parts[:len(base_parts)] == base_parts
-
-
-@attr.s
-class _CompatProperty(object):
-    name = attr.ib()
-
-    def __get__(self, obj, owner):
-        if obj is None:
-            return self
-
-        # TODO: reenable in the features branch
-        # warnings.warn(
-        #     "usage of {owner!r}.{name} is deprecated, please use pytest.{name} instead".format(
-        #         name=self.name, owner=type(owner).__name__),
-        #     PendingDeprecationWarning, stacklevel=2)
-        return getattr(__import__("pytest"), self.name)
+    return node_parts[: len(base_parts)] == base_parts
 
 
 class Node(object):
@@ -102,49 +90,51 @@ class Node(object):
         self._name2pseudofixturedef = {}
 
         if nodeid is not None:
+            assert "::()" not in nodeid
             self._nodeid = nodeid
         else:
-            assert parent is not None
-            self._nodeid = self.parent.nodeid + "::" + self.name
+            self._nodeid = self.parent.nodeid
+            if self.name != "()":
+                self._nodeid += "::" + self.name
 
     @property
     def ihook(self):
         """ fspath sensitive hook proxy used to call pytest hooks"""
         return self.session.gethookproxy(self.fspath)
 
-    Module = _CompatProperty("Module")
-    Class = _CompatProperty("Class")
-    Instance = _CompatProperty("Instance")
-    Function = _CompatProperty("Function")
-    File = _CompatProperty("File")
-    Item = _CompatProperty("Item")
-
-    def _getcustomclass(self, name):
-        maybe_compatprop = getattr(type(self), name)
-        if isinstance(maybe_compatprop, _CompatProperty):
-            return getattr(__import__("pytest"), name)
-        else:
-            cls = getattr(self, name)
-            # TODO: reenable in the features branch
-            # warnings.warn("use of node.%s is deprecated, "
-            #    "use pytest_pycollect_makeitem(...) to create custom "
-            #    "collection nodes" % name, category=DeprecationWarning)
-        return cls
-
     def __repr__(self):
-        return "<%s %r>" % (self.__class__.__name__, getattr(self, "name", None))
+        return "<%s %s>" % (self.__class__.__name__, getattr(self, "name", None))
 
-    def warn(self, code, message):
-        """ generate a warning with the given code and message for this
-        item. """
-        assert isinstance(code, str)
-        fslocation = getattr(self, "location", None)
-        if fslocation is None:
-            fslocation = getattr(self, "fspath", None)
-        self.ihook.pytest_logwarning.call_historic(
-            kwargs=dict(
-                code=code, message=message, nodeid=self.nodeid, fslocation=fslocation
+    def warn(self, warning):
+        """Issue a warning for this item.
+
+        Warnings will be displayed after the test session, unless explicitly suppressed
+
+        :param Warning warning: the warning instance to issue. Must be a subclass of PytestWarning.
+
+        :raise ValueError: if ``warning`` instance is not a subclass of PytestWarning.
+
+        Example usage:
+
+        .. code-block:: python
+
+            node.warn(PytestWarning("some message"))
+
+        """
+        from _pytest.warning_types import PytestWarning
+
+        if not isinstance(warning, PytestWarning):
+            raise ValueError(
+                "warning must be an instance of PytestWarning or subclass, got {!r}".format(
+                    warning
+                )
             )
+        path, lineno = get_fslocation_from_item(self)
+        warnings.warn_explicit(
+            warning,
+            category=None,
+            filename=str(path),
+            lineno=lineno + 1 if lineno is not None else None,
         )
 
     # methods for ordering nodes
@@ -173,10 +163,13 @@ class Node(object):
         chain.reverse()
         return chain
 
-    def add_marker(self, marker):
+    def add_marker(self, marker, append=True):
         """dynamically add a marker object to the node.
 
-        :type marker: str or pytest.mark.*
+        :type marker: ``str`` or ``pytest.mark.*``  object
+        :param marker:
+            ``append=True`` whether to append the marker,
+            if ``False`` insert at position ``0``.
         """
         from _pytest.mark import MarkDecorator, MARK_GEN
 
@@ -185,7 +178,10 @@ class Node(object):
         elif not isinstance(marker, MarkDecorator):
             raise ValueError("is not a string or pytest.mark.* Marker")
         self.keywords[marker.name] = marker
-        self.own_markers.append(marker.mark)
+        if append:
+            self.own_markers.append(marker.mark)
+        else:
+            self.own_markers.insert(0, marker.mark)
 
     def iter_markers(self, name=None):
         """
@@ -216,20 +212,6 @@ class Node(object):
         """
         return next(self.iter_markers(name=name), default)
 
-    def get_marker(self, name):
-        """ get a marker object from this node or None if
-        the node doesn't have a marker with that name.
-
-        .. deprecated:: 3.6
-            This function has been deprecated in favor of
-            :meth:`Node.get_closest_marker <_pytest.nodes.Node.get_closest_marker>` and
-            :meth:`Node.iter_markers <_pytest.nodes.Node.iter_markers>`, see :ref:`update marker code`
-            for more details.
-        """
-        markers = list(self.iter_markers(name=name))
-        if markers:
-            return MarkInfo(markers)
-
     def listextrakeywords(self):
         """ Return a set of all extra keywords in self and any parents."""
         extra_keywords = set()
@@ -260,11 +242,14 @@ class Node(object):
         pass
 
     def _repr_failure_py(self, excinfo, style=None):
+        if excinfo.errisinstance(fail.Exception):
+            if not excinfo.value.pytrace:
+                return six.text_type(excinfo.value)
         fm = self.session._fixturemanager
         if excinfo.errisinstance(fm.FixtureLookupError):
             return excinfo.value.formatrepr()
         tbfilter = True
-        if self.config.option.fulltrace:
+        if self.config.getoption("fulltrace", False):
             style = "long"
         else:
             tb = _pytest._code.Traceback([excinfo.traceback[-1]])
@@ -276,11 +261,16 @@ class Node(object):
                 style = "long"
         # XXX should excinfo.getrepr record all data and toterminal() process it?
         if style is None:
-            if self.config.option.tbstyle == "short":
+            if self.config.getoption("tbstyle", "auto") == "short":
                 style = "short"
             else:
                 style = "long"
 
+        if self.config.getoption("verbose", 0) > 1:
+            truncate_locals = False
+        else:
+            truncate_locals = True
+
         try:
             os.getcwd()
             abspath = False
@@ -290,14 +280,33 @@ class Node(object):
         return excinfo.getrepr(
             funcargs=True,
             abspath=abspath,
-            showlocals=self.config.option.showlocals,
+            showlocals=self.config.getoption("showlocals", False),
             style=style,
             tbfilter=tbfilter,
+            truncate_locals=truncate_locals,
         )
 
     repr_failure = _repr_failure_py
 
 
+def get_fslocation_from_item(item):
+    """Tries to extract the actual location from an item, depending on available attributes:
+
+    * "fslocation": a pair (path, lineno)
+    * "obj": a Python object that the item wraps.
+    * "fspath": just a path
+
+    :rtype: a tuple of (str|LocalPath, int) with filename and line number.
+    """
+    result = getattr(item, "location", None)
+    if result is not None:
+        return result[:2]
+    obj = getattr(item, "obj", None)
+    if obj is not None:
+        return getfslineno(obj)
+    return getattr(item, "fspath", "unknown location"), -1
+
+
 class Collector(Node):
     """ Collector instances create children through collect()
         and thus iteratively build a tree.
@@ -317,7 +326,14 @@ class Collector(Node):
         if excinfo.errisinstance(self.CollectError):
             exc = excinfo.value
             return str(exc.args[0])
-        return self._repr_failure_py(excinfo, style="short")
+
+        # Respect explicit tbstyle option, but default to "short"
+        # (None._repr_failure_py defaults to "long" without "fulltrace" option).
+        tbstyle = self.config.getoption("tbstyle", "auto")
+        if tbstyle == "auto":
+            tbstyle = "short"
+
+        return self._repr_failure_py(excinfo, style=tbstyle)
 
     def _prunetraceback(self, excinfo):
         if hasattr(self, "fspath"):
@@ -331,11 +347,10 @@ class Collector(Node):
 def _check_initialpaths_for_relpath(session, fspath):
     for initial_path in session._initialpaths:
         if fspath.common(initial_path) == initial_path:
-            return fspath.relto(initial_path.dirname)
+            return fspath.relto(initial_path)
 
 
 class FSCollector(Collector):
-
     def __init__(self, fspath, parent=None, config=None, session=None, nodeid=None):
         fspath = py.path.local(fspath)  # xxx only for test_resultlog.py?
         name = fspath.basename
@@ -353,7 +368,7 @@ class FSCollector(Collector):
 
             if not nodeid:
                 nodeid = _check_initialpaths_for_relpath(session, fspath)
-            if os.sep != SEP:
+            if nodeid and os.sep != SEP:
                 nodeid = nodeid.replace(os.sep, SEP)
 
         super(FSCollector, self).__init__(
@@ -369,6 +384,7 @@ class Item(Node):
     """ a basic test invocation item. Note that for a single function
     there might be multiple test invocation items.
     """
+
     nextitem = None
 
     def __init__(self, name, parent=None, config=None, session=None, nodeid=None):
@@ -407,13 +423,7 @@ class Item(Node):
             return self._location
         except AttributeError:
             location = self.reportinfo()
-            # bestrelpath is a quite slow function
-            cache = self.config.__dict__.setdefault("_bestrelpathcache", {})
-            try:
-                fspath = cache[location[0]]
-            except KeyError:
-                fspath = self.session.fspath.bestrelpath(location[0])
-                cache[location[0]] = fspath
+            fspath = self.session._node_location_to_relpath(location[0])
             location = (fspath, location[1], str(location[2]))
             self._location = location
             return location
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/nose.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/nose.py
index bb2e4277d1c..fbab91da249 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/nose.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/nose.py
@@ -1,9 +1,17 @@
+# -*- coding: utf-8 -*-
 """ run test suites written for nose. """
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import sys
 
-from _pytest import unittest, runner, python
+import six
+
+import pytest
+from _pytest import python
+from _pytest import runner
+from _pytest import unittest
 from _pytest.config import hookimpl
 
 
@@ -19,20 +27,15 @@ def get_skip_exceptions():
 def pytest_runtest_makereport(item, call):
     if call.excinfo and call.excinfo.errisinstance(get_skip_exceptions()):
         # let's substitute the excinfo with a pytest.skip one
-        call2 = call.__class__(lambda: runner.skip(str(call.excinfo.value)), call.when)
+        call2 = runner.CallInfo.from_call(
+            lambda: pytest.skip(six.text_type(call.excinfo.value)), call.when
+        )
         call.excinfo = call2.excinfo
 
 
 @hookimpl(trylast=True)
 def pytest_runtest_setup(item):
     if is_potential_nosetest(item):
-        if isinstance(item.parent, python.Generator):
-            gen = item.parent
-            if not hasattr(gen, "_nosegensetup"):
-                call_optional(gen.obj, "setup")
-                if isinstance(gen.parent, python.Instance):
-                    call_optional(gen.parent.obj, "setup")
-                gen._nosegensetup = True
         if not call_optional(item.obj, "setup"):
             # call module level setup if there is no object level one
             call_optional(item.parent.obj, "setup")
@@ -49,11 +52,6 @@ def teardown_nose(item):
         #    del item.parent._nosegensetup
 
 
-def pytest_make_collect_report(collector):
-    if isinstance(collector, python.Generator):
-        call_optional(collector.obj, "setup")
-
-
 def is_potential_nosetest(item):
     # extra check needed since we do not do nose style setup/teardown
     # on direct unittest style classes
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/outcomes.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/outcomes.py
index 8a3662e1b3e..4620f957c7d 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/outcomes.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/outcomes.py
@@ -1,11 +1,16 @@
+# -*- coding: utf-8 -*-
 """
 exception classes and constants handling test outcomes
 as well as functions creating them
 """
-from __future__ import absolute_import, division, print_function
-import py
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import sys
 
+from packaging.version import Version
+
 
 class OutcomeException(BaseException):
     """ OutcomeException and its subclass instances indicate and
@@ -21,7 +26,7 @@ class OutcomeException(BaseException):
         if self.msg:
             val = self.msg
             if isinstance(val, bytes):
-                val = py._builtin._totext(val, errors="replace")
+                val = val.decode("UTF-8", errors="replace")
             return val
         return "<%s instance>" % (self.__class__.__name__,)
 
@@ -43,43 +48,59 @@ class Skipped(OutcomeException):
 
 class Failed(OutcomeException):
     """ raised from an explicit call to pytest.fail() """
+
     __module__ = "builtins"
 
 
-class Exit(KeyboardInterrupt):
+class Exit(Exception):
     """ raised for immediate program exits (no tracebacks/summaries)"""
 
-    def __init__(self, msg="unknown reason"):
+    def __init__(self, msg="unknown reason", returncode=None):
         self.msg = msg
-        KeyboardInterrupt.__init__(self, msg)
+        self.returncode = returncode
+        super(Exit, self).__init__(msg)
 
 
 # exposed helper methods
 
 
-def exit(msg):
-    """ exit testing process as if KeyboardInterrupt was triggered. """
+def exit(msg, returncode=None):
+    """
+    Exit testing process.
+
+    :param str msg: message to display upon exit.
+    :param int returncode: return code to be used when exiting pytest.
+    """
     __tracebackhide__ = True
-    raise Exit(msg)
+    raise Exit(msg, returncode)
 
 
 exit.Exception = Exit
 
 
 def skip(msg="", **kwargs):
-    """ skip an executing test with the given message.  Note: it's usually
-    better to use the pytest.mark.skipif marker to declare a test to be
-    skipped under certain conditions like mismatching platforms or
-    dependencies.  See the pytest_skipping plugin for details.
+    """
+    Skip an executing test with the given message.
+
+    This function should be called only during testing (setup, call or teardown) or
+    during collection by using the ``allow_module_level`` flag.  This function can
+    be called in doctests as well.
 
     :kwarg bool allow_module_level: allows this function to be called at
         module level, skipping the rest of the module. Default to False.
+
+    .. note::
+        It is better to use the :ref:`pytest.mark.skipif ref` marker when possible to declare a test to be
+        skipped under certain conditions like mismatching platforms or
+        dependencies.
+        Similarly, use the ``# doctest: +SKIP`` directive (see `doctest.SKIP
+        <https://docs.python.org/3/library/doctest.html#doctest.SKIP>`_)
+        to skip a doctest statically.
     """
     __tracebackhide__ = True
     allow_module_level = kwargs.pop("allow_module_level", False)
     if kwargs:
-        keys = [k for k in kwargs.keys()]
-        raise TypeError("unexpected keyword arguments: {}".format(keys))
+        raise TypeError("unexpected keyword arguments: {}".format(sorted(kwargs)))
     raise Skipped(msg=msg, allow_module_level=allow_module_level)
 
 
@@ -87,10 +108,12 @@ skip.Exception = Skipped
 
 
 def fail(msg="", pytrace=True):
-    """ explicitly fail a currently-executing test with the given Message.
+    """
+    Explicitly fail an executing test with the given message.
 
-    :arg pytrace: if false the msg represents the full failure information
-                  and no python traceback will be reported.
+    :param str msg: the message to show the user as reason for the failure.
+    :param bool pytrace: if false the msg represents the full failure information and no
+        python traceback will be reported.
     """
     __tracebackhide__ = True
     raise Failed(msg=msg, pytrace=pytrace)
@@ -104,7 +127,15 @@ class XFailed(fail.Exception):
 
 
 def xfail(reason=""):
-    """ xfail an executing test or setup functions with the given reason."""
+    """
+    Imperatively xfail an executing test or setup functions with the given reason.
+
+    This function should be called only during testing (setup, call or teardown).
+
+    .. note::
+        It is better to use the :ref:`pytest.mark.xfail ref` marker when possible to declare a test to be
+        xfailed under certain conditions like known bugs or missing features.
+    """
     __tracebackhide__ = True
     raise XFailed(reason)
 
@@ -112,16 +143,21 @@ def xfail(reason=""):
 xfail.Exception = XFailed
 
 
-def importorskip(modname, minversion=None):
-    """ return imported module if it has at least "minversion" as its
-    __version__ attribute.  If no minversion is specified the a skip
-    is only triggered if the module can not be imported.
+def importorskip(modname, minversion=None, reason=None):
+    """Imports and returns the requested module ``modname``, or skip the current test
+    if the module cannot be imported.
+
+    :param str modname: the name of the module to import
+    :param str minversion: if given, the imported module ``__version__`` attribute must be
+        at least this minimal version, otherwise the test is still skipped.
+    :param str reason: if given, this reason is shown as the message when the module
+        cannot be imported.
     """
     import warnings
 
     __tracebackhide__ = True
     compile(modname, "", "eval")  # to catch syntaxerrors
-    should_skip = False
+    import_exc = None
 
     with warnings.catch_warnings():
         # make sure to ignore ImportWarnings that might happen because
@@ -130,25 +166,19 @@ def importorskip(modname, minversion=None):
         warnings.simplefilter("ignore")
         try:
             __import__(modname)
-        except ImportError:
+        except ImportError as exc:
             # Do not raise chained exception here(#1485)
-            should_skip = True
-    if should_skip:
-        raise Skipped("could not import %r" % (modname,), allow_module_level=True)
+            import_exc = exc
+    if import_exc:
+        if reason is None:
+            reason = "could not import %r: %s" % (modname, import_exc)
+        raise Skipped(reason, allow_module_level=True)
     mod = sys.modules[modname]
     if minversion is None:
         return mod
     verattr = getattr(mod, "__version__", None)
     if minversion is not None:
-        try:
-            from pkg_resources import parse_version as pv
-        except ImportError:
-            raise Skipped(
-                "we have a required version for %r but can not import "
-                "pkg_resources to parse version strings." % (modname,),
-                allow_module_level=True,
-            )
-        if verattr is None or pv(verattr) < pv(minversion):
+        if verattr is None or Version(verattr) < Version(minversion):
             raise Skipped(
                 "module %r has __version__ %r, required is: %r"
                 % (modname, verattr, minversion),
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/pastebin.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/pastebin.py
index 6af202d1f0a..7a3e80231c2 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/pastebin.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/pastebin.py
@@ -1,11 +1,16 @@
+# -*- coding: utf-8 -*-
 """ submit failure or test session information to a pastebin service. """
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
-import pytest
-import six
 import sys
 import tempfile
 
+import six
+
+import pytest
+
 
 def pytest_addoption(parser):
     group = parser.getgroup("terminal reporting")
@@ -72,11 +77,7 @@ def create_new_paste(contents):
         from urllib.request import urlopen
         from urllib.parse import urlencode
 
-    params = {
-        "code": contents,
-        "lexer": "python3" if sys.version_info[0] == 3 else "python",
-        "expiry": "1week",
-    }
+    params = {"code": contents, "lexer": "text", "expiry": "1week"}
     url = "https://bpaste.net"
     response = urlopen(url, data=urlencode(params).encode("ascii")).read()
     m = re.search(r'href="/raw/(\w+)"', response.decode("utf-8"))
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/pathlib.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/pathlib.py
new file mode 100644
index 00000000000..42071f43104
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/pathlib.py
@@ -0,0 +1,380 @@
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+
+import atexit
+import errno
+import fnmatch
+import itertools
+import operator
+import os
+import shutil
+import sys
+import uuid
+import warnings
+from functools import partial
+from functools import reduce
+from os.path import expanduser
+from os.path import expandvars
+from os.path import isabs
+from os.path import sep
+from posixpath import sep as posix_sep
+
+import six
+from six.moves import map
+
+from .compat import PY36
+from _pytest.warning_types import PytestWarning
+
+if PY36:
+    from pathlib import Path, PurePath
+else:
+    from pathlib2 import Path, PurePath
+
+__all__ = ["Path", "PurePath"]
+
+
+LOCK_TIMEOUT = 60 * 60 * 3
+
+get_lock_path = operator.methodcaller("joinpath", ".lock")
+
+
+def ensure_reset_dir(path):
+    """
+    ensures the given path is an empty directory
+    """
+    if path.exists():
+        rm_rf(path)
+    path.mkdir()
+
+
+def on_rm_rf_error(func, path, exc, **kwargs):
+    """Handles known read-only errors during rmtree.
+
+    The returned value is used only by our own tests.
+    """
+    start_path = kwargs["start_path"]
+    exctype, excvalue = exc[:2]
+
+    # another process removed the file in the middle of the "rm_rf" (xdist for example)
+    # more context: https://github.com/pytest-dev/pytest/issues/5974#issuecomment-543799018
+    if isinstance(excvalue, OSError) and excvalue.errno == errno.ENOENT:
+        return False
+
+    if not isinstance(excvalue, OSError) or excvalue.errno not in (
+        errno.EACCES,
+        errno.EPERM,
+    ):
+        warnings.warn(
+            PytestWarning(
+                "(rm_rf) error removing {}\n{}: {}".format(path, exctype, excvalue)
+            )
+        )
+        return False
+
+    if func not in (os.rmdir, os.remove, os.unlink):
+        warnings.warn(
+            PytestWarning(
+                "(rm_rf) unknown function {} when removing {}:\n{}: {}".format(
+                    path, func, exctype, excvalue
+                )
+            )
+        )
+        return False
+
+    # Chmod + retry.
+    import stat
+
+    def chmod_rw(p):
+        mode = os.stat(p).st_mode
+        os.chmod(p, mode | stat.S_IRUSR | stat.S_IWUSR)
+
+    # For files, we need to recursively go upwards in the directories to
+    # ensure they all are also writable.
+    p = Path(path)
+    if p.is_file():
+        for parent in p.parents:
+            chmod_rw(str(parent))
+            # stop when we reach the original path passed to rm_rf
+            if parent == start_path:
+                break
+    chmod_rw(str(path))
+
+    func(path)
+    return True
+
+
+def rm_rf(path):
+    """Remove the path contents recursively, even if some elements
+    are read-only.
+    """
+    onerror = partial(on_rm_rf_error, start_path=path)
+    shutil.rmtree(str(path), onerror=onerror)
+
+
+def find_prefixed(root, prefix):
+    """finds all elements in root that begin with the prefix, case insensitive"""
+    l_prefix = prefix.lower()
+    for x in root.iterdir():
+        if x.name.lower().startswith(l_prefix):
+            yield x
+
+
+def extract_suffixes(iter, prefix):
+    """
+    :param iter: iterator over path names
+    :param prefix: expected prefix of the path names
+    :returns: the parts of the paths following the prefix
+    """
+    p_len = len(prefix)
+    for p in iter:
+        yield p.name[p_len:]
+
+
+def find_suffixes(root, prefix):
+    """combines find_prefixes and extract_suffixes
+    """
+    return extract_suffixes(find_prefixed(root, prefix), prefix)
+
+
+def parse_num(maybe_num):
+    """parses number path suffixes, returns -1 on error"""
+    try:
+        return int(maybe_num)
+    except ValueError:
+        return -1
+
+
+if six.PY2:
+
+    def _max(iterable, default):
+        """needed due to python2.7 lacking the default argument for max"""
+        return reduce(max, iterable, default)
+
+
+else:
+    _max = max
+
+
+def _force_symlink(root, target, link_to):
+    """helper to create the current symlink
+
+    it's full of race conditions that are reasonably ok to ignore
+    for the context of best effort linking to the latest testrun
+
+    the presumption being thatin case of much parallelism
+    the inaccuracy is going to be acceptable
+    """
+    current_symlink = root.joinpath(target)
+    try:
+        current_symlink.unlink()
+    except OSError:
+        pass
+    try:
+        current_symlink.symlink_to(link_to)
+    except Exception:
+        pass
+
+
+def make_numbered_dir(root, prefix):
+    """create a directory with an increased number as suffix for the given prefix"""
+    for i in range(10):
+        # try up to 10 times to create the folder
+        max_existing = _max(map(parse_num, find_suffixes(root, prefix)), default=-1)
+        new_number = max_existing + 1
+        new_path = root.joinpath("{}{}".format(prefix, new_number))
+        try:
+            new_path.mkdir()
+        except Exception:
+            pass
+        else:
+            _force_symlink(root, prefix + "current", new_path)
+            return new_path
+    else:
+        raise EnvironmentError(
+            "could not create numbered dir with prefix "
+            "{prefix} in {root} after 10 tries".format(prefix=prefix, root=root)
+        )
+
+
+def create_cleanup_lock(p):
+    """crates a lock to prevent premature folder cleanup"""
+    lock_path = get_lock_path(p)
+    try:
+        fd = os.open(str(lock_path), os.O_WRONLY | os.O_CREAT | os.O_EXCL, 0o644)
+    except OSError as e:
+        if e.errno == errno.EEXIST:
+            six.raise_from(
+                EnvironmentError("cannot create lockfile in {path}".format(path=p)), e
+            )
+        else:
+            raise
+    else:
+        pid = os.getpid()
+        spid = str(pid)
+        if not isinstance(spid, bytes):
+            spid = spid.encode("ascii")
+        os.write(fd, spid)
+        os.close(fd)
+        if not lock_path.is_file():
+            raise EnvironmentError("lock path got renamed after successful creation")
+        return lock_path
+
+
+def register_cleanup_lock_removal(lock_path, register=atexit.register):
+    """registers a cleanup function for removing a lock, by default on atexit"""
+    pid = os.getpid()
+
+    def cleanup_on_exit(lock_path=lock_path, original_pid=pid):
+        current_pid = os.getpid()
+        if current_pid != original_pid:
+            # fork
+            return
+        try:
+            lock_path.unlink()
+        except (OSError, IOError):
+            pass
+
+    return register(cleanup_on_exit)
+
+
+def maybe_delete_a_numbered_dir(path):
+    """removes a numbered directory if its lock can be obtained and it does not seem to be in use"""
+    lock_path = None
+    try:
+        lock_path = create_cleanup_lock(path)
+        parent = path.parent
+
+        garbage = parent.joinpath("garbage-{}".format(uuid.uuid4()))
+        path.rename(garbage)
+        rm_rf(garbage)
+    except (OSError, EnvironmentError):
+        #  known races:
+        #  * other process did a cleanup at the same time
+        #  * deletable folder was found
+        #  * process cwd (Windows)
+        return
+    finally:
+        # if we created the lock, ensure we remove it even if we failed
+        # to properly remove the numbered dir
+        if lock_path is not None:
+            try:
+                lock_path.unlink()
+            except (OSError, IOError):
+                pass
+
+
+def ensure_deletable(path, consider_lock_dead_if_created_before):
+    """checks if a lock exists and breaks it if its considered dead"""
+    if path.is_symlink():
+        return False
+    lock = get_lock_path(path)
+    if not lock.exists():
+        return True
+    try:
+        lock_time = lock.stat().st_mtime
+    except Exception:
+        return False
+    else:
+        if lock_time < consider_lock_dead_if_created_before:
+            lock.unlink()
+            return True
+        else:
+            return False
+
+
+def try_cleanup(path, consider_lock_dead_if_created_before):
+    """tries to cleanup a folder if we can ensure it's deletable"""
+    if ensure_deletable(path, consider_lock_dead_if_created_before):
+        maybe_delete_a_numbered_dir(path)
+
+
+def cleanup_candidates(root, prefix, keep):
+    """lists candidates for numbered directories to be removed - follows py.path"""
+    max_existing = _max(map(parse_num, find_suffixes(root, prefix)), default=-1)
+    max_delete = max_existing - keep
+    paths = find_prefixed(root, prefix)
+    paths, paths2 = itertools.tee(paths)
+    numbers = map(parse_num, extract_suffixes(paths2, prefix))
+    for path, number in zip(paths, numbers):
+        if number <= max_delete:
+            yield path
+
+
+def cleanup_numbered_dir(root, prefix, keep, consider_lock_dead_if_created_before):
+    """cleanup for lock driven numbered directories"""
+    for path in cleanup_candidates(root, prefix, keep):
+        try_cleanup(path, consider_lock_dead_if_created_before)
+    for path in root.glob("garbage-*"):
+        try_cleanup(path, consider_lock_dead_if_created_before)
+
+
+def make_numbered_dir_with_cleanup(root, prefix, keep, lock_timeout):
+    """creates a numbered dir with a cleanup lock and removes old ones"""
+    e = None
+    for i in range(10):
+        try:
+            p = make_numbered_dir(root, prefix)
+            lock_path = create_cleanup_lock(p)
+            register_cleanup_lock_removal(lock_path)
+        except Exception as exc:
+            e = exc
+        else:
+            consider_lock_dead_if_created_before = p.stat().st_mtime - lock_timeout
+            cleanup_numbered_dir(
+                root=root,
+                prefix=prefix,
+                keep=keep,
+                consider_lock_dead_if_created_before=consider_lock_dead_if_created_before,
+            )
+            return p
+    assert e is not None
+    raise e
+
+
+def resolve_from_str(input, root):
+    assert not isinstance(input, Path), "would break on py2"
+    root = Path(root)
+    input = expanduser(input)
+    input = expandvars(input)
+    if isabs(input):
+        return Path(input)
+    else:
+        return root.joinpath(input)
+
+
+def fnmatch_ex(pattern, path):
+    """FNMatcher port from py.path.common which works with PurePath() instances.
+
+    The difference between this algorithm and PurePath.match() is that the latter matches "**" glob expressions
+    for each part of the path, while this algorithm uses the whole path instead.
+
+    For example:
+        "tests/foo/bar/doc/test_foo.py" matches pattern "tests/**/doc/test*.py" with this algorithm, but not with
+        PurePath.match().
+
+    This algorithm was ported to keep backward-compatibility with existing settings which assume paths match according
+    this logic.
+
+    References:
+    * https://bugs.python.org/issue29249
+    * https://bugs.python.org/issue34731
+    """
+    path = PurePath(path)
+    iswin32 = sys.platform.startswith("win")
+
+    if iswin32 and sep not in pattern and posix_sep in pattern:
+        # Running on Windows, the pattern has no Windows path separators,
+        # and the pattern has one or more Posix path separators. Replace
+        # the Posix path separators with the Windows path separator.
+        pattern = pattern.replace(posix_sep, sep)
+
+    if sep not in pattern:
+        name = path.name
+    else:
+        name = six.text_type(path)
+    return fnmatch.fnmatch(name, pattern)
+
+
+def parts(s):
+    parts = s.split(sep)
+    return {sep.join(parts[: i + 1]) or sep for i in range(len(parts))}
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/pytester.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/pytester.py
index c9defe03a66..f1d739c9917 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/pytester.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/pytester.py
@@ -1,5 +1,8 @@
+# -*- coding: utf-8 -*-
 """(disabled by default) support for testing pytest and pytest plugins."""
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import codecs
 import gc
@@ -7,26 +10,28 @@ import os
 import platform
 import re
 import subprocess
-import six
 import sys
 import time
 import traceback
 from fnmatch import fnmatch
-
 from weakref import WeakKeyDictionary
 
-from _pytest.capture import MultiCapture, SysCapture
-from _pytest._code import Source
 import py
+import six
+
 import pytest
-from _pytest.main import Session, EXIT_OK
+from _pytest._code import Source
+from _pytest._io.saferepr import saferepr
 from _pytest.assertion.rewrite import AssertionRewritingHook
-
-
-PYTEST_FULLPATH = os.path.abspath(pytest.__file__.rstrip("oc")).replace(
-    "$py.class", ".py"
-)
-
+from _pytest.capture import MultiCapture
+from _pytest.capture import SysCapture
+from _pytest.compat import safe_str
+from _pytest.compat import Sequence
+from _pytest.main import EXIT_INTERRUPTED
+from _pytest.main import EXIT_OK
+from _pytest.main import Session
+from _pytest.monkeypatch import MonkeyPatch
+from _pytest.pathlib import Path
 
 IGNORE_PAM = [  # filenames added when obtaining details about the current user
     u"/var/lib/sss/mc/passwd"
@@ -39,7 +44,7 @@ def pytest_addoption(parser):
         action="store_true",
         dest="lsof",
         default=False,
-        help=("run FD checks if lsof is available"),
+        help="run FD checks if lsof is available",
     )
 
     parser.addoption(
@@ -53,6 +58,10 @@ def pytest_addoption(parser):
         ),
     )
 
+    parser.addini(
+        "pytester_example_dir", help="directory to take the pytester example files from"
+    )
+
 
 def pytest_configure(config):
     if config.getvalue("lsof"):
@@ -60,9 +69,22 @@ def pytest_configure(config):
         if checker.matching_platform():
             config.pluginmanager.register(checker)
 
+    config.addinivalue_line(
+        "markers",
+        "pytester_example_path(*path_segments): join the given path "
+        "segments to `pytester_example_dir` for this test.",
+    )
+
+
+def raise_on_kwargs(kwargs):
+    __tracebackhide__ = True
+    if kwargs:  # pragma: no branch
+        raise TypeError(
+            "Unexpected keyword arguments: {}".format(", ".join(sorted(kwargs)))
+        )
+
 
 class LsofFdLeakChecker(object):
-
     def get_open_files(self):
         out = self._exec_lsof()
         open_files = self._parse_lsof_output(out)
@@ -70,10 +92,13 @@ class LsofFdLeakChecker(object):
 
     def _exec_lsof(self):
         pid = os.getpid()
-        return py.process.cmdexec("lsof -Ffn0 -p %d" % pid)
+        # py3: use subprocess.DEVNULL directly.
+        with open(os.devnull, "wb") as devnull:
+            return subprocess.check_output(
+                ("lsof", "-Ffn0", "-p", str(pid)), stderr=devnull
+            ).decode()
 
     def _parse_lsof_output(self, out):
-
         def isopen(line):
             return line.startswith("f") and (
                 "deleted" not in line
@@ -98,11 +123,8 @@ class LsofFdLeakChecker(object):
 
     def matching_platform(self):
         try:
-            py.process.cmdexec("lsof -v")
-        except (py.process.cmdexec.Error, UnicodeDecodeError):
-            # cmdexec may raise UnicodeDecodeError on Windows systems with
-            # locale other than English:
-            # https://bitbucket.org/pytest-dev/py/issues/66
+            subprocess.check_output(("lsof", "-v"))
+        except (OSError, subprocess.CalledProcessError):
             return False
         else:
             return True
@@ -128,57 +150,7 @@ class LsofFdLeakChecker(object):
             error.append(error[0])
             error.append("*** function %s:%s: %s " % item.location)
             error.append("See issue #2366")
-            item.warn("", "\n".join(error))
-
-
-# XXX copied from execnet's conftest.py - needs to be merged
-winpymap = {
-    "python2.7": r"C:\Python27\python.exe",
-    "python3.4": r"C:\Python34\python.exe",
-    "python3.5": r"C:\Python35\python.exe",
-    "python3.6": r"C:\Python36\python.exe",
-}
-
-
-def getexecutable(name, cache={}):
-    try:
-        return cache[name]
-    except KeyError:
-        executable = py.path.local.sysfind(name)
-        if executable:
-            import subprocess
-
-            popen = subprocess.Popen(
-                [str(executable), "--version"],
-                universal_newlines=True,
-                stderr=subprocess.PIPE,
-            )
-            out, err = popen.communicate()
-            if name == "jython":
-                if not err or "2.5" not in err:
-                    executable = None
-                if "2.5.2" in err:
-                    executable = None  # http://bugs.jython.org/issue1790
-            elif popen.returncode != 0:
-                # handle pyenv's 127
-                executable = None
-        cache[name] = executable
-        return executable
-
-
-@pytest.fixture(params=["python2.7", "python3.4", "pypy", "pypy3"])
-def anypython(request):
-    name = request.param
-    executable = getexecutable(name)
-    if executable is None:
-        if sys.platform == "win32":
-            executable = winpymap.get(name, None)
-            if executable:
-                executable = py.path.local(executable)
-                if executable.check():
-                    return executable
-        pytest.skip("no suitable %s found" % (name,))
-    return executable
+            item.warn(pytest.PytestWarning("\n".join(error)))
 
 
 # used at least by pytest-xdist plugin
@@ -195,7 +167,6 @@ def _pytest(request):
 
 
 class PytestArg(object):
-
     def __init__(self, request):
         self.request = request
 
@@ -211,7 +182,6 @@ def get_public_names(values):
 
 
 class ParsedCall(object):
-
     def __init__(self, name, kwargs):
         self.__dict__.update(kwargs)
         self._name = name
@@ -278,7 +248,7 @@ class HookRecorder(object):
                 del self.calls[i]
                 return call
         lines = ["could not find call %r, in:" % (name,)]
-        lines.extend(["  %s" % str(x) for x in self.calls])
+        lines.extend(["  %s" % x for x in self.calls])
         pytest.fail("\n".join(lines))
 
     def getcall(self, name):
@@ -300,13 +270,10 @@ class HookRecorder(object):
         """return a testreport whose dotted import path matches"""
         values = []
         for rep in self.getreports(names=names):
-            try:
-                if not when and rep.when != "call" and rep.passed:
-                    # setup/teardown passing reports - let's ignore those
-                    continue
-            except AttributeError:
-                pass
-            if when and getattr(rep, "when", None) != when:
+            if not when and rep.when != "call" and rep.passed:
+                # setup/teardown passing reports - let's ignore those
+                continue
+            if when and rep.when != when:
                 continue
             if not inamepart or inamepart in rep.nodeid.split("::"):
                 values.append(rep)
@@ -333,11 +300,12 @@ class HookRecorder(object):
         failed = []
         for rep in self.getreports("pytest_collectreport pytest_runtest_logreport"):
             if rep.passed:
-                if getattr(rep, "when", None) == "call":
+                if rep.when == "call":
                     passed.append(rep)
             elif rep.skipped:
                 skipped.append(rep)
-            elif rep.failed:
+            else:
+                assert rep.failed, "Unexpected outcome: {!r}".format(rep)
                 failed.append(rep)
         return passed, skipped, failed
 
@@ -369,6 +337,24 @@ def testdir(request, tmpdir_factory):
     return Testdir(request, tmpdir_factory)
 
 
+@pytest.fixture
+def _sys_snapshot():
+    snappaths = SysPathsSnapshot()
+    snapmods = SysModulesSnapshot()
+    yield
+    snapmods.restore()
+    snappaths.restore()
+
+
+@pytest.fixture
+def _config_for_test():
+    from _pytest.config import get_config
+
+    config = get_config()
+    yield config
+    config._ensure_unconfigure()  # cleanup, e.g. capman closing tmpfiles.
+
+
 rex_outcome = re.compile(r"(\d+) ([\w-]+)")
 
 
@@ -396,6 +382,12 @@ class RunResult(object):
         self.stderr = LineMatcher(errlines)
         self.duration = duration
 
+    def __repr__(self):
+        return (
+            "<RunResult ret=%r len(stdout.lines)=%d len(stderr.lines)=%d duration=%.2fs>"
+            % (self.ret, len(self.stdout.lines), len(self.stderr.lines), self.duration)
+        )
+
     def parseoutcomes(self):
         """Return a dictionary of outcomestring->num from parsing the terminal
         output that the test process produced.
@@ -411,7 +403,9 @@ class RunResult(object):
                     return d
         raise ValueError("Pytest terminal report not found")
 
-    def assert_outcomes(self, passed=0, skipped=0, failed=0, error=0):
+    def assert_outcomes(
+        self, passed=0, skipped=0, failed=0, error=0, xpassed=0, xfailed=0
+    ):
         """Assert that the specified outcomes appear with the respective
         numbers (0 means it didn't occur) in the text output from a test run.
 
@@ -422,14 +416,21 @@ class RunResult(object):
             "skipped": d.get("skipped", 0),
             "failed": d.get("failed", 0),
             "error": d.get("error", 0),
+            "xpassed": d.get("xpassed", 0),
+            "xfailed": d.get("xfailed", 0),
         }
-        assert (
-            obtained == dict(passed=passed, skipped=skipped, failed=failed, error=error)
-        )
+        expected = {
+            "passed": passed,
+            "skipped": skipped,
+            "failed": failed,
+            "error": error,
+            "xpassed": xpassed,
+            "xfailed": xfailed,
+        }
+        assert obtained == expected
 
 
 class CwdSnapshot(object):
-
     def __init__(self):
         self.__saved = os.getcwd()
 
@@ -438,7 +439,6 @@ class CwdSnapshot(object):
 
 
 class SysModulesSnapshot(object):
-
     def __init__(self, preserve=None):
         self.__preserve = preserve
         self.__saved = dict(sys.modules)
@@ -453,7 +453,6 @@ class SysModulesSnapshot(object):
 
 
 class SysPathsSnapshot(object):
-
     def __init__(self):
         self.__saved = list(sys.path), list(sys.meta_path)
 
@@ -479,11 +478,17 @@ class Testdir(object):
 
     """
 
+    CLOSE_STDIN = object
+
+    class TimeoutExpired(Exception):
+        pass
+
     def __init__(self, request, tmpdir_factory):
         self.request = request
         self._mod_collections = WeakKeyDictionary()
         name = request.function.__name__
         self.tmpdir = tmpdir_factory.mktemp(name, numbered=True)
+        self.test_tmproot = tmpdir_factory.mktemp("tmp-" + name, numbered=True)
         self.plugins = []
         self._cwd_snapshot = CwdSnapshot()
         self._sys_path_snapshot = SysPathsSnapshot()
@@ -496,9 +501,23 @@ class Testdir(object):
         elif method == "subprocess":
             self._runpytest_method = self.runpytest_subprocess
 
+        mp = self.monkeypatch = MonkeyPatch()
+        mp.setenv("PYTEST_DEBUG_TEMPROOT", str(self.test_tmproot))
+        # Ensure no unexpected caching via tox.
+        mp.delenv("TOX_ENV_DIR", raising=False)
+        # Discard outer pytest options.
+        mp.delenv("PYTEST_ADDOPTS", raising=False)
+
+        # Environment (updates) for inner runs.
+        tmphome = str(self.tmpdir)
+        self._env_run_update = {"HOME": tmphome, "USERPROFILE": tmphome}
+
     def __repr__(self):
         return "<Testdir %r>" % (self.tmpdir,)
 
+    def __str__(self):
+        return str(self.tmpdir)
+
     def finalize(self):
         """Clean up global state artifacts.
 
@@ -510,6 +529,7 @@ class Testdir(object):
         self._sys_modules_snapshot.restore()
         self._sys_path_snapshot.restore()
         self._cwd_snapshot.restore()
+        self.monkeypatch.undo()
 
     def __take_sys_modules_snapshot(self):
         # some zope modules used by twisted-related tests keep internal state
@@ -522,7 +542,6 @@ class Testdir(object):
 
     def make_hook_recorder(self, pluginmanager):
         """Create a new :py:class:`HookRecorder` for a PluginManager."""
-        assert not hasattr(pluginmanager, "reprec")
         pluginmanager.reprec = reprec = HookRecorder(pluginmanager)
         self.request.addfinalizer(reprec.finish_recording)
         return reprec
@@ -558,18 +577,22 @@ class Testdir(object):
         return ret
 
     def makefile(self, ext, *args, **kwargs):
-        """Create a new file in the testdir.
+        r"""Create new file(s) in the testdir.
 
-        ext: The extension the file should use, including the dot, e.g. `.py`.
-
-        args: All args will be treated as strings and joined using newlines.
+        :param str ext: The extension the file(s) should use, including the dot, e.g. `.py`.
+        :param list[str] args: All args will be treated as strings and joined using newlines.
            The result will be written as contents to the file.  The name of the
            file will be based on the test function requesting this fixture.
-           E.g. "testdir.makefile('.txt', 'line1', 'line2')"
-
-        kwargs: Each keyword is the name of a file, while the value of it will
+        :param kwargs: Each keyword is the name of a file, while the value of it will
            be written as contents of the file.
-           E.g. "testdir.makefile('.ini', pytest='[pytest]\naddopts=-rs\n')"
+
+        Examples:
+
+        .. code-block:: python
+
+            testdir.makefile(".txt", "line1", "line2")
+
+            testdir.makefile(".ini", pytest="[pytest]\naddopts=-rs\n")
 
         """
         return self._makefile(ext, args, kwargs)
@@ -600,25 +623,11 @@ class Testdir(object):
 
         This is undone automatically when this object dies at the end of each
         test.
-
         """
         if path is None:
             path = self.tmpdir
-        sys.path.insert(0, str(path))
-        # a call to syspathinsert() usually means that the caller wants to
-        # import some dynamically created files, thus with python3 we
-        # invalidate its import caches
-        self._possibly_invalidate_import_caches()
 
-    def _possibly_invalidate_import_caches(self):
-        # invalidate caches if we can (py33 and above)
-        try:
-            import importlib
-        except ImportError:
-            pass
-        else:
-            if hasattr(importlib, "invalidate_caches"):
-                importlib.invalidate_caches()
+        self.monkeypatch.syspath_prepend(str(path))
 
     def mkdir(self, name):
         """Create a new (sub)directory."""
@@ -635,6 +644,50 @@ class Testdir(object):
         p.ensure("__init__.py")
         return p
 
+    def copy_example(self, name=None):
+        import warnings
+        from _pytest.warning_types import PYTESTER_COPY_EXAMPLE
+
+        warnings.warn(PYTESTER_COPY_EXAMPLE, stacklevel=2)
+        example_dir = self.request.config.getini("pytester_example_dir")
+        if example_dir is None:
+            raise ValueError("pytester_example_dir is unset, can't copy examples")
+        example_dir = self.request.config.rootdir.join(example_dir)
+
+        for extra_element in self.request.node.iter_markers("pytester_example_path"):
+            assert extra_element.args
+            example_dir = example_dir.join(*extra_element.args)
+
+        if name is None:
+            func_name = self.request.function.__name__
+            maybe_dir = example_dir / func_name
+            maybe_file = example_dir / (func_name + ".py")
+
+            if maybe_dir.isdir():
+                example_path = maybe_dir
+            elif maybe_file.isfile():
+                example_path = maybe_file
+            else:
+                raise LookupError(
+                    "{} cant be found as module or package in {}".format(
+                        func_name, example_dir.bestrelpath(self.request.config.rootdir)
+                    )
+                )
+        else:
+            example_path = example_dir.join(name)
+
+        if example_path.isdir() and not example_path.join("__init__.py").isfile():
+            example_path.copy(self.tmpdir)
+            return self.tmpdir
+        elif example_path.isfile():
+            result = self.tmpdir.join(example_path.basename)
+            example_path.copy(result)
+            return result
+        else:
+            raise LookupError(
+                'example "{}" is not found as a file or directory'.format(example_path)
+            )
+
     Session = Session
 
     def getnode(self, config, arg):
@@ -742,14 +795,23 @@ class Testdir(object):
 
         :param args: command line arguments to pass to :py:func:`pytest.main`
 
-        :param plugin: (keyword-only) extra plugin instances the
+        :param plugins: (keyword-only) extra plugin instances the
            ``pytest.main()`` instance should use
 
         :return: a :py:class:`HookRecorder` instance
-
         """
+        plugins = kwargs.pop("plugins", [])
+        no_reraise_ctrlc = kwargs.pop("no_reraise_ctrlc", None)
+        raise_on_kwargs(kwargs)
+
         finalizers = []
         try:
+            # Do not load user config (during runs only).
+            mp_run = MonkeyPatch()
+            for k, v in self._env_run_update.items():
+                mp_run.setenv(k, v)
+            finalizers.append(mp_run.undo)
+
             # When running pytest inline any plugins active in the main test
             # process are already imported.  So this disables the warning which
             # will trigger to say they can no longer be rewritten, which is
@@ -778,11 +840,9 @@ class Testdir(object):
             rec = []
 
             class Collect(object):
-
                 def pytest_configure(x, config):
                     rec.append(self.make_hook_recorder(config.pluginmanager))
 
-            plugins = kwargs.get("plugins") or []
             plugins.append(Collect())
             ret = pytest.main(list(args), plugins=plugins)
             if len(rec) == 1:
@@ -796,7 +856,7 @@ class Testdir(object):
 
             # typically we reraise keyboard interrupts from the child run
             # because it's our user requesting interruption of the testing
-            if ret == 2 and not kwargs.get("no_reraise_ctrlc"):
+            if ret == EXIT_INTERRUPTED and not no_reraise_ctrlc:
                 calls = reprec.getcalls("pytest_keyboard_interrupt")
                 if calls and calls[-1].excinfo.type == KeyboardInterrupt:
                     raise KeyboardInterrupt()
@@ -808,9 +868,10 @@ class Testdir(object):
     def runpytest_inprocess(self, *args, **kwargs):
         """Return result of running pytest in-process, providing a similar
         interface to what self.runpytest() provides.
-
         """
-        if kwargs.get("syspathinsert"):
+        syspathinsert = kwargs.pop("syspathinsert", False)
+
+        if syspathinsert:
             self.syspathinsert()
         now = time.time()
         capture = MultiCapture(Capture=SysCapture)
@@ -848,14 +909,12 @@ class Testdir(object):
         return self._runpytest_method(*args, **kwargs)
 
     def _ensure_basetemp(self, args):
-        args = [str(x) for x in args]
+        args = list(args)
         for x in args:
-            if str(x).startswith("--basetemp"):
-                # print("basedtemp exists: %s" %(args,))
+            if safe_str(x).startswith("--basetemp"):
                 break
         else:
             args.append("--basetemp=%s" % self.tmpdir.dirpath("basetemp"))
-            # print("added basetemp: %s" %(args,))
         return args
 
     def parseconfig(self, *args):
@@ -910,8 +969,10 @@ class Testdir(object):
         for item in items:
             if item.name == funcname:
                 return item
-        assert 0, (
-            "%r item not found in module:\n%s\nitems: %s" % (funcname, source, items)
+        assert 0, "%r item not found in module:\n%s\nitems: %s" % (
+            funcname,
+            source,
+            items,
         )
 
     def getitems(self, source):
@@ -940,14 +1001,16 @@ class Testdir(object):
             same directory to ensure it is a package
 
         """
-        kw = {self.request.function.__name__: Source(source).strip()}
-        path = self.makepyfile(**kw)
+        if isinstance(source, Path):
+            path = self.tmpdir.join(str(source))
+            assert not withinit, "not supported for paths"
+        else:
+            kw = {self.request.function.__name__: Source(source).strip()}
+            path = self.makepyfile(**kw)
         if withinit:
             self.makepyfile(__init__="#")
         self.config = config = self.parseconfigure(path, *configargs)
-        node = self.getnode(config, path)
-
-        return node
+        return self.getnode(config, path)
 
     def collect_by_name(self, modcol, name):
         """Return the collection node for name from the module collection.
@@ -966,7 +1029,14 @@ class Testdir(object):
             if colitem.name == name:
                 return colitem
 
-    def popen(self, cmdargs, stdout, stderr, **kw):
+    def popen(
+        self,
+        cmdargs,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        stdin=CLOSE_STDIN,
+        **kw
+    ):
         """Invoke subprocess.Popen.
 
         This calls subprocess.Popen making sure the current working directory
@@ -977,41 +1047,102 @@ class Testdir(object):
         """
         env = os.environ.copy()
         env["PYTHONPATH"] = os.pathsep.join(
-            filter(None, [str(os.getcwd()), env.get("PYTHONPATH", "")])
+            filter(None, [os.getcwd(), env.get("PYTHONPATH", "")])
         )
+        env.update(self._env_run_update)
         kw["env"] = env
 
-        popen = subprocess.Popen(
-            cmdargs, stdin=subprocess.PIPE, stdout=stdout, stderr=stderr, **kw
-        )
-        popen.stdin.close()
+        if stdin is Testdir.CLOSE_STDIN:
+            kw["stdin"] = subprocess.PIPE
+        elif isinstance(stdin, bytes):
+            kw["stdin"] = subprocess.PIPE
+        else:
+            kw["stdin"] = stdin
+
+        popen = subprocess.Popen(cmdargs, stdout=stdout, stderr=stderr, **kw)
+        if stdin is Testdir.CLOSE_STDIN:
+            popen.stdin.close()
+        elif isinstance(stdin, bytes):
+            popen.stdin.write(stdin)
 
         return popen
 
-    def run(self, *cmdargs):
+    def run(self, *cmdargs, **kwargs):
         """Run a command with arguments.
 
         Run a process using subprocess.Popen saving the stdout and stderr.
 
+        :param args: the sequence of arguments to pass to `subprocess.Popen()`
+        :param timeout: the period in seconds after which to timeout and raise
+            :py:class:`Testdir.TimeoutExpired`
+        :param stdin: optional standard input.  Bytes are being send, closing
+            the pipe, otherwise it is passed through to ``popen``.
+            Defaults to ``CLOSE_STDIN``, which translates to using a pipe
+            (``subprocess.PIPE``) that gets closed.
+
         Returns a :py:class:`RunResult`.
 
         """
-        return self._run(*cmdargs)
+        __tracebackhide__ = True
 
-    def _run(self, *cmdargs):
-        cmdargs = [str(x) for x in cmdargs]
+        timeout = kwargs.pop("timeout", None)
+        stdin = kwargs.pop("stdin", Testdir.CLOSE_STDIN)
+        raise_on_kwargs(kwargs)
+
+        cmdargs = [
+            str(arg) if isinstance(arg, py.path.local) else arg for arg in cmdargs
+        ]
         p1 = self.tmpdir.join("stdout")
         p2 = self.tmpdir.join("stderr")
-        print("running:", " ".join(cmdargs))
-        print("     in:", str(py.path.local()))
+        print("running:", *cmdargs)
+        print("     in:", py.path.local())
         f1 = codecs.open(str(p1), "w", encoding="utf8")
         f2 = codecs.open(str(p2), "w", encoding="utf8")
         try:
             now = time.time()
             popen = self.popen(
-                cmdargs, stdout=f1, stderr=f2, close_fds=(sys.platform != "win32")
+                cmdargs,
+                stdin=stdin,
+                stdout=f1,
+                stderr=f2,
+                close_fds=(sys.platform != "win32"),
             )
-            ret = popen.wait()
+            if isinstance(stdin, bytes):
+                popen.stdin.close()
+
+            def handle_timeout():
+                __tracebackhide__ = True
+
+                timeout_message = (
+                    "{seconds} second timeout expired running:"
+                    " {command}".format(seconds=timeout, command=cmdargs)
+                )
+
+                popen.kill()
+                popen.wait()
+                raise self.TimeoutExpired(timeout_message)
+
+            if timeout is None:
+                ret = popen.wait()
+            elif not six.PY2:
+                try:
+                    ret = popen.wait(timeout)
+                except subprocess.TimeoutExpired:
+                    handle_timeout()
+            else:
+                end = time.time() + timeout
+
+                resolution = min(0.1, timeout / 10)
+
+                while True:
+                    ret = popen.poll()
+                    if ret is not None:
+                        break
+
+                    if time.time() > end:
+                        handle_timeout()
+
+                    time.sleep(resolution)
         finally:
             f1.close()
             f2.close()
@@ -1035,9 +1166,7 @@ class Testdir(object):
             print("couldn't print to %s because of encoding" % (fp,))
 
     def _getpytestargs(self):
-        # we cannot use `(sys.executable, script)` because on Windows the
-        # script is e.g. `pytest.exe`
-        return (sys.executable, PYTEST_FULLPATH)  # noqa
+        return sys.executable, "-mpytest"
 
     def runpython(self, script):
         """Run a python script using sys.executable as interpreter.
@@ -1054,15 +1183,22 @@ class Testdir(object):
     def runpytest_subprocess(self, *args, **kwargs):
         """Run pytest as a subprocess with given arguments.
 
-        Any plugins added to the :py:attr:`plugins` list will added using the
-        ``-p`` command line option.  Additionally ``--basetemp`` is used put
+        Any plugins added to the :py:attr:`plugins` list will be added using the
+        ``-p`` command line option.  Additionally ``--basetemp`` is used to put
         any temporary files and directories in a numbered directory prefixed
-        with "runpytest-" so they do not conflict with the normal numbered
-        pytest location for temporary files and directories.
+        with "runpytest-" to not conflict with the normal numbered pytest
+        location for temporary files and directories.
+
+        :param args: the sequence of arguments to pass to the pytest subprocess
+        :param timeout: the period in seconds after which to timeout and raise
+            :py:class:`Testdir.TimeoutExpired`
 
         Returns a :py:class:`RunResult`.
-
         """
+        __tracebackhide__ = True
+        timeout = kwargs.pop("timeout", None)
+        raise_on_kwargs(kwargs)
+
         p = py.path.local.make_numbered_dir(
             prefix="runpytest-", keep=None, rootdir=self.tmpdir
         )
@@ -1071,7 +1207,7 @@ class Testdir(object):
         if plugins:
             args = ("-p", plugins[0]) + args
         args = self._getpytestargs() + args
-        return self.run(*args)
+        return self.run(*args, timeout=timeout)
 
     def spawn_pytest(self, string, expect_timeout=10.0):
         """Run pytest using pexpect.
@@ -1099,7 +1235,12 @@ class Testdir(object):
         if sys.platform.startswith("freebsd"):
             pytest.xfail("pexpect does not work reliably on freebsd")
         logfile = self.tmpdir.join("spawn.out").open("wb")
-        child = pexpect.spawn(cmd, logfile=logfile)
+
+        # Do not load user config.
+        env = os.environ.copy()
+        env.update(self._env_run_update)
+
+        child = pexpect.spawn(cmd, logfile=logfile, env=env)
         self.request.addfinalizer(logfile.close)
         child.timeout = expect_timeout
         return child
@@ -1109,13 +1250,10 @@ def getdecoded(out):
     try:
         return out.decode("utf-8")
     except UnicodeDecodeError:
-        return "INTERNAL not-utf8-decodeable, truncated string:\n%s" % (
-            py.io.saferepr(out),
-        )
+        return "INTERNAL not-utf8-decodeable, truncated string:\n%s" % (saferepr(out),)
 
 
 class LineComp(object):
-
     def __init__(self):
         self.stringio = py.io.TextIO()
 
@@ -1202,11 +1340,11 @@ class LineMatcher(object):
         """
         for i, line in enumerate(self.lines):
             if fnline == line or fnmatch(line, fnline):
-                return self.lines[i + 1:]
+                return self.lines[i + 1 :]
         raise ValueError("line %r not found in output" % fnline)
 
     def _log(self, *args):
-        self._log_output.append(" ".join((str(x) for x in args)))
+        self._log_output.append(" ".join(str(x) for x in args))
 
     @property
     def _log_text(self):
@@ -1220,6 +1358,7 @@ class LineMatcher(object):
         matches and non-matches are also printed on stdout.
 
         """
+        __tracebackhide__ = True
         self._match_lines(lines2, fnmatch, "fnmatch")
 
     def re_match_lines(self, lines2):
@@ -1231,6 +1370,7 @@ class LineMatcher(object):
         The matches and non-matches are also printed on stdout.
 
         """
+        __tracebackhide__ = True
         self._match_lines(lines2, lambda name, pat: re.match(pat, name), "re.match")
 
     def _match_lines(self, lines2, match_func, match_nickname):
@@ -1245,6 +1385,7 @@ class LineMatcher(object):
             will be logged to stdout when a match occurs
 
         """
+        assert isinstance(lines2, Sequence)
         lines2 = self._getlines(lines2)
         lines1 = self.lines[:]
         nextline = None
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/python.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/python.py
index 48516199fff..5f1e6885be3 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/python.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/python.py
@@ -1,81 +1,55 @@
+# -*- coding: utf-8 -*-
 """ Python test discovery, setup and run of test functions. """
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
+import collections
 import fnmatch
 import inspect
-import sys
 import os
-import collections
+import sys
 import warnings
+from functools import partial
 from textwrap import dedent
-from itertools import count
-
 
 import py
 import six
-from _pytest.mark import MarkerError
-from _pytest.config import hookimpl
 
 import _pytest
-import pluggy
+from _pytest import deprecated
 from _pytest import fixtures
 from _pytest import nodes
-from _pytest import deprecated
-from _pytest.compat import (
-    isclass,
-    isfunction,
-    is_generator,
-    ascii_escaped,
-    REGEX_TYPE,
-    STRING_TYPES,
-    NoneType,
-    NOTSET,
-    get_real_func,
-    getfslineno,
-    safe_getattr,
-    safe_str,
-    getlocation,
-    enum,
-    get_default_arg_names,
-)
+from _pytest._code import filter_traceback
+from _pytest.compat import ascii_escaped
+from _pytest.compat import enum
+from _pytest.compat import get_default_arg_names
+from _pytest.compat import get_real_func
+from _pytest.compat import getfslineno
+from _pytest.compat import getimfunc
+from _pytest.compat import getlocation
+from _pytest.compat import is_generator
+from _pytest.compat import isclass
+from _pytest.compat import isfunction
+from _pytest.compat import NOTSET
+from _pytest.compat import REGEX_TYPE
+from _pytest.compat import safe_getattr
+from _pytest.compat import safe_isclass
+from _pytest.compat import safe_str
+from _pytest.compat import STRING_TYPES
+from _pytest.config import hookimpl
+from _pytest.main import FSHookProxy
+from _pytest.mark import MARK_GEN
+from _pytest.mark.structures import get_unpacked_marks
+from _pytest.mark.structures import normalize_mark_list
 from _pytest.outcomes import fail
-from _pytest.mark.structures import transfer_markers, get_unpacked_marks
-
-
-# relative paths that we use to filter traceback entries from appearing to the user;
-# see filter_traceback
-# note: if we need to add more paths than what we have now we should probably use a list
-# for better maintenance
-_pluggy_dir = py.path.local(pluggy.__file__.rstrip("oc"))
-# pluggy is either a package or a single module depending on the version
-if _pluggy_dir.basename == "__init__.py":
-    _pluggy_dir = _pluggy_dir.dirpath()
-_pytest_dir = py.path.local(_pytest.__file__).dirpath()
-_py_dir = py.path.local(py.__file__).dirpath()
-
-
-def filter_traceback(entry):
-    """Return True if a TracebackEntry instance should be removed from tracebacks:
-    * dynamically generated code (no code to show up for it);
-    * internal traceback from pytest or its internal libraries, py and pluggy.
-    """
-    # entry.path might sometimes return a str object when the entry
-    # points to dynamically generated code
-    # see https://bitbucket.org/pytest-dev/py/issues/71
-    raw_filename = entry.frame.code.raw.co_filename
-    is_generated = "<" in raw_filename and ">" in raw_filename
-    if is_generated:
-        return False
-    # entry.path might point to a non-existing file, in which case it will
-    # also return a str object. see #1133
-    p = py.path.local(entry.path)
-    return not p.relto(_pluggy_dir) and not p.relto(_pytest_dir) and not p.relto(
-        _py_dir
-    )
+from _pytest.outcomes import skip
+from _pytest.pathlib import parts
+from _pytest.warning_types import PytestCollectionWarning
+from _pytest.warning_types import PytestUnhandledCoroutineWarning
 
 
 def pyobj_property(name):
-
     def get(self):
         node = self.getparent(getattr(__import__("pytest"), name))
         if node is not None:
@@ -105,15 +79,10 @@ def pytest_addoption(parser):
         default=False,
         help="show fixtures per test",
     )
-    parser.addini(
-        "usefixtures",
-        type="args",
-        default=[],
-        help="list of default fixtures to be used with this project",
-    )
     parser.addini(
         "python_files",
         type="args",
+        # NOTE: default is also used in AssertionRewritingHook.
         default=["test_*.py", "*_test.py"],
         help="glob-style file patterns for Python test module discovery",
     )
@@ -127,7 +96,14 @@ def pytest_addoption(parser):
         "python_functions",
         type="args",
         default=["test"],
-        help="prefixes or glob names for Python test function and " "method discovery",
+        help="prefixes or glob names for Python test function and method discovery",
+    )
+    parser.addini(
+        "disable_test_id_escaping_and_forfeit_all_rights_to_community_support",
+        type="bool",
+        default=False,
+        help="disable string escape non-ascii characters, might cause unwanted "
+        "side effects(use at your own risk)",
     )
 
     group.addoption(
@@ -153,10 +129,10 @@ def pytest_generate_tests(metafunc):
     # those alternative spellings are common - raise a specific error to alert
     # the user
     alt_spellings = ["parameterize", "parametrise", "parameterise"]
-    for attr in alt_spellings:
-        if hasattr(metafunc.function, attr):
-            msg = "{0} has '{1}', spelling should be 'parametrize'"
-            raise MarkerError(msg.format(metafunc.function.__name__, attr))
+    for mark_name in alt_spellings:
+        if metafunc.definition.get_closest_marker(mark_name):
+            msg = "{0} has '{1}' mark, spelling should be 'parametrize'"
+            fail(msg.format(metafunc.function.__name__, mark_name), pytrace=False)
     for marker in metafunc.definition.iter_markers(name="parametrize"):
         metafunc.parametrize(*marker.args, **marker.kwargs)
 
@@ -170,27 +146,32 @@ def pytest_configure(config):
         "or a list of tuples of values if argnames specifies multiple names. "
         "Example: @parametrize('arg1', [1,2]) would lead to two calls of the "
         "decorated test function, one with arg1=1 and another with arg1=2."
-        "see http://pytest.org/latest/parametrize.html for more info and "
-        "examples.",
+        "see https://docs.pytest.org/en/latest/parametrize.html for more info "
+        "and examples.",
     )
     config.addinivalue_line(
         "markers",
         "usefixtures(fixturename1, fixturename2, ...): mark tests as needing "
-        "all of the specified fixtures. see http://pytest.org/latest/fixture.html#usefixtures ",
+        "all of the specified fixtures. see "
+        "https://docs.pytest.org/en/latest/fixture.html#usefixtures ",
     )
 
 
 @hookimpl(trylast=True)
 def pytest_pyfunc_call(pyfuncitem):
     testfunction = pyfuncitem.obj
-    if pyfuncitem._isyieldedfunction():
-        testfunction(*pyfuncitem._args)
-    else:
-        funcargs = pyfuncitem.funcargs
-        testargs = {}
-        for arg in pyfuncitem._fixtureinfo.argnames:
-            testargs[arg] = funcargs[arg]
-        testfunction(**testargs)
+    iscoroutinefunction = getattr(inspect, "iscoroutinefunction", None)
+    if iscoroutinefunction is not None and iscoroutinefunction(testfunction):
+        msg = "Coroutine functions are not natively supported and have been skipped.\n"
+        msg += "You need to install a suitable plugin for your async framework, for example:\n"
+        msg += "  - pytest-asyncio\n"
+        msg += "  - pytest-trio\n"
+        msg += "  - pytest-tornasync"
+        warnings.warn(PytestUnhandledCoroutineWarning(msg.format(pyfuncitem.nodeid)))
+        skip(msg="coroutine function and no async plugin installed (see warnings)")
+    funcargs = pyfuncitem.funcargs
+    testargs = {arg: funcargs[arg] for arg in pyfuncitem._fixtureinfo.argnames}
+    testfunction(**testargs)
     return True
 
 
@@ -198,16 +179,22 @@ def pytest_collect_file(path, parent):
     ext = path.ext
     if ext == ".py":
         if not parent.session.isinitpath(path):
-            for pat in parent.config.getini("python_files"):
-                if path.fnmatch(pat):
-                    break
-            else:
+            if not path_matches_patterns(
+                path, parent.config.getini("python_files") + ["__init__.py"]
+            ):
                 return
         ihook = parent.session.gethookproxy(path)
         return ihook.pytest_pycollect_makemodule(path=path, parent=parent)
 
 
+def path_matches_patterns(path, patterns):
+    """Returns True if the given py.path.local matches one of the patterns in the list of globs given"""
+    return any(path.fnmatch(pattern) for pattern in patterns)
+
+
 def pytest_pycollect_makemodule(path, parent):
+    if path.basename == "__init__.py":
+        return Package(path, parent)
     return Module(path, parent)
 
 
@@ -218,9 +205,8 @@ def pytest_pycollect_makeitem(collector, name, obj):
     if res is not None:
         return
     # nothing was collected elsewhere, let's do it here
-    if isclass(obj):
+    if safe_isclass(obj):
         if collector.istestclass(obj, name):
-            Class = collector._getcustomclass("Class")
             outcome.force_result(Class(name, parent=collector))
     elif collector.istestfunction(obj, name):
         # mock seems to store unbound methods (issue473), normalize it
@@ -229,13 +215,21 @@ def pytest_pycollect_makeitem(collector, name, obj):
         # or a funtools.wrapped.
         # We musn't if it's been wrapped with mock.patch (python 2 only)
         if not (isfunction(obj) or isfunction(get_real_func(obj))):
-            collector.warn(
-                code="C2",
-                message="cannot collect %r because it is not a function." % name,
+            filename, lineno = getfslineno(obj)
+            warnings.warn_explicit(
+                message=PytestCollectionWarning(
+                    "cannot collect %r because it is not a function." % name
+                ),
+                category=None,
+                filename=str(filename),
+                lineno=lineno + 1,
             )
         elif getattr(obj, "__test__", True):
             if is_generator(obj):
-                res = Generator(name, parent=collector)
+                res = Function(name, parent=collector)
+                reason = deprecated.YIELD_TESTS.format(name=name)
+                res.add_marker(MARK_GEN.xfail(run=False, reason=reason))
+                res.warn(PytestCollectionWarning(reason))
             else:
                 res = list(collector._genfunctions(name, obj))
             outcome.force_result(res)
@@ -257,26 +251,24 @@ class PyobjMixin(PyobjContext):
     def __init__(self, *k, **kw):
         super(PyobjMixin, self).__init__(*k, **kw)
 
-    def obj():
+    @property
+    def obj(self):
+        """Underlying Python object."""
+        obj = getattr(self, "_obj", None)
+        if obj is None:
+            self._obj = obj = self._getobj()
+            # XXX evil hack
+            # used to avoid Instance collector marker duplication
+            if self._ALLOW_MARKERS:
+                self.own_markers.extend(get_unpacked_marks(self.obj))
+        return obj
 
-        def fget(self):
-            obj = getattr(self, "_obj", None)
-            if obj is None:
-                self._obj = obj = self._getobj()
-                # XXX evil hack
-                # used to avoid Instance collector marker duplication
-                if self._ALLOW_MARKERS:
-                    self.own_markers.extend(get_unpacked_marks(self.obj))
-            return obj
-
-        def fset(self, value):
-            self._obj = value
-
-        return property(fget, fset, None, "underlying python object")
-
-    obj = obj()
+    @obj.setter
+    def obj(self, value):
+        self._obj = value
 
     def _getobj(self):
+        """Gets the underlying Python object. May be overwritten by subclasses."""
         return getattr(self.parent.obj, self.name)
 
     def getmodpath(self, stopatmodule=True, includemodule=False):
@@ -299,9 +291,6 @@ class PyobjMixin(PyobjContext):
         s = ".".join(parts)
         return s.replace(".[", "[")
 
-    def _getfslineno(self):
-        return getfslineno(self.obj)
-
     def reportinfo(self):
         # XXX caching?
         obj = self.obj
@@ -320,7 +309,6 @@ class PyobjMixin(PyobjContext):
 
 
 class PyCollector(PyobjMixin, nodes.Collector):
-
     def funcnamefilter(self, name):
         return self._matches_prefix_or_glob_option("python_functions", name)
 
@@ -341,11 +329,6 @@ class PyCollector(PyobjMixin, nodes.Collector):
             if isinstance(obj, staticmethod):
                 # static methods need to be unwrapped
                 obj = safe_getattr(obj, "__func__", False)
-                if obj is False:
-                    # Python 2.6 wraps in a different way that we won't try to handle
-                    msg = "cannot collect static method %r because it is not a function"
-                    self.warn(code="C2", message=msg % name)
-                    return False
             return (
                 safe_getattr(obj, "__call__", False)
                 and fixtures.getfixturemarker(obj) is None
@@ -398,10 +381,6 @@ class PyCollector(PyobjMixin, nodes.Collector):
         values.sort(key=lambda item: item.reportinfo()[:2])
         return values
 
-    def makeitem(self, name, obj):
-        warnings.warn(deprecated.COLLECTOR_MAKEITEM, stacklevel=2)
-        self._makeitem(name, obj)
-
     def _makeitem(self, name, obj):
         # assert self.ihook.fspath == self.fspath, self
         return self.ihook.pytest_pycollect_makeitem(collector=self, name=name, obj=obj)
@@ -410,7 +389,6 @@ class PyCollector(PyobjMixin, nodes.Collector):
         module = self.getparent(Module).obj
         clscol = self.getparent(Class)
         cls = clscol and clscol.obj or None
-        transfer_markers(funcobj, cls, module)
         fm = self.session._fixturemanager
 
         definition = FunctionDefinition(name=name, parent=self, callobj=funcobj)
@@ -431,13 +409,17 @@ class PyCollector(PyobjMixin, nodes.Collector):
         else:
             self.ihook.pytest_generate_tests(metafunc=metafunc)
 
-        Function = self._getcustomclass("Function")
         if not metafunc._calls:
             yield Function(name, parent=self, fixtureinfo=fixtureinfo)
         else:
             # add funcargs() as fixturedefs to fixtureinfo.arg2fixturedefs
             fixtures.add_funcarg_pseudo_fixture_def(self, metafunc, fm)
 
+            # add_funcarg_pseudo_fixture_def may have shadowed some fixtures
+            # with direct parametrization, so make sure we update what the
+            # function really needs.
+            fixtureinfo.prune_dependency_tree()
+
             for callspec in metafunc._calls:
                 subname = "%s[%s]" % (name, callspec.id)
                 yield Function(
@@ -458,9 +440,66 @@ class Module(nodes.File, PyCollector):
         return self._importtestmodule()
 
     def collect(self):
+        self._inject_setup_module_fixture()
+        self._inject_setup_function_fixture()
         self.session._fixturemanager.parsefactories(self)
         return super(Module, self).collect()
 
+    def _inject_setup_module_fixture(self):
+        """Injects a hidden autouse, module scoped fixture into the collected module object
+        that invokes setUpModule/tearDownModule if either or both are available.
+
+        Using a fixture to invoke this methods ensures we play nicely and unsurprisingly with
+        other fixtures (#517).
+        """
+        setup_module = _get_non_fixture_func(self.obj, "setUpModule")
+        if setup_module is None:
+            setup_module = _get_non_fixture_func(self.obj, "setup_module")
+
+        teardown_module = _get_non_fixture_func(self.obj, "tearDownModule")
+        if teardown_module is None:
+            teardown_module = _get_non_fixture_func(self.obj, "teardown_module")
+
+        if setup_module is None and teardown_module is None:
+            return
+
+        @fixtures.fixture(autouse=True, scope="module")
+        def xunit_setup_module_fixture(request):
+            if setup_module is not None:
+                _call_with_optional_argument(setup_module, request.module)
+            yield
+            if teardown_module is not None:
+                _call_with_optional_argument(teardown_module, request.module)
+
+        self.obj.__pytest_setup_module = xunit_setup_module_fixture
+
+    def _inject_setup_function_fixture(self):
+        """Injects a hidden autouse, function scoped fixture into the collected module object
+        that invokes setup_function/teardown_function if either or both are available.
+
+        Using a fixture to invoke this methods ensures we play nicely and unsurprisingly with
+        other fixtures (#517).
+        """
+        setup_function = _get_non_fixture_func(self.obj, "setup_function")
+        teardown_function = _get_non_fixture_func(self.obj, "teardown_function")
+        if setup_function is None and teardown_function is None:
+            return
+
+        @fixtures.fixture(autouse=True, scope="function")
+        def xunit_setup_function_fixture(request):
+            if request.instance is not None:
+                # in this case we are bound to an instance, so we need to let
+                # setup_method handle this
+                yield
+                return
+            if setup_function is not None:
+                _call_with_optional_argument(setup_function, request.function)
+            yield
+            if teardown_function is not None:
+                _call_with_optional_argument(teardown_function, request.function)
+
+        self.obj.__pytest_setup_function = xunit_setup_function_fixture
+
     def _importtestmodule(self):
         # we assume we are only called once per module
         importmode = self.config.getoption("--import-mode")
@@ -468,7 +507,7 @@ class Module(nodes.File, PyCollector):
             mod = self.fspath.pyimport(ensuresyspath=importmode)
         except SyntaxError:
             raise self.CollectError(
-                _pytest._code.ExceptionInfo().getrepr(style="short")
+                _pytest._code.ExceptionInfo.from_current().getrepr(style="short")
             )
         except self.fspath.ImportMismatchError:
             e = sys.exc_info()[1]
@@ -484,12 +523,14 @@ class Module(nodes.File, PyCollector):
         except ImportError:
             from _pytest._code.code import ExceptionInfo
 
-            exc_info = ExceptionInfo()
+            exc_info = ExceptionInfo.from_current()
             if self.config.getoption("verbose") < 2:
                 exc_info.traceback = exc_info.traceback.filter(filter_traceback)
-            exc_repr = exc_info.getrepr(
-                style="short"
-            ) if exc_info.traceback else exc_info.exconly()
+            exc_repr = (
+                exc_info.getrepr(style="short")
+                if exc_info.traceback
+                else exc_info.exconly()
+            )
             formatted_tb = safe_str(exc_repr)
             raise self.CollectError(
                 "ImportError while importing test module '{fspath}'.\n"
@@ -509,18 +550,120 @@ class Module(nodes.File, PyCollector):
         self.config.pluginmanager.consider_module(mod)
         return mod
 
-    def setup(self):
-        setup_module = _get_xunit_setup_teardown(self.obj, "setUpModule")
-        if setup_module is None:
-            setup_module = _get_xunit_setup_teardown(self.obj, "setup_module")
-        if setup_module is not None:
-            setup_module()
 
-        teardown_module = _get_xunit_setup_teardown(self.obj, "tearDownModule")
+class Package(Module):
+    def __init__(self, fspath, parent=None, config=None, session=None, nodeid=None):
+        session = parent.session
+        nodes.FSCollector.__init__(
+            self, fspath, parent=parent, config=config, session=session, nodeid=nodeid
+        )
+        self.name = fspath.dirname
+        self.trace = session.trace
+        self._norecursepatterns = session._norecursepatterns
+        self.fspath = fspath
+
+    def setup(self):
+        # not using fixtures to call setup_module here because autouse fixtures
+        # from packages are not called automatically (#4085)
+        setup_module = _get_non_fixture_func(self.obj, "setUpModule")
+        if setup_module is None:
+            setup_module = _get_non_fixture_func(self.obj, "setup_module")
+        if setup_module is not None:
+            _call_with_optional_argument(setup_module, self.obj)
+
+        teardown_module = _get_non_fixture_func(self.obj, "tearDownModule")
         if teardown_module is None:
-            teardown_module = _get_xunit_setup_teardown(self.obj, "teardown_module")
+            teardown_module = _get_non_fixture_func(self.obj, "teardown_module")
         if teardown_module is not None:
-            self.addfinalizer(teardown_module)
+            func = partial(_call_with_optional_argument, teardown_module, self.obj)
+            self.addfinalizer(func)
+
+    def _recurse(self, dirpath):
+        if dirpath.basename == "__pycache__":
+            return False
+        ihook = self.gethookproxy(dirpath.dirpath())
+        if ihook.pytest_ignore_collect(path=dirpath, config=self.config):
+            return
+        for pat in self._norecursepatterns:
+            if dirpath.check(fnmatch=pat):
+                return False
+        ihook = self.gethookproxy(dirpath)
+        ihook.pytest_collect_directory(path=dirpath, parent=self)
+        return True
+
+    def gethookproxy(self, fspath):
+        # check if we have the common case of running
+        # hooks with all conftest.py filesall conftest.py
+        pm = self.config.pluginmanager
+        my_conftestmodules = pm._getconftestmodules(fspath)
+        remove_mods = pm._conftest_plugins.difference(my_conftestmodules)
+        if remove_mods:
+            # one or more conftests are not in use at this fspath
+            proxy = FSHookProxy(fspath, pm, remove_mods)
+        else:
+            # all plugis are active for this fspath
+            proxy = self.config.hook
+        return proxy
+
+    def _collectfile(self, path, handle_dupes=True):
+        assert path.isfile(), "%r is not a file (isdir=%r, exists=%r, islink=%r)" % (
+            path,
+            path.isdir(),
+            path.exists(),
+            path.islink(),
+        )
+        ihook = self.gethookproxy(path)
+        if not self.isinitpath(path):
+            if ihook.pytest_ignore_collect(path=path, config=self.config):
+                return ()
+
+        if handle_dupes:
+            keepduplicates = self.config.getoption("keepduplicates")
+            if not keepduplicates:
+                duplicate_paths = self.config.pluginmanager._duplicatepaths
+                if path in duplicate_paths:
+                    return ()
+                else:
+                    duplicate_paths.add(path)
+
+        if self.fspath == path:  # __init__.py
+            return [self]
+
+        return ihook.pytest_collect_file(path=path, parent=self)
+
+    def isinitpath(self, path):
+        return path in self.session._initialpaths
+
+    def collect(self):
+        this_path = self.fspath.dirpath()
+        init_module = this_path.join("__init__.py")
+        if init_module.check(file=1) and path_matches_patterns(
+            init_module, self.config.getini("python_files")
+        ):
+            yield Module(init_module, self)
+        pkg_prefixes = set()
+        for path in this_path.visit(rec=self._recurse, bf=True, sort=True):
+            # We will visit our own __init__.py file, in which case we skip it.
+            is_file = path.isfile()
+            if is_file:
+                if path.basename == "__init__.py" and path.dirpath() == this_path:
+                    continue
+
+            parts_ = parts(path.strpath)
+            if any(
+                pkg_prefix in parts_ and pkg_prefix.join("__init__.py") != path
+                for pkg_prefix in pkg_prefixes
+            ):
+                continue
+
+            if is_file:
+                for x in self._collectfile(path):
+                    yield x
+            elif not path.isdir():
+                # Broken symlink or invalid/missing file.
+                continue
+            elif path.join("__init__.py").check(file=1):
+                pkg_prefixes.add(path)
 
 
 def _get_xunit_setup_teardown(holder, attr_name, param_obj=None):
@@ -531,8 +674,9 @@ def _get_xunit_setup_teardown(holder, attr_name, param_obj=None):
     when the callable is called without arguments, defaults to the ``holder`` object.
     Return ``None`` if a suitable callable is not found.
     """
+    # TODO: only needed because of Package!
     param_obj = param_obj if param_obj is not None else holder
-    result = _get_xunit_func(holder, attr_name)
+    result = _get_non_fixture_func(holder, attr_name)
     if result is not None:
         arg_count = result.__code__.co_argcount
         if inspect.ismethod(result):
@@ -543,7 +687,19 @@ def _get_xunit_setup_teardown(holder, attr_name, param_obj=None):
             return result
 
 
-def _get_xunit_func(obj, name):
+def _call_with_optional_argument(func, arg):
+    """Call the given function with the given argument if func accepts one argument, otherwise
+    calls func without arguments"""
+    arg_count = func.__code__.co_argcount
+    if inspect.ismethod(func):
+        arg_count -= 1
+    if arg_count:
+        func(arg)
+    else:
+        func()
+
+
+def _get_non_fixture_func(obj, name):
     """Return the attribute from the given object to be used as a setup/teardown
     xunit-style function, but only if not marked as a fixture to
     avoid calling it twice.
@@ -561,39 +717,83 @@ class Class(PyCollector):
             return []
         if hasinit(self.obj):
             self.warn(
-                "C1",
-                "cannot collect test class %r because it has a "
-                "__init__ constructor" % self.obj.__name__,
+                PytestCollectionWarning(
+                    "cannot collect test class %r because it has a "
+                    "__init__ constructor (from: %s)"
+                    % (self.obj.__name__, self.parent.nodeid)
+                )
             )
             return []
         elif hasnew(self.obj):
             self.warn(
-                "C1",
-                "cannot collect test class %r because it has a "
-                "__new__ constructor" % self.obj.__name__,
+                PytestCollectionWarning(
+                    "cannot collect test class %r because it has a "
+                    "__new__ constructor (from: %s)"
+                    % (self.obj.__name__, self.parent.nodeid)
+                )
             )
             return []
-        return [self._getcustomclass("Instance")(name="()", parent=self)]
 
-    def setup(self):
-        setup_class = _get_xunit_func(self.obj, "setup_class")
-        if setup_class is not None:
-            setup_class = getattr(setup_class, "im_func", setup_class)
-            setup_class = getattr(setup_class, "__func__", setup_class)
-            setup_class(self.obj)
+        self._inject_setup_class_fixture()
+        self._inject_setup_method_fixture()
 
-        fin_class = getattr(self.obj, "teardown_class", None)
-        if fin_class is not None:
-            fin_class = getattr(fin_class, "im_func", fin_class)
-            fin_class = getattr(fin_class, "__func__", fin_class)
-            self.addfinalizer(lambda: fin_class(self.obj))
+        return [Instance(name="()", parent=self)]
+
+    def _inject_setup_class_fixture(self):
+        """Injects a hidden autouse, class scoped fixture into the collected class object
+        that invokes setup_class/teardown_class if either or both are available.
+
+        Using a fixture to invoke this methods ensures we play nicely and unsurprisingly with
+        other fixtures (#517).
+        """
+        setup_class = _get_non_fixture_func(self.obj, "setup_class")
+        teardown_class = getattr(self.obj, "teardown_class", None)
+        if setup_class is None and teardown_class is None:
+            return
+
+        @fixtures.fixture(autouse=True, scope="class")
+        def xunit_setup_class_fixture(cls):
+            if setup_class is not None:
+                func = getimfunc(setup_class)
+                _call_with_optional_argument(func, self.obj)
+            yield
+            if teardown_class is not None:
+                func = getimfunc(teardown_class)
+                _call_with_optional_argument(func, self.obj)
+
+        self.obj.__pytest_setup_class = xunit_setup_class_fixture
+
+    def _inject_setup_method_fixture(self):
+        """Injects a hidden autouse, function scoped fixture into the collected class object
+        that invokes setup_method/teardown_method if either or both are available.
+
+        Using a fixture to invoke this methods ensures we play nicely and unsurprisingly with
+        other fixtures (#517).
+        """
+        setup_method = _get_non_fixture_func(self.obj, "setup_method")
+        teardown_method = getattr(self.obj, "teardown_method", None)
+        if setup_method is None and teardown_method is None:
+            return
+
+        @fixtures.fixture(autouse=True, scope="function")
+        def xunit_setup_method_fixture(self, request):
+            method = request.function
+            if setup_method is not None:
+                func = getattr(self, "setup_method")
+                _call_with_optional_argument(func, method)
+            yield
+            if teardown_method is not None:
+                func = getattr(self, "teardown_method")
+                _call_with_optional_argument(func, method)
+
+        self.obj.__pytest_setup_method = xunit_setup_method_fixture
 
 
 class Instance(PyCollector):
     _ALLOW_MARKERS = False  # hack, destroy later
     # instances share the object with their parents in a way
     # that duplicates markers instances if not taken out
-    # can be removed at node strucutre reorganization time
+    # can be removed at node structure reorganization time
 
     def _getobj(self):
         return self.parent.obj()
@@ -613,32 +813,12 @@ class FunctionMixin(PyobjMixin):
 
     def setup(self):
         """ perform setup for this test function. """
-        if hasattr(self, "_preservedparent"):
-            obj = self._preservedparent
-        elif isinstance(self.parent, Instance):
-            obj = self.parent.newinstance()
+        if isinstance(self.parent, Instance):
+            self.parent.newinstance()
             self.obj = self._getobj()
-        else:
-            obj = self.parent.obj
-        if inspect.ismethod(self.obj):
-            setup_name = "setup_method"
-            teardown_name = "teardown_method"
-        else:
-            setup_name = "setup_function"
-            teardown_name = "teardown_function"
-        setup_func_or_method = _get_xunit_setup_teardown(
-            obj, setup_name, param_obj=self.obj
-        )
-        if setup_func_or_method is not None:
-            setup_func_or_method()
-        teardown_func_or_method = _get_xunit_setup_teardown(
-            obj, teardown_name, param_obj=self.obj
-        )
-        if teardown_func_or_method is not None:
-            self.addfinalizer(teardown_func_or_method)
 
     def _prunetraceback(self, excinfo):
-        if hasattr(self, "_obj") and not self.config.option.fulltrace:
+        if hasattr(self, "_obj") and not self.config.getoption("fulltrace", False):
             code = _pytest._code.Code(get_real_func(self.obj))
             path, firstlineno = code.path, code.firstlineno
             traceback = excinfo.traceback
@@ -653,68 +833,19 @@ class FunctionMixin(PyobjMixin):
             excinfo.traceback = ntraceback.filter()
             # issue364: mark all but first and last frames to
             # only show a single-line message for each frame
-            if self.config.option.tbstyle == "auto":
+            if self.config.getoption("tbstyle", "auto") == "auto":
                 if len(excinfo.traceback) > 2:
                     for entry in excinfo.traceback[1:-1]:
                         entry.set_repr_style("short")
 
-    def _repr_failure_py(self, excinfo, style="long"):
-        if excinfo.errisinstance(fail.Exception):
-            if not excinfo.value.pytrace:
-                return py._builtin._totext(excinfo.value)
-        return super(FunctionMixin, self)._repr_failure_py(excinfo, style=style)
-
     def repr_failure(self, excinfo, outerr=None):
         assert outerr is None, "XXX outerr usage is deprecated"
-        style = self.config.option.tbstyle
+        style = self.config.getoption("tbstyle", "auto")
         if style == "auto":
             style = "long"
         return self._repr_failure_py(excinfo, style=style)
 
 
-class Generator(FunctionMixin, PyCollector):
-
-    def collect(self):
-        # test generators are seen as collectors but they also
-        # invoke setup/teardown on popular request
-        # (induced by the common "test_*" naming shared with normal tests)
-        from _pytest import deprecated
-
-        self.session._setupstate.prepare(self)
-        # see FunctionMixin.setup and test_setupstate_is_preserved_134
-        self._preservedparent = self.parent.obj
-        values = []
-        seen = {}
-        for i, x in enumerate(self.obj()):
-            name, call, args = self.getcallargs(x)
-            if not callable(call):
-                raise TypeError("%r yielded non callable test %r" % (self.obj, call))
-            if name is None:
-                name = "[%d]" % i
-            else:
-                name = "['%s']" % name
-            if name in seen:
-                raise ValueError(
-                    "%r generated tests with non-unique name %r" % (self, name)
-                )
-            seen[name] = True
-            values.append(self.Function(name, self, args=args, callobj=call))
-        self.warn("C1", deprecated.YIELD_TESTS)
-        return values
-
-    def getcallargs(self, obj):
-        if not isinstance(obj, (tuple, list)):
-            obj = (obj,)
-        # explicit naming
-        if isinstance(obj[0], six.string_types):
-            name = obj[0]
-            obj = obj[1:]
-        else:
-            name = None
-        call, args = obj[0], obj[1:]
-        return name, call, args
-
-
 def hasinit(obj):
     init = getattr(obj, "__init__", None)
     if init:
@@ -728,20 +859,18 @@ def hasnew(obj):
 
 
 class CallSpec2(object):
-
     def __init__(self, metafunc):
         self.metafunc = metafunc
         self.funcargs = {}
         self._idlist = []
         self.params = {}
         self._globalid = NOTSET
-        self._globalid_args = set()
         self._globalparam = NOTSET
         self._arg2scopenum = {}  # used for sorting parametrized resources
         self.marks = []
         self.indices = {}
 
-    def copy(self, metafunc):
+    def copy(self):
         cs = CallSpec2(self.metafunc)
         cs.funcargs.update(self.funcargs)
         cs.params.update(self.params)
@@ -750,7 +879,6 @@ class CallSpec2(object):
         cs._arg2scopenum.update(self._arg2scopenum)
         cs._idlist = list(self._idlist)
         cs._globalid = self._globalid
-        cs._globalid_args = self._globalid_args
         cs._globalparam = self._globalparam
         return cs
 
@@ -778,7 +906,7 @@ class CallSpec2(object):
             self.indices[arg] = param_index
             self._arg2scopenum[arg] = scopenum
         self._idlist.append(id)
-        self.marks.extend(marks)
+        self.marks.extend(normalize_mark_list(marks))
 
     def setall(self, funcargs, id, param):
         for x in funcargs:
@@ -802,12 +930,13 @@ class Metafunc(fixtures.FuncargnamesCompatAttr):
     """
 
     def __init__(self, definition, fixtureinfo, config, cls=None, module=None):
-        #: access to the :class:`_pytest.config.Config` object for the test session
         assert (
             isinstance(definition, FunctionDefinition)
             or type(definition).__name__ == "DefinitionMock"
         )
         self.definition = definition
+
+        #: access to the :class:`_pytest.config.Config` object for the test session
         self.config = config
 
         #: the module object where the test function is defined in.
@@ -866,33 +995,92 @@ class Metafunc(fixtures.FuncargnamesCompatAttr):
         """
         from _pytest.fixtures import scope2index
         from _pytest.mark import ParameterSet
-        from py.io import saferepr
 
         argnames, parameters = ParameterSet._for_parametrize(
-            argnames, argvalues, self.function, self.config
+            argnames,
+            argvalues,
+            self.function,
+            self.config,
+            function_definition=self.definition,
         )
         del argvalues
-        default_arg_names = set(get_default_arg_names(self.function))
 
         if scope is None:
             scope = _find_parametrized_scope(argnames, self._arg2fixturedefs, indirect)
 
-        scopenum = scope2index(scope, descr="call to {}".format(self.parametrize))
-        valtypes = {}
-        for arg in argnames:
-            if arg not in self.fixturenames:
-                if arg in default_arg_names:
-                    raise ValueError(
-                        "%r already takes an argument %r with a default value"
-                        % (self.function, arg)
-                    )
-                else:
-                    if isinstance(indirect, (tuple, list)):
-                        name = "fixture" if arg in indirect else "argument"
-                    else:
-                        name = "fixture" if indirect else "argument"
-                    raise ValueError("%r uses no %s %r" % (self.function, name, arg))
+        self._validate_if_using_arg_names(argnames, indirect)
 
+        arg_values_types = self._resolve_arg_value_types(argnames, indirect)
+
+        ids = self._resolve_arg_ids(argnames, ids, parameters, item=self.definition)
+
+        scopenum = scope2index(
+            scope, descr="parametrize() call in {}".format(self.function.__name__)
+        )
+
+        # create the new calls: if we are parametrize() multiple times (by applying the decorator
+        # more than once) then we accumulate those calls generating the cartesian product
+        # of all calls
+        newcalls = []
+        for callspec in self._calls or [CallSpec2(self)]:
+            for param_index, (param_id, param_set) in enumerate(zip(ids, parameters)):
+                newcallspec = callspec.copy()
+                newcallspec.setmulti2(
+                    arg_values_types,
+                    argnames,
+                    param_set.values,
+                    param_id,
+                    param_set.marks,
+                    scopenum,
+                    param_index,
+                )
+                newcalls.append(newcallspec)
+        self._calls = newcalls
+
+    def _resolve_arg_ids(self, argnames, ids, parameters, item):
+        """Resolves the actual ids for the given argnames, based on the ``ids`` parameter given
+        to ``parametrize``.
+
+        :param List[str] argnames: list of argument names passed to ``parametrize()``.
+        :param ids: the ids parameter of the parametrized call (see docs).
+        :param List[ParameterSet] parameters: the list of parameter values, same size as ``argnames``.
+        :param Item item: the item that generated this parametrized call.
+        :rtype: List[str]
+        :return: the list of ids for each argname given
+        """
+        from _pytest._io.saferepr import saferepr
+
+        idfn = None
+        if callable(ids):
+            idfn = ids
+            ids = None
+        if ids:
+            func_name = self.function.__name__
+            if len(ids) != len(parameters):
+                msg = "In {}: {} parameter sets specified, with different number of ids: {}"
+                fail(msg.format(func_name, len(parameters), len(ids)), pytrace=False)
+            for id_value in ids:
+                if id_value is not None and not isinstance(id_value, six.string_types):
+                    msg = "In {}: ids must be list of strings, found: {} (type: {!r})"
+                    fail(
+                        msg.format(func_name, saferepr(id_value), type(id_value)),
+                        pytrace=False,
+                    )
+        ids = idmaker(argnames, parameters, idfn, ids, self.config, item=item)
+        return ids
+
+    def _resolve_arg_value_types(self, argnames, indirect):
+        """Resolves if each parametrized argument must be considered a parameter to a fixture or a "funcarg"
+        to the function, based on the ``indirect`` parameter of the parametrized() call.
+
+        :param List[str] argnames: list of argument names passed to ``parametrize()``.
+        :param indirect: same ``indirect`` parameter of ``parametrize()``.
+        :rtype: Dict[str, str]
+            A dict mapping each arg name to either:
+            * "params" if the argname should be the parameter of a fixture of the same name.
+            * "funcargs" if the argname should be a parameter to the parametrized test function.
+        """
+        valtypes = {}
         if indirect is True:
             valtypes = dict.fromkeys(argnames, "params")
         elif indirect is False:
@@ -901,94 +1089,43 @@ class Metafunc(fixtures.FuncargnamesCompatAttr):
             valtypes = dict.fromkeys(argnames, "funcargs")
             for arg in indirect:
                 if arg not in argnames:
-                    raise ValueError(
-                        "indirect given to %r: fixture %r doesn't exist"
-                        % (self.function, arg)
+                    fail(
+                        "In {}: indirect fixture '{}' doesn't exist".format(
+                            self.function.__name__, arg
+                        ),
+                        pytrace=False,
                     )
                 valtypes[arg] = "params"
-        idfn = None
-        if callable(ids):
-            idfn = ids
-            ids = None
-        if ids:
-            if len(ids) != len(parameters):
-                raise ValueError(
-                    "%d tests specified with %d ids" % (len(parameters), len(ids))
-                )
-            for id_value in ids:
-                if id_value is not None and not isinstance(id_value, six.string_types):
-                    msg = "ids must be list of strings, found: %s (type: %s)"
-                    raise ValueError(
-                        msg % (saferepr(id_value), type(id_value).__name__)
-                    )
-        ids = idmaker(argnames, parameters, idfn, ids, self.config)
-        newcalls = []
-        for callspec in self._calls or [CallSpec2(self)]:
-            elements = zip(ids, parameters, count())
-            for a_id, param, param_index in elements:
-                if len(param.values) != len(argnames):
-                    raise ValueError(
-                        'In "parametrize" the number of values ({}) must be '
-                        "equal to the number of names ({})".format(
-                            param.values, argnames
-                        )
-                    )
-                newcallspec = callspec.copy(self)
-                newcallspec.setmulti2(
-                    valtypes,
-                    argnames,
-                    param.values,
-                    a_id,
-                    param.marks,
-                    scopenum,
-                    param_index,
-                )
-                newcalls.append(newcallspec)
-        self._calls = newcalls
+        return valtypes
 
-    def addcall(self, funcargs=None, id=NOTSET, param=NOTSET):
-        """ Add a new call to the underlying test function during the collection phase of a test run.
-
-        .. deprecated:: 3.3
-
-            Use :meth:`parametrize` instead.
-
-        Note that request.addcall() is called during the test collection phase prior and
-        independently to actual test execution.  You should only use addcall()
-        if you need to specify multiple arguments of a test function.
-
-        :arg funcargs: argument keyword dictionary used when invoking
-            the test function.
-
-        :arg id: used for reporting and identification purposes.  If you
-            don't supply an `id` an automatic unique id will be generated.
-
-        :arg param: a parameter which will be exposed to a later fixture function
-            invocation through the ``request.param`` attribute.
+    def _validate_if_using_arg_names(self, argnames, indirect):
         """
-        if self.config:
-            self.config.warn(
-                "C1", message=deprecated.METAFUNC_ADD_CALL, fslocation=None
-            )
-        assert funcargs is None or isinstance(funcargs, dict)
-        if funcargs is not None:
-            for name in funcargs:
-                if name not in self.fixturenames:
-                    fail("funcarg %r not used in this function." % name)
-        else:
-            funcargs = {}
-        if id is None:
-            raise ValueError("id=None not allowed")
-        if id is NOTSET:
-            id = len(self._calls)
-        id = str(id)
-        if id in self._ids:
-            raise ValueError("duplicate id %r" % id)
-        self._ids.add(id)
+        Check if all argnames are being used, by default values, or directly/indirectly.
 
-        cs = CallSpec2(self)
-        cs.setall(funcargs, id, param)
-        self._calls.append(cs)
+        :param List[str] argnames: list of argument names passed to ``parametrize()``.
+        :param indirect: same ``indirect`` parameter of ``parametrize()``.
+        :raise ValueError: if validation fails.
+        """
+        default_arg_names = set(get_default_arg_names(self.function))
+        func_name = self.function.__name__
+        for arg in argnames:
+            if arg not in self.fixturenames:
+                if arg in default_arg_names:
+                    fail(
+                        "In {}: function already takes an argument '{}' with a default value".format(
+                            func_name, arg
+                        ),
+                        pytrace=False,
+                    )
+                else:
+                    if isinstance(indirect, (tuple, list)):
+                        name = "fixture" if arg in indirect else "argument"
+                    else:
+                        name = "fixture" if indirect else "argument"
+                    fail(
+                        "In {}: function uses no {} '{}'".format(func_name, name, arg),
+                        pytrace=False,
+                    )
 
 
 def _find_parametrized_scope(argnames, arg2fixturedefs, indirect):
@@ -1003,13 +1140,18 @@ def _find_parametrized_scope(argnames, arg2fixturedefs, indirect):
     """
     from _pytest.fixtures import scopes
 
-    indirect_as_list = isinstance(indirect, (list, tuple))
-    all_arguments_are_fixtures = indirect is True or indirect_as_list and len(
-        indirect
-    ) == argnames
+    if isinstance(indirect, (list, tuple)):
+        all_arguments_are_fixtures = len(indirect) == len(argnames)
+    else:
+        all_arguments_are_fixtures = bool(indirect)
+
     if all_arguments_are_fixtures:
         fixturedefs = arg2fixturedefs or {}
-        used_scopes = [fixturedef[0].scope for name, fixturedef in fixturedefs.items()]
+        used_scopes = [
+            fixturedef[0].scope
+            for name, fixturedef in fixturedefs.items()
+            if name in argnames
+        ]
         if used_scopes:
             # Takes the most narrow scope from used fixtures
             for scope in reversed(scopes):
@@ -1019,24 +1161,30 @@ def _find_parametrized_scope(argnames, arg2fixturedefs, indirect):
     return "function"
 
 
-def _idval(val, argname, idx, idfn, config=None):
+def _ascii_escaped_by_config(val, config):
+    if config is None:
+        escape_option = False
+    else:
+        escape_option = config.getini(
+            "disable_test_id_escaping_and_forfeit_all_rights_to_community_support"
+        )
+    return val if escape_option else ascii_escaped(val)
+
+
+def _idval(val, argname, idx, idfn, item, config):
     if idfn:
-        s = None
         try:
-            s = idfn(val)
-        except Exception:
+            generated_id = idfn(val)
+            if generated_id is not None:
+                val = generated_id
+        except Exception as e:
             # See issue https://github.com/pytest-dev/pytest/issues/2169
-            import warnings
-
-            msg = "Raised while trying to determine id of parameter %s at position %d." % (
-                argname, idx
-            )
-            msg += "\nUpdate your code as this will raise an error in pytest-4.0."
-            warnings.warn(msg, DeprecationWarning)
-        if s:
-            return ascii_escaped(s)
-
-    if config:
+            msg = "{}: error raised while trying to determine id of parameter '{}' at position {}\n"
+            msg = msg.format(item.nodeid, argname, idx)
+            # we only append the exception type and message because on Python 2 reraise does nothing
+            msg += "  {}: {}\n".format(type(e).__name__, e)
+            six.raise_from(ValueError(msg), e)
+    elif config:
         hook_id = config.hook.pytest_make_parametrize_id(
             config=config, val=val, argname=argname
         )
@@ -1044,8 +1192,8 @@ def _idval(val, argname, idx, idfn, config=None):
             return hook_id
 
     if isinstance(val, STRING_TYPES):
-        return ascii_escaped(val)
-    elif isinstance(val, (float, int, bool, NoneType)):
+        return _ascii_escaped_by_config(val, config)
+    elif val is None or isinstance(val, (float, int, bool)):
         return str(val)
     elif isinstance(val, REGEX_TYPE):
         return ascii_escaped(val.pattern)
@@ -1056,22 +1204,22 @@ def _idval(val, argname, idx, idfn, config=None):
     return str(argname) + str(idx)
 
 
-def _idvalset(idx, parameterset, argnames, idfn, ids, config=None):
+def _idvalset(idx, parameterset, argnames, idfn, ids, item, config):
     if parameterset.id is not None:
         return parameterset.id
     if ids is None or (idx >= len(ids) or ids[idx] is None):
         this_id = [
-            _idval(val, argname, idx, idfn, config)
+            _idval(val, argname, idx, idfn, item=item, config=config)
             for val, argname in zip(parameterset.values, argnames)
         ]
         return "-".join(this_id)
     else:
-        return ascii_escaped(ids[idx])
+        return _ascii_escaped_by_config(ids[idx], config)
 
 
-def idmaker(argnames, parametersets, idfn=None, ids=None, config=None):
+def idmaker(argnames, parametersets, idfn=None, ids=None, config=None, item=None):
     ids = [
-        _idvalset(valindex, parameterset, argnames, idfn, ids, config)
+        _idvalset(valindex, parameterset, argnames, idfn, ids, config=config, item=item)
         for valindex, parameterset in enumerate(parametersets)
     ]
     if len(set(ids)) != len(ids):
@@ -1191,21 +1339,22 @@ def _showfixtures_main(config, session):
                 currentmodule = module
         if verbose <= 0 and argname[0] == "_":
             continue
+        tw.write(argname, green=True)
+        if fixturedef.scope != "function":
+            tw.write(" [%s scope]" % fixturedef.scope, cyan=True)
         if verbose > 0:
-            funcargspec = "%s -- %s" % (argname, bestrel)
-        else:
-            funcargspec = argname
-        tw.line(funcargspec, green=True)
+            tw.write(" -- %s" % bestrel, yellow=True)
+        tw.write("\n")
         loc = getlocation(fixturedef.func, curdir)
         doc = fixturedef.func.__doc__ or ""
         if doc:
             write_docstring(tw, doc)
         else:
             tw.line("    %s: no docstring available" % (loc,), red=True)
+        tw.line()
 
 
-def write_docstring(tw, doc):
-    INDENT = "    "
+def write_docstring(tw, doc, indent="    "):
     doc = doc.rstrip()
     if "\n" in doc:
         firstline, rest = doc.split("\n", 1)
@@ -1213,19 +1362,19 @@ def write_docstring(tw, doc):
         firstline, rest = doc, ""
 
     if firstline.strip():
-        tw.line(INDENT + firstline.strip())
+        tw.line(indent + firstline.strip())
 
     if rest:
         for line in dedent(rest).split("\n"):
-            tw.write(INDENT + line + "\n")
+            tw.write(indent + line + "\n")
 
 
 class Function(FunctionMixin, nodes.Item, fixtures.FuncargnamesCompatAttr):
     """ a Function Item is responsible for setting up and executing a
     Python test function.
     """
-    _genid = None
-    # disable since functions handle it themselfes
+
+    # disable since functions handle it themselves
     _ALLOW_MARKERS = False
 
     def __init__(
@@ -1257,13 +1406,27 @@ class Function(FunctionMixin, nodes.Item, fixtures.FuncargnamesCompatAttr):
                 # feel free to cry, this was broken for years before
                 # and keywords cant fix it per design
                 self.keywords[mark.name] = mark
-            self.own_markers.extend(callspec.marks)
+            self.own_markers.extend(normalize_mark_list(callspec.marks))
         if keywords:
             self.keywords.update(keywords)
 
+        # todo: this is a hell of a hack
+        # https://github.com/pytest-dev/pytest/issues/4569
+
+        self.keywords.update(
+            dict.fromkeys(
+                [
+                    mark.name
+                    for mark in self.iter_markers()
+                    if mark.name not in self.keywords
+                ],
+                True,
+            )
+        )
+
         if fixtureinfo is None:
             fixtureinfo = self.session._fixturemanager.getfixtureinfo(
-                self, self.obj, self.cls, funcargs=not self._isyieldedfunction()
+                self, self.obj, self.cls, funcargs=True
             )
         self._fixtureinfo = fixtureinfo
         self.fixturenames = fixtureinfo.names_closure
@@ -1277,23 +1440,12 @@ class Function(FunctionMixin, nodes.Item, fixtures.FuncargnamesCompatAttr):
 
     def _initrequest(self):
         self.funcargs = {}
-        if self._isyieldedfunction():
-            assert not hasattr(
-                self, "callspec"
-            ), "yielded functions (deprecated) cannot have funcargs"
-        else:
-            if hasattr(self, "callspec"):
-                callspec = self.callspec
-                assert not callspec.funcargs
-                self._genid = callspec.id
-                if hasattr(callspec, "param"):
-                    self.param = callspec.param
         self._request = fixtures.FixtureRequest(self)
 
     @property
     def function(self):
         "underlying python 'function' object"
-        return getattr(self.obj, "im_func", self.obj)
+        return getimfunc(self.obj)
 
     def _getobj(self):
         name = self.name
@@ -1307,9 +1459,6 @@ class Function(FunctionMixin, nodes.Item, fixtures.FuncargnamesCompatAttr):
         "(compatonly) for code expecting pytest-2.2 style request objects"
         return self
 
-    def _isyieldedfunction(self):
-        return getattr(self, "_args", None) is not None
-
     def runtest(self):
         """ execute the underlying test function. """
         self.ihook.pytest_pyfunc_call(pyfuncitem=self)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/python_api.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/python_api.py
index 9257d210c27..f6e475c3a24 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/python_api.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/python_api.py
@@ -1,17 +1,25 @@
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+
 import math
+import pprint
 import sys
+import warnings
+from decimal import Decimal
+from numbers import Number
 
-import py
-from six.moves import zip, filterfalse
 from more_itertools.more import always_iterable
+from six.moves import filterfalse
+from six.moves import zip
 
-from _pytest.compat import isclass
-
-from _pytest.compat import Mapping, Sequence
-from _pytest.compat import STRING_TYPES
-
-from _pytest.outcomes import fail
 import _pytest._code
+from _pytest import deprecated
+from _pytest.compat import isclass
+from _pytest.compat import Iterable
+from _pytest.compat import Mapping
+from _pytest.compat import Sized
+from _pytest.compat import STRING_TYPES
+from _pytest.outcomes import fail
 
 BASE_TYPE = (type, STRING_TYPES)
 
@@ -30,6 +38,15 @@ def _cmp_raises_type_error(self, other):
     )
 
 
+def _non_numeric_type_error(value, at):
+    at_str = " at {}".format(at) if at else ""
+    return TypeError(
+        "cannot make approximate comparisons to non-numeric values: {!r} {}".format(
+            value, at_str
+        )
+    )
+
+
 # builtin pytest.approx helper
 
 
@@ -39,15 +56,17 @@ class ApproxBase(object):
     or sequences of numbers.
     """
 
-    # Tell numpy to use our `__eq__` operator instead of its
+    # Tell numpy to use our `__eq__` operator instead of its.
     __array_ufunc__ = None
     __array_priority__ = 100
 
     def __init__(self, expected, rel=None, abs=None, nan_ok=False):
+        __tracebackhide__ = True
         self.expected = expected
         self.abs = abs
         self.rel = rel
         self.nan_ok = nan_ok
+        self._check_type()
 
     def __repr__(self):
         raise NotImplementedError
@@ -75,20 +94,33 @@ class ApproxBase(object):
         """
         raise NotImplementedError
 
+    def _check_type(self):
+        """
+        Raise a TypeError if the expected value is not a valid type.
+        """
+        # This is only a concern if the expected value is a sequence.  In every
+        # other case, the approx() function ensures that the expected value has
+        # a numeric type.  For this reason, the default is to do nothing.  The
+        # classes that deal with sequences should reimplement this method to
+        # raise if there are any non-numeric elements in the sequence.
+        pass
+
+
+def _recursive_list_map(f, x):
+    if isinstance(x, list):
+        return list(_recursive_list_map(f, xi) for xi in x)
+    else:
+        return f(x)
+
 
 class ApproxNumpy(ApproxBase):
     """
-    Perform approximate comparisons for numpy arrays.
+    Perform approximate comparisons where the expected value is numpy array.
     """
 
     def __repr__(self):
-        # It might be nice to rewrite this function to account for the
-        # shape of the array...
-        import numpy as np
-
-        return "approx({!r})".format(
-            list(self._approx_scalar(x) for x in np.asarray(self.expected))
-        )
+        list_scalars = _recursive_list_map(self._approx_scalar, self.expected.tolist())
+        return "approx({!r})".format(list_scalars)
 
     if sys.version_info[0] == 2:
         __cmp__ = _cmp_raises_type_error
@@ -118,16 +150,16 @@ class ApproxNumpy(ApproxBase):
 
         if np.isscalar(actual):
             for i in np.ndindex(self.expected.shape):
-                yield actual, np.asscalar(self.expected[i])
+                yield actual, self.expected[i].item()
         else:
             for i in np.ndindex(self.expected.shape):
-                yield np.asscalar(actual[i]), np.asscalar(self.expected[i])
+                yield actual[i].item(), self.expected[i].item()
 
 
 class ApproxMapping(ApproxBase):
     """
-    Perform approximate comparisons for mappings where the values are numbers
-    (the keys can be anything).
+    Perform approximate comparisons where the expected value is a mapping with
+    numeric values (the keys can be anything).
     """
 
     def __repr__(self):
@@ -145,10 +177,20 @@ class ApproxMapping(ApproxBase):
         for k in self.expected.keys():
             yield actual[k], self.expected[k]
 
+    def _check_type(self):
+        __tracebackhide__ = True
+        for key, value in self.expected.items():
+            if isinstance(value, type(self.expected)):
+                msg = "pytest.approx() does not support nested dictionaries: key={!r} value={!r}\n  full mapping={}"
+                raise TypeError(msg.format(key, value, pprint.pformat(self.expected)))
+            elif not isinstance(value, Number):
+                raise _non_numeric_type_error(self.expected, at="key={!r}".format(key))
 
-class ApproxSequence(ApproxBase):
+
+class ApproxSequencelike(ApproxBase):
     """
-    Perform approximate comparisons for sequences of numbers.
+    Perform approximate comparisons where the expected value is a sequence of
+    numbers.
     """
 
     def __repr__(self):
@@ -167,11 +209,23 @@ class ApproxSequence(ApproxBase):
     def _yield_comparisons(self, actual):
         return zip(actual, self.expected)
 
+    def _check_type(self):
+        __tracebackhide__ = True
+        for index, x in enumerate(self.expected):
+            if isinstance(x, type(self.expected)):
+                msg = "pytest.approx() does not support nested data structures: {!r} at index {}\n  full sequence: {}"
+                raise TypeError(msg.format(x, index, pprint.pformat(self.expected)))
+            elif not isinstance(x, Number):
+                raise _non_numeric_type_error(
+                    self.expected, at="index {}".format(index)
+                )
+
 
 class ApproxScalar(ApproxBase):
     """
-    Perform approximate comparisons for single numbers only.
+    Perform approximate comparisons where the expected value is a single number.
     """
+
     DEFAULT_ABSOLUTE_TOLERANCE = 1e-12
     DEFAULT_RELATIVE_TOLERANCE = 1e-6
 
@@ -208,7 +262,9 @@ class ApproxScalar(ApproxBase):
         the pre-specified tolerance.
         """
         if _is_numpy_array(actual):
-            return ApproxNumpy(actual, self.abs, self.rel, self.nan_ok) == self.expected
+            # Call ``__eq__()`` manually to prevent infinite-recursion with
+            # numpy<1.13.  See #3748.
+            return all(self.__eq__(a) for a in actual.flat)
 
         # Short-circuit exact equality.
         if actual == self.expected:
@@ -269,9 +325,7 @@ class ApproxScalar(ApproxBase):
         # we aren't even going to use it.
         relative_tolerance = set_default(
             self.rel, self.DEFAULT_RELATIVE_TOLERANCE
-        ) * abs(
-            self.expected
-        )
+        ) * abs(self.expected)
 
         if relative_tolerance < 0:
             raise ValueError(
@@ -285,7 +339,9 @@ class ApproxScalar(ApproxBase):
 
 
 class ApproxDecimal(ApproxScalar):
-    from decimal import Decimal
+    """
+    Perform approximate comparisons where the expected value is a decimal.
+    """
 
     DEFAULT_ABSOLUTE_TOLERANCE = Decimal("1e-12")
     DEFAULT_RELATIVE_TOLERANCE = Decimal("1e-6")
@@ -444,32 +500,39 @@ def approx(expected, rel=None, abs=None, nan_ok=False):
        __ https://docs.python.org/3/reference/datamodel.html#object.__ge__
     """
 
-    from decimal import Decimal
-
     # Delegate the comparison to a class that knows how to deal with the type
     # of the expected value (e.g. int, float, list, dict, numpy.array, etc).
     #
-    # This architecture is really driven by the need to support numpy arrays.
-    # The only way to override `==` for arrays without requiring that approx be
-    # the left operand is to inherit the approx object from `numpy.ndarray`.
-    # But that can't be a general solution, because it requires (1) numpy to be
-    # installed and (2) the expected value to be a numpy array.  So the general
-    # solution is to delegate each type of expected value to a different class.
+    # The primary responsibility of these classes is to implement ``__eq__()``
+    # and ``__repr__()``.  The former is used to actually check if some
+    # "actual" value is equivalent to the given expected value within the
+    # allowed tolerance.  The latter is used to show the user the expected
+    # value and tolerance, in the case that a test failed.
     #
-    # This has the advantage that it made it easy to support mapping types
-    # (i.e. dict).  The old code accepted mapping types, but would only compare
-    # their keys, which is probably not what most people would expect.
+    # The actual logic for making approximate comparisons can be found in
+    # ApproxScalar, which is used to compare individual numbers.  All of the
+    # other Approx classes eventually delegate to this class.  The ApproxBase
+    # class provides some convenient methods and overloads, but isn't really
+    # essential.
 
-    if _is_numpy_array(expected):
-        cls = ApproxNumpy
+    __tracebackhide__ = True
+
+    if isinstance(expected, Decimal):
+        cls = ApproxDecimal
+    elif isinstance(expected, Number):
+        cls = ApproxScalar
     elif isinstance(expected, Mapping):
         cls = ApproxMapping
-    elif isinstance(expected, Sequence) and not isinstance(expected, STRING_TYPES):
-        cls = ApproxSequence
-    elif isinstance(expected, Decimal):
-        cls = ApproxDecimal
+    elif _is_numpy_array(expected):
+        cls = ApproxNumpy
+    elif (
+        isinstance(expected, Iterable)
+        and isinstance(expected, Sized)
+        and not isinstance(expected, STRING_TYPES)
+    ):
+        cls = ApproxSequencelike
     else:
-        cls = ApproxScalar
+        raise _non_numeric_type_error(expected, at=None)
 
     return cls(expected, rel, abs, nan_ok)
 
@@ -479,17 +542,11 @@ def _is_numpy_array(obj):
     Return true if the given object is a numpy array.  Make a special effort to
     avoid importing numpy unless it's really necessary.
     """
-    import inspect
-
-    for cls in inspect.getmro(type(obj)):
-        if cls.__module__ == "numpy":
-            try:
-                import numpy as np
-
-                return isinstance(obj, np.ndarray)
-            except ImportError:
-                pass
+    import sys
 
+    np = sys.modules.get("numpy")
+    if np is not None:
+        return isinstance(obj, np.ndarray)
     return False
 
 
@@ -499,29 +556,54 @@ def _is_numpy_array(obj):
 def raises(expected_exception, *args, **kwargs):
     r"""
     Assert that a code block/function call raises ``expected_exception``
-    and raise a failure exception otherwise.
+    or raise a failure exception otherwise.
 
-    :arg message: if specified, provides a custom failure message if the
-        exception is not raised
-    :arg match: if specified, asserts that the exception matches a text or regex
+    :kwparam match: if specified, a string containing a regular expression,
+        or a regular expression object, that is tested against the string
+        representation of the exception using ``re.search``. To match a literal
+        string that may contain `special characters`__, the pattern can
+        first be escaped with ``re.escape``.
 
-    This helper produces a ``ExceptionInfo()`` object (see below).
+    __ https://docs.python.org/3/library/re.html#regular-expression-syntax
 
-    You may use this function as a context manager::
+    :kwparam message: **(deprecated since 4.1)** if specified, provides a custom failure message
+        if the exception is not raised. See :ref:`the deprecation docs <raises message deprecated>` for a workaround.
+
+    .. currentmodule:: _pytest._code
+
+    Use ``pytest.raises`` as a context manager, which will capture the exception of the given
+    type::
 
         >>> with raises(ZeroDivisionError):
         ...    1/0
 
-    .. versionchanged:: 2.10
+    If the code block does not raise the expected exception (``ZeroDivisionError`` in the example
+    above), or no exception at all, the check will fail instead.
 
-    In the context manager form you may use the keyword argument
-    ``message`` to specify a custom failure message::
+    You can also use the keyword argument ``match`` to assert that the
+    exception matches a text or regex::
 
-        >>> with raises(ZeroDivisionError, message="Expecting ZeroDivisionError"):
-        ...    pass
-        Traceback (most recent call last):
-          ...
-        Failed: Expecting ZeroDivisionError
+        >>> with raises(ValueError, match='must be 0 or None'):
+        ...     raise ValueError("value must be 0 or None")
+
+        >>> with raises(ValueError, match=r'must be \d+$'):
+        ...     raise ValueError("value must be 42")
+
+    The context manager produces an :class:`ExceptionInfo` object which can be used to inspect the
+    details of the captured exception::
+
+        >>> with raises(ValueError) as exc_info:
+        ...     raise ValueError("value must be 42")
+        >>> assert exc_info.type is ValueError
+        >>> assert exc_info.value.args[0] == "value must be 42"
+
+    .. deprecated:: 4.1
+
+        In the context manager form you may use the keyword argument
+        ``message`` to specify a custom failure message that will be displayed
+        in case the ``pytest.raises`` check fails. This has been deprecated as it
+        is considered error prone as users often mean to use ``match`` instead.
+        See :ref:`the deprecation docs <raises message deprecated>` for a workaround.
 
     .. note::
 
@@ -535,7 +617,7 @@ def raises(expected_exception, *args, **kwargs):
            >>> with raises(ValueError) as exc_info:
            ...     if value > 10:
            ...         raise ValueError("value must be <= 10")
-           ...     assert exc_info.type == ValueError  # this will not execute
+           ...     assert exc_info.type is ValueError  # this will not execute
 
        Instead, the following approach must be taken (note the difference in
        scope)::
@@ -544,22 +626,17 @@ def raises(expected_exception, *args, **kwargs):
            ...     if value > 10:
            ...         raise ValueError("value must be <= 10")
            ...
-           >>> assert exc_info.type == ValueError
+           >>> assert exc_info.type is ValueError
 
+    **Using with** ``pytest.mark.parametrize``
 
-    Since version ``3.1`` you can use the keyword argument ``match`` to assert that the
-    exception matches a text or regex::
+    When using :ref:`pytest.mark.parametrize ref`
+    it is possible to parametrize tests such that
+    some runs raise an exception and others do not.
 
-        >>> with raises(ValueError, match='must be 0 or None'):
-        ...     raise ValueError("value must be 0 or None")
+    See :ref:`parametrizing_conditional_raising` for an example.
 
-        >>> with raises(ValueError, match=r'must be \d+$'):
-        ...     raise ValueError("value must be 42")
-
-    **Legacy forms**
-
-    The forms below are fully supported but are discouraged for new code because the
-    context manager form is regarded as more readable and less error-prone.
+    **Legacy form**
 
     It is possible to specify a callable by passing a to-be-called lambda::
 
@@ -575,17 +652,8 @@ def raises(expected_exception, *args, **kwargs):
         >>> raises(ZeroDivisionError, f, x=0)
         <ExceptionInfo ...>
 
-    It is also possible to pass a string to be evaluated at runtime::
-
-        >>> raises(ZeroDivisionError, "f(0)")
-        <ExceptionInfo ...>
-
-    The string will be evaluated using the same ``locals()`` and ``globals()``
-    at the moment of the ``raises`` call.
-
-    .. currentmodule:: _pytest._code
-
-    Consult the API of ``excinfo`` objects: :class:`ExceptionInfo`.
+    The form above is fully supported but discouraged for new code because the
+    context manager form is regarded as more readable and less error-prone.
 
     .. note::
         Similar to caught exception objects in Python, explicitly clearing
@@ -616,33 +684,35 @@ def raises(expected_exception, *args, **kwargs):
     if not args:
         if "message" in kwargs:
             message = kwargs.pop("message")
+            warnings.warn(deprecated.RAISES_MESSAGE_PARAMETER, stacklevel=2)
         if "match" in kwargs:
             match_expr = kwargs.pop("match")
         if kwargs:
             msg = "Unexpected keyword arguments passed to pytest.raises: "
-            msg += ", ".join(kwargs.keys())
+            msg += ", ".join(sorted(kwargs))
             raise TypeError(msg)
         return RaisesContext(expected_exception, message, match_expr)
     elif isinstance(args[0], str):
-        code, = args
+        warnings.warn(deprecated.RAISES_EXEC, stacklevel=2)
+        (code,) = args
         assert isinstance(code, str)
         frame = sys._getframe(1)
         loc = frame.f_locals.copy()
         loc.update(kwargs)
         # print "raises frame scope: %r" % frame.f_locals
         try:
-            code = _pytest._code.Source(code).compile()
-            py.builtin.exec_(code, frame.f_globals, loc)
-            # XXX didn'T mean f_globals == f_locals something special?
+            code = _pytest._code.Source(code).compile(_genframe=frame)
+            exec(code, frame.f_globals, loc)
+            # XXX didn't mean f_globals == f_locals something special?
             #     this is destroyed here ...
         except expected_exception:
-            return _pytest._code.ExceptionInfo()
+            return _pytest._code.ExceptionInfo.from_current()
     else:
         func = args[0]
         try:
             func(*args[1:], **kwargs)
         except expected_exception:
-            return _pytest._code.ExceptionInfo()
+            return _pytest._code.ExceptionInfo.from_current()
     fail(message)
 
 
@@ -650,7 +720,6 @@ raises.Exception = fail.Exception
 
 
 class RaisesContext(object):
-
     def __init__(self, expected_exception, message, match_expr):
         self.expected_exception = expected_exception
         self.message = message
@@ -658,7 +727,7 @@ class RaisesContext(object):
         self.excinfo = None
 
     def __enter__(self):
-        self.excinfo = object.__new__(_pytest._code.ExceptionInfo)
+        self.excinfo = _pytest._code.ExceptionInfo.for_later()
         return self.excinfo
 
     def __exit__(self, *tp):
@@ -669,6 +738,6 @@ class RaisesContext(object):
         suppress_exception = issubclass(self.excinfo.type, self.expected_exception)
         if sys.version_info[0] == 2 and suppress_exception:
             sys.exc_clear()
-        if self.match_expr and suppress_exception:
+        if self.match_expr is not None and suppress_exception:
             self.excinfo.match(self.match_expr)
         return suppress_exception
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/recwarn.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/recwarn.py
index 7839f5700c8..7abf2e93550 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/recwarn.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/recwarn.py
@@ -1,15 +1,19 @@
+# -*- coding: utf-8 -*-
 """ recording warnings during test function execution. """
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import inspect
-
-import _pytest._code
-import py
+import re
 import sys
 import warnings
 
-import re
+import six
 
+import _pytest._code
+from _pytest.deprecated import PYTEST_WARNS_UNKNOWN_KWARGS
+from _pytest.deprecated import WARNS_EXEC
 from _pytest.fixtures import yield_fixture
 from _pytest.outcomes import fail
 
@@ -43,45 +47,10 @@ def deprecated_call(func=None, *args, **kwargs):
     in which case it will ensure calling ``func(*args, **kwargs)`` produces one of the warnings
     types above.
     """
-    if not func:
-        return _DeprecatedCallContext()
-    else:
-        __tracebackhide__ = True
-        with _DeprecatedCallContext():
-            return func(*args, **kwargs)
-
-
-class _DeprecatedCallContext(object):
-    """Implements the logic to capture deprecation warnings as a context manager."""
-
-    def __enter__(self):
-        self._captured_categories = []
-        self._old_warn = warnings.warn
-        self._old_warn_explicit = warnings.warn_explicit
-        warnings.warn_explicit = self._warn_explicit
-        warnings.warn = self._warn
-
-    def _warn_explicit(self, message, category, *args, **kwargs):
-        self._captured_categories.append(category)
-
-    def _warn(self, message, category=None, *args, **kwargs):
-        if isinstance(message, Warning):
-            self._captured_categories.append(message.__class__)
-        else:
-            self._captured_categories.append(category)
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        warnings.warn_explicit = self._old_warn_explicit
-        warnings.warn = self._old_warn
-
-        if exc_type is None:
-            deprecation_categories = (DeprecationWarning, PendingDeprecationWarning)
-            if not any(
-                issubclass(c, deprecation_categories) for c in self._captured_categories
-            ):
-                __tracebackhide__ = True
-                msg = "Did not produce DeprecationWarning or PendingDeprecationWarning"
-                raise AssertionError(msg)
+    __tracebackhide__ = True
+    if func is not None:
+        args = (func,) + args
+    return warns((DeprecationWarning, PendingDeprecationWarning), *args, **kwargs)
 
 
 def warns(expected_warning, *args, **kwargs):
@@ -116,24 +85,28 @@ def warns(expected_warning, *args, **kwargs):
         Failed: DID NOT WARN. No warnings of type ...UserWarning... was emitted...
 
     """
-    match_expr = None
+    __tracebackhide__ = True
     if not args:
-        if "match" in kwargs:
-            match_expr = kwargs.pop("match")
+        match_expr = kwargs.pop("match", None)
+        if kwargs:
+            warnings.warn(
+                PYTEST_WARNS_UNKNOWN_KWARGS.format(args=sorted(kwargs)), stacklevel=2
+            )
         return WarningsChecker(expected_warning, match_expr=match_expr)
     elif isinstance(args[0], str):
-        code, = args
+        warnings.warn(WARNS_EXEC, stacklevel=2)
+        (code,) = args
         assert isinstance(code, str)
         frame = sys._getframe(1)
         loc = frame.f_locals.copy()
         loc.update(kwargs)
 
-        with WarningsChecker(expected_warning, match_expr=match_expr):
+        with WarningsChecker(expected_warning):
             code = _pytest._code.Source(code).compile()
-            py.builtin.exec_(code, frame.f_globals, loc)
+            exec(code, frame.f_globals, loc)
     else:
         func = args[0]
-        with WarningsChecker(expected_warning, match_expr=match_expr):
+        with WarningsChecker(expected_warning):
             return func(*args[1:], **kwargs)
 
 
@@ -183,23 +156,56 @@ class WarningsRecorder(warnings.catch_warnings):
             raise RuntimeError("Cannot enter %r twice" % self)
         self._list = super(WarningsRecorder, self).__enter__()
         warnings.simplefilter("always")
+        # python3 keeps track of a "filter version", when the filters are
+        # updated previously seen warnings can be re-warned.  python2 has no
+        # concept of this so we must reset the warnings registry manually.
+        # trivial patching of `warnings.warn` seems to be enough somehow?
+        if six.PY2:
+
+            def warn(message, category=None, stacklevel=1):
+                # duplicate the stdlib logic due to
+                # bad handing in the c version of warnings
+                if isinstance(message, Warning):
+                    category = message.__class__
+                # Check category argument
+                if category is None:
+                    category = UserWarning
+                assert issubclass(category, Warning)
+
+                # emulate resetting the warn registry
+                f_globals = sys._getframe(stacklevel).f_globals
+                if "__warningregistry__" in f_globals:
+                    orig = f_globals["__warningregistry__"]
+                    f_globals["__warningregistry__"] = None
+                    try:
+                        return self._saved_warn(message, category, stacklevel + 1)
+                    finally:
+                        f_globals["__warningregistry__"] = orig
+                else:
+                    return self._saved_warn(message, category, stacklevel + 1)
+
+            warnings.warn, self._saved_warn = warn, warnings.warn
         return self
 
     def __exit__(self, *exc_info):
         if not self._entered:
             __tracebackhide__ = True
             raise RuntimeError("Cannot exit %r without entering first" % self)
+        # see above where `self._saved_warn` is assigned
+        if six.PY2:
+            warnings.warn = self._saved_warn
         super(WarningsRecorder, self).__exit__(*exc_info)
 
+        # Built-in catch_warnings does not reset entered state so we do it
+        # manually here for this context manager to become reusable.
+        self._entered = False
+
 
 class WarningsChecker(WarningsRecorder):
-
     def __init__(self, expected_warning=None, match_expr=None):
         super(WarningsChecker, self).__init__()
 
-        msg = (
-            "exceptions must be old-style classes or " "derived from Warning, not %s"
-        )
+        msg = "exceptions must be old-style classes or derived from Warning, not %s"
         if isinstance(expected_warning, tuple):
             for exc in expected_warning:
                 if not inspect.isclass(exc):
@@ -215,6 +221,8 @@ class WarningsChecker(WarningsRecorder):
     def __exit__(self, *exc_info):
         super(WarningsChecker, self).__exit__(*exc_info)
 
+        __tracebackhide__ = True
+
         # only check if we're not currently handling an exception
         if all(a is None for a in exc_info):
             if self.expected_warning is not None:
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/reports.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/reports.py
new file mode 100644
index 00000000000..0bba6762c33
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/reports.py
@@ -0,0 +1,435 @@
+# -*- coding: utf-8 -*-
+from pprint import pprint
+
+import py
+import six
+
+from _pytest._code.code import ExceptionInfo
+from _pytest._code.code import ReprEntry
+from _pytest._code.code import ReprEntryNative
+from _pytest._code.code import ReprExceptionInfo
+from _pytest._code.code import ReprFileLocation
+from _pytest._code.code import ReprFuncArgs
+from _pytest._code.code import ReprLocals
+from _pytest._code.code import ReprTraceback
+from _pytest._code.code import TerminalRepr
+from _pytest.outcomes import skip
+from _pytest.pathlib import Path
+
+
+def getslaveinfoline(node):
+    try:
+        return node._slaveinfocache
+    except AttributeError:
+        d = node.slaveinfo
+        ver = "%s.%s.%s" % d["version_info"][:3]
+        node._slaveinfocache = s = "[%s] %s -- Python %s %s" % (
+            d["id"],
+            d["sysplatform"],
+            ver,
+            d["executable"],
+        )
+        return s
+
+
+class BaseReport(object):
+    when = None
+    location = None
+
+    def __init__(self, **kw):
+        self.__dict__.update(kw)
+
+    def toterminal(self, out):
+        if hasattr(self, "node"):
+            out.line(getslaveinfoline(self.node))
+
+        longrepr = self.longrepr
+        if longrepr is None:
+            return
+
+        if hasattr(longrepr, "toterminal"):
+            longrepr.toterminal(out)
+        else:
+            try:
+                out.line(longrepr)
+            except UnicodeEncodeError:
+                out.line("<unprintable longrepr>")
+
+    def get_sections(self, prefix):
+        for name, content in self.sections:
+            if name.startswith(prefix):
+                yield prefix, content
+
+    @property
+    def longreprtext(self):
+        """
+        Read-only property that returns the full string representation
+        of ``longrepr``.
+
+        .. versionadded:: 3.0
+        """
+        tw = py.io.TerminalWriter(stringio=True)
+        tw.hasmarkup = False
+        self.toterminal(tw)
+        exc = tw.stringio.getvalue()
+        return exc.strip()
+
+    @property
+    def caplog(self):
+        """Return captured log lines, if log capturing is enabled
+
+        .. versionadded:: 3.5
+        """
+        return "\n".join(
+            content for (prefix, content) in self.get_sections("Captured log")
+        )
+
+    @property
+    def capstdout(self):
+        """Return captured text from stdout, if capturing is enabled
+
+        .. versionadded:: 3.0
+        """
+        return "".join(
+            content for (prefix, content) in self.get_sections("Captured stdout")
+        )
+
+    @property
+    def capstderr(self):
+        """Return captured text from stderr, if capturing is enabled
+
+        .. versionadded:: 3.0
+        """
+        return "".join(
+            content for (prefix, content) in self.get_sections("Captured stderr")
+        )
+
+    passed = property(lambda x: x.outcome == "passed")
+    failed = property(lambda x: x.outcome == "failed")
+    skipped = property(lambda x: x.outcome == "skipped")
+
+    @property
+    def fspath(self):
+        return self.nodeid.split("::")[0]
+
+    @property
+    def count_towards_summary(self):
+        """
+        **Experimental**
+
+        Returns True if this report should be counted towards the totals shown at the end of the
+        test session: "1 passed, 1 failure, etc".
+
+        .. note::
+
+            This function is considered **experimental**, so beware that it is subject to changes
+            even in patch releases.
+        """
+        return True
+
+    @property
+    def head_line(self):
+        """
+        **Experimental**
+
+        Returns the head line shown with longrepr output for this report, more commonly during
+        traceback representation during failures::
+
+            ________ Test.foo ________
+
+
+        In the example above, the head_line is "Test.foo".
+
+        .. note::
+
+            This function is considered **experimental**, so beware that it is subject to changes
+            even in patch releases.
+        """
+        if self.location is not None:
+            fspath, lineno, domain = self.location
+            return domain
+
+    def _get_verbose_word(self, config):
+        _category, _short, verbose = config.hook.pytest_report_teststatus(
+            report=self, config=config
+        )
+        return verbose
+
+    def _to_json(self):
+        """
+        This was originally the serialize_report() function from xdist (ca03269).
+
+        Returns the contents of this report as a dict of builtin entries, suitable for
+        serialization.
+
+        Experimental method.
+        """
+
+        def disassembled_report(rep):
+            reprtraceback = rep.longrepr.reprtraceback.__dict__.copy()
+            reprcrash = rep.longrepr.reprcrash.__dict__.copy()
+
+            new_entries = []
+            for entry in reprtraceback["reprentries"]:
+                entry_data = {
+                    "type": type(entry).__name__,
+                    "data": entry.__dict__.copy(),
+                }
+                for key, value in entry_data["data"].items():
+                    if hasattr(value, "__dict__"):
+                        entry_data["data"][key] = value.__dict__.copy()
+                new_entries.append(entry_data)
+
+            reprtraceback["reprentries"] = new_entries
+
+            return {
+                "reprcrash": reprcrash,
+                "reprtraceback": reprtraceback,
+                "sections": rep.longrepr.sections,
+            }
+
+        d = self.__dict__.copy()
+        if hasattr(self.longrepr, "toterminal"):
+            if hasattr(self.longrepr, "reprtraceback") and hasattr(
+                self.longrepr, "reprcrash"
+            ):
+                d["longrepr"] = disassembled_report(self)
+            else:
+                d["longrepr"] = six.text_type(self.longrepr)
+        else:
+            d["longrepr"] = self.longrepr
+        for name in d:
+            if isinstance(d[name], (py.path.local, Path)):
+                d[name] = str(d[name])
+            elif name == "result":
+                d[name] = None  # for now
+        return d
+
+    @classmethod
+    def _from_json(cls, reportdict):
+        """
+        This was originally the serialize_report() function from xdist (ca03269).
+
+        Factory method that returns either a TestReport or CollectReport, depending on the calling
+        class. It's the callers responsibility to know which class to pass here.
+
+        Experimental method.
+        """
+        if reportdict["longrepr"]:
+            if (
+                "reprcrash" in reportdict["longrepr"]
+                and "reprtraceback" in reportdict["longrepr"]
+            ):
+
+                reprtraceback = reportdict["longrepr"]["reprtraceback"]
+                reprcrash = reportdict["longrepr"]["reprcrash"]
+
+                unserialized_entries = []
+                reprentry = None
+                for entry_data in reprtraceback["reprentries"]:
+                    data = entry_data["data"]
+                    entry_type = entry_data["type"]
+                    if entry_type == "ReprEntry":
+                        reprfuncargs = None
+                        reprfileloc = None
+                        reprlocals = None
+                        if data["reprfuncargs"]:
+                            reprfuncargs = ReprFuncArgs(**data["reprfuncargs"])
+                        if data["reprfileloc"]:
+                            reprfileloc = ReprFileLocation(**data["reprfileloc"])
+                        if data["reprlocals"]:
+                            reprlocals = ReprLocals(data["reprlocals"]["lines"])
+
+                        reprentry = ReprEntry(
+                            lines=data["lines"],
+                            reprfuncargs=reprfuncargs,
+                            reprlocals=reprlocals,
+                            filelocrepr=reprfileloc,
+                            style=data["style"],
+                        )
+                    elif entry_type == "ReprEntryNative":
+                        reprentry = ReprEntryNative(data["lines"])
+                    else:
+                        _report_unserialization_failure(entry_type, cls, reportdict)
+                    unserialized_entries.append(reprentry)
+                reprtraceback["reprentries"] = unserialized_entries
+
+                exception_info = ReprExceptionInfo(
+                    reprtraceback=ReprTraceback(**reprtraceback),
+                    reprcrash=ReprFileLocation(**reprcrash),
+                )
+
+                for section in reportdict["longrepr"]["sections"]:
+                    exception_info.addsection(*section)
+                reportdict["longrepr"] = exception_info
+
+        return cls(**reportdict)
+
+
+def _report_unserialization_failure(type_name, report_class, reportdict):
+    url = "https://github.com/pytest-dev/pytest/issues"
+    stream = py.io.TextIO()
+    pprint("-" * 100, stream=stream)
+    pprint("INTERNALERROR: Unknown entry type returned: %s" % type_name, stream=stream)
+    pprint("report_name: %s" % report_class, stream=stream)
+    pprint(reportdict, stream=stream)
+    pprint("Please report this bug at %s" % url, stream=stream)
+    pprint("-" * 100, stream=stream)
+    raise RuntimeError(stream.getvalue())
+
+
+class TestReport(BaseReport):
+    """ Basic test report object (also used for setup and teardown calls if
+    they fail).
+    """
+
+    __test__ = False
+
+    def __init__(
+        self,
+        nodeid,
+        location,
+        keywords,
+        outcome,
+        longrepr,
+        when,
+        sections=(),
+        duration=0,
+        user_properties=None,
+        **extra
+    ):
+        #: normalized collection node id
+        self.nodeid = nodeid
+
+        #: a (filesystempath, lineno, domaininfo) tuple indicating the
+        #: actual location of a test item - it might be different from the
+        #: collected one e.g. if a method is inherited from a different module.
+        self.location = location
+
+        #: a name -> value dictionary containing all keywords and
+        #: markers associated with a test invocation.
+        self.keywords = keywords
+
+        #: test outcome, always one of "passed", "failed", "skipped".
+        self.outcome = outcome
+
+        #: None or a failure representation.
+        self.longrepr = longrepr
+
+        #: one of 'setup', 'call', 'teardown' to indicate runtest phase.
+        self.when = when
+
+        #: user properties is a list of tuples (name, value) that holds user
+        #: defined properties of the test
+        self.user_properties = list(user_properties or [])
+
+        #: list of pairs ``(str, str)`` of extra information which needs to
+        #: marshallable. Used by pytest to add captured text
+        #: from ``stdout`` and ``stderr``, but may be used by other plugins
+        #: to add arbitrary information to reports.
+        self.sections = list(sections)
+
+        #: time it took to run just the test
+        self.duration = duration
+
+        self.__dict__.update(extra)
+
+    def __repr__(self):
+        return "<%s %r when=%r outcome=%r>" % (
+            self.__class__.__name__,
+            self.nodeid,
+            self.when,
+            self.outcome,
+        )
+
+    @classmethod
+    def from_item_and_call(cls, item, call):
+        """
+        Factory method to create and fill a TestReport with standard item and call info.
+        """
+        when = call.when
+        duration = call.stop - call.start
+        keywords = {x: 1 for x in item.keywords}
+        excinfo = call.excinfo
+        sections = []
+        if not call.excinfo:
+            outcome = "passed"
+            longrepr = None
+        else:
+            if not isinstance(excinfo, ExceptionInfo):
+                outcome = "failed"
+                longrepr = excinfo
+            elif excinfo.errisinstance(skip.Exception):
+                outcome = "skipped"
+                r = excinfo._getreprcrash()
+                longrepr = (str(r.path), r.lineno, r.message)
+            else:
+                outcome = "failed"
+                if call.when == "call":
+                    longrepr = item.repr_failure(excinfo)
+                else:  # exception in setup or teardown
+                    longrepr = item._repr_failure_py(
+                        excinfo, style=item.config.getoption("tbstyle", "auto")
+                    )
+        for rwhen, key, content in item._report_sections:
+            sections.append(("Captured %s %s" % (key, rwhen), content))
+        return cls(
+            item.nodeid,
+            item.location,
+            keywords,
+            outcome,
+            longrepr,
+            when,
+            sections,
+            duration,
+            user_properties=item.user_properties,
+        )
+
+
+class CollectReport(BaseReport):
+    when = "collect"
+
+    def __init__(self, nodeid, outcome, longrepr, result, sections=(), **extra):
+        self.nodeid = nodeid
+        self.outcome = outcome
+        self.longrepr = longrepr
+        self.result = result or []
+        self.sections = list(sections)
+        self.__dict__.update(extra)
+
+    @property
+    def location(self):
+        return (self.fspath, None, self.fspath)
+
+    def __repr__(self):
+        return "<CollectReport %r lenresult=%s outcome=%r>" % (
+            self.nodeid,
+            len(self.result),
+            self.outcome,
+        )
+
+
+class CollectErrorRepr(TerminalRepr):
+    def __init__(self, msg):
+        self.longrepr = msg
+
+    def toterminal(self, out):
+        out.line(self.longrepr, red=True)
+
+
+def pytest_report_to_serializable(report):
+    if isinstance(report, (TestReport, CollectReport)):
+        data = report._to_json()
+        data["_report_type"] = report.__class__.__name__
+        return data
+
+
+def pytest_report_from_serializable(data):
+    if "_report_type" in data:
+        if data["_report_type"] == "TestReport":
+            return TestReport._from_json(data)
+        elif data["_report_type"] == "CollectReport":
+            return CollectReport._from_json(data)
+        assert False, "Unknown report_type unserialize data: {}".format(
+            data["_report_type"]
+        )
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/resultlog.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/resultlog.py
index 8f300c98300..bd30b5071e9 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/resultlog.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/resultlog.py
@@ -1,10 +1,14 @@
+# -*- coding: utf-8 -*-
 """ log machine-parseable test session result information in a plain
 text file.
 """
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import os
 
 import py
-import os
 
 
 def pytest_addoption(parser):
@@ -31,8 +35,9 @@ def pytest_configure(config):
         config.pluginmanager.register(config._resultlog)
 
         from _pytest.deprecated import RESULT_LOG
+        from _pytest.warnings import _issue_warning_captured
 
-        config.warn("C1", RESULT_LOG)
+        _issue_warning_captured(RESULT_LOG, config.hook, stacklevel=2)
 
 
 def pytest_unconfigure(config):
@@ -43,32 +48,7 @@ def pytest_unconfigure(config):
         config.pluginmanager.unregister(resultlog)
 
 
-def generic_path(item):
-    chain = item.listchain()
-    gpath = [chain[0].name]
-    fspath = chain[0].fspath
-    fspart = False
-    for node in chain[1:]:
-        newfspath = node.fspath
-        if newfspath == fspath:
-            if fspart:
-                gpath.append(":")
-                fspart = False
-            else:
-                gpath.append(".")
-        else:
-            gpath.append("/")
-            fspart = True
-        name = node.name
-        if name[0] in "([":
-            gpath.pop()
-        gpath.append(name)
-        fspath = newfspath
-    return "".join(gpath)
-
-
 class ResultLog(object):
-
     def __init__(self, config, logfile):
         self.config = config
         self.logfile = logfile  # preferably line buffered
@@ -87,7 +67,9 @@ class ResultLog(object):
     def pytest_runtest_logreport(self, report):
         if report.when != "call" and report.passed:
             return
-        res = self.config.hook.pytest_report_teststatus(report=report)
+        res = self.config.hook.pytest_report_teststatus(
+            report=report, config=self.config
+        )
         code = res[1]
         if code == "x":
             longrepr = str(report.longrepr)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/runner.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/runner.py
index 18e925509ec..d51e859f1d1 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/runner.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/runner.py
@@ -1,14 +1,24 @@
+# -*- coding: utf-8 -*-
 """ basic collect and runtest protocol implementations """
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import bdb
 import os
 import sys
 from time import time
 
-import py
-from _pytest._code.code import TerminalRepr, ExceptionInfo
-from _pytest.outcomes import skip, Skipped, TEST_OUTCOME
+import attr
+import six
+
+from .reports import CollectErrorRepr
+from .reports import CollectReport
+from .reports import TestReport
+from _pytest._code.code import ExceptionInfo
+from _pytest.outcomes import Exit
+from _pytest.outcomes import Skipped
+from _pytest.outcomes import TEST_OUTCOME
 
 #
 # pytest plugin hooks
@@ -28,6 +38,7 @@ def pytest_addoption(parser):
 
 def pytest_terminal_summary(terminalreporter):
     durations = terminalreporter.config.option.durations
+    verbose = terminalreporter.config.getvalue("verbose")
     if durations is None:
         return
     tr = terminalreporter
@@ -47,8 +58,11 @@ def pytest_terminal_summary(terminalreporter):
         dlist = dlist[:durations]
 
     for rep in dlist:
-        nodeid = rep.nodeid.replace("::()::", "::")
-        tr.write_line("%02.2fs %-8s %s" % (rep.duration, rep.when, nodeid))
+        if verbose < 2 and rep.duration < 0.005:
+            tr.write_line("")
+            tr.write_line("(0.00 durations hidden.  Use -vv to show these durations.)")
+            break
+        tr.write_line("%02.2fs %-8s %s" % (rep.duration, rep.when, rep.nodeid))
 
 
 def pytest_sessionstart(session):
@@ -73,9 +87,9 @@ def runtestprotocol(item, log=True, nextitem=None):
     rep = call_and_report(item, "setup", log)
     reports = [rep]
     if rep.passed:
-        if item.config.option.setupshow:
+        if item.config.getoption("setupshow", False):
             show_test_item(item)
-        if not item.config.option.setuponly:
+        if not item.config.getoption("setuponly", False):
             reports.append(call_and_report(item, "call", log))
     reports.append(call_and_report(item, "teardown", log, nextitem=nextitem))
     # after all teardown hooks have been called
@@ -169,7 +183,7 @@ def call_and_report(item, when, log=True, **kwds):
 def check_interactive_exception(call, report):
     return call.excinfo and not (
         hasattr(report, "wasxfail")
-        or call.excinfo.errisinstance(skip.Exception)
+        or call.excinfo.errisinstance(Skipped)
         or call.excinfo.errisinstance(bdb.BdbQuit)
     )
 
@@ -177,246 +191,66 @@ def check_interactive_exception(call, report):
 def call_runtest_hook(item, when, **kwds):
     hookname = "pytest_runtest_" + when
     ihook = getattr(item.ihook, hookname)
-    return CallInfo(
-        lambda: ihook(item=item, **kwds),
-        when=when,
-        treat_keyboard_interrupt_as_exception=item.config.getvalue("usepdb"),
+    reraise = (Exit,)
+    if not item.config.getoption("usepdb", False):
+        reraise += (KeyboardInterrupt,)
+    return CallInfo.from_call(
+        lambda: ihook(item=item, **kwds), when=when, reraise=reraise
     )
 
 
+@attr.s(repr=False)
 class CallInfo(object):
     """ Result/Exception info a function invocation. """
-    #: None or ExceptionInfo object.
-    excinfo = None
 
-    def __init__(self, func, when, treat_keyboard_interrupt_as_exception=False):
+    _result = attr.ib()
+    # Optional[ExceptionInfo]
+    excinfo = attr.ib()
+    start = attr.ib()
+    stop = attr.ib()
+    when = attr.ib()
+
+    @property
+    def result(self):
+        if self.excinfo is not None:
+            raise AttributeError("{!r} has no valid result".format(self))
+        return self._result
+
+    @classmethod
+    def from_call(cls, func, when, reraise=None):
         #: context of invocation: one of "setup", "call",
         #: "teardown", "memocollect"
-        self.when = when
-        self.start = time()
+        start = time()
+        excinfo = None
         try:
-            self.result = func()
-        except KeyboardInterrupt:
-            if treat_keyboard_interrupt_as_exception:
-                self.excinfo = ExceptionInfo()
-            else:
-                self.stop = time()
-                raise
+            result = func()
         except:  # noqa
-            self.excinfo = ExceptionInfo()
-        self.stop = time()
+            excinfo = ExceptionInfo.from_current()
+            if reraise is not None and excinfo.errisinstance(reraise):
+                raise
+            result = None
+        stop = time()
+        return cls(start=start, stop=stop, when=when, result=result, excinfo=excinfo)
 
     def __repr__(self):
-        if self.excinfo:
-            status = "exception: %s" % str(self.excinfo.value)
+        if self.excinfo is not None:
+            status = "exception"
+            value = self.excinfo.value
         else:
-            status = "result: %r" % (self.result,)
-        return "<CallInfo when=%r %s>" % (self.when, status)
-
-
-def getslaveinfoline(node):
-    try:
-        return node._slaveinfocache
-    except AttributeError:
-        d = node.slaveinfo
-        ver = "%s.%s.%s" % d["version_info"][:3]
-        node._slaveinfocache = s = "[%s] %s -- Python %s %s" % (
-            d["id"], d["sysplatform"], ver, d["executable"]
+            # TODO: investigate unification
+            value = repr(self._result)
+            status = "result"
+        return "<CallInfo when={when!r} {status}: {value}>".format(
+            when=self.when, value=value, status=status
         )
-        return s
-
-
-class BaseReport(object):
-
-    def __init__(self, **kw):
-        self.__dict__.update(kw)
-
-    def toterminal(self, out):
-        if hasattr(self, "node"):
-            out.line(getslaveinfoline(self.node))
-
-        longrepr = self.longrepr
-        if longrepr is None:
-            return
-
-        if hasattr(longrepr, "toterminal"):
-            longrepr.toterminal(out)
-        else:
-            try:
-                out.line(longrepr)
-            except UnicodeEncodeError:
-                out.line("<unprintable longrepr>")
-
-    def get_sections(self, prefix):
-        for name, content in self.sections:
-            if name.startswith(prefix):
-                yield prefix, content
-
-    @property
-    def longreprtext(self):
-        """
-        Read-only property that returns the full string representation
-        of ``longrepr``.
-
-        .. versionadded:: 3.0
-        """
-        tw = py.io.TerminalWriter(stringio=True)
-        tw.hasmarkup = False
-        self.toterminal(tw)
-        exc = tw.stringio.getvalue()
-        return exc.strip()
-
-    @property
-    def caplog(self):
-        """Return captured log lines, if log capturing is enabled
-
-        .. versionadded:: 3.5
-        """
-        return "\n".join(
-            content for (prefix, content) in self.get_sections("Captured log")
-        )
-
-    @property
-    def capstdout(self):
-        """Return captured text from stdout, if capturing is enabled
-
-        .. versionadded:: 3.0
-        """
-        return "".join(
-            content for (prefix, content) in self.get_sections("Captured stdout")
-        )
-
-    @property
-    def capstderr(self):
-        """Return captured text from stderr, if capturing is enabled
-
-        .. versionadded:: 3.0
-        """
-        return "".join(
-            content for (prefix, content) in self.get_sections("Captured stderr")
-        )
-
-    passed = property(lambda x: x.outcome == "passed")
-    failed = property(lambda x: x.outcome == "failed")
-    skipped = property(lambda x: x.outcome == "skipped")
-
-    @property
-    def fspath(self):
-        return self.nodeid.split("::")[0]
 
 
 def pytest_runtest_makereport(item, call):
-    when = call.when
-    duration = call.stop - call.start
-    keywords = {x: 1 for x in item.keywords}
-    excinfo = call.excinfo
-    sections = []
-    if not call.excinfo:
-        outcome = "passed"
-        longrepr = None
-    else:
-        if not isinstance(excinfo, ExceptionInfo):
-            outcome = "failed"
-            longrepr = excinfo
-        elif excinfo.errisinstance(skip.Exception):
-            outcome = "skipped"
-            r = excinfo._getreprcrash()
-            longrepr = (str(r.path), r.lineno, r.message)
-        else:
-            outcome = "failed"
-            if call.when == "call":
-                longrepr = item.repr_failure(excinfo)
-            else:  # exception in setup or teardown
-                longrepr = item._repr_failure_py(
-                    excinfo, style=item.config.option.tbstyle
-                )
-    for rwhen, key, content in item._report_sections:
-        sections.append(("Captured %s %s" % (key, rwhen), content))
-    return TestReport(
-        item.nodeid,
-        item.location,
-        keywords,
-        outcome,
-        longrepr,
-        when,
-        sections,
-        duration,
-        user_properties=item.user_properties,
-    )
-
-
-class TestReport(BaseReport):
-    """ Basic test report object (also used for setup and teardown calls if
-    they fail).
-    """
-
-    def __init__(
-        self,
-        nodeid,
-        location,
-        keywords,
-        outcome,
-        longrepr,
-        when,
-        sections=(),
-        duration=0,
-        user_properties=(),
-        **extra
-    ):
-        #: normalized collection node id
-        self.nodeid = nodeid
-
-        #: a (filesystempath, lineno, domaininfo) tuple indicating the
-        #: actual location of a test item - it might be different from the
-        #: collected one e.g. if a method is inherited from a different module.
-        self.location = location
-
-        #: a name -> value dictionary containing all keywords and
-        #: markers associated with a test invocation.
-        self.keywords = keywords
-
-        #: test outcome, always one of "passed", "failed", "skipped".
-        self.outcome = outcome
-
-        #: None or a failure representation.
-        self.longrepr = longrepr
-
-        #: one of 'setup', 'call', 'teardown' to indicate runtest phase.
-        self.when = when
-
-        #: user properties is a list of tuples (name, value) that holds user
-        #: defined properties of the test
-        self.user_properties = user_properties
-
-        #: list of pairs ``(str, str)`` of extra information which needs to
-        #: marshallable. Used by pytest to add captured text
-        #: from ``stdout`` and ``stderr``, but may be used by other plugins
-        #: to add arbitrary information to reports.
-        self.sections = list(sections)
-
-        #: time it took to run just the test
-        self.duration = duration
-
-        self.__dict__.update(extra)
-
-    def __repr__(self):
-        return "<TestReport %r when=%r outcome=%r>" % (
-            self.nodeid, self.when, self.outcome
-        )
-
-
-class TeardownErrorReport(BaseReport):
-    outcome = "failed"
-    when = "teardown"
-
-    def __init__(self, longrepr, **extra):
-        self.longrepr = longrepr
-        self.sections = []
-        self.__dict__.update(extra)
+    return TestReport.from_item_and_call(item, call)
 
 
 def pytest_make_collect_report(collector):
-    call = CallInfo(lambda: list(collector.collect()), "collect")
+    call = CallInfo.from_call(lambda: list(collector.collect()), "collect")
     longrepr = None
     if not call.excinfo:
         outcome = "passed"
@@ -441,35 +275,6 @@ def pytest_make_collect_report(collector):
     return rep
 
 
-class CollectReport(BaseReport):
-
-    def __init__(self, nodeid, outcome, longrepr, result, sections=(), **extra):
-        self.nodeid = nodeid
-        self.outcome = outcome
-        self.longrepr = longrepr
-        self.result = result or []
-        self.sections = list(sections)
-        self.__dict__.update(extra)
-
-    @property
-    def location(self):
-        return (self.fspath, None, self.fspath)
-
-    def __repr__(self):
-        return "<CollectReport %r lenresult=%s outcome=%r>" % (
-            self.nodeid, len(self.result), self.outcome
-        )
-
-
-class CollectErrorRepr(TerminalRepr):
-
-    def __init__(self, msg):
-        self.longrepr = msg
-
-    def toterminal(self, out):
-        out.line(self.longrepr, red=True)
-
-
 class SetupState(object):
     """ shared state for setting up/tearing down test items or collectors. """
 
@@ -504,7 +309,7 @@ class SetupState(object):
                 if exc is None:
                     exc = sys.exc_info()
         if exc:
-            py.builtin._reraise(*exc)
+            six.reraise(*exc)
 
     def _teardown_with_finalization(self, colitem):
         self._callfinalizers(colitem)
@@ -529,7 +334,7 @@ class SetupState(object):
     def _teardown_towards(self, needed_collectors):
         exc = None
         while self.stack:
-            if self.stack == needed_collectors[:len(self.stack)]:
+            if self.stack == needed_collectors[: len(self.stack)]:
                 break
             try:
                 self._pop_and_teardown()
@@ -539,7 +344,7 @@ class SetupState(object):
                 if exc is None:
                     exc = sys.exc_info()
         if exc:
-            py.builtin._reraise(*exc)
+            six.reraise(*exc)
 
     def prepare(self, colitem):
         """ setup objects along the collector chain to the test-method
@@ -550,8 +355,8 @@ class SetupState(object):
         # check if the last collection node has raised an error
         for col in self.stack:
             if hasattr(col, "_prepare_exc"):
-                py.builtin._reraise(*col._prepare_exc)
-        for col in needed_collectors[len(self.stack):]:
+                six.reraise(*col._prepare_exc)
+        for col in needed_collectors[len(self.stack) :]:
             self.stack.append(col)
             try:
                 col.setup()
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/setuponly.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/setuponly.py
index 81240d9d055..0859011241a 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/setuponly.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/setuponly.py
@@ -1,7 +1,11 @@
-from __future__ import absolute_import, division, print_function
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import sys
 
 import pytest
-import sys
 
 
 def pytest_addoption(parser):
@@ -51,7 +55,8 @@ def _show_fixture_action(fixturedef, msg):
     config = fixturedef._fixturemanager.config
     capman = config.pluginmanager.getplugin("capturemanager")
     if capman:
-        out, err = capman.suspend_global_capture()
+        capman.suspend_global_capture()
+        out, err = capman.read_global_capture()
 
     tw = config.get_terminal_writer()
     tw.line()
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/setupplan.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/setupplan.py
index 23f4f97e6d9..47b0fe82ef6 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/setupplan.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/setupplan.py
@@ -1,4 +1,7 @@
-from __future__ import absolute_import, division, print_function
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import pytest
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/skipping.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/skipping.py
index a348d5484cd..bc8b88e7178 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/skipping.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/skipping.py
@@ -1,9 +1,14 @@
+# -*- coding: utf-8 -*-
 """ support for skip/xfail functions and markers. """
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 from _pytest.config import hookimpl
 from _pytest.mark.evaluate import MarkEvaluator
-from _pytest.outcomes import fail, skip, xfail
+from _pytest.outcomes import fail
+from _pytest.outcomes import skip
+from _pytest.outcomes import xfail
 
 
 def pytest_addoption(parser):
@@ -13,7 +18,7 @@ def pytest_addoption(parser):
         action="store_true",
         dest="runxfail",
         default=False,
-        help="run tests even if they are marked xfail",
+        help="report the results of xfail tests as if they were not marked",
     )
 
     parser.addini(
@@ -51,7 +56,7 @@ def pytest_configure(config):
         "results in a True value.  Evaluation happens within the "
         "module global context. Example: skipif('sys.platform == \"win32\"') "
         "skips the test if we are on the win32 platform. see "
-        "http://pytest.org/latest/skipping.html",
+        "https://docs.pytest.org/en/latest/skipping.html",
     )
     config.addinivalue_line(
         "markers",
@@ -61,7 +66,7 @@ def pytest_configure(config):
         "and run=False if you don't even want to execute the test function. "
         "If only specific exception(s) are expected, you can list them in "
         "raises, and if the test fails in other ways, it will be reported as "
-        "a true failure. See http://pytest.org/latest/skipping.html",
+        "a true failure. See https://docs.pytest.org/en/latest/skipping.html",
     )
 
 
@@ -157,9 +162,11 @@ def pytest_runtest_makereport(item, call):
             else:
                 rep.outcome = "passed"
                 rep.wasxfail = explanation
-    elif getattr(item, "_skipped_by_mark", False) and rep.skipped and type(
-        rep.longrepr
-    ) is tuple:
+    elif (
+        getattr(item, "_skipped_by_mark", False)
+        and rep.skipped
+        and type(rep.longrepr) is tuple
+    ):
         # skipped by mark.skipif; change the location of the failure
         # to point to the item definition, otherwise it will display
         # the location of where the skip exception was raised within pytest
@@ -174,120 +181,6 @@ def pytest_runtest_makereport(item, call):
 def pytest_report_teststatus(report):
     if hasattr(report, "wasxfail"):
         if report.skipped:
-            return "xfailed", "x", "xfail"
+            return "xfailed", "x", "XFAIL"
         elif report.passed:
-            return "xpassed", "X", ("XPASS", {"yellow": True})
-
-
-# called by the terminalreporter instance/plugin
-
-
-def pytest_terminal_summary(terminalreporter):
-    tr = terminalreporter
-    if not tr.reportchars:
-        # for name in "xfailed skipped failed xpassed":
-        #    if not tr.stats.get(name, 0):
-        #        tr.write_line("HINT: use '-r' option to see extra "
-        #              "summary info about tests")
-        #        break
-        return
-
-    lines = []
-    for char in tr.reportchars:
-        action = REPORTCHAR_ACTIONS.get(char, lambda tr, lines: None)
-        action(terminalreporter, lines)
-
-    if lines:
-        tr._tw.sep("=", "short test summary info")
-        for line in lines:
-            tr._tw.line(line)
-
-
-def show_simple(terminalreporter, lines, stat, format):
-    failed = terminalreporter.stats.get(stat)
-    if failed:
-        for rep in failed:
-            pos = terminalreporter.config.cwd_relative_nodeid(rep.nodeid)
-            lines.append(format % (pos,))
-
-
-def show_xfailed(terminalreporter, lines):
-    xfailed = terminalreporter.stats.get("xfailed")
-    if xfailed:
-        for rep in xfailed:
-            pos = terminalreporter.config.cwd_relative_nodeid(rep.nodeid)
-            reason = rep.wasxfail
-            lines.append("XFAIL %s" % (pos,))
-            if reason:
-                lines.append("  " + str(reason))
-
-
-def show_xpassed(terminalreporter, lines):
-    xpassed = terminalreporter.stats.get("xpassed")
-    if xpassed:
-        for rep in xpassed:
-            pos = terminalreporter.config.cwd_relative_nodeid(rep.nodeid)
-            reason = rep.wasxfail
-            lines.append("XPASS %s %s" % (pos, reason))
-
-
-def folded_skips(skipped):
-    d = {}
-    for event in skipped:
-        key = event.longrepr
-        assert len(key) == 3, (event, key)
-        keywords = getattr(event, "keywords", {})
-        # folding reports with global pytestmark variable
-        # this is workaround, because for now we cannot identify the scope of a skip marker
-        # TODO: revisit after marks scope would be fixed
-        when = getattr(event, "when", None)
-        if when == "setup" and "skip" in keywords and "pytestmark" not in keywords:
-            key = (key[0], None, key[2])
-        d.setdefault(key, []).append(event)
-    values = []
-    for key, events in d.items():
-        values.append((len(events),) + key)
-    return values
-
-
-def show_skipped(terminalreporter, lines):
-    tr = terminalreporter
-    skipped = tr.stats.get("skipped", [])
-    if skipped:
-        # if not tr.hasopt('skipped'):
-        #    tr.write_line(
-        #        "%d skipped tests, specify -rs for more info" %
-        #        len(skipped))
-        #    return
-        fskips = folded_skips(skipped)
-        if fskips:
-            # tr.write_sep("_", "skipped test summary")
-            for num, fspath, lineno, reason in fskips:
-                if reason.startswith("Skipped: "):
-                    reason = reason[9:]
-                if lineno is not None:
-                    lines.append(
-                        "SKIP [%d] %s:%d: %s" % (num, fspath, lineno + 1, reason)
-                    )
-                else:
-                    lines.append("SKIP [%d] %s: %s" % (num, fspath, reason))
-
-
-def shower(stat, format):
-
-    def show_(terminalreporter, lines):
-        return show_simple(terminalreporter, lines, stat, format)
-
-    return show_
-
-
-REPORTCHAR_ACTIONS = {
-    "x": show_xfailed,
-    "X": show_xpassed,
-    "f": shower("failed", "FAIL %s"),
-    "F": shower("failed", "FAIL %s"),
-    "s": show_skipped,
-    "S": show_skipped,
-    "p": shower("passed", "PASSED %s"),
-    "E": shower("error", "ERROR %s"),
-}
+            return "xpassed", "X", "XPASS"
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/stepwise.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/stepwise.py
new file mode 100644
index 00000000000..88902595896
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/stepwise.py
@@ -0,0 +1,109 @@
+# -*- coding: utf-8 -*-
+import pytest
+
+
+def pytest_addoption(parser):
+    group = parser.getgroup("general")
+    group.addoption(
+        "--sw",
+        "--stepwise",
+        action="store_true",
+        dest="stepwise",
+        help="exit on test failure and continue from last failing test next time",
+    )
+    group.addoption(
+        "--stepwise-skip",
+        action="store_true",
+        dest="stepwise_skip",
+        help="ignore the first failing test but stop on the next failing test",
+    )
+
+
+@pytest.hookimpl
+def pytest_configure(config):
+    config.pluginmanager.register(StepwisePlugin(config), "stepwiseplugin")
+
+
+class StepwisePlugin:
+    def __init__(self, config):
+        self.config = config
+        self.active = config.getvalue("stepwise")
+        self.session = None
+        self.report_status = ""
+
+        if self.active:
+            self.lastfailed = config.cache.get("cache/stepwise", None)
+            self.skip = config.getvalue("stepwise_skip")
+
+    def pytest_sessionstart(self, session):
+        self.session = session
+
+    def pytest_collection_modifyitems(self, session, config, items):
+        if not self.active:
+            return
+        if not self.lastfailed:
+            self.report_status = "no previously failed tests, not skipping."
+            return
+
+        already_passed = []
+        found = False
+
+        # Make a list of all tests that have been run before the last failing one.
+        for item in items:
+            if item.nodeid == self.lastfailed:
+                found = True
+                break
+            else:
+                already_passed.append(item)
+
+        # If the previously failed test was not found among the test items,
+        # do not skip any tests.
+        if not found:
+            self.report_status = "previously failed test not found, not skipping."
+            already_passed = []
+        else:
+            self.report_status = "skipping {} already passed items.".format(
+                len(already_passed)
+            )
+
+        for item in already_passed:
+            items.remove(item)
+
+        config.hook.pytest_deselected(items=already_passed)
+
+    def pytest_runtest_logreport(self, report):
+        if not self.active:
+            return
+
+        if report.failed:
+            if self.skip:
+                # Remove test from the failed ones (if it exists) and unset the skip option
+                # to make sure the following tests will not be skipped.
+                if report.nodeid == self.lastfailed:
+                    self.lastfailed = None
+
+                self.skip = False
+            else:
+                # Mark test as the last failing and interrupt the test session.
+                self.lastfailed = report.nodeid
+                self.session.shouldstop = (
+                    "Test failed, continuing from this test next run."
+                )
+
+        else:
+            # If the test was actually run and did pass.
+            if report.when == "call":
+                # Remove test from the failed ones, if exists.
+                if report.nodeid == self.lastfailed:
+                    self.lastfailed = None
+
+    def pytest_report_collectionfinish(self):
+        if self.active and self.config.getoption("verbose") >= 0 and self.report_status:
+            return "stepwise: %s" % self.report_status
+
+    def pytest_sessionfinish(self, session):
+        if self.active:
+            self.config.cache.set("cache/stepwise", self.lastfailed)
+        else:
+            # Clear the list of failing tests if the plugin is not active.
+            self.config.cache.set("cache/stepwise", [])
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/terminal.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/terminal.py
index 9c4eec7531a..4418338c656 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/terminal.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/terminal.py
@@ -1,14 +1,20 @@
+# -*- coding: utf-8 -*-
 """ terminal reporting of the full testing process.
 
 This is a good source for looking at the various reporting hooks.
 """
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
-import itertools
+import argparse
+import collections
 import platform
 import sys
 import time
+from functools import partial
 
+import attr
 import pluggy
 import py
 import six
@@ -16,16 +22,13 @@ from more_itertools import collapse
 
 import pytest
 from _pytest import nodes
-from _pytest.main import (
-    EXIT_OK,
-    EXIT_TESTSFAILED,
-    EXIT_INTERRUPTED,
-    EXIT_USAGEERROR,
-    EXIT_NOTESTSCOLLECTED,
-)
+from _pytest.main import EXIT_INTERRUPTED
+from _pytest.main import EXIT_NOTESTSCOLLECTED
+from _pytest.main import EXIT_OK
+from _pytest.main import EXIT_TESTSFAILED
+from _pytest.main import EXIT_USAGEERROR
 
-
-import argparse
+REPORT_COLLECTING_RESOLUTION = 0.5
 
 
 class MoreQuietAction(argparse.Action):
@@ -80,11 +83,11 @@ def pytest_addoption(parser):
         dest="reportchars",
         default="",
         metavar="chars",
-        help="show extra test summary info as specified by chars (f)ailed, "
-        "(E)error, (s)skipped, (x)failed, (X)passed, "
-        "(p)passed, (P)passed with output, (a)all except pP. "
+        help="show extra test summary info as specified by chars: (f)ailed, "
+        "(E)rror, (s)kipped, (x)failed, (X)passed, "
+        "(p)assed, (P)assed with output, (a)ll except passed (p/P), or (A)ll. "
         "Warnings are displayed at all times except when "
-        "--disable-warnings is set",
+        "--disable-warnings is set.",
     )
     group._addoption(
         "--disable-warnings",
@@ -139,7 +142,7 @@ def pytest_addoption(parser):
 
     parser.addini(
         "console_output_style",
-        help="console output: classic or with additional progress information (classic|progress).",
+        help='console output: "classic", or with additional progress information ("progress" (percentage) | "count").',
         default="progress",
     )
 
@@ -163,44 +166,52 @@ def getreportopt(config):
         reportchars += "w"
     elif config.option.disable_warnings and "w" in reportchars:
         reportchars = reportchars.replace("w", "")
-    if reportchars:
-        for char in reportchars:
-            if char not in reportopts and char != "a":
-                reportopts += char
-            elif char == "a":
-                reportopts = "fEsxXw"
+    aliases = {"F", "S"}
+    for char in reportchars:
+        # handle old aliases
+        if char in aliases:
+            char = char.lower()
+        if char == "a":
+            reportopts = "sxXwEf"
+        elif char == "A":
+            reportopts = "PpsxXwEf"
+            break
+        elif char not in reportopts:
+            reportopts += char
     return reportopts
 
 
+@pytest.hookimpl(trylast=True)  # after _pytest.runner
 def pytest_report_teststatus(report):
+    letter = "F"
     if report.passed:
         letter = "."
     elif report.skipped:
         letter = "s"
-    elif report.failed:
-        letter = "F"
-        if report.when != "call":
-            letter = "f"
-    return report.outcome, letter, report.outcome.upper()
+
+    outcome = report.outcome
+    if report.when in ("collect", "setup", "teardown") and outcome == "failed":
+        outcome = "error"
+        letter = "E"
+
+    return outcome, letter, outcome.upper()
 
 
+@attr.s
 class WarningReport(object):
     """
-    Simple structure to hold warnings information captured by ``pytest_logwarning``.
+    Simple structure to hold warnings information captured by ``pytest_warning_captured``.
+
+    :ivar str message: user friendly message about the warning
+    :ivar str|None nodeid: node id that generated the warning (see ``get_location``).
+    :ivar tuple|py.path.local fslocation:
+        file system location of the source of the warning (see ``get_location``).
     """
 
-    def __init__(self, code, message, nodeid=None, fslocation=None):
-        """
-        :param code: unused
-        :param str message: user friendly message about the warning
-        :param str|None nodeid: node id that generated the warning (see ``get_location``).
-        :param tuple|py.path.local fslocation:
-            file system location of the source of the warning (see ``get_location``).
-        """
-        self.code = code
-        self.message = message
-        self.nodeid = nodeid
-        self.fslocation = fslocation
+    message = attr.ib()
+    nodeid = attr.ib(default=None)
+    fslocation = attr.ib(default=None)
+    count_towards_summary = True
 
     def get_location(self, config):
         """
@@ -213,6 +224,8 @@ class WarningReport(object):
             if isinstance(self.fslocation, tuple) and len(self.fslocation) >= 2:
                 filename, linenum = self.fslocation[:2]
                 relpath = py.path.local(filename).relto(config.invocation_dir)
+                if not relpath:
+                    relpath = str(filename)
                 return "%s:%s" % (relpath, linenum)
             else:
                 return str(self.fslocation)
@@ -220,20 +233,16 @@ class WarningReport(object):
 
 
 class TerminalReporter(object):
-
     def __init__(self, config, file=None):
         import _pytest.config
 
         self.config = config
-        self.verbosity = self.config.option.verbose
-        self.showheader = self.verbosity >= 0
-        self.showfspath = self.verbosity >= 0
-        self.showlongtestinfo = self.verbosity > 0
         self._numcollected = 0
         self._session = None
+        self._showfspath = None
 
         self.stats = {}
-        self.startdir = py.path.local()
+        self.startdir = config.invocation_dir
         if file is None:
             file = sys.stdout
         self._tw = _pytest.config.create_terminal_writer(config, file)
@@ -246,31 +255,59 @@ class TerminalReporter(object):
         self.isatty = file.isatty()
         self._progress_nodeids_reported = set()
         self._show_progress_info = self._determine_show_progress_info()
+        self._collect_report_last_write = None
 
     def _determine_show_progress_info(self):
         """Return True if we should display progress information based on the current config"""
         # do not show progress if we are not capturing output (#3038)
-        if self.config.getoption("capture") == "no":
+        if self.config.getoption("capture", "no") == "no":
             return False
         # do not show progress if we are showing fixture setup/teardown
-        if self.config.getoption("setupshow"):
+        if self.config.getoption("setupshow", False):
             return False
-        return self.config.getini("console_output_style") == "progress"
+        cfg = self.config.getini("console_output_style")
+        if cfg in ("progress", "count"):
+            return cfg
+        return False
+
+    @property
+    def verbosity(self):
+        return self.config.option.verbose
+
+    @property
+    def showheader(self):
+        return self.verbosity >= 0
+
+    @property
+    def showfspath(self):
+        if self._showfspath is None:
+            return self.verbosity >= 0
+        return self._showfspath
+
+    @showfspath.setter
+    def showfspath(self, value):
+        self._showfspath = value
+
+    @property
+    def showlongtestinfo(self):
+        return self.verbosity > 0
 
     def hasopt(self, char):
         char = {"xfailed": "x", "skipped": "s"}.get(char, char)
         return char in self.reportchars
 
-    def write_fspath_result(self, nodeid, res):
+    def write_fspath_result(self, nodeid, res, **markup):
         fspath = self.config.rootdir.join(nodeid.split("::")[0])
-        if fspath != self.currentfspath:
-            if self.currentfspath is not None:
+        # NOTE: explicitly check for None to work around py bug, and for less
+        # overhead in general (https://github.com/pytest-dev/py/pull/207).
+        if self.currentfspath is None or fspath != self.currentfspath:
+            if self.currentfspath is not None and self._show_progress_info:
                 self._write_progress_information_filling_space()
             self.currentfspath = fspath
             fspath = self.startdir.bestrelpath(fspath)
             self._tw.line()
             self._tw.write(fspath + " ")
-        self._tw.write(res)
+        self._tw.write(res, **markup)
 
     def write_ensure_prefix(self, prefix, extra="", **kwargs):
         if self.currentfspath != prefix:
@@ -328,12 +365,19 @@ class TerminalReporter(object):
             self.write_line("INTERNALERROR> " + line)
         return 1
 
-    def pytest_logwarning(self, code, fslocation, message, nodeid):
+    def pytest_warning_captured(self, warning_message, item):
+        # from _pytest.nodes import get_fslocation_from_item
+        from _pytest.warnings import warning_record_to_str
+
         warnings = self.stats.setdefault("warnings", [])
-        warning = WarningReport(
-            code=code, fslocation=fslocation, message=message, nodeid=nodeid
+        fslocation = warning_message.filename, warning_message.lineno
+        message = warning_record_to_str(warning_message)
+
+        nodeid = item.nodeid if item is not None else ""
+        warning_report = WarningReport(
+            fslocation=fslocation, message=message, nodeid=nodeid
         )
-        warnings.append(warning)
+        warnings.append(warning_report)
 
     def pytest_plugin_registered(self, plugin):
         if self.config.option.traceconfig:
@@ -357,35 +401,38 @@ class TerminalReporter(object):
             self.write_fspath_result(fsid, "")
 
     def pytest_runtest_logreport(self, report):
+        self._tests_ran = True
         rep = report
-        res = self.config.hook.pytest_report_teststatus(report=rep)
-        cat, letter, word = res
+        res = self.config.hook.pytest_report_teststatus(report=rep, config=self.config)
+        category, letter, word = res
         if isinstance(word, tuple):
             word, markup = word
         else:
             markup = None
-        self.stats.setdefault(cat, []).append(rep)
-        self._tests_ran = True
+        self.stats.setdefault(category, []).append(rep)
         if not letter and not word:
             # probably passed setup/teardown
             return
         running_xdist = hasattr(rep, "node")
+        if markup is None:
+            was_xfail = hasattr(report, "wasxfail")
+            if rep.passed and not was_xfail:
+                markup = {"green": True}
+            elif rep.passed and was_xfail:
+                markup = {"yellow": True}
+            elif rep.failed:
+                markup = {"red": True}
+            elif rep.skipped:
+                markup = {"yellow": True}
+            else:
+                markup = {}
         if self.verbosity <= 0:
             if not running_xdist and self.showfspath:
-                self.write_fspath_result(rep.nodeid, letter)
+                self.write_fspath_result(rep.nodeid, letter, **markup)
             else:
-                self._tw.write(letter)
+                self._tw.write(letter, **markup)
         else:
             self._progress_nodeids_reported.add(rep.nodeid)
-            if markup is None:
-                if rep.passed:
-                    markup = {"green": True}
-                elif rep.failed:
-                    markup = {"red": True}
-                elif rep.skipped:
-                    markup = {"yellow": True}
-                else:
-                    markup = {}
             line = self._locationline(rep.nodeid, *rep.location)
             if not running_xdist:
                 self.write_ensure_prefix(line, word, **markup)
@@ -406,38 +453,61 @@ class TerminalReporter(object):
 
     def pytest_runtest_logfinish(self, nodeid):
         if self.verbosity <= 0 and self._show_progress_info:
+            if self._show_progress_info == "count":
+                num_tests = self._session.testscollected
+                progress_length = len(" [{}/{}]".format(str(num_tests), str(num_tests)))
+            else:
+                progress_length = len(" [100%]")
+
             self._progress_nodeids_reported.add(nodeid)
-            last_item = len(
-                self._progress_nodeids_reported
-            ) == self._session.testscollected
-            if last_item:
+            is_last_item = (
+                len(self._progress_nodeids_reported) == self._session.testscollected
+            )
+            if is_last_item:
                 self._write_progress_information_filling_space()
             else:
-                past_edge = self._tw.chars_on_current_line + self._PROGRESS_LENGTH + 1 >= self._screen_width
+                w = self._width_of_current_line
+                past_edge = w + progress_length + 1 >= self._screen_width
                 if past_edge:
                     msg = self._get_progress_information_message()
                     self._tw.write(msg + "\n", cyan=True)
 
-    _PROGRESS_LENGTH = len(" [100%]")
-
     def _get_progress_information_message(self):
-        if self.config.getoption("capture") == "no":
-            return ""
         collected = self._session.testscollected
-        if collected:
-            progress = len(self._progress_nodeids_reported) * 100 // collected
-            return " [{:3d}%]".format(progress)
-        return " [100%]"
+        if self._show_progress_info == "count":
+            if collected:
+                progress = self._progress_nodeids_reported
+                counter_format = "{{:{}d}}".format(len(str(collected)))
+                format_string = " [{}/{{}}]".format(counter_format)
+                return format_string.format(len(progress), collected)
+            return " [ {} / {} ]".format(collected, collected)
+        else:
+            if collected:
+                progress = len(self._progress_nodeids_reported) * 100 // collected
+                return " [{:3d}%]".format(progress)
+            return " [100%]"
 
     def _write_progress_information_filling_space(self):
         msg = self._get_progress_information_message()
-        fill = " " * (
-            self._tw.fullwidth - self._tw.chars_on_current_line - len(msg) - 1
-        )
-        self.write(fill + msg, cyan=True)
+        w = self._width_of_current_line
+        fill = self._tw.fullwidth - w - 1
+        self.write(msg.rjust(fill), cyan=True)
+
+    @property
+    def _width_of_current_line(self):
+        """Return the width of current line, using the superior implementation of py-1.6 when available"""
+        try:
+            return self._tw.width_of_current_line
+        except AttributeError:
+            # py < 1.6.0
+            return self._tw.chars_on_current_line
 
     def pytest_collection(self):
-        if not self.isatty and self.config.option.verbose >= 1:
+        if self.isatty:
+            if self.config.option.verbose >= 0:
+                self.write("collecting ... ", bold=True)
+                self._collect_report_last_write = time.time()
+        elif self.config.option.verbose >= 1:
             self.write("collecting ... ", bold=True)
 
     def pytest_collectreport(self, report):
@@ -448,22 +518,32 @@ class TerminalReporter(object):
         items = [x for x in report.result if isinstance(x, pytest.Item)]
         self._numcollected += len(items)
         if self.isatty:
-            # self.write_fspath_result(report.nodeid, 'E')
             self.report_collect()
 
     def report_collect(self, final=False):
         if self.config.option.verbose < 0:
             return
 
+        if not final:
+            # Only write "collecting" report every 0.5s.
+            t = time.time()
+            if (
+                self._collect_report_last_write is not None
+                and self._collect_report_last_write > t - REPORT_COLLECTING_RESOLUTION
+            ):
+                return
+            self._collect_report_last_write = t
+
         errors = len(self.stats.get("error", []))
         skipped = len(self.stats.get("skipped", []))
         deselected = len(self.stats.get("deselected", []))
+        selected = self._numcollected - errors - skipped - deselected
         if final:
             line = "collected "
         else:
             line = "collecting "
-        line += str(self._numcollected) + " item" + (
-            "" if self._numcollected == 1 else "s"
+        line += (
+            str(self._numcollected) + " item" + ("" if self._numcollected == 1 else "s")
         )
         if errors:
             line += " / %d errors" % errors
@@ -471,6 +551,8 @@ class TerminalReporter(object):
             line += " / %d deselected" % deselected
         if skipped:
             line += " / %d skipped" % skipped
+        if self._numcollected > selected > 0:
+            line += " / %d selected" % selected
         if self.isatty:
             self.rewrite(line, bold=True, erase=True)
             if final:
@@ -478,10 +560,6 @@ class TerminalReporter(object):
         else:
             self.write_line(line)
 
-    @pytest.hookimpl(trylast=True)
-    def pytest_collection_modifyitems(self):
-        self.report_collect(True)
-
     @pytest.hookimpl(trylast=True)
     def pytest_sessionstart(self, session):
         self._session = session
@@ -495,7 +573,9 @@ class TerminalReporter(object):
             verinfo = ".".join(map(str, sys.pypy_version_info[:3]))
             msg += "[pypy-%s-%s]" % (verinfo, sys.pypy_version_info[3])
         msg += ", pytest-%s, py-%s, pluggy-%s" % (
-            pytest.__version__, py.__version__, pluggy.__version__
+            pytest.__version__,
+            py.__version__,
+            pluggy.__version__,
         )
         if (
             self.verbosity > 0
@@ -515,31 +595,39 @@ class TerminalReporter(object):
             self.write_line(line)
 
     def pytest_report_header(self, config):
-        inifile = ""
+        line = "rootdir: %s" % config.rootdir
+
         if config.inifile:
-            inifile = " " + config.rootdir.bestrelpath(config.inifile)
-        lines = ["rootdir: %s, inifile:%s" % (config.rootdir, inifile)]
+            line += ", inifile: " + config.rootdir.bestrelpath(config.inifile)
+
+        testpaths = config.getini("testpaths")
+        if testpaths and config.args == testpaths:
+            rel_paths = [config.rootdir.bestrelpath(x) for x in testpaths]
+            line += ", testpaths: {}".format(", ".join(rel_paths))
+        result = [line]
 
         plugininfo = config.pluginmanager.list_plugin_distinfo()
         if plugininfo:
-
-            lines.append("plugins: %s" % ", ".join(_plugin_nameversions(plugininfo)))
-        return lines
+            result.append("plugins: %s" % ", ".join(_plugin_nameversions(plugininfo)))
+        return result
 
     def pytest_collection_finish(self, session):
-        if self.config.option.collectonly:
+        self.report_collect(True)
+
+        if self.config.getoption("collectonly"):
             self._printcollecteditems(session.items)
-            if self.stats.get("failed"):
-                self._tw.sep("!", "collection failures")
-                for rep in self.stats.get("failed"):
-                    rep.toterminal(self._tw)
-                return 1
-            return 0
+
         lines = self.config.hook.pytest_report_collectionfinish(
             config=self.config, startdir=self.startdir, items=session.items
         )
         self._write_report_lines_from_hooks(lines)
 
+        if self.config.getoption("collectonly"):
+            if self.stats.get("failed"):
+                self._tw.sep("!", "collection failures")
+                for rep in self.stats.get("failed"):
+                    rep.toterminal(self._tw)
+
     def _printcollecteditems(self, items):
         # to print out items and their parent collectors
         # we take care to leave out Instances aka ()
@@ -554,24 +642,26 @@ class TerminalReporter(object):
                     self._tw.line("%s: %d" % (name, count))
             else:
                 for item in items:
-                    nodeid = item.nodeid
-                    nodeid = nodeid.replace("::()::", "::")
-                    self._tw.line(nodeid)
+                    self._tw.line(item.nodeid)
             return
         stack = []
         indent = ""
         for item in items:
             needed_collectors = item.listchain()[1:]  # strip root node
             while stack:
-                if stack == needed_collectors[:len(stack)]:
+                if stack == needed_collectors[: len(stack)]:
                     break
                 stack.pop()
-            for col in needed_collectors[len(stack):]:
+            for col in needed_collectors[len(stack) :]:
                 stack.append(col)
-                # if col.name == "()":
-                #    continue
+                if col.name == "()":  # Skip Instances.
+                    continue
                 indent = (len(stack) - 1) * "  "
                 self._tw.line("%s%s" % (indent, col))
+                if self.config.option.verbose >= 1:
+                    if hasattr(col, "_obj") and col._obj.__doc__:
+                        for line in col._obj.__doc__.strip().splitlines():
+                            self._tw.line("%s%s" % (indent + "  ", line.strip()))
 
     @pytest.hookimpl(hookwrapper=True)
     def pytest_sessionfinish(self, exitstatus):
@@ -587,7 +677,7 @@ class TerminalReporter(object):
         )
         if exitstatus in summary_exit_codes:
             self.config.hook.pytest_terminal_summary(
-                terminalreporter=self, exitstatus=exitstatus
+                terminalreporter=self, exitstatus=exitstatus, config=self.config
             )
         if exitstatus == EXIT_INTERRUPTED:
             self._report_keyboardinterrupt()
@@ -598,9 +688,12 @@ class TerminalReporter(object):
     def pytest_terminal_summary(self):
         self.summary_errors()
         self.summary_failures()
-        yield
         self.summary_warnings()
         self.summary_passes()
+        yield
+        self.short_test_summary()
+        # Display any extra warnings from teardown here (if any).
+        self.summary_warnings()
 
     def pytest_keyboard_interrupt(self, excinfo):
         self._keyboardinterrupt_memo = excinfo.getrepr(funcargs=True)
@@ -624,11 +717,10 @@ class TerminalReporter(object):
                 )
 
     def _locationline(self, nodeid, fspath, lineno, domain):
-
         def mkrel(nodeid):
             line = self.config.cwd_relative_nodeid(nodeid)
             if domain and line.endswith(domain):
-                line = line[:-len(domain)]
+                line = line[: -len(domain)]
                 values = domain.split("[")
                 values[0] = values[0].replace(".", "::")  # don't replace '.' in params
                 line += "[".join(values)
@@ -637,19 +729,20 @@ class TerminalReporter(object):
         # collect_fspath comes from testid which has a "/"-normalized path
 
         if fspath:
-            res = mkrel(nodeid).replace("::()", "")  # parens-normalization
-            if nodeid.split("::")[0] != fspath.replace("\\", nodes.SEP):
+            res = mkrel(nodeid)
+            if self.verbosity >= 2 and nodeid.split("::")[0] != fspath.replace(
+                "\\", nodes.SEP
+            ):
                 res += " <- " + self.startdir.bestrelpath(fspath)
         else:
             res = "[location]"
         return res + " "
 
     def _getfailureheadline(self, rep):
-        if hasattr(rep, "location"):
-            fspath, lineno, domain = rep.location
-            return domain
-        else:
-            return "test session"  # XXX?
+        head_line = rep.head_line
+        if head_line:
+            return head_line
+        return "test session"  # XXX?
 
     def _getcrashline(self, rep):
         try:
@@ -676,19 +769,37 @@ class TerminalReporter(object):
             if not all_warnings:
                 return
 
-            grouped = itertools.groupby(
-                all_warnings, key=lambda wr: wr.get_location(self.config)
-            )
+            final = hasattr(self, "_already_displayed_warnings")
+            if final:
+                warning_reports = all_warnings[self._already_displayed_warnings :]
+            else:
+                warning_reports = all_warnings
+            self._already_displayed_warnings = len(warning_reports)
+            if not warning_reports:
+                return
 
-            self.write_sep("=", "warnings summary", yellow=True, bold=False)
-            for location, warning_records in grouped:
-                self._tw.line(str(location) if location else "<undetermined location>")
-                for w in warning_records:
-                    lines = w.message.splitlines()
+            reports_grouped_by_message = collections.OrderedDict()
+            for wr in warning_reports:
+                reports_grouped_by_message.setdefault(wr.message, []).append(wr)
+
+            title = "warnings summary (final)" if final else "warnings summary"
+            self.write_sep("=", title, yellow=True, bold=False)
+            for message, warning_reports in reports_grouped_by_message.items():
+                has_any_location = False
+                for w in warning_reports:
+                    location = w.get_location(self.config)
+                    if location:
+                        self._tw.line(str(location))
+                        has_any_location = True
+                if has_any_location:
+                    lines = message.splitlines()
                     indented = "\n".join("  " + x for x in lines)
-                    self._tw.line(indented)
+                    message = indented.rstrip()
+                else:
+                    message = message.rstrip()
+                self._tw.line(message)
                 self._tw.line()
-            self._tw.line("-- Docs: http://doc.pytest.org/en/latest/warnings.html")
+            self._tw.line("-- Docs: https://docs.pytest.org/en/latest/warnings.html")
 
     def summary_passes(self):
         if self.config.option.tbstyle != "no":
@@ -698,12 +809,18 @@ class TerminalReporter(object):
                     return
                 self.write_sep("=", "PASSES")
                 for rep in reports:
-                    msg = self._getfailureheadline(rep)
-                    self.write_sep("_", msg)
-                    self._outrep_summary(rep)
+                    if rep.sections:
+                        msg = self._getfailureheadline(rep)
+                        self.write_sep("_", msg, green=True, bold=True)
+                        self._outrep_summary(rep)
 
     def print_teardown_sections(self, rep):
+        showcapture = self.config.option.showcapture
+        if showcapture == "no":
+            return
         for secname, content in rep.sections:
+            if showcapture != "all" and showcapture not in secname:
+                continue
             if "teardown" in secname:
                 self._tw.sep("-", secname)
                 if content[-1:] == "\n":
@@ -716,18 +833,22 @@ class TerminalReporter(object):
             if not reports:
                 return
             self.write_sep("=", "FAILURES")
-            for rep in reports:
-                if self.config.option.tbstyle == "line":
+            if self.config.option.tbstyle == "line":
+                for rep in reports:
                     line = self._getcrashline(rep)
                     self.write_line(line)
-                else:
+            else:
+                teardown_sections = {}
+                for report in self.getreports(""):
+                    if report.when == "teardown":
+                        teardown_sections.setdefault(report.nodeid, []).append(report)
+
+                for rep in reports:
                     msg = self._getfailureheadline(rep)
-                    markup = {"red": True, "bold": True}
-                    self.write_sep("_", msg, **markup)
+                    self.write_sep("_", msg, red=True, bold=True)
                     self._outrep_summary(rep)
-                    for report in self.getreports(""):
-                        if report.nodeid == rep.nodeid and report.when == "teardown":
-                            self.print_teardown_sections(report)
+                    for report in teardown_sections.get(rep.nodeid, []):
+                        self.print_teardown_sections(report)
 
     def summary_errors(self):
         if self.config.option.tbstyle != "no":
@@ -737,14 +858,11 @@ class TerminalReporter(object):
             self.write_sep("=", "ERRORS")
             for rep in self.stats["error"]:
                 msg = self._getfailureheadline(rep)
-                if not hasattr(rep, "when"):
-                    # collect
+                if rep.when == "collect":
                     msg = "ERROR collecting " + msg
-                elif rep.when == "setup":
-                    msg = "ERROR at setup of " + msg
-                elif rep.when == "teardown":
-                    msg = "ERROR at teardown of " + msg
-                self.write_sep("_", msg)
+                else:
+                    msg = "ERROR at %s of %s" % (rep.when, msg)
+                self.write_sep("_", msg, red=True, bold=True)
                 self._outrep_summary(rep)
 
     def _outrep_summary(self, rep):
@@ -771,31 +889,174 @@ class TerminalReporter(object):
         if self.verbosity == -1:
             self.write_line(msg, **markup)
 
+    def short_test_summary(self):
+        if not self.reportchars:
+            return
+
+        def show_simple(stat, lines):
+            failed = self.stats.get(stat, [])
+            if not failed:
+                return
+            termwidth = self.writer.fullwidth
+            config = self.config
+            for rep in failed:
+                line = _get_line_with_reprcrash_message(config, rep, termwidth)
+                lines.append(line)
+
+        def show_xfailed(lines):
+            xfailed = self.stats.get("xfailed", [])
+            for rep in xfailed:
+                verbose_word = rep._get_verbose_word(self.config)
+                pos = _get_pos(self.config, rep)
+                lines.append("%s %s" % (verbose_word, pos))
+                reason = rep.wasxfail
+                if reason:
+                    lines.append("  " + str(reason))
+
+        def show_xpassed(lines):
+            xpassed = self.stats.get("xpassed", [])
+            for rep in xpassed:
+                verbose_word = rep._get_verbose_word(self.config)
+                pos = _get_pos(self.config, rep)
+                reason = rep.wasxfail
+                lines.append("%s %s %s" % (verbose_word, pos, reason))
+
+        def show_skipped(lines):
+            skipped = self.stats.get("skipped", [])
+            fskips = _folded_skips(skipped) if skipped else []
+            if not fskips:
+                return
+            verbose_word = skipped[0]._get_verbose_word(self.config)
+            for num, fspath, lineno, reason in fskips:
+                if reason.startswith("Skipped: "):
+                    reason = reason[9:]
+                if lineno is not None:
+                    lines.append(
+                        "%s [%d] %s:%d: %s"
+                        % (verbose_word, num, fspath, lineno + 1, reason)
+                    )
+                else:
+                    lines.append("%s [%d] %s: %s" % (verbose_word, num, fspath, reason))
+
+        REPORTCHAR_ACTIONS = {
+            "x": show_xfailed,
+            "X": show_xpassed,
+            "f": partial(show_simple, "failed"),
+            "s": show_skipped,
+            "p": partial(show_simple, "passed"),
+            "E": partial(show_simple, "error"),
+        }
+
+        lines = []
+        for char in self.reportchars:
+            action = REPORTCHAR_ACTIONS.get(char)
+            if action:  # skipping e.g. "P" (passed with output) here.
+                action(lines)
+
+        if lines:
+            self.write_sep("=", "short test summary info")
+            for line in lines:
+                self.write_line(line)
+
+
+def _get_pos(config, rep):
+    nodeid = config.cwd_relative_nodeid(rep.nodeid)
+    return nodeid
+
+
+def _get_line_with_reprcrash_message(config, rep, termwidth):
+    """Get summary line for a report, trying to add reprcrash message."""
+    from wcwidth import wcswidth
+
+    verbose_word = rep._get_verbose_word(config)
+    pos = _get_pos(config, rep)
+
+    line = "%s %s" % (verbose_word, pos)
+    len_line = wcswidth(line)
+    ellipsis, len_ellipsis = "...", 3
+    if len_line > termwidth - len_ellipsis:
+        # No space for an additional message.
+        return line
 
-def repr_pythonversion(v=None):
-    if v is None:
-        v = sys.version_info
     try:
-        return "%s.%s.%s-%s-%s" % v
-    except (TypeError, ValueError):
-        return str(v)
+        msg = rep.longrepr.reprcrash.message
+    except AttributeError:
+        pass
+    else:
+        # Only use the first line.
+        i = msg.find("\n")
+        if i != -1:
+            msg = msg[:i]
+        len_msg = wcswidth(msg)
+
+        sep, len_sep = " - ", 3
+        max_len_msg = termwidth - len_line - len_sep
+        if max_len_msg >= len_ellipsis:
+            if len_msg > max_len_msg:
+                max_len_msg -= len_ellipsis
+                msg = msg[:max_len_msg]
+                while wcswidth(msg) > max_len_msg:
+                    msg = msg[:-1]
+                if six.PY2:
+                    # on python 2 systems with narrow unicode compilation, trying to
+                    # get a single character out of a multi-byte unicode character such as
+                    # u'😄' will result in a High Surrogate (U+D83D) character, which is
+                    # rendered as u'�'; in this case we just strip that character out as it
+                    # serves no purpose being rendered
+                    try:
+                        surrogate = six.unichr(0xD83D)
+                        msg = msg.rstrip(surrogate)
+                    except ValueError:  # pragma: no cover
+                        # Jython cannot represent this lone surrogate at all (#5256):
+                        # ValueError: unichr() arg is a lone surrogate in range
+                        #     (0xD800, 0xDFFF) (Jython UTF-16 encoding)
+                        # ignore this case as it shouldn't appear in the string anyway
+                        pass
+                msg += ellipsis
+            line += sep + msg
+    return line
+
+
+def _folded_skips(skipped):
+    d = {}
+    for event in skipped:
+        key = event.longrepr
+        assert len(key) == 3, (event, key)
+        keywords = getattr(event, "keywords", {})
+        # folding reports with global pytestmark variable
+        # this is workaround, because for now we cannot identify the scope of a skip marker
+        # TODO: revisit after marks scope would be fixed
+        if (
+            event.when == "setup"
+            and "skip" in keywords
+            and "pytestmark" not in keywords
+        ):
+            key = (key[0], None, key[2])
+        d.setdefault(key, []).append(event)
+    values = []
+    for key, events in d.items():
+        values.append((len(events),) + key)
+    return values
 
 
 def build_summary_stats_line(stats):
-    keys = (
-        "failed passed skipped deselected " "xfailed xpassed warnings error"
-    ).split()
-    unknown_key_seen = False
-    for key in stats.keys():
-        if key not in keys:
-            if key:  # setup/teardown reports have an empty key, ignore them
-                keys.append(key)
-                unknown_key_seen = True
+    known_types = (
+        "failed passed skipped deselected xfailed xpassed warnings error".split()
+    )
+    unknown_type_seen = False
+    for found_type in stats:
+        if found_type not in known_types:
+            if found_type:  # setup/teardown reports have an empty key, ignore them
+                known_types.append(found_type)
+                unknown_type_seen = True
     parts = []
-    for key in keys:
-        val = stats.get(key, None)
-        if val:
-            parts.append("%d %s" % (len(val), key))
+    for key in known_types:
+        reports = stats.get(key, None)
+        if reports:
+            count = sum(
+                1 for rep in reports if getattr(rep, "count_towards_summary", True)
+            )
+            parts.append("%d %s" % (count, key))
 
     if parts:
         line = ", ".join(parts)
@@ -804,14 +1065,14 @@ def build_summary_stats_line(stats):
 
     if "failed" in stats or "error" in stats:
         color = "red"
-    elif "warnings" in stats or unknown_key_seen:
+    elif "warnings" in stats or unknown_type_seen:
         color = "yellow"
     elif "passed" in stats:
         color = "green"
     else:
         color = "yellow"
 
-    return (line, color)
+    return line, color
 
 
 def _plugin_nameversions(plugininfo):
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/tmpdir.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/tmpdir.py
index 260d2842234..a8a7037713c 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/tmpdir.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/tmpdir.py
@@ -1,22 +1,97 @@
+# -*- coding: utf-8 -*-
 """ support for providing temporary directories to test functions.  """
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
+import os
 import re
+import tempfile
+import warnings
+
+import attr
+import py
+import six
 
 import pytest
-import py
+from .pathlib import ensure_reset_dir
+from .pathlib import LOCK_TIMEOUT
+from .pathlib import make_numbered_dir
+from .pathlib import make_numbered_dir_with_cleanup
+from .pathlib import Path
 from _pytest.monkeypatch import MonkeyPatch
 
 
-class TempdirFactory(object):
+@attr.s
+class TempPathFactory(object):
     """Factory for temporary directories under the common base temp directory.
 
-    The base directory can be configured using the ``--basetemp`` option.
+    The base directory can be configured using the ``--basetemp`` option."""
+
+    _given_basetemp = attr.ib(
+        # using os.path.abspath() to get absolute path instead of resolve() as it
+        # does not work the same in all platforms (see #4427)
+        # Path.absolute() exists, but it is not public (see https://bugs.python.org/issue25012)
+        converter=attr.converters.optional(
+            lambda p: Path(os.path.abspath(six.text_type(p)))
+        )
+    )
+    _trace = attr.ib()
+    _basetemp = attr.ib(default=None)
+
+    @classmethod
+    def from_config(cls, config):
+        """
+        :param config: a pytest configuration
+        """
+        return cls(
+            given_basetemp=config.option.basetemp, trace=config.trace.get("tmpdir")
+        )
+
+    def mktemp(self, basename, numbered=True):
+        """makes a temporary directory managed by the factory"""
+        if not numbered:
+            p = self.getbasetemp().joinpath(basename)
+            p.mkdir()
+        else:
+            p = make_numbered_dir(root=self.getbasetemp(), prefix=basename)
+            self._trace("mktemp", p)
+        return p
+
+    def getbasetemp(self):
+        """ return base temporary directory. """
+        if self._basetemp is not None:
+            return self._basetemp
+
+        if self._given_basetemp is not None:
+            basetemp = self._given_basetemp
+            ensure_reset_dir(basetemp)
+            basetemp = basetemp.resolve()
+        else:
+            from_env = os.environ.get("PYTEST_DEBUG_TEMPROOT")
+            temproot = Path(from_env or tempfile.gettempdir()).resolve()
+            user = get_user() or "unknown"
+            # use a sub-directory in the temproot to speed-up
+            # make_numbered_dir() call
+            rootdir = temproot.joinpath("pytest-of-{}".format(user))
+            rootdir.mkdir(exist_ok=True)
+            basetemp = make_numbered_dir_with_cleanup(
+                prefix="pytest-", root=rootdir, keep=3, lock_timeout=LOCK_TIMEOUT
+            )
+        assert basetemp is not None, basetemp
+        self._basetemp = t = basetemp
+        self._trace("new basetemp", t)
+        return t
+
+
+@attr.s
+class TempdirFactory(object):
+    """
+    backward comptibility wrapper that implements
+    :class:``py.path.local`` for :class:``TempPathFactory``
     """
 
-    def __init__(self, config):
-        self.config = config
-        self.trace = config.trace.get("tmpdir")
+    _tmppath_factory = attr.ib()
 
     def ensuretemp(self, string, dir=1):
         """ (deprecated) return temporary directory path with
@@ -26,6 +101,9 @@ class TempdirFactory(object):
             and is guaranteed to be empty.
         """
         # py.log._apiwarn(">1.1", "use tmpdir function argument")
+        from .deprecated import PYTEST_ENSURETEMP
+
+        warnings.warn(PYTEST_ENSURETEMP, stacklevel=2)
         return self.getbasetemp().ensure(string, dir=dir)
 
     def mktemp(self, basename, numbered=True):
@@ -33,46 +111,11 @@ class TempdirFactory(object):
         If ``numbered``, ensure the directory is unique by adding a number
         prefix greater than any existing one.
         """
-        basetemp = self.getbasetemp()
-        if not numbered:
-            p = basetemp.mkdir(basename)
-        else:
-            p = py.path.local.make_numbered_dir(
-                prefix=basename, keep=0, rootdir=basetemp, lock_timeout=None
-            )
-        self.trace("mktemp", p)
-        return p
+        return py.path.local(self._tmppath_factory.mktemp(basename, numbered).resolve())
 
     def getbasetemp(self):
-        """ return base temporary directory. """
-        try:
-            return self._basetemp
-        except AttributeError:
-            basetemp = self.config.option.basetemp
-            if basetemp:
-                basetemp = py.path.local(basetemp)
-                if basetemp.check():
-                    basetemp.remove()
-                basetemp.mkdir()
-            else:
-                temproot = py.path.local.get_temproot()
-                user = get_user()
-                if user:
-                    # use a sub-directory in the temproot to speed-up
-                    # make_numbered_dir() call
-                    rootdir = temproot.join("pytest-of-%s" % user)
-                else:
-                    rootdir = temproot
-                rootdir.ensure(dir=1)
-                basetemp = py.path.local.make_numbered_dir(
-                    prefix="pytest-", rootdir=rootdir
-                )
-            self._basetemp = t = basetemp.realpath()
-            self.trace("new basetemp", t)
-            return t
-
-    def finish(self):
-        self.trace("finish")
+        """backward compat wrapper for ``_tmppath_factory.getbasetemp``"""
+        return py.path.local(self._tmppath_factory.getbasetemp().resolve())
 
 
 def get_user():
@@ -87,10 +130,6 @@ def get_user():
         return None
 
 
-# backward compatibility
-TempdirHandler = TempdirFactory
-
-
 def pytest_configure(config):
     """Create a TempdirFactory and attach it to the config object.
 
@@ -99,21 +138,38 @@ def pytest_configure(config):
     to the tmpdir_factory session fixture.
     """
     mp = MonkeyPatch()
-    t = TempdirFactory(config)
-    config._cleanup.extend([mp.undo, t.finish])
+    tmppath_handler = TempPathFactory.from_config(config)
+    t = TempdirFactory(tmppath_handler)
+    config._cleanup.append(mp.undo)
+    mp.setattr(config, "_tmp_path_factory", tmppath_handler, raising=False)
     mp.setattr(config, "_tmpdirhandler", t, raising=False)
     mp.setattr(pytest, "ensuretemp", t.ensuretemp, raising=False)
 
 
 @pytest.fixture(scope="session")
 def tmpdir_factory(request):
-    """Return a TempdirFactory instance for the test session.
+    """Return a :class:`_pytest.tmpdir.TempdirFactory` instance for the test session.
     """
     return request.config._tmpdirhandler
 
 
+@pytest.fixture(scope="session")
+def tmp_path_factory(request):
+    """Return a :class:`_pytest.tmpdir.TempPathFactory` instance for the test session.
+    """
+    return request.config._tmp_path_factory
+
+
+def _mk_tmp(request, factory):
+    name = request.node.name
+    name = re.sub(r"[\W]", "_", name)
+    MAXVAL = 30
+    name = name[:MAXVAL]
+    return factory.mktemp(name, numbered=True)
+
+
 @pytest.fixture
-def tmpdir(request, tmpdir_factory):
+def tmpdir(tmp_path):
     """Return a temporary directory path object
     which is unique to each test function invocation,
     created as a sub directory of the base temporary
@@ -122,10 +178,20 @@ def tmpdir(request, tmpdir_factory):
 
     .. _`py.path.local`: https://py.readthedocs.io/en/latest/path.html
     """
-    name = request.node.name
-    name = re.sub(r"[\W]", "_", name)
-    MAXVAL = 30
-    if len(name) > MAXVAL:
-        name = name[:MAXVAL]
-    x = tmpdir_factory.mktemp(name, numbered=True)
-    return x
+    return py.path.local(tmp_path)
+
+
+@pytest.fixture
+def tmp_path(request, tmp_path_factory):
+    """Return a temporary directory path object
+    which is unique to each test function invocation,
+    created as a sub directory of the base temporary
+    directory.  The returned object is a :class:`pathlib.Path`
+    object.
+
+    .. note::
+
+        in python < 3.6 this is a pathlib2.Path
+    """
+
+    return _mk_tmp(request, tmp_path_factory)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/unittest.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/unittest.py
index 6ad9fda8870..3ff6f45d8db 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/unittest.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/unittest.py
@@ -1,14 +1,21 @@
+# -*- coding: utf-8 -*-
 """ discovery and running of std-library "unittest" style tests. """
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import sys
 import traceback
 
-# for transferring markers
 import _pytest._code
+import pytest
+from _pytest.compat import getimfunc
 from _pytest.config import hookimpl
-from _pytest.outcomes import fail, skip, xfail
-from _pytest.python import transfer_markers, Class, Module, Function
+from _pytest.outcomes import fail
+from _pytest.outcomes import skip
+from _pytest.outcomes import xfail
+from _pytest.python import Class
+from _pytest.python import Function
 
 
 def pytest_pycollect_makeitem(collector, name, obj):
@@ -27,34 +34,26 @@ class UnitTestCase(Class):
     # to declare that our children do not support funcargs
     nofuncargs = True
 
-    def setup(self):
-        cls = self.obj
-        if getattr(cls, "__unittest_skip__", False):
-            return  # skipped
-        setup = getattr(cls, "setUpClass", None)
-        if setup is not None:
-            setup()
-        teardown = getattr(cls, "tearDownClass", None)
-        if teardown is not None:
-            self.addfinalizer(teardown)
-        super(UnitTestCase, self).setup()
-
     def collect(self):
         from unittest import TestLoader
 
         cls = self.obj
         if not getattr(cls, "__test__", True):
             return
+
+        skipped = getattr(cls, "__unittest_skip__", False)
+        if not skipped:
+            self._inject_setup_teardown_fixtures(cls)
+            self._inject_setup_class_fixture()
+
         self.session._fixturemanager.parsefactories(self, unittest=True)
         loader = TestLoader()
-        module = self.getparent(Module).obj
         foundsomething = False
         for name in loader.getTestCaseNames(self.obj):
             x = getattr(self.obj, name)
             if not getattr(x, "__test__", True):
                 continue
-            funcobj = getattr(x, "im_func", x)
-            transfer_markers(funcobj, cls, module)
+            funcobj = getimfunc(x)
             yield TestCaseFunction(name, parent=self, callobj=funcobj)
             foundsomething = True
 
@@ -65,17 +64,57 @@ class UnitTestCase(Class):
                 if ut is None or runtest != ut.TestCase.runTest:
                     yield TestCaseFunction("runTest", parent=self)
 
+    def _inject_setup_teardown_fixtures(self, cls):
+        """Injects a hidden auto-use fixture to invoke setUpClass/setup_method and corresponding
+        teardown functions (#517)"""
+        class_fixture = _make_xunit_fixture(
+            cls, "setUpClass", "tearDownClass", scope="class", pass_self=False
+        )
+        if class_fixture:
+            cls.__pytest_class_setup = class_fixture
+
+        method_fixture = _make_xunit_fixture(
+            cls, "setup_method", "teardown_method", scope="function", pass_self=True
+        )
+        if method_fixture:
+            cls.__pytest_method_setup = method_fixture
+
+
+def _make_xunit_fixture(obj, setup_name, teardown_name, scope, pass_self):
+    setup = getattr(obj, setup_name, None)
+    teardown = getattr(obj, teardown_name, None)
+    if setup is None and teardown is None:
+        return None
+
+    @pytest.fixture(scope=scope, autouse=True)
+    def fixture(self, request):
+        if getattr(self, "__unittest_skip__", None):
+            reason = self.__unittest_skip_why__
+            pytest.skip(reason)
+        if setup is not None:
+            if pass_self:
+                setup(self, request.function)
+            else:
+                setup()
+        yield
+        if teardown is not None:
+            if pass_self:
+                teardown(self, request.function)
+            else:
+                teardown()
+
+    return fixture
+
 
 class TestCaseFunction(Function):
     nofuncargs = True
     _excinfo = None
+    _testcase = None
 
     def setup(self):
         self._testcase = self.parent.obj(self.name)
         self._fix_unittest_skip_decorator()
         self._obj = getattr(self._testcase, self.name)
-        if hasattr(self._testcase, "setup_method"):
-            self._testcase.setup_method(self._obj)
         if hasattr(self, "_request"):
             self._request._fillfixtures()
 
@@ -93,9 +132,6 @@ class TestCaseFunction(Function):
             setattr(self._testcase, "__name__", self.name)
 
     def teardown(self):
-        if hasattr(self._testcase, "teardown_method"):
-            self._testcase.teardown_method(self._obj)
-        # Allow garbage collection on TestCase instance attributes.
         self._testcase = None
         self._obj = None
 
@@ -107,6 +143,10 @@ class TestCaseFunction(Function):
         rawexcinfo = getattr(rawexcinfo, "_rawexcinfo", rawexcinfo)
         try:
             excinfo = _pytest._code.ExceptionInfo(rawexcinfo)
+            # invoke the attributes to trigger storing the traceback
+            # trial causes some issue there
+            excinfo.value
+            excinfo.traceback
         except TypeError:
             try:
                 try:
@@ -128,7 +168,7 @@ class TestCaseFunction(Function):
             except KeyboardInterrupt:
                 raise
             except fail.Exception:
-                excinfo = _pytest._code.ExceptionInfo()
+                excinfo = _pytest._code.ExceptionInfo.from_current()
         self.__dict__.setdefault("_excinfo", []).append(excinfo)
 
     def addError(self, testcase, rawexcinfo):
@@ -163,15 +203,13 @@ class TestCaseFunction(Function):
         # implements the skipping machinery (see #2137)
         # analog to pythons Lib/unittest/case.py:run
         testMethod = getattr(self._testcase, self._testcase._testMethodName)
-        if (
-            getattr(self._testcase.__class__, "__unittest_skip__", False)
-            or getattr(testMethod, "__unittest_skip__", False)
+        if getattr(self._testcase.__class__, "__unittest_skip__", False) or getattr(
+            testMethod, "__unittest_skip__", False
         ):
             # If the class or method was skipped.
-            skip_why = (
-                getattr(self._testcase.__class__, "__unittest_skip_why__", "")
-                or getattr(testMethod, "__unittest_skip_why__", "")
-            )
+            skip_why = getattr(
+                self._testcase.__class__, "__unittest_skip_why__", ""
+            ) or getattr(testMethod, "__unittest_skip_why__", "")
             try:  # PY3, unittest2 on PY2
                 self._testcase._addSkip(self, self._testcase, skip_why)
             except TypeError:  # PY2
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/warning_types.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/warning_types.py
new file mode 100644
index 00000000000..861010a1275
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/warning_types.py
@@ -0,0 +1,112 @@
+# -*- coding: utf-8 -*-
+import attr
+
+
+class PytestWarning(UserWarning):
+    """
+    Bases: :class:`UserWarning`.
+
+    Base class for all warnings emitted by pytest.
+    """
+
+
+class PytestAssertRewriteWarning(PytestWarning):
+    """
+    Bases: :class:`PytestWarning`.
+
+    Warning emitted by the pytest assert rewrite module.
+    """
+
+
+class PytestCacheWarning(PytestWarning):
+    """
+    Bases: :class:`PytestWarning`.
+
+    Warning emitted by the cache plugin in various situations.
+    """
+
+
+class PytestConfigWarning(PytestWarning):
+    """
+    Bases: :class:`PytestWarning`.
+
+    Warning emitted for configuration issues.
+    """
+
+
+class PytestCollectionWarning(PytestWarning):
+    """
+    Bases: :class:`PytestWarning`.
+
+    Warning emitted when pytest is not able to collect a file or symbol in a module.
+    """
+
+
+class PytestDeprecationWarning(PytestWarning, DeprecationWarning):
+    """
+    Bases: :class:`pytest.PytestWarning`, :class:`DeprecationWarning`.
+
+    Warning class for features that will be removed in a future version.
+    """
+
+
+class PytestExperimentalApiWarning(PytestWarning, FutureWarning):
+    """
+    Bases: :class:`pytest.PytestWarning`, :class:`FutureWarning`.
+
+    Warning category used to denote experiments in pytest. Use sparingly as the API might change or even be
+    removed completely in future version
+    """
+
+    @classmethod
+    def simple(cls, apiname):
+        return cls(
+            "{apiname} is an experimental api that may change over time".format(
+                apiname=apiname
+            )
+        )
+
+
+class PytestUnhandledCoroutineWarning(PytestWarning):
+    """
+    Bases: :class:`PytestWarning`.
+
+    Warning emitted when pytest encounters a test function which is a coroutine,
+    but it was not handled by any async-aware plugin. Coroutine test functions
+    are not natively supported.
+    """
+
+
+class PytestUnknownMarkWarning(PytestWarning):
+    """
+    Bases: :class:`PytestWarning`.
+
+    Warning emitted on use of unknown markers.
+    See https://docs.pytest.org/en/latest/mark.html for details.
+    """
+
+
+class RemovedInPytest4Warning(PytestDeprecationWarning):
+    """
+    Bases: :class:`pytest.PytestDeprecationWarning`.
+
+    Warning class for features scheduled to be removed in pytest 4.0.
+    """
+
+
+@attr.s
+class UnformattedWarning(object):
+    """Used to hold warnings that need to format their message at runtime, as opposed to a direct message.
+
+    Using this class avoids to keep all the warning types and messages in this module, avoiding misuse.
+    """
+
+    category = attr.ib()
+    template = attr.ib()
+
+    def format(self, **kwargs):
+        """Returns an instance of the warning category, formatted with given kwargs"""
+        return self.category(self.template.format(**kwargs))
+
+
+PYTESTER_COPY_EXAMPLE = PytestExperimentalApiWarning.simple("testdir.copy_example")
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/warnings.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/warnings.py
index e023d0ab491..a3debae462f 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/warnings.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/warnings.py
@@ -1,12 +1,17 @@
-from __future__ import absolute_import, division, print_function
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
+import sys
 import warnings
 from contextlib import contextmanager
 
 import pytest
-
 from _pytest import compat
 
+SHOW_PYTEST_WARNINGS_ARG = "-Walways::pytest.RemovedInPytest4Warning"
+
 
 def _setoption(wmod, arg):
     """
@@ -49,64 +54,127 @@ def pytest_addoption(parser):
     )
 
 
-@contextmanager
-def catch_warnings_for_item(item):
-    """
-    catches the warnings generated during setup/call/teardown execution
-    of the given item and after it is done posts them as warnings to this
-    item.
-    """
-    args = item.config.getoption("pythonwarnings") or []
-    inifilters = item.config.getini("filterwarnings")
-    with warnings.catch_warnings(record=True) as log:
-        for arg in args:
-            warnings._setoption(arg)
+def pytest_configure(config):
+    config.addinivalue_line(
+        "markers",
+        "filterwarnings(warning): add a warning filter to the given test. "
+        "see https://docs.pytest.org/en/latest/warnings.html#pytest-mark-filterwarnings ",
+    )
 
+
+@contextmanager
+def catch_warnings_for_item(config, ihook, when, item):
+    """
+    Context manager that catches warnings generated in the contained execution block.
+
+    ``item`` can be None if we are not in the context of an item execution.
+
+    Each warning captured triggers the ``pytest_warning_captured`` hook.
+    """
+    cmdline_filters = config.getoption("pythonwarnings") or []
+    inifilters = config.getini("filterwarnings")
+    with warnings.catch_warnings(record=True) as log:
+
+        if not sys.warnoptions:
+            # if user is not explicitly configuring warning filters, show deprecation warnings by default (#2908)
+            warnings.filterwarnings("always", category=DeprecationWarning)
+            warnings.filterwarnings("always", category=PendingDeprecationWarning)
+
+        warnings.filterwarnings("error", category=pytest.RemovedInPytest4Warning)
+
+        # filters should have this precedence: mark, cmdline options, ini
+        # filters should be applied in the inverse order of precedence
         for arg in inifilters:
             _setoption(warnings, arg)
 
-        for mark in item.iter_markers(name="filterwarnings"):
-            for arg in mark.args:
-                warnings._setoption(arg)
+        for arg in cmdline_filters:
+            warnings._setoption(arg)
+
+        if item is not None:
+            for mark in item.iter_markers(name="filterwarnings"):
+                for arg in mark.args:
+                    _setoption(warnings, arg)
 
         yield
 
-        for warning in log:
-            warn_msg = warning.message
-            unicode_warning = False
-
-            if (
-                compat._PY2
-                and any(isinstance(m, compat.UNICODE_TYPES) for m in warn_msg.args)
-            ):
-                new_args = []
-                for m in warn_msg.args:
-                    new_args.append(
-                        compat.ascii_escaped(m)
-                        if isinstance(m, compat.UNICODE_TYPES)
-                        else m
-                    )
-                unicode_warning = list(warn_msg.args) != new_args
-                warn_msg.args = new_args
-
-            msg = warnings.formatwarning(
-                warn_msg,
-                warning.category,
-                warning.filename,
-                warning.lineno,
-                warning.line,
+        for warning_message in log:
+            ihook.pytest_warning_captured.call_historic(
+                kwargs=dict(warning_message=warning_message, when=when, item=item)
             )
-            item.warn("unused", msg)
 
-            if unicode_warning:
-                warnings.warn(
-                    "Warning is using unicode non convertible to ascii, "
-                    "converting to a safe representation:\n  %s" % msg,
-                    UnicodeWarning,
-                )
+
+def warning_record_to_str(warning_message):
+    """Convert a warnings.WarningMessage to a string.
+
+    This takes lot of unicode shenaningans into account for Python 2.
+    When Python 2 support is dropped this function can be greatly simplified.
+    """
+    warn_msg = warning_message.message
+    unicode_warning = False
+    if compat._PY2 and any(isinstance(m, compat.UNICODE_TYPES) for m in warn_msg.args):
+        new_args = []
+        for m in warn_msg.args:
+            new_args.append(
+                compat.ascii_escaped(m) if isinstance(m, compat.UNICODE_TYPES) else m
+            )
+        unicode_warning = list(warn_msg.args) != new_args
+        warn_msg.args = new_args
+
+    msg = warnings.formatwarning(
+        warn_msg,
+        warning_message.category,
+        warning_message.filename,
+        warning_message.lineno,
+        warning_message.line,
+    )
+    if unicode_warning:
+        warnings.warn(
+            "Warning is using unicode non convertible to ascii, "
+            "converting to a safe representation:\n  {!r}".format(compat.safe_str(msg)),
+            UnicodeWarning,
+        )
+    return msg
+
+
+@pytest.hookimpl(hookwrapper=True, tryfirst=True)
+def pytest_runtest_protocol(item):
+    with catch_warnings_for_item(
+        config=item.config, ihook=item.ihook, when="runtest", item=item
+    ):
+        yield
+
+
+@pytest.hookimpl(hookwrapper=True, tryfirst=True)
+def pytest_collection(session):
+    config = session.config
+    with catch_warnings_for_item(
+        config=config, ihook=config.hook, when="collect", item=None
+    ):
+        yield
 
 
 @pytest.hookimpl(hookwrapper=True)
-def pytest_runtest_protocol(item):
-    with catch_warnings_for_item(item):
+def pytest_terminal_summary(terminalreporter):
+    config = terminalreporter.config
+    with catch_warnings_for_item(
+        config=config, ihook=config.hook, when="config", item=None
+    ):
         yield
+
+
+def _issue_warning_captured(warning, hook, stacklevel):
+    """
+    This function should be used instead of calling ``warnings.warn`` directly when we are in the "configure" stage:
+    at this point the actual options might not have been set, so we manually trigger the pytest_warning_captured
+    hook so we can display this warnings in the terminal. This is a hack until we can sort out #2891.
+
+    :param warning: the warning instance.
+    :param hook: the hook caller
+    :param stacklevel: stacklevel forwarded to warnings.warn
+    """
+    with warnings.catch_warnings(record=True) as records:
+        warnings.simplefilter("always", type(warning))
+        warnings.warn(warning, stacklevel=stacklevel)
+    hook.pytest_warning_captured.call_historic(
+        kwargs=dict(warning_message=records[0], when="config", item=None)
+    )
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/pytest.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/pytest.py
index f27f5a1955b..ccc77b476f5 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/pytest.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/src/pytest.py
@@ -1,62 +1,97 @@
+# -*- coding: utf-8 -*-
 # PYTHON_ARGCOMPLETE_OK
 """
 pytest: unit and functional testing with Python.
 """
-
-
 # else we are imported
-
-from _pytest.config import main, UsageError, cmdline, hookspec, hookimpl
-from _pytest.fixtures import fixture, yield_fixture
-from _pytest.assertion import register_assert_rewrite
-from _pytest.freeze_support import freeze_includes
 from _pytest import __version__
+from _pytest.assertion import register_assert_rewrite
+from _pytest.config import cmdline
+from _pytest.config import hookimpl
+from _pytest.config import hookspec
+from _pytest.config import main
+from _pytest.config import UsageError
 from _pytest.debugging import pytestPDB as __pytestPDB
-from _pytest.recwarn import warns, deprecated_call
-from _pytest.outcomes import fail, skip, importorskip, exit, xfail
-from _pytest.mark import MARK_GEN as mark, param
-from _pytest.main import Session
-from _pytest.nodes import Item, Collector, File
 from _pytest.fixtures import fillfixtures as _fillfuncargs
-from _pytest.python import Module, Class, Instance, Function, Generator
-
-from _pytest.python_api import approx, raises
+from _pytest.fixtures import fixture
+from _pytest.fixtures import yield_fixture
+from _pytest.freeze_support import freeze_includes
+from _pytest.main import Session
+from _pytest.mark import MARK_GEN as mark
+from _pytest.mark import param
+from _pytest.nodes import Collector
+from _pytest.nodes import File
+from _pytest.nodes import Item
+from _pytest.outcomes import exit
+from _pytest.outcomes import fail
+from _pytest.outcomes import importorskip
+from _pytest.outcomes import skip
+from _pytest.outcomes import xfail
+from _pytest.python import Class
+from _pytest.python import Function
+from _pytest.python import Instance
+from _pytest.python import Module
+from _pytest.python import Package
+from _pytest.python_api import approx
+from _pytest.python_api import raises
+from _pytest.recwarn import deprecated_call
+from _pytest.recwarn import warns
+from _pytest.warning_types import PytestAssertRewriteWarning
+from _pytest.warning_types import PytestCacheWarning
+from _pytest.warning_types import PytestCollectionWarning
+from _pytest.warning_types import PytestConfigWarning
+from _pytest.warning_types import PytestDeprecationWarning
+from _pytest.warning_types import PytestExperimentalApiWarning
+from _pytest.warning_types import PytestUnhandledCoroutineWarning
+from _pytest.warning_types import PytestUnknownMarkWarning
+from _pytest.warning_types import PytestWarning
+from _pytest.warning_types import RemovedInPytest4Warning
 
 set_trace = __pytestPDB.set_trace
 
 __all__ = [
-    "main",
-    "UsageError",
-    "cmdline",
-    "hookspec",
-    "hookimpl",
     "__version__",
-    "register_assert_rewrite",
-    "freeze_includes",
-    "set_trace",
-    "warns",
-    "deprecated_call",
-    "fixture",
-    "yield_fixture",
-    "fail",
-    "skip",
-    "xfail",
-    "importorskip",
-    "exit",
-    "mark",
-    "param",
-    "approx",
     "_fillfuncargs",
-    "Item",
-    "File",
-    "Collector",
-    "Session",
-    "Module",
+    "approx",
     "Class",
-    "Instance",
+    "cmdline",
+    "Collector",
+    "deprecated_call",
+    "exit",
+    "fail",
+    "File",
+    "fixture",
+    "freeze_includes",
     "Function",
-    "Generator",
+    "hookimpl",
+    "hookspec",
+    "importorskip",
+    "Instance",
+    "Item",
+    "main",
+    "mark",
+    "Module",
+    "Package",
+    "param",
+    "PytestAssertRewriteWarning",
+    "PytestCacheWarning",
+    "PytestCollectionWarning",
+    "PytestConfigWarning",
+    "PytestDeprecationWarning",
+    "PytestExperimentalApiWarning",
+    "PytestUnhandledCoroutineWarning",
+    "PytestUnknownMarkWarning",
+    "PytestWarning",
     "raises",
+    "register_assert_rewrite",
+    "RemovedInPytest4Warning",
+    "Session",
+    "set_trace",
+    "skip",
+    "UsageError",
+    "warns",
+    "xfail",
+    "yield_fixture",
 ]
 
 if __name__ == "__main__":
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/tasks/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/tasks/__init__.py
deleted file mode 100644
index ea5b1293e33..00000000000
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/tasks/__init__.py
+++ /dev/null
@@ -1,10 +0,0 @@
-"""
-Invoke tasks to help with pytest development and release process.
-"""
-
-import invoke
-
-from . import generate
-
-
-ns = invoke.Collection(generate)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/tasks/generate.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/tasks/generate.py
deleted file mode 100644
index 398af70c942..00000000000
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/tasks/generate.py
+++ /dev/null
@@ -1,118 +0,0 @@
-"""
-Invoke development tasks.
-"""
-from pathlib import Path
-from subprocess import check_output, check_call
-
-import invoke
-
-
-@invoke.task(help={"version": "version being released"})
-def announce(ctx, version):
-    """Generates a new release announcement entry in the docs."""
-    # Get our list of authors
-    stdout = check_output(["git", "describe", "--abbrev=0", "--tags"])
-    stdout = stdout.decode("utf-8")
-    last_version = stdout.strip()
-
-    stdout = check_output(
-        ["git", "log", "{}..HEAD".format(last_version), "--format=%aN"]
-    )
-    stdout = stdout.decode("utf-8")
-
-    contributors = set(stdout.splitlines())
-
-    template_name = "release.minor.rst" if version.endswith(
-        ".0"
-    ) else "release.patch.rst"
-    template_text = Path(__file__).parent.joinpath(template_name).read_text(
-        encoding="UTF-8"
-    )
-
-    contributors_text = "\n".join(
-        "* {}".format(name) for name in sorted(contributors)
-    ) + "\n"
-    text = template_text.format(version=version, contributors=contributors_text)
-
-    target = Path(__file__).parent.joinpath(
-        "../doc/en/announce/release-{}.rst".format(version)
-    )
-    target.write_text(text, encoding="UTF-8")
-    print("[generate.announce] Generated {}".format(target.name))
-
-    # Update index with the new release entry
-    index_path = Path(__file__).parent.joinpath("../doc/en/announce/index.rst")
-    lines = index_path.read_text(encoding="UTF-8").splitlines()
-    indent = "   "
-    for index, line in enumerate(lines):
-        if line.startswith("{}release-".format(indent)):
-            new_line = indent + target.stem
-            if line != new_line:
-                lines.insert(index, new_line)
-                index_path.write_text("\n".join(lines) + "\n", encoding="UTF-8")
-                print("[generate.announce] Updated {}".format(index_path.name))
-            else:
-                print(
-                    "[generate.announce] Skip {} (already contains release)".format(
-                        index_path.name
-                    )
-                )
-            break
-
-    check_call(["git", "add", str(target)])
-
-
-@invoke.task()
-def regen(ctx):
-    """Call regendoc tool to update examples and pytest output in the docs."""
-    print("[generate.regen] Updating docs")
-    check_call(["tox", "-e", "regen"])
-
-
-@invoke.task()
-def make_tag(ctx, version):
-    """Create a new, local tag for the release, only if the repository is clean."""
-    from git import Repo
-
-    repo = Repo(".")
-    if repo.is_dirty():
-        print("Current repository is dirty. Please commit any changes and try again.")
-        raise invoke.Exit(code=2)
-
-    tag_names = [x.name for x in repo.tags]
-    if version in tag_names:
-        print("[generate.make_tag] Delete existing tag {}".format(version))
-        repo.delete_tag(version)
-
-    print("[generate.make_tag] Create tag {}".format(version))
-    repo.create_tag(version)
-
-
-@invoke.task(help={"version": "version being released"})
-def pre_release(ctx, version):
-    """Generates new docs, release announcements and creates a local tag."""
-    announce(ctx, version)
-    regen(ctx)
-    changelog(ctx, version, write_out=True)
-
-    msg = "Preparing release version {}".format(version)
-    check_call(["git", "commit", "-a", "-m", msg])
-
-    make_tag(ctx, version)
-
-    print()
-    print("[generate.pre_release] Please push your branch and open a PR.")
-
-
-@invoke.task(
-    help={
-        "version": "version being released",
-        "write_out": "write changes to the actual changelog",
-    }
-)
-def changelog(ctx, version, write_out=False):
-    if write_out:
-        addopts = []
-    else:
-        addopts = ["--draft"]
-    check_call(["towncrier", "--yes", "--version", version] + addopts)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/tasks/requirements.txt b/tests/wpt/web-platform-tests/tools/third_party/pytest/tasks/requirements.txt
deleted file mode 100644
index db54e76e85c..00000000000
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/tasks/requirements.txt
+++ /dev/null
@@ -1,6 +0,0 @@
--e .
-gitpython
-invoke
-towncrier
-tox
-wheel
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/acceptance_test.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/acceptance_test.py
index c2eed419c9c..9b33930a06c 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/acceptance_test.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/acceptance_test.py
@@ -1,30 +1,38 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import os
 import sys
+import textwrap
 import types
 
+import attr
+import py
 import six
 
-import _pytest._code
-import py
 import pytest
-from _pytest.main import EXIT_NOTESTSCOLLECTED, EXIT_USAGEERROR
+from _pytest.compat import importlib_metadata
+from _pytest.main import EXIT_NOTESTSCOLLECTED
+from _pytest.main import EXIT_USAGEERROR
+from _pytest.warnings import SHOW_PYTEST_WARNINGS_ARG
+
+
+def prepend_pythonpath(*dirs):
+    cur = os.getenv("PYTHONPATH")
+    if cur:
+        dirs += (cur,)
+    return os.pathsep.join(str(p) for p in dirs)
 
 
 class TestGeneralUsage(object):
-
     def test_config_error(self, testdir):
-        testdir.makeconftest(
-            """
-            def pytest_configure(config):
-                import pytest
-                raise pytest.UsageError("hello")
-        """
-        )
+        testdir.copy_example("conftest_usageerror/conftest.py")
         result = testdir.runpytest(testdir.tmpdir)
-        assert result.ret != 0
+        assert result.ret == EXIT_USAGEERROR
         result.stderr.fnmatch_lines(["*ERROR: hello"])
+        result.stdout.fnmatch_lines(["*pytest_unconfigure_called"])
 
     def test_root_conftest_syntax_error(self, testdir):
         testdir.makepyfile(conftest="raise SyntaxError\n")
@@ -102,6 +110,48 @@ class TestGeneralUsage(object):
         assert result.ret == 0
         result.stdout.fnmatch_lines(["*1 passed*"])
 
+    @pytest.mark.parametrize("load_cov_early", [True, False])
+    def test_early_load_setuptools_name(self, testdir, monkeypatch, load_cov_early):
+        testdir.makepyfile(mytestplugin1_module="")
+        testdir.makepyfile(mytestplugin2_module="")
+        testdir.makepyfile(mycov_module="")
+        testdir.syspathinsert()
+
+        loaded = []
+
+        @attr.s
+        class DummyEntryPoint(object):
+            name = attr.ib()
+            module = attr.ib()
+            group = "pytest11"
+
+            def load(self):
+                __import__(self.module)
+                loaded.append(self.name)
+                return sys.modules[self.module]
+
+        entry_points = [
+            DummyEntryPoint("myplugin1", "mytestplugin1_module"),
+            DummyEntryPoint("myplugin2", "mytestplugin2_module"),
+            DummyEntryPoint("mycov", "mycov_module"),
+        ]
+
+        @attr.s
+        class DummyDist(object):
+            entry_points = attr.ib()
+            files = ()
+
+        def my_dists():
+            return (DummyDist(entry_points),)
+
+        monkeypatch.setattr(importlib_metadata, "distributions", my_dists)
+        params = ("-p", "mycov") if load_cov_early else ()
+        testdir.runpytest_inprocess(*params)
+        if load_cov_early:
+            assert loaded == ["mycov", "myplugin1", "myplugin2"]
+        else:
+            assert loaded == ["myplugin1", "myplugin2", "mycov"]
+
     def test_assertion_magic(self, testdir):
         p = testdir.makepyfile(
             """
@@ -138,11 +188,19 @@ class TestGeneralUsage(object):
         p2 = testdir.makefile(".pyc", "123")
         result = testdir.runpytest(p1, p2)
         assert result.ret
-        result.stderr.fnmatch_lines(["*ERROR: not found:*%s" % (p2.basename,)])
+        result.stderr.fnmatch_lines(["*ERROR: not found:*{}".format(p2.basename)])
 
-    def test_issue486_better_reporting_on_conftest_load_failure(self, testdir):
+    @pytest.mark.filterwarnings("default")
+    def test_better_reporting_on_conftest_load_failure(self, testdir, request):
+        """Show a user-friendly traceback on conftest import failures (#486, #3332)"""
         testdir.makepyfile("")
-        testdir.makeconftest("import qwerty")
+        testdir.makeconftest(
+            """
+            def foo():
+                import qwerty
+            foo()
+        """
+        )
         result = testdir.runpytest("--help")
         result.stdout.fnmatch_lines(
             """
@@ -151,10 +209,23 @@ class TestGeneralUsage(object):
         """
         )
         result = testdir.runpytest()
+        dirname = request.node.name + "0"
+        exc_name = (
+            "ModuleNotFoundError" if sys.version_info >= (3, 6) else "ImportError"
+        )
         result.stderr.fnmatch_lines(
-            """
-            *ERROR*could not load*conftest.py*
-        """
+            [
+                "ImportError while loading conftest '*{sep}{dirname}{sep}conftest.py'.".format(
+                    dirname=dirname, sep=os.sep
+                ),
+                "conftest.py:3: in <module>",
+                "    foo()",
+                "conftest.py:2: in foo",
+                "    import qwerty",
+                "E   {}: No module named {q}qwerty{q}".format(
+                    exc_name, q="" if six.PY2 else "'"
+                ),
+            ]
         )
 
     def test_early_skip(self, testdir):
@@ -171,18 +242,7 @@ class TestGeneralUsage(object):
         result.stdout.fnmatch_lines(["*1 skip*"])
 
     def test_issue88_initial_file_multinodes(self, testdir):
-        testdir.makeconftest(
-            """
-            import pytest
-            class MyFile(pytest.File):
-                def collect(self):
-                    return [MyItem("hello", parent=self)]
-            def pytest_collect_file(path, parent):
-                return MyFile(path, parent)
-            class MyItem(pytest.Item):
-                pass
-        """
-        )
+        testdir.copy_example("issue88_initial_file_multinodes")
         p = testdir.makepyfile("def test_hello(): pass")
         result = testdir.runpytest(p, "--collect-only")
         result.stdout.fnmatch_lines(["*MyFile*test_issue88*", "*Module*test_issue88*"])
@@ -191,7 +251,7 @@ class TestGeneralUsage(object):
         testdir.makeconftest(
             """
             import sys
-            print ("should not be seen")
+            print("should not be seen")
             sys.stderr.write("stder42\\n")
         """
         )
@@ -203,7 +263,7 @@ class TestGeneralUsage(object):
     def test_conftest_printing_shows_if_error(self, testdir):
         testdir.makeconftest(
             """
-            print ("should be seen")
+            print("should be seen")
             assert 0
         """
         )
@@ -219,16 +279,16 @@ class TestGeneralUsage(object):
         testdir.tmpdir.join("py").mksymlinkto(py._pydir)
         p = testdir.tmpdir.join("main.py")
         p.write(
-            _pytest._code.Source(
+            textwrap.dedent(
+                """\
+                import sys, os
+                sys.path.insert(0, '')
+                import py
+                print(py.__file__)
+                print(py.__path__)
+                os.chdir(os.path.dirname(os.getcwd()))
+                print(py.log)
                 """
-            import sys, os
-            sys.path.insert(0, '')
-            import py
-            print (py.__file__)
-            print (py.__path__)
-            os.chdir(os.path.dirname(os.getcwd()))
-            print (py.log)
-        """
             )
         )
         result = testdir.runpython(p)
@@ -284,16 +344,16 @@ class TestGeneralUsage(object):
             """
             import pytest
             def pytest_generate_tests(metafunc):
-                metafunc.addcall({'x': 3}, id='hello-123')
+                metafunc.parametrize('x', [3], ids=['hello-123'])
             def pytest_runtest_setup(item):
-                print (item.keywords)
+                print(item.keywords)
                 if 'hello-123' in item.keywords:
                     pytest.skip("hello")
                 assert 0
         """
         )
         p = testdir.makepyfile("""def test_func(x): pass""")
-        res = testdir.runpytest(p)
+        res = testdir.runpytest(p, SHOW_PYTEST_WARNINGS_ARG)
         assert res.ret == 0
         res.stdout.fnmatch_lines(["*1 skipped*"])
 
@@ -301,13 +361,14 @@ class TestGeneralUsage(object):
         p = testdir.makepyfile(
             """
             def pytest_generate_tests(metafunc):
-                metafunc.addcall({'i': 1}, id="1")
-                metafunc.addcall({'i': 2}, id="2")
+                metafunc.parametrize('i', [1, 2], ids=["1", "2"])
             def test_func(i):
                 pass
         """
         )
-        res = testdir.runpytest(p.basename + "::" + "test_func[1]")
+        res = testdir.runpytest(
+            p.basename + "::" + "test_func[1]", SHOW_PYTEST_WARNINGS_ARG
+        )
         assert res.ret == 0
         res.stdout.fnmatch_lines(["*1 passed*"])
 
@@ -356,9 +417,20 @@ class TestGeneralUsage(object):
             assert result.ret == 4  # usage error only if item not found
 
     def test_report_all_failed_collections_initargs(self, testdir):
+        testdir.makeconftest(
+            """
+            from _pytest.main import EXIT_USAGEERROR
+
+            def pytest_sessionfinish(exitstatus):
+                assert exitstatus == EXIT_USAGEERROR
+                print("pytest_sessionfinish_called")
+            """
+        )
         testdir.makepyfile(test_a="def", test_b="def")
         result = testdir.runpytest("test_a.py::a", "test_b.py::b")
         result.stderr.fnmatch_lines(["*ERROR*test_a.py::a*", "*ERROR*test_b.py::b*"])
+        result.stdout.fnmatch_lines(["pytest_sessionfinish_called"])
+        assert result.ret == EXIT_USAGEERROR
 
     @pytest.mark.usefixtures("recwarn")
     def test_namespace_import_doesnt_confuse_import_hook(self, testdir):
@@ -413,7 +485,7 @@ class TestGeneralUsage(object):
             ["*source code not available*", "E*fixture 'invalid_fixture' not found"]
         )
 
-    def test_plugins_given_as_strings(self, tmpdir, monkeypatch):
+    def test_plugins_given_as_strings(self, tmpdir, monkeypatch, _sys_snapshot):
         """test that str values passed to main() as `plugins` arg
         are interpreted as module names to be imported and registered.
         #855.
@@ -458,7 +530,6 @@ class TestGeneralUsage(object):
 
 
 class TestInvocationVariants(object):
-
     def test_earlyinit(self, testdir):
         p = testdir.makepyfile(
             """
@@ -472,7 +543,7 @@ class TestInvocationVariants(object):
     @pytest.mark.xfail("sys.platform.startswith('java')")
     def test_pydoc(self, testdir):
         for name in ("py.test", "pytest"):
-            result = testdir.runpython_c("import %s;help(%s)" % (name, name))
+            result = testdir.runpython_c("import {};help({})".format(name, name))
             assert result.ret == 0
             s = result.stdout.str()
             assert "MarkGenerator" in s
@@ -544,12 +615,11 @@ class TestInvocationVariants(object):
     def test_equivalence_pytest_pytest(self):
         assert pytest.main == py.test.cmdline.main
 
-    def test_invoke_with_string(self, capsys):
-        retcode = pytest.main("-h")
-        assert not retcode
-        out, err = capsys.readouterr()
-        assert "--help" in out
-        pytest.raises(ValueError, lambda: pytest.main(0))
+    def test_invoke_with_invalid_type(self, capsys):
+        with pytest.raises(
+            TypeError, match="expected to be a list or tuple of strings, got: '-h'"
+        ):
+            pytest.main("-h")
 
     def test_invoke_with_path(self, tmpdir, capsys):
         retcode = pytest.main(tmpdir)
@@ -557,9 +627,7 @@ class TestInvocationVariants(object):
         out, err = capsys.readouterr()
 
     def test_invoke_plugin_api(self, testdir, capsys):
-
         class MyPlugin(object):
-
             def pytest_addoption(self, parser):
                 parser.addoption("--myopt")
 
@@ -591,14 +659,8 @@ class TestInvocationVariants(object):
         assert result.ret == 0
         result.stdout.fnmatch_lines(["*1 passed*"])
 
-        def join_pythonpath(what):
-            cur = os.environ.get("PYTHONPATH")
-            if cur:
-                return str(what) + os.pathsep + cur
-            return what
-
         empty_package = testdir.mkpydir("empty_package")
-        monkeypatch.setenv("PYTHONPATH", join_pythonpath(empty_package))
+        monkeypatch.setenv("PYTHONPATH", str(empty_package), prepend=os.pathsep)
         # the path which is not a package raises a warning on pypy;
         # no idea why only pypy and not normal python warn about it here
         with warnings.catch_warnings():
@@ -607,7 +669,7 @@ class TestInvocationVariants(object):
         assert result.ret == 0
         result.stdout.fnmatch_lines(["*2 passed*"])
 
-        monkeypatch.setenv("PYTHONPATH", join_pythonpath(testdir))
+        monkeypatch.setenv("PYTHONPATH", str(testdir), prepend=os.pathsep)
         result = testdir.runpytest("--pyargs", "tpkg.test_missing", syspathinsert=True)
         assert result.ret != 0
         result.stderr.fnmatch_lines(["*not*found*test_missing*"])
@@ -615,6 +677,8 @@ class TestInvocationVariants(object):
     def test_cmdline_python_namespace_package(self, testdir, monkeypatch):
         """
         test --pyargs option with namespace packages (#1567)
+
+        Ref: https://packaging.python.org/guides/packaging-namespace-packages/
         """
         monkeypatch.delenv("PYTHONDONTWRITEBYTECODE", raising=False)
 
@@ -629,7 +693,7 @@ class TestInvocationVariants(object):
             lib = ns.mkdir(dirname)
             lib.ensure("__init__.py")
             lib.join("test_{}.py".format(dirname)).write(
-                "def test_{}(): pass\n" "def test_other():pass".format(dirname)
+                "def test_{}(): pass\ndef test_other():pass".format(dirname)
             )
 
         # The structure of the test directory is now:
@@ -647,27 +711,22 @@ class TestInvocationVariants(object):
         #             ├── __init__.py
         #             └── test_world.py
 
-        def join_pythonpath(*dirs):
-            cur = os.environ.get("PYTHONPATH")
-            if cur:
-                dirs += (cur,)
-            return os.pathsep.join(str(p) for p in dirs)
-
-        monkeypatch.setenv("PYTHONPATH", join_pythonpath(*search_path))
+        # NOTE: the different/reversed ordering is intentional here.
+        monkeypatch.setenv("PYTHONPATH", prepend_pythonpath(*search_path))
         for p in search_path:
             monkeypatch.syspath_prepend(p)
 
         # mixed module and filenames:
-        os.chdir("world")
+        monkeypatch.chdir("world")
         result = testdir.runpytest("--pyargs", "-v", "ns_pkg.hello", "ns_pkg/world")
         assert result.ret == 0
         result.stdout.fnmatch_lines(
             [
-                "*test_hello.py::test_hello*PASSED*",
-                "*test_hello.py::test_other*PASSED*",
-                "*test_world.py::test_world*PASSED*",
-                "*test_world.py::test_other*PASSED*",
-                "*4 passed*",
+                "test_hello.py::test_hello*PASSED*",
+                "test_hello.py::test_other*PASSED*",
+                "ns_pkg/world/test_world.py::test_world*PASSED*",
+                "ns_pkg/world/test_world.py::test_other*PASSED*",
+                "*4 passed in*",
             ]
         )
 
@@ -681,6 +740,16 @@ class TestInvocationVariants(object):
             ["*test_world.py::test_other*PASSED*", "*1 passed*"]
         )
 
+    def test_invoke_test_and_doctestmodules(self, testdir):
+        p = testdir.makepyfile(
+            """
+            def test():
+                pass
+        """
+        )
+        result = testdir.runpytest(str(p) + "::test", "--doctest-modules")
+        result.stdout.fnmatch_lines(["*1 passed*"])
+
     @pytest.mark.skipif(not hasattr(os, "symlink"), reason="requires symlinks")
     def test_cmdline_python_package_symlink(self, testdir, monkeypatch):
         """
@@ -699,8 +768,6 @@ class TestInvocationVariants(object):
                 pytest.skip(six.text_type(e.args[0]))
         monkeypatch.delenv("PYTHONDONTWRITEBYTECODE", raising=False)
 
-        search_path = ["lib", os.path.join("local", "lib")]
-
         dirname = "lib"
         d = testdir.mkdir(dirname)
         foo = d.mkdir("foo")
@@ -708,10 +775,10 @@ class TestInvocationVariants(object):
         lib = foo.mkdir("bar")
         lib.ensure("__init__.py")
         lib.join("test_bar.py").write(
-            "def test_bar(): pass\n" "def test_other(a_fixture):pass"
+            "def test_bar(): pass\ndef test_other(a_fixture):pass"
         )
         lib.join("conftest.py").write(
-            "import pytest\n" "@pytest.fixture\n" "def a_fixture():pass"
+            "import pytest\n@pytest.fixture\ndef a_fixture():pass"
         )
 
         d_local = testdir.mkdir("local")
@@ -733,27 +800,33 @@ class TestInvocationVariants(object):
         #             ├── conftest.py
         #             └── test_bar.py
 
-        def join_pythonpath(*dirs):
-            cur = os.getenv("PYTHONPATH")
-            if cur:
-                dirs += (cur,)
-            return os.pathsep.join(str(p) for p in dirs)
-
-        monkeypatch.setenv("PYTHONPATH", join_pythonpath(*search_path))
+        # NOTE: the different/reversed ordering is intentional here.
+        search_path = ["lib", os.path.join("local", "lib")]
+        monkeypatch.setenv("PYTHONPATH", prepend_pythonpath(*search_path))
         for p in search_path:
             monkeypatch.syspath_prepend(p)
 
         # module picked up in symlink-ed directory:
+        # It picks up local/lib/foo/bar (symlink) via sys.path.
         result = testdir.runpytest("--pyargs", "-v", "foo.bar")
         testdir.chdir()
         assert result.ret == 0
-        result.stdout.fnmatch_lines(
-            [
-                "*lib/foo/bar/test_bar.py::test_bar*PASSED*",
-                "*lib/foo/bar/test_bar.py::test_other*PASSED*",
-                "*2 passed*",
-            ]
-        )
+        if hasattr(py.path.local, "mksymlinkto"):
+            result.stdout.fnmatch_lines(
+                [
+                    "lib/foo/bar/test_bar.py::test_bar PASSED*",
+                    "lib/foo/bar/test_bar.py::test_other PASSED*",
+                    "*2 passed*",
+                ]
+            )
+        else:
+            result.stdout.fnmatch_lines(
+                [
+                    "*lib/foo/bar/test_bar.py::test_bar PASSED*",
+                    "*lib/foo/bar/test_bar.py::test_other PASSED*",
+                    "*2 passed*",
+                ]
+            )
 
     def test_cmdline_python_package_not_exists(self, testdir):
         result = testdir.runpytest("--pyargs", "tpkgwhatv")
@@ -788,19 +861,22 @@ class TestInvocationVariants(object):
         result = testdir.runpytest("-rf")
         lines = result.stdout.str().splitlines()
         for line in lines:
-            if line.startswith("FAIL "):
-                testid = line[5:].strip()
+            if line.startswith(("FAIL ", "FAILED ")):
+                _fail, _sep, testid = line.partition(" ")
                 break
         result = testdir.runpytest(testid, "-rf")
-        result.stdout.fnmatch_lines([line, "*1 failed*"])
+        result.stdout.fnmatch_lines(
+            ["FAILED test_doctest_id.txt::test_doctest_id.txt", "*1 failed*"]
+        )
 
     def test_core_backward_compatibility(self):
         """Test backward compatibility for get_plugin_manager function. See #787."""
         import _pytest.config
 
-        assert type(
-            _pytest.config.get_plugin_manager()
-        ) is _pytest.config.PytestPluginManager
+        assert (
+            type(_pytest.config.get_plugin_manager())
+            is _pytest.config.PytestPluginManager
+        )
 
     def test_has_plugin(self, request):
         """Test hasplugin function of the plugin manager (#932)."""
@@ -826,7 +902,10 @@ class TestDurations(object):
         result = testdir.runpytest("--durations=10")
         assert result.ret == 0
         result.stdout.fnmatch_lines_random(
-            ["*durations*", "*call*test_3*", "*call*test_2*", "*call*test_1*"]
+            ["*durations*", "*call*test_3*", "*call*test_2*"]
+        )
+        result.stdout.fnmatch_lines(
+            ["(0.00 durations hidden.  Use -vv to show these durations.)"]
         )
 
     def test_calls_show_2(self, testdir):
@@ -840,19 +919,31 @@ class TestDurations(object):
         testdir.makepyfile(self.source)
         result = testdir.runpytest("--durations=0")
         assert result.ret == 0
+        for x in "23":
+            for y in ("call",):  # 'setup', 'call', 'teardown':
+                for line in result.stdout.lines:
+                    if ("test_%s" % x) in line and y in line:
+                        break
+                else:
+                    raise AssertionError("not found {} {}".format(x, y))
+
+    def test_calls_showall_verbose(self, testdir):
+        testdir.makepyfile(self.source)
+        result = testdir.runpytest("--durations=0", "-vv")
+        assert result.ret == 0
         for x in "123":
             for y in ("call",):  # 'setup', 'call', 'teardown':
                 for line in result.stdout.lines:
                     if ("test_%s" % x) in line and y in line:
                         break
                 else:
-                    raise AssertionError("not found %s %s" % (x, y))
+                    raise AssertionError("not found {} {}".format(x, y))
 
     def test_with_deselected(self, testdir):
         testdir.makepyfile(self.source)
-        result = testdir.runpytest("--durations=2", "-k test_1")
+        result = testdir.runpytest("--durations=2", "-k test_2")
         assert result.ret == 0
-        result.stdout.fnmatch_lines(["*durations*", "*call*test_1*"])
+        result.stdout.fnmatch_lines(["*durations*", "*call*test_2*"])
 
     def test_with_failing_collection(self, testdir):
         testdir.makepyfile(self.source)
@@ -872,13 +963,15 @@ class TestDurations(object):
 
 class TestDurationWithFixture(object):
     source = """
+        import pytest
         import time
-        frag = 0.001
-        def setup_function(func):
-            time.sleep(frag * 3)
-        def test_1():
-            time.sleep(frag*2)
-        def test_2():
+        frag = 0.01
+
+        @pytest.fixture
+        def setup_fixt():
+            time.sleep(frag)
+
+        def test_1(setup_fixt):
             time.sleep(frag)
     """
 
@@ -933,6 +1026,20 @@ def test_import_plugin_unicode_name(testdir):
     assert r.ret == 0
 
 
+def test_pytest_plugins_as_module(testdir):
+    """Do not raise an error if pytest_plugins attribute is a module (#3899)"""
+    testdir.makepyfile(
+        **{
+            "__init__.py": "",
+            "pytest_plugins.py": "",
+            "conftest.py": "from . import pytest_plugins",
+            "test_foo.py": "def test(): pass",
+        }
+    )
+    result = testdir.runpytest()
+    result.stdout.fnmatch_lines(["* 1 passed in *"])
+
+
 def test_deferred_hook_checking(testdir):
     """
     Check hooks as late as possible (#1821).
@@ -1064,3 +1171,43 @@ def test_frame_leak_on_failing_test(testdir):
     )
     result = testdir.runpytest_subprocess()
     result.stdout.fnmatch_lines(["*1 failed, 1 passed in*"])
+
+
+def test_fixture_mock_integration(testdir):
+    """Test that decorators applied to fixture are left working (#3774)"""
+    p = testdir.copy_example("acceptance/fixture_mock_integration.py")
+    result = testdir.runpytest(p)
+    result.stdout.fnmatch_lines(["*1 passed*"])
+
+
+def test_usage_error_code(testdir):
+    result = testdir.runpytest("-unknown-option-")
+    assert result.ret == EXIT_USAGEERROR
+
+
+@pytest.mark.skipif(
+    sys.version_info[:2] < (3, 5), reason="async def syntax python 3.5+ only"
+)
+@pytest.mark.filterwarnings("default")
+def test_warn_on_async_function(testdir):
+    testdir.makepyfile(
+        test_async="""
+        async def test_1():
+            pass
+        async def test_2():
+            pass
+    """
+    )
+    result = testdir.runpytest()
+    result.stdout.fnmatch_lines(
+        [
+            "test_async.py::test_1",
+            "test_async.py::test_2",
+            "*Coroutine functions are not natively supported*",
+            "*2 skipped, 2 warnings in*",
+        ]
+    )
+    # ensure our warning message appears only once
+    assert (
+        result.stdout.str().count("Coroutine functions are not natively supported") == 1
+    )
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/code/test_code.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/code/test_code.py
index bfae3691882..0b63fcf4d42 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/code/test_code.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/code/test_code.py
@@ -1,12 +1,20 @@
-# coding: utf-8
-from __future__ import absolute_import, division, print_function
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import sys
 
-import _pytest._code
-import py
-import pytest
-from test_excinfo import TWMock
 from six import text_type
+from test_excinfo import TWMock
+
+import _pytest._code
+import pytest
+
+try:
+    import mock
+except ImportError:
+    import unittest.mock as mock
 
 
 def test_ne():
@@ -26,17 +34,14 @@ def test_code_gives_back_name_for_not_existing_file():
 
 
 def test_code_with_class():
-
     class A(object):
         pass
 
-    pytest.raises(TypeError, "_pytest._code.Code(A)")
+    pytest.raises(TypeError, _pytest._code.Code, A)
 
 
-if True:
-
-    def x():
-        pass
+def x():
+    raise NotImplementedError()
 
 
 def test_code_fullsource():
@@ -49,12 +54,11 @@ def test_code_source():
     code = _pytest._code.Code(x)
     src = code.source()
     expected = """def x():
-    pass"""
+    raise NotImplementedError()"""
     assert str(src) == expected
 
 
 def test_frame_getsourcelineno_myself():
-
     def func():
         return sys._getframe(0)
 
@@ -65,18 +69,13 @@ def test_frame_getsourcelineno_myself():
 
 
 def test_getstatement_empty_fullsource():
-
     def func():
         return sys._getframe(0)
 
     f = func()
     f = _pytest._code.Frame(f)
-    prop = f.code.__class__.fullsource
-    try:
-        f.code.__class__.fullsource = None
-        assert f.statement == _pytest._code.Source("")
-    finally:
-        f.code.__class__.fullsource = prop
+    with mock.patch.object(f.code.__class__, "fullsource", None):
+        assert f.statement == ""
 
 
 def test_code_from_func():
@@ -86,20 +85,20 @@ def test_code_from_func():
 
 
 def test_unicode_handling():
-    value = py.builtin._totext("\xc4\x85\xc4\x87\n", "utf-8").encode("utf8")
+    value = u"ąć".encode("UTF-8")
 
     def f():
         raise Exception(value)
 
     excinfo = pytest.raises(Exception, f)
-    str(excinfo)
-    if sys.version_info[0] < 3:
-        text_type(excinfo)
+    text_type(excinfo)
+    if sys.version_info < (3,):
+        bytes(excinfo)
 
 
 @pytest.mark.skipif(sys.version_info[0] >= 3, reason="python 2 only issue")
 def test_unicode_handling_syntax_error():
-    value = py.builtin._totext("\xc4\x85\xc4\x87\n", "utf-8").encode("utf8")
+    value = u"ąć".encode("UTF-8")
 
     def f():
         raise SyntaxError("invalid syntax", (None, 1, 3, value))
@@ -111,34 +110,32 @@ def test_unicode_handling_syntax_error():
 
 
 def test_code_getargs():
-
     def f1(x):
-        pass
+        raise NotImplementedError()
 
     c1 = _pytest._code.Code(f1)
     assert c1.getargs(var=True) == ("x",)
 
     def f2(x, *y):
-        pass
+        raise NotImplementedError()
 
     c2 = _pytest._code.Code(f2)
     assert c2.getargs(var=True) == ("x", "y")
 
     def f3(x, **z):
-        pass
+        raise NotImplementedError()
 
     c3 = _pytest._code.Code(f3)
     assert c3.getargs(var=True) == ("x", "z")
 
     def f4(x, *y, **z):
-        pass
+        raise NotImplementedError()
 
     c4 = _pytest._code.Code(f4)
     assert c4.getargs(var=True) == ("x", "y", "z")
 
 
 def test_frame_getargs():
-
     def f1(x):
         return sys._getframe(0)
 
@@ -165,7 +162,6 @@ def test_frame_getargs():
 
 
 class TestExceptionInfo(object):
-
     def test_bad_getsource(self):
         try:
             if False:
@@ -173,12 +169,15 @@ class TestExceptionInfo(object):
             else:
                 assert False
         except AssertionError:
-            exci = _pytest._code.ExceptionInfo()
+            exci = _pytest._code.ExceptionInfo.from_current()
         assert exci.getrepr()
 
+    def test_from_current_with_missing(self):
+        with pytest.raises(AssertionError, match="no current exception"):
+            _pytest._code.ExceptionInfo.from_current()
+
 
 class TestTracebackEntry(object):
-
     def test_getsource(self):
         try:
             if False:
@@ -186,7 +185,7 @@ class TestTracebackEntry(object):
             else:
                 assert False
         except AssertionError:
-            exci = _pytest._code.ExceptionInfo()
+            exci = _pytest._code.ExceptionInfo.from_current()
         entry = exci.traceback[0]
         source = entry.getsource()
         assert len(source) == 6
@@ -194,17 +193,19 @@ class TestTracebackEntry(object):
 
 
 class TestReprFuncArgs(object):
-
     def test_not_raise_exception_with_mixed_encoding(self):
         from _pytest._code.code import ReprFuncArgs
 
         tw = TWMock()
 
-        args = [("unicode_string", u"São Paulo"), ("utf8_string", "S\xc3\xa3o Paulo")]
+        args = [("unicode_string", u"São Paulo"), ("utf8_string", b"S\xc3\xa3o Paulo")]
 
         r = ReprFuncArgs(args)
         r.toterminal(tw)
         if sys.version_info[0] >= 3:
-            assert tw.lines[0] == "unicode_string = São Paulo, utf8_string = São Paulo"
+            assert (
+                tw.lines[0]
+                == r"unicode_string = São Paulo, utf8_string = b'S\xc3\xa3o Paulo'"
+            )
         else:
             assert tw.lines[0] == "unicode_string = São Paulo, utf8_string = São Paulo"
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/code/test_excinfo.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/code/test_excinfo.py
index f4044b6ecc4..a76797301dd 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/code/test_excinfo.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/code/test_excinfo.py
@@ -1,21 +1,23 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import operator
 import os
 import sys
-import _pytest
+import textwrap
+
 import py
-import pytest
-from _pytest._code.code import (
-    ExceptionInfo,
-    FormattedExcinfo,
-    ReprExceptionInfo,
-    ExceptionChainRepr,
-)
+import six
 from six.moves import queue
 
-from test_source import astonly
+import _pytest
+import pytest
+from _pytest._code.code import ExceptionChainRepr
+from _pytest._code.code import ExceptionInfo
+from _pytest._code.code import FormattedExcinfo
+from _pytest._code.code import ReprExceptionInfo
 
 try:
     import importlib
@@ -29,6 +31,14 @@ failsonjython = pytest.mark.xfail("sys.platform.startswith('java')")
 pytest_version_info = tuple(map(int, pytest.__version__.split(".")[:3]))
 
 
+@pytest.fixture
+def limited_recursion_depth():
+    before = sys.getrecursionlimit()
+    sys.setrecursionlimit(150)
+    yield
+    sys.setrecursionlimit(before)
+
+
 class TWMock(object):
     WRITE = object()
 
@@ -60,12 +70,11 @@ def test_excinfo_simple():
     try:
         raise ValueError
     except ValueError:
-        info = _pytest._code.ExceptionInfo()
+        info = _pytest._code.ExceptionInfo.from_current()
     assert info.type == ValueError
 
 
 def test_excinfo_getstatement():
-
     def g():
         raise ValueError
 
@@ -75,7 +84,7 @@ def test_excinfo_getstatement():
     try:
         f()
     except ValueError:
-        excinfo = _pytest._code.ExceptionInfo()
+        excinfo = _pytest._code.ExceptionInfo.from_current()
     linenumbers = [
         _pytest._code.getrawcode(f).co_firstlineno - 1 + 4,
         _pytest._code.getrawcode(f).co_firstlineno - 1 + 1,
@@ -112,12 +121,11 @@ def h():
 
 
 class TestTraceback_f_g_h(object):
-
     def setup_method(self, method):
         try:
             h()
         except ValueError:
-            self.excinfo = _pytest._code.ExceptionInfo()
+            self.excinfo = _pytest._code.ExceptionInfo.from_current()
 
     def test_traceback_entries(self):
         tb = self.excinfo.traceback
@@ -138,7 +146,6 @@ class TestTraceback_f_g_h(object):
         assert s.startswith("def f():")
         assert s.endswith("raise ValueError")
 
-    @astonly
     @failsonjython
     def test_traceback_entry_getsource_in_construct(self):
         source = _pytest._code.Source(
@@ -149,12 +156,12 @@ class TestTraceback_f_g_h(object):
                 except somenoname:
                     pass
             xyz()
-        """
+            """
         )
         try:
             exec(source.compile())
         except NameError:
-            tb = _pytest._code.ExceptionInfo().traceback
+            tb = _pytest._code.ExceptionInfo.from_current().traceback
             print(tb[-1].getsource())
             s = str(tb[-1].getsource())
             assert s.startswith("def xyz():\n    try:")
@@ -171,7 +178,8 @@ class TestTraceback_f_g_h(object):
 
     def test_traceback_cut_excludepath(self, testdir):
         p = testdir.makepyfile("def f(): raise ValueError")
-        excinfo = pytest.raises(ValueError, "p.pyimport().f()")
+        with pytest.raises(ValueError) as excinfo:
+            p.pyimport().f()
         basedir = py.path.local(pytest.__file__).dirpath()
         newtraceback = excinfo.traceback.cut(excludepath=basedir)
         for x in newtraceback:
@@ -194,7 +202,6 @@ class TestTraceback_f_g_h(object):
         ],
     )
     def test_traceback_filter_selective(self, tracebackhide, matching):
-
         def f():
             #
             raise ValueError
@@ -224,7 +231,6 @@ class TestTraceback_f_g_h(object):
             assert len(ntraceback) == len(traceback) - 1
 
     def test_traceback_recursion_index(self):
-
         def f(n):
             if n < 10:
                 n += 1
@@ -236,19 +242,17 @@ class TestTraceback_f_g_h(object):
         assert recindex == 3
 
     def test_traceback_only_specific_recursion_errors(self, monkeypatch):
-
         def f(n):
             if n == 0:
                 raise RuntimeError("hello")
             f(n - 1)
 
-        excinfo = pytest.raises(RuntimeError, f, 100)
+        excinfo = pytest.raises(RuntimeError, f, 25)
         monkeypatch.delattr(excinfo.traceback.__class__, "recursionindex")
         repr = excinfo.getrepr()
         assert "RuntimeError: hello" in str(repr.reprcrash)
 
     def test_traceback_no_recursion_index(self):
-
         def do_stuff():
             raise RuntimeError
 
@@ -256,7 +260,7 @@ class TestTraceback_f_g_h(object):
             import sys
 
             exc, val, tb = sys.exc_info()
-            py.builtin._reraise(exc, val, tb)
+            six.reraise(exc, val, tb)
 
         def f(n):
             try:
@@ -274,7 +278,7 @@ class TestTraceback_f_g_h(object):
         decorator = pytest.importorskip("decorator").decorator
 
         def log(f, *k, **kw):
-            print("%s %s" % (k, kw))
+            print("{} {}".format(k, kw))
             f(*k, **kw)
 
         log = decorator(log)
@@ -288,7 +292,6 @@ class TestTraceback_f_g_h(object):
         assert excinfo.traceback.recursionindex() is None
 
     def test_traceback_getcrashentry(self):
-
         def i():
             __tracebackhide__ = True
             raise ValueError
@@ -312,7 +315,6 @@ class TestTraceback_f_g_h(object):
         assert entry.frame.code.name == "h"
 
     def test_traceback_getcrashentry_empty(self):
-
         def g():
             __tracebackhide__ = True
             raise ValueError
@@ -333,7 +335,8 @@ class TestTraceback_f_g_h(object):
 def test_excinfo_exconly():
     excinfo = pytest.raises(ValueError, h)
     assert excinfo.exconly().startswith("ValueError")
-    excinfo = pytest.raises(ValueError, "raise ValueError('hello\\nworld')")
+    with pytest.raises(ValueError) as excinfo:
+        raise ValueError("hello\nworld")
     msg = excinfo.exconly(tryshort=True)
     assert msg.startswith("ValueError")
     assert msg.endswith("world")
@@ -353,6 +356,12 @@ def test_excinfo_str():
     assert len(s.split(":")) >= 3  # on windows it's 4
 
 
+def test_excinfo_for_later():
+    e = ExceptionInfo.for_later()
+    assert "for raises" in repr(e)
+    assert "for raises" in str(e)
+
+
 def test_excinfo_errisinstance():
     excinfo = pytest.raises(ValueError, h)
     assert excinfo.errisinstance(ValueError)
@@ -362,7 +371,7 @@ def test_excinfo_no_sourcecode():
     try:
         exec("raise ValueError()")
     except ValueError:
-        excinfo = _pytest._code.ExceptionInfo()
+        excinfo = _pytest._code.ExceptionInfo.from_current()
     s = str(excinfo.traceback[-1])
     assert s == "  File '<string>':1 in <module>\n  ???\n"
 
@@ -387,7 +396,7 @@ def test_entrysource_Queue_example():
     try:
         queue.Queue().get(timeout=0.001)
     except queue.Empty:
-        excinfo = _pytest._code.ExceptionInfo()
+        excinfo = _pytest._code.ExceptionInfo.from_current()
     entry = excinfo.traceback[-1]
     source = entry.getsource()
     assert source is not None
@@ -399,7 +408,7 @@ def test_codepath_Queue_example():
     try:
         queue.Queue().get(timeout=0.001)
     except queue.Empty:
-        excinfo = _pytest._code.ExceptionInfo()
+        excinfo = _pytest._code.ExceptionInfo.from_current()
     entry = excinfo.traceback[-1]
     path = entry.path
     assert isinstance(path, py.path.local)
@@ -429,12 +438,10 @@ def test_match_raises_error(testdir):
 
 
 class TestFormattedExcinfo(object):
-
     @pytest.fixture
-    def importasmod(self, request):
-
+    def importasmod(self, request, _sys_snapshot):
         def importasmod(source):
-            source = _pytest._code.Source(source)
+            source = textwrap.dedent(source)
             tmpdir = request.getfixturevalue("tmpdir")
             modpath = tmpdir.join("mod.py")
             tmpdir.ensure("__init__.py")
@@ -452,16 +459,16 @@ class TestFormattedExcinfo(object):
         except KeyboardInterrupt:
             raise
         except:  # noqa
-            return _pytest._code.ExceptionInfo()
+            return _pytest._code.ExceptionInfo.from_current()
         assert 0, "did not raise"
 
     def test_repr_source(self):
         pr = FormattedExcinfo()
         source = _pytest._code.Source(
-            """
+            """\
             def f(x):
                 pass
-        """
+            """
         ).strip()
         pr.flow_marker = "|"
         lines = pr.get_source(source, 0)
@@ -490,7 +497,7 @@ class TestFormattedExcinfo(object):
         try:
             exec(co)
         except ValueError:
-            excinfo = _pytest._code.ExceptionInfo()
+            excinfo = _pytest._code.ExceptionInfo.from_current()
         repr = pr.repr_excinfo(excinfo)
         assert repr.reprtraceback.reprentries[1].lines[0] == ">   ???"
         if sys.version_info[0] >= 3:
@@ -509,7 +516,7 @@ raise ValueError()
         try:
             exec(co)
         except ValueError:
-            excinfo = _pytest._code.ExceptionInfo()
+            excinfo = _pytest._code.ExceptionInfo.from_current()
         repr = pr.repr_excinfo(excinfo)
         assert repr.reprtraceback.reprentries[1].lines[0] == ">   ???"
         if sys.version_info[0] >= 3:
@@ -519,7 +526,6 @@ raise ValueError()
         pr = FormattedExcinfo()
 
         class FakeCode(object):
-
             class raw(object):
                 co_filename = "?"
 
@@ -537,7 +543,6 @@ raise ValueError()
             f_globals = {}
 
         class FakeTracebackEntry(_pytest._code.Traceback.Entry):
-
             def __init__(self, tb, excinfo=None):
                 self.lineno = 5 + 3
 
@@ -591,6 +596,47 @@ raise ValueError()
         assert reprlocals.lines[2] == "y          = 5"
         assert reprlocals.lines[3] == "z          = 7"
 
+    def test_repr_local_with_error(self):
+        class ObjWithErrorInRepr:
+            def __repr__(self):
+                raise NotImplementedError
+
+        p = FormattedExcinfo(showlocals=True, truncate_locals=False)
+        loc = {"x": ObjWithErrorInRepr(), "__builtins__": {}}
+        reprlocals = p.repr_locals(loc)
+        assert reprlocals.lines
+        assert reprlocals.lines[0] == "__builtins__ = <builtins>"
+        assert '[NotImplementedError("") raised in repr()]' in reprlocals.lines[1]
+
+    def test_repr_local_with_exception_in_class_property(self):
+        class ExceptionWithBrokenClass(Exception):
+            @property
+            def __class__(self):
+                raise TypeError("boom!")
+
+        class ObjWithErrorInRepr:
+            def __repr__(self):
+                raise ExceptionWithBrokenClass()
+
+        p = FormattedExcinfo(showlocals=True, truncate_locals=False)
+        loc = {"x": ObjWithErrorInRepr(), "__builtins__": {}}
+        reprlocals = p.repr_locals(loc)
+        assert reprlocals.lines
+        assert reprlocals.lines[0] == "__builtins__ = <builtins>"
+        assert '[ExceptionWithBrokenClass("") raised in repr()]' in reprlocals.lines[1]
+
+    def test_repr_local_truncated(self):
+        loc = {"l": [i for i in range(10)]}
+        p = FormattedExcinfo(showlocals=True)
+        truncated_reprlocals = p.repr_locals(loc)
+        assert truncated_reprlocals.lines
+        assert truncated_reprlocals.lines[0] == "l          = [0, 1, 2, 3, 4, 5, ...]"
+
+        q = FormattedExcinfo(showlocals=True, truncate_locals=False)
+        full_reprlocals = q.repr_locals(loc)
+        assert full_reprlocals.lines
+        assert full_reprlocals.lines[0] == "l          = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]"
+
     def test_repr_tracebackentry_lines(self, importasmod):
         mod = importasmod(
             """
@@ -882,12 +928,11 @@ raise ValueError()
         from _pytest._code.code import TerminalRepr
 
         class MyRepr(TerminalRepr):
-
             def toterminal(self, tw):
-                tw.line(py.builtin._totext("я", "utf-8"))
+                tw.line(u"я")
 
-        x = py.builtin._totext(MyRepr())
-        assert x == py.builtin._totext("я", "utf-8")
+        x = six.text_type(MyRepr())
+        assert x == u"я"
 
     def test_toterminal_long(self, importasmod):
         mod = importasmod(
@@ -1175,20 +1220,28 @@ raise ValueError()
         assert tw.lines[47] == ":15: AttributeError"
 
     @pytest.mark.skipif("sys.version_info[0] < 3")
-    def test_exc_repr_with_raise_from_none_chain_suppression(self, importasmod):
+    @pytest.mark.parametrize("mode", ["from_none", "explicit_suppress"])
+    def test_exc_repr_chain_suppression(self, importasmod, mode):
+        """Check that exc repr does not show chained exceptions in Python 3.
+        - When the exception is raised with "from None"
+        - Explicitly suppressed with "chain=False" to ExceptionInfo.getrepr().
+        """
+        raise_suffix = " from None" if mode == "from_none" else ""
         mod = importasmod(
             """
             def f():
                 try:
                     g()
                 except Exception:
-                    raise AttributeError() from None
+                    raise AttributeError(){raise_suffix}
             def g():
                 raise ValueError()
-        """
+        """.format(
+                raise_suffix=raise_suffix
+            )
         )
         excinfo = pytest.raises(AttributeError, mod.f)
-        r = excinfo.getrepr(style="long")
+        r = excinfo.getrepr(style="long", chain=mode != "explicit_suppress")
         tw = TWMock()
         r.toterminal(tw)
         for line in tw.lines:
@@ -1198,7 +1251,9 @@ raise ValueError()
         assert tw.lines[2] == "        try:"
         assert tw.lines[3] == "            g()"
         assert tw.lines[4] == "        except Exception:"
-        assert tw.lines[5] == ">           raise AttributeError() from None"
+        assert tw.lines[5] == ">           raise AttributeError(){}".format(
+            raise_suffix
+        )
         assert tw.lines[6] == "E           AttributeError"
         assert tw.lines[7] == ""
         line = tw.get_write_msg(8)
@@ -1266,6 +1321,50 @@ raise ValueError()
             ]
         )
 
+    @pytest.mark.skipif("sys.version_info[0] < 3")
+    def test_exc_chain_repr_cycle(self, importasmod):
+        mod = importasmod(
+            """
+            class Err(Exception):
+                pass
+            def fail():
+                return 0 / 0
+            def reraise():
+                try:
+                    fail()
+                except ZeroDivisionError as e:
+                    raise Err() from e
+            def unreraise():
+                try:
+                    reraise()
+                except Err as e:
+                    raise e.__cause__
+        """
+        )
+        excinfo = pytest.raises(ZeroDivisionError, mod.unreraise)
+        r = excinfo.getrepr(style="short")
+        tw = TWMock()
+        r.toterminal(tw)
+        out = "\n".join(line for line in tw.lines if isinstance(line, str))
+        expected_out = textwrap.dedent(
+            """\
+            :13: in unreraise
+                reraise()
+            :10: in reraise
+                raise Err() from e
+            E   test_exc_chain_repr_cycle0.mod.Err
+
+            During handling of the above exception, another exception occurred:
+            :15: in unreraise
+                raise e.__cause__
+            :8: in reraise
+                fail()
+            :5: in fail
+                return 0 / 0
+            E   ZeroDivisionError: division by zero"""
+        )
+        assert out == expected_out
+
 
 @pytest.mark.parametrize("style", ["short", "long"])
 @pytest.mark.parametrize("encoding", [None, "utf8", "utf16"])
@@ -1276,7 +1375,7 @@ def test_repr_traceback_with_unicode(style, encoding):
     try:
         raise RuntimeError(msg)
     except RuntimeError:
-        e_info = ExceptionInfo()
+        e_info = ExceptionInfo.from_current()
     formatter = FormattedExcinfo(style=style)
     repr_traceback = formatter.repr_traceback(e_info)
     assert repr_traceback is not None
@@ -1296,14 +1395,15 @@ def test_cwd_deleted(testdir):
     assert "INTERNALERROR" not in result.stdout.str() + result.stderr.str()
 
 
+@pytest.mark.usefixtures("limited_recursion_depth")
 def test_exception_repr_extraction_error_on_recursion():
     """
     Ensure we can properly detect a recursion error even
     if some locals raise error on comparison (#2459).
     """
+    from _pytest.pytester import LineMatcher
 
     class numpy_like(object):
-
         def __eq__(self, other):
             if type(other) is numpy_like:
                 raise ValueError(
@@ -1317,41 +1417,30 @@ def test_exception_repr_extraction_error_on_recursion():
     def b(x):
         return a(numpy_like())
 
-    try:
+    with pytest.raises(RuntimeError) as excinfo:
         a(numpy_like())
-    except:  # noqa
-        from _pytest._code.code import ExceptionInfo
-        from _pytest.pytester import LineMatcher
 
-        exc_info = ExceptionInfo()
-
-        matcher = LineMatcher(str(exc_info.getrepr()).splitlines())
-        matcher.fnmatch_lines(
-            [
-                "!!! Recursion error detected, but an error occurred locating the origin of recursion.",
-                "*The following exception happened*",
-                "*ValueError: The truth value of an array*",
-            ]
-        )
+    matcher = LineMatcher(str(excinfo.getrepr()).splitlines())
+    matcher.fnmatch_lines(
+        [
+            "!!! Recursion error detected, but an error occurred locating the origin of recursion.",
+            "*The following exception happened*",
+            "*ValueError: The truth value of an array*",
+        ]
+    )
 
 
+@pytest.mark.usefixtures("limited_recursion_depth")
 def test_no_recursion_index_on_recursion_error():
     """
     Ensure that we don't break in case we can't find the recursion index
     during a recursion error (#2486).
     """
-    try:
 
-        class RecursionDepthError(object):
-
-            def __getattr__(self, attr):
-                return getattr(self, "_" + attr)
+    class RecursionDepthError(object):
+        def __getattr__(self, attr):
+            return getattr(self, "_" + attr)
 
+    with pytest.raises(RuntimeError) as excinfo:
         RecursionDepthError().trigger
-    except:  # noqa
-        from _pytest._code.code import ExceptionInfo
-
-        exc_info = ExceptionInfo()
-        assert "maximum recursion" in str(exc_info.getrepr())
-    else:
-        assert 0
+    assert "maximum recursion" in str(excinfo.getrepr())
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/code/test_source.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/code/test_source.py
index 56dad75671f..d2e3c134cd5 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/code/test_source.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/code/test_source.py
@@ -1,18 +1,21 @@
+# -*- coding: utf-8 -*-
 # flake8: noqa
 # disable flake check on this file because some constructs are strange
 # or redundant on purpose and can't be disable on a line-by-line basis
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import ast
 import inspect
 import sys
 
+import six
+
 import _pytest._code
-import py
 import pytest
 from _pytest._code import Source
-from _pytest._code.source import ast
 
-
-astonly = pytest.mark.nothing
 failsonjython = pytest.mark.xfail("sys.platform.startswith('java')")
 
 
@@ -26,30 +29,17 @@ def test_source_str_function():
     x = Source(
         """
         3
-    """,
-        rstrip=False,
-    )
-    assert str(x) == "\n3\n    "
-
-    x = Source(
         """
-        3
-    """,
-        rstrip=True,
     )
     assert str(x) == "\n3"
 
 
 def test_unicode():
-    try:
-        unicode
-    except NameError:
-        return
-    x = Source(unicode("4"))
+    x = Source(u"4")
     assert str(x) == "4"
-    co = _pytest._code.compile(unicode('u"\xc3\xa5"', "utf8"), mode="eval")
+    co = _pytest._code.compile(u'u"å"', mode="eval")
     val = eval(co)
-    assert isinstance(val, unicode)
+    assert isinstance(val, six.text_type)
 
 
 def test_source_from_function():
@@ -58,9 +48,7 @@ def test_source_from_function():
 
 
 def test_source_from_method():
-
     class TestClass(object):
-
         def test_method(self):
             pass
 
@@ -75,7 +63,6 @@ def test_source_from_lines():
 
 
 def test_source_from_inner_function():
-
     def f():
         pass
 
@@ -135,7 +122,7 @@ def test_source_strip_multiline():
 def test_syntaxerror_rerepresentation():
     ex = pytest.raises(SyntaxError, _pytest._code.compile, "xyz xyz")
     assert ex.value.lineno == 1
-    assert ex.value.offset in (4, 7)  # XXX pypy/jython versus cpython?
+    assert ex.value.offset in (4, 5, 7)  # XXX pypy/jython versus cpython?
     assert ex.value.text.strip(), "x x"
 
 
@@ -199,7 +186,6 @@ class TestSourceParsingAndCompiling(object):
         assert str(source) == "x=3"
 
     def test_compile_and_getsource_through_same_function(self):
-
         def gensource(source):
             return _pytest._code.compile(source)
 
@@ -240,7 +226,6 @@ class TestSourceParsingAndCompiling(object):
         s = source.getstatement(1)
         assert s == str(source)
 
-    @astonly
     def test_getstatementrange_within_constructs(self):
         source = Source(
             """\
@@ -318,8 +303,6 @@ class TestSourceParsingAndCompiling(object):
         pytest.raises(SyntaxError, lambda: source.getstatementrange(0))
 
     def test_compile_to_ast(self):
-        import ast
-
         source = Source("x = 4")
         mod = source.compile(flag=ast.PyCF_ONLY_AST)
         assert isinstance(mod, ast.Module)
@@ -327,23 +310,21 @@ class TestSourceParsingAndCompiling(object):
 
     def test_compile_and_getsource(self):
         co = self.source.compile()
-        py.builtin.exec_(co, globals())
+        exec(co, globals())
         f(7)
-        excinfo = pytest.raises(AssertionError, "f(6)")
+        excinfo = pytest.raises(AssertionError, f, 6)
         frame = excinfo.traceback[-1].frame
         stmt = frame.code.fullsource.getstatement(frame.lineno)
-        # print "block", str(block)
         assert str(stmt).strip().startswith("assert")
 
     @pytest.mark.parametrize("name", ["", None, "my"])
     def test_compilefuncs_and_path_sanity(self, name):
-
         def check(comp, name):
             co = comp(self.source, name)
             if not name:
-                expected = "codegen %s:%d>" % (mypath, mylineno + 2 + 3)
+                expected = "codegen %s:%d>" % (mypath, mylineno + 2 + 2)
             else:
-                expected = "codegen %r %s:%d>" % (name, mypath, mylineno + 2 + 3)
+                expected = "codegen %r %s:%d>" % (name, mypath, mylineno + 2 + 2)
             fn = co.co_filename
             assert fn.endswith(expected)
 
@@ -359,9 +340,7 @@ class TestSourceParsingAndCompiling(object):
 
 
 def test_getstartingblock_singleline():
-
     class A(object):
-
         def __init__(self, *args):
             frame = sys._getframe(1)
             self.source = _pytest._code.Frame(frame).statement
@@ -373,21 +352,16 @@ def test_getstartingblock_singleline():
 
 
 def test_getline_finally():
-
     def c():
         pass
 
-    excinfo = pytest.raises(
-        TypeError,
-        """
-           teardown = None
-           try:
-                c(1)
-           finally:
-                if teardown:
-                    teardown()
-    """,
-    )
+    with pytest.raises(TypeError) as excinfo:
+        teardown = None
+        try:
+            c(1)
+        finally:
+            if teardown:
+                teardown()
     source = excinfo.traceback[-1].statement
     assert str(source).strip() == "c(1)"
 
@@ -400,22 +374,24 @@ def test_getfuncsource_dynamic():
         def g(): pass
     """
     co = _pytest._code.compile(source)
-    py.builtin.exec_(co, globals())
+    exec(co, globals())
     assert str(_pytest._code.Source(f)).strip() == "def f():\n    raise ValueError"
     assert str(_pytest._code.Source(g)).strip() == "def g(): pass"
 
 
 def test_getfuncsource_with_multine_string():
-
     def f():
         c = """while True:
     pass
 """
 
-    assert (
-        str(_pytest._code.Source(f)).strip()
-        == 'def f():\n    c = """while True:\n    pass\n"""'
-    )
+    expected = '''\
+    def f():
+        c = """while True:
+    pass
+"""
+'''
+    assert str(_pytest._code.Source(f)) == expected.rstrip()
 
 
 def test_deindent():
@@ -423,24 +399,16 @@ def test_deindent():
 
     assert deindent(["\tfoo", "\tbar"]) == ["foo", "bar"]
 
-    def f():
-        c = """while True:
-    pass
-"""
-
-    lines = deindent(inspect.getsource(f).splitlines())
-    assert lines == ["def f():", '    c = """while True:', "    pass", '"""']
-
-    source = """
+    source = """\
         def f():
             def g():
                 pass
     """
     lines = deindent(source.splitlines())
-    assert lines == ["", "def f():", "    def g():", "        pass", "    "]
+    assert lines == ["def f():", "    def g():", "        pass"]
 
 
-def test_source_of_class_at_eof_without_newline(tmpdir):
+def test_source_of_class_at_eof_without_newline(tmpdir, _sys_snapshot):
     # this test fails because the implicit inspect.getsource(A) below
     # does not return the "x = 1" last line.
     source = _pytest._code.Source(
@@ -533,19 +501,17 @@ def test_getfslineno():
     class B(object):
         pass
 
-    B.__name__ = "B2"
+    B.__name__ = B.__qualname__ = "B2"
     assert getfslineno(B)[1] == -1
 
 
 def test_code_of_object_instance_with_call():
-
     class A(object):
         pass
 
     pytest.raises(TypeError, lambda: _pytest._code.Source(A()))
 
     class WithCall(object):
-
         def __call__(self):
             pass
 
@@ -553,7 +519,6 @@ def test_code_of_object_instance_with_call():
     assert "pass" in str(code.source())
 
     class Hello(object):
-
         def __call__(self):
             pass
 
@@ -592,7 +557,6 @@ def test_oneline_and_comment():
     assert str(source) == "raise ValueError"
 
 
-@pytest.mark.xfail(hasattr(sys, "pypy_version_info"), reason="does not work on pypy")
 def test_comments():
     source = '''def test():
     "comment 1"
@@ -608,9 +572,15 @@ comment 4
 '''
     for line in range(2, 6):
         assert str(getstatement(line, source)) == "    x = 1"
-    for line in range(6, 10):
+    if sys.version_info >= (3, 8) or hasattr(sys, "pypy_version_info"):
+        tqs_start = 8
+    else:
+        tqs_start = 10
+        assert str(getstatement(10, source)) == '"""'
+    for line in range(6, tqs_start):
         assert str(getstatement(line, source)) == "    assert False"
-    assert str(getstatement(10, source)) == '"""'
+    for line in range(tqs_start, 10):
+        assert str(getstatement(line, source)) == '"""\ncomment 4\n"""'
 
 
 def test_comment_in_statement():
@@ -644,7 +614,7 @@ def test_issue55():
     assert str(s) == '  round_trip("""\n""")'
 
 
-def XXXtest_multiline():
+def test_multiline():
     source = getstatement(
         0,
         """\
@@ -658,7 +628,6 @@ x = 3
 
 
 class TestTry(object):
-    pytestmark = astonly
     source = """\
 try:
     raise ValueError
@@ -703,7 +672,6 @@ finally:
 
 
 class TestIf(object):
-    pytestmark = astonly
     source = """\
 if 1:
     y = 3
@@ -756,3 +724,19 @@ something
 '''"""
     result = getstatement(1, source)
     assert str(result) == "'''\n'''"
+
+
+def test_getstartingblock_multiline():
+    class A(object):
+        def __init__(self, *args):
+            frame = sys._getframe(1)
+            self.source = _pytest._code.Frame(frame).statement
+
+    # fmt: off
+    x = A('x',
+          'y'
+          ,
+          'z')
+    # fmt: on
+    values = [i for i in x.source.lines if i.strip()]
+    assert len(values) == 4
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/code/test_source_multiline_block.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/code/test_source_multiline_block.py
deleted file mode 100644
index 92f7412eb8c..00000000000
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/code/test_source_multiline_block.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# flake8: noqa
-import sys
-
-import _pytest._code
-
-
-def test_getstartingblock_multiline():
-    """
-    This test was originally found in test_source.py, but it depends on the weird
-    formatting of the ``x = A`` construct seen here and our autopep8 tool can only exclude entire
-    files (it does not support excluding lines/blocks using the traditional #noqa comment yet,
-    see hhatto/autopep8#307). It was considered better to just move this single test to its own
-    file and exclude it from autopep8 than try to complicate things.
-    """
-
-    class A(object):
-
-        def __init__(self, *args):
-            frame = sys._getframe(1)
-            self.source = _pytest._code.Frame(frame).statement
-
-    # fmt: off
-    x = A('x',
-          'y'
-          ,
-          'z')
-    # fmt: on
-    values = [i for i in x.source.lines if i.strip()]
-    assert len(values) == 4
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/conftest.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/conftest.py
new file mode 100644
index 00000000000..627ee763d2f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/conftest.py
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+import sys
+
+import pytest
+
+if sys.gettrace():
+
+    @pytest.fixture(autouse=True)
+    def restore_tracing():
+        """Restore tracing function (when run with Coverage.py).
+
+        https://bugs.python.org/issue37011
+        """
+        orig_trace = sys.gettrace()
+        yield
+        if sys.gettrace() != orig_trace:
+            sys.settrace(orig_trace)
+
+
+@pytest.hookimpl(hookwrapper=True, tryfirst=True)
+def pytest_collection_modifyitems(config, items):
+    """Prefer faster tests.
+
+    Use a hookwrapper to do this in the beginning, so e.g. --ff still works
+    correctly.
+    """
+    fast_items = []
+    slow_items = []
+    slowest_items = []
+    neutral_items = []
+
+    spawn_names = {"spawn_pytest", "spawn"}
+
+    for item in items:
+        try:
+            fixtures = item.fixturenames
+        except AttributeError:
+            # doctest at least
+            # (https://github.com/pytest-dev/pytest/issues/5070)
+            neutral_items.append(item)
+        else:
+            if "testdir" in fixtures:
+                if spawn_names.intersection(item.function.__code__.co_names):
+                    item.add_marker(pytest.mark.uses_pexpect)
+                    slowest_items.append(item)
+                else:
+                    slow_items.append(item)
+                item.add_marker(pytest.mark.slow)
+            else:
+                marker = item.get_closest_marker("slow")
+                if marker:
+                    slowest_items.append(item)
+                else:
+                    fast_items.append(item)
+
+    items[:] = fast_items + neutral_items + slow_items + slowest_items
+
+    yield
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/deprecated_test.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/deprecated_test.py
index 39ff1f1fc38..70460214fbd 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/deprecated_test.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/deprecated_test.py
@@ -1,55 +1,18 @@
-from __future__ import absolute_import, division, print_function
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import os
+
 import pytest
+from _pytest.warning_types import PytestDeprecationWarning
+from _pytest.warnings import SHOW_PYTEST_WARNINGS_ARG
+
+pytestmark = pytest.mark.pytester_example_path("deprecated")
 
 
-def test_yield_tests_deprecation(testdir):
-    testdir.makepyfile(
-        """
-        def func1(arg, arg2):
-            assert arg == arg2
-        def test_gen():
-            yield "m1", func1, 15, 3*5
-            yield "m2", func1, 42, 6*7
-        def test_gen2():
-            for k in range(10):
-                yield func1, 1, 1
-    """
-    )
-    result = testdir.runpytest("-ra")
-    result.stdout.fnmatch_lines(
-        [
-            "*yield tests are deprecated, and scheduled to be removed in pytest 4.0*",
-            "*2 passed*",
-        ]
-    )
-    assert result.stdout.str().count("yield tests are deprecated") == 2
-
-
-def test_funcarg_prefix_deprecation(testdir):
-    testdir.makepyfile(
-        """
-        def pytest_funcarg__value():
-            return 10
-
-        def test_funcarg_prefix(value):
-            assert value == 10
-    """
-    )
-    result = testdir.runpytest("-ra")
-    result.stdout.fnmatch_lines(
-        [
-            (
-                "*pytest_funcarg__value: "
-                'declaring fixtures using "pytest_funcarg__" prefix is deprecated '
-                "and scheduled to be removed in pytest 4.0.  "
-                "Please remove the prefix and use the @pytest.fixture decorator instead."
-            ),
-            "*1 passed*",
-        ]
-    )
-
-
-def test_pytest_setup_cfg_deprecated(testdir):
+def test_pytest_setup_cfg_unsupported(testdir):
     testdir.makefile(
         ".cfg",
         setup="""
@@ -57,13 +20,11 @@ def test_pytest_setup_cfg_deprecated(testdir):
         addopts = --verbose
     """,
     )
-    result = testdir.runpytest()
-    result.stdout.fnmatch_lines(
-        ["*pytest*section in setup.cfg files is deprecated*use*tool:pytest*instead*"]
-    )
+    with pytest.raises(pytest.fail.Exception):
+        testdir.runpytest()
 
 
-def test_pytest_custom_cfg_deprecated(testdir):
+def test_pytest_custom_cfg_unsupported(testdir):
     testdir.makefile(
         ".cfg",
         custom="""
@@ -71,36 +32,15 @@ def test_pytest_custom_cfg_deprecated(testdir):
         addopts = --verbose
     """,
     )
-    result = testdir.runpytest("-c", "custom.cfg")
-    result.stdout.fnmatch_lines(
-        ["*pytest*section in custom.cfg files is deprecated*use*tool:pytest*instead*"]
-    )
-
-
-def test_str_args_deprecated(tmpdir, testdir):
-    """Deprecate passing strings to pytest.main(). Scheduled for removal in pytest-4.0."""
-    from _pytest.main import EXIT_NOTESTSCOLLECTED
-
-    warnings = []
-
-    class Collect(object):
-
-        def pytest_logwarning(self, message):
-            warnings.append(message)
-
-    ret = pytest.main("%s -x" % tmpdir, plugins=[Collect()])
-    msg = (
-        "passing a string to pytest.main() is deprecated, "
-        "pass a list of arguments instead."
-    )
-    assert msg in warnings
-    assert ret == EXIT_NOTESTSCOLLECTED
+    with pytest.raises(pytest.fail.Exception):
+        testdir.runpytest("-c", "custom.cfg")
 
 
 def test_getfuncargvalue_is_deprecated(request):
     pytest.deprecated_call(request.getfuncargvalue, "tmpdir")
 
 
+@pytest.mark.filterwarnings("default")
 def test_resultlog_is_deprecated(testdir):
     result = testdir.runpytest("--help")
     result.stdout.fnmatch_lines(["*DEPRECATED path for machine-readable result log*"])
@@ -114,30 +54,12 @@ def test_resultlog_is_deprecated(testdir):
     result = testdir.runpytest("--result-log=%s" % testdir.tmpdir.join("result.log"))
     result.stdout.fnmatch_lines(
         [
-            "*--result-log is deprecated and scheduled for removal in pytest 4.0*",
-            "*See https://docs.pytest.org/*/usage.html#creating-resultlog-format-files for more information*",
+            "*--result-log is deprecated and scheduled for removal in pytest 5.0*",
+            "*See https://docs.pytest.org/en/latest/deprecations.html#result-log-result-log for more information*",
         ]
     )
 
 
-@pytest.mark.filterwarnings("always:Metafunc.addcall is deprecated")
-def test_metafunc_addcall_deprecated(testdir):
-    testdir.makepyfile(
-        """
-        def pytest_generate_tests(metafunc):
-            metafunc.addcall({'i': 1})
-            metafunc.addcall({'i': 2})
-        def test_func(i):
-            pass
-    """
-    )
-    res = testdir.runpytest("-s")
-    assert res.ret == 0
-    res.stdout.fnmatch_lines(
-        ["*Metafunc.addcall is deprecated*", "*2 passed, 2 warnings*"]
-    )
-
-
 def test_terminal_reporter_writer_attr(pytestconfig):
     """Check that TerminalReporter._tw is also available as 'writer' (#2984)
     This attribute is planned to be deprecated in 3.4.
@@ -153,6 +75,7 @@ def test_terminal_reporter_writer_attr(pytestconfig):
 
 
 @pytest.mark.parametrize("plugin", ["catchlog", "capturelog"])
+@pytest.mark.filterwarnings("default")
 def test_pytest_catchlog_deprecated(testdir, plugin):
     testdir.makepyfile(
         """
@@ -169,24 +92,21 @@ def test_pytest_catchlog_deprecated(testdir, plugin):
     )
 
 
+def test_raises_message_argument_deprecated():
+    with pytest.warns(pytest.PytestDeprecationWarning):
+        with pytest.raises(RuntimeError, message="foobar"):
+            raise RuntimeError
+
+
 def test_pytest_plugins_in_non_top_level_conftest_deprecated(testdir):
     from _pytest.deprecated import PYTEST_PLUGINS_FROM_NON_TOP_LEVEL_CONFTEST
 
-    subdirectory = testdir.tmpdir.join("subdirectory")
-    subdirectory.mkdir()
-    # create the inner conftest with makeconftest and then move it to the subdirectory
-    testdir.makeconftest(
-        """
+    testdir.makepyfile(
+        **{
+            "subdirectory/conftest.py": """
         pytest_plugins=['capture']
     """
-    )
-    testdir.tmpdir.join("conftest.py").move(subdirectory.join("conftest.py"))
-    # make the top level conftest
-    testdir.makeconftest(
-        """
-        import warnings
-        warnings.filterwarnings('always', category=DeprecationWarning)
-    """
+        }
     )
     testdir.makepyfile(
         """
@@ -194,15 +114,45 @@ def test_pytest_plugins_in_non_top_level_conftest_deprecated(testdir):
             pass
     """
     )
-    res = testdir.runpytest_subprocess()
-    assert res.ret == 0
-    res.stderr.fnmatch_lines(
-        "*" + str(PYTEST_PLUGINS_FROM_NON_TOP_LEVEL_CONFTEST).splitlines()[0]
+    res = testdir.runpytest(SHOW_PYTEST_WARNINGS_ARG)
+    assert res.ret == 2
+    msg = str(PYTEST_PLUGINS_FROM_NON_TOP_LEVEL_CONFTEST).splitlines()[0]
+    res.stdout.fnmatch_lines(
+        ["*{msg}*".format(msg=msg), "*subdirectory{sep}conftest.py*".format(sep=os.sep)]
     )
 
 
-def test_pytest_plugins_in_non_top_level_conftest_deprecated_no_top_level_conftest(
-    testdir
+@pytest.mark.parametrize("use_pyargs", [True, False])
+def test_pytest_plugins_in_non_top_level_conftest_unsupported_pyargs(
+    testdir, use_pyargs
+):
+    """When using --pyargs, do not emit the warning about non-top-level conftest warnings (#4039, #4044)"""
+    from _pytest.deprecated import PYTEST_PLUGINS_FROM_NON_TOP_LEVEL_CONFTEST
+
+    files = {
+        "src/pkg/__init__.py": "",
+        "src/pkg/conftest.py": "",
+        "src/pkg/test_root.py": "def test(): pass",
+        "src/pkg/sub/__init__.py": "",
+        "src/pkg/sub/conftest.py": "pytest_plugins=['capture']",
+        "src/pkg/sub/test_bar.py": "def test(): pass",
+    }
+    testdir.makepyfile(**files)
+    testdir.syspathinsert(testdir.tmpdir.join("src"))
+
+    args = ("--pyargs", "pkg") if use_pyargs else ()
+    args += (SHOW_PYTEST_WARNINGS_ARG,)
+    res = testdir.runpytest(*args)
+    assert res.ret == (0 if use_pyargs else 2)
+    msg = str(PYTEST_PLUGINS_FROM_NON_TOP_LEVEL_CONFTEST).splitlines()[0]
+    if use_pyargs:
+        assert msg not in res.stdout.str()
+    else:
+        res.stdout.fnmatch_lines(["*{msg}*".format(msg=msg)])
+
+
+def test_pytest_plugins_in_non_top_level_conftest_unsupported_no_top_level_conftest(
+    testdir,
 ):
     from _pytest.deprecated import PYTEST_PLUGINS_FROM_NON_TOP_LEVEL_CONFTEST
 
@@ -210,8 +160,6 @@ def test_pytest_plugins_in_non_top_level_conftest_deprecated_no_top_level_confte
     subdirectory.mkdir()
     testdir.makeconftest(
         """
-        import warnings
-        warnings.filterwarnings('always', category=DeprecationWarning)
         pytest_plugins=['capture']
     """
     )
@@ -225,14 +173,15 @@ def test_pytest_plugins_in_non_top_level_conftest_deprecated_no_top_level_confte
     )
 
     res = testdir.runpytest_subprocess()
-    assert res.ret == 0
-    res.stderr.fnmatch_lines(
-        "*" + str(PYTEST_PLUGINS_FROM_NON_TOP_LEVEL_CONFTEST).splitlines()[0]
+    assert res.ret == 2
+    msg = str(PYTEST_PLUGINS_FROM_NON_TOP_LEVEL_CONFTEST).splitlines()[0]
+    res.stdout.fnmatch_lines(
+        ["*{msg}*".format(msg=msg), "*subdirectory{sep}conftest.py*".format(sep=os.sep)]
     )
 
 
-def test_pytest_plugins_in_non_top_level_conftest_deprecated_no_false_positives(
-    testdir
+def test_pytest_plugins_in_non_top_level_conftest_unsupported_no_false_positives(
+    testdir,
 ):
     from _pytest.deprecated import PYTEST_PLUGINS_FROM_NON_TOP_LEVEL_CONFTEST
 
@@ -260,6 +209,23 @@ def test_pytest_plugins_in_non_top_level_conftest_deprecated_no_false_positives(
     )
     res = testdir.runpytest_subprocess()
     assert res.ret == 0
-    assert str(PYTEST_PLUGINS_FROM_NON_TOP_LEVEL_CONFTEST).splitlines()[
-        0
-    ] not in res.stderr.str()
+    msg = str(PYTEST_PLUGINS_FROM_NON_TOP_LEVEL_CONFTEST).splitlines()[0]
+    assert msg not in res.stdout.str()
+
+
+def test_fixture_named_request(testdir):
+    testdir.copy_example()
+    result = testdir.runpytest()
+    result.stdout.fnmatch_lines(
+        [
+            "*'request' is a reserved name for fixtures and will raise an error in future versions"
+        ]
+    )
+
+
+def test_pytest_warns_unknown_kwargs():
+    with pytest.warns(
+        PytestDeprecationWarning,
+        match=r"pytest.warns\(\) got unexpected keyword arguments: \['foo'\]",
+    ):
+        pytest.warns(UserWarning, foo="hello")
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/README.rst b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/README.rst
new file mode 100644
index 00000000000..97d0fda5c5d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/README.rst
@@ -0,0 +1,9 @@
+Example test scripts
+=====================
+
+
+The files in this folder are not direct tests, but rather example test suites that demonstrate certain issues/behaviours.
+
+In the future we will move part of the content of the acceptance tests here in order to have directly testable code instead of writing out things and then running them in nested pytest sessions/subprocesses.
+
+This will aid debugging and comprehension.
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/acceptance/fixture_mock_integration.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/acceptance/fixture_mock_integration.py
new file mode 100644
index 00000000000..c8ccdf1b488
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/acceptance/fixture_mock_integration.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+"""Reproduces issue #3774"""
+
+try:
+    import mock
+except ImportError:
+    import unittest.mock as mock
+
+import pytest
+
+config = {"mykey": "ORIGINAL"}
+
+
+@pytest.fixture(scope="function")
+@mock.patch.dict(config, {"mykey": "MOCKED"})
+def my_fixture():
+    return config["mykey"]
+
+
+def test_foobar(my_fixture):
+    assert my_fixture == "MOCKED"
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/collect_init_tests/pytest.ini b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/collect_init_tests/pytest.ini
new file mode 100644
index 00000000000..7c479554025
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/collect_init_tests/pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+python_files = *.py
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/collect_init_tests/tests/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/collect_init_tests/tests/__init__.py
new file mode 100644
index 00000000000..6211055718f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/collect_init_tests/tests/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+def test_init():
+    pass
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/collect_init_tests/tests/test_foo.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/collect_init_tests/tests/test_foo.py
new file mode 100644
index 00000000000..8c560fd139f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/collect_init_tests/tests/test_foo.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+def test_foo():
+    pass
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/package_infinite_recursion/conftest.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/package_infinite_recursion/conftest.py
new file mode 100644
index 00000000000..9c3d9a791c0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/package_infinite_recursion/conftest.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+def pytest_ignore_collect(path):
+    return False
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/package_infinite_recursion/tests/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/package_infinite_recursion/tests/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/package_infinite_recursion/tests/test_basic.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/package_infinite_recursion/tests/test_basic.py
new file mode 100644
index 00000000000..10c5f605202
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/package_infinite_recursion/tests/test_basic.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+def test():
+    pass
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/package_init_given_as_arg/pkg/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/package_init_given_as_arg/pkg/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/package_init_given_as_arg/pkg/test_foo.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/package_init_given_as_arg/pkg/test_foo.py
new file mode 100644
index 00000000000..10c5f605202
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/package_init_given_as_arg/pkg/test_foo.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+def test():
+    pass
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/config/collect_pytest_prefix/conftest.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/config/collect_pytest_prefix/conftest.py
new file mode 100644
index 00000000000..13397ccc4c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/config/collect_pytest_prefix/conftest.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+class pytest_something(object):
+    pass
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/config/collect_pytest_prefix/test_foo.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/config/collect_pytest_prefix/test_foo.py
new file mode 100644
index 00000000000..8c560fd139f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/config/collect_pytest_prefix/test_foo.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+def test_foo():
+    pass
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/conftest_usageerror/conftest.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/conftest_usageerror/conftest.py
new file mode 100644
index 00000000000..d2f040578fa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/conftest_usageerror/conftest.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+def pytest_configure(config):
+    import pytest
+
+    raise pytest.UsageError("hello")
+
+
+def pytest_unconfigure(config):
+    print("pytest_unconfigure_called")
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_dataclasses.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_dataclasses.py
new file mode 100644
index 00000000000..5381b5ed071
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_dataclasses.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from dataclasses import dataclass
+from dataclasses import field
+
+
+def test_dataclasses():
+    @dataclass
+    class SimpleDataObject(object):
+        field_a: int = field()
+        field_b: int = field()
+
+    left = SimpleDataObject(1, "b")
+    right = SimpleDataObject(1, "c")
+
+    assert left == right
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_dataclasses_field_comparison_off.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_dataclasses_field_comparison_off.py
new file mode 100644
index 00000000000..d418dd6b0cf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_dataclasses_field_comparison_off.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from dataclasses import dataclass
+from dataclasses import field
+
+
+def test_dataclasses_with_attribute_comparison_off():
+    @dataclass
+    class SimpleDataObject(object):
+        field_a: int = field()
+        field_b: int = field(compare=False)
+
+    left = SimpleDataObject(1, "b")
+    right = SimpleDataObject(1, "c")
+
+    assert left == right
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_dataclasses_verbose.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_dataclasses_verbose.py
new file mode 100644
index 00000000000..a72ca5119e6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_dataclasses_verbose.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from dataclasses import dataclass
+from dataclasses import field
+
+
+def test_dataclasses_verbose():
+    @dataclass
+    class SimpleDataObject(object):
+        field_a: int = field()
+        field_b: int = field()
+
+    left = SimpleDataObject(1, "b")
+    right = SimpleDataObject(1, "c")
+
+    assert left == right
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_two_different_dataclasses.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_two_different_dataclasses.py
new file mode 100644
index 00000000000..b77b70d3c2d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_two_different_dataclasses.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from dataclasses import dataclass
+from dataclasses import field
+
+
+def test_comparing_two_different_data_classes():
+    @dataclass
+    class SimpleDataObjectOne(object):
+        field_a: int = field()
+        field_b: int = field()
+
+    @dataclass
+    class SimpleDataObjectTwo(object):
+        field_a: int = field()
+        field_b: int = field()
+
+    left = SimpleDataObjectOne(1, "b")
+    right = SimpleDataObjectTwo(1, "c")
+
+    assert left != right
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/deprecated/test_fixture_named_request.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/deprecated/test_fixture_named_request.py
new file mode 100644
index 00000000000..36addc29954
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/deprecated/test_fixture_named_request.py
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+import pytest
+
+
+@pytest.fixture
+def request():
+    pass
+
+
+def test():
+    pass
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/custom_item/conftest.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/custom_item/conftest.py
new file mode 100644
index 00000000000..fa41d0fba68
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/custom_item/conftest.py
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+import pytest
+
+
+class CustomItem(pytest.Item, pytest.File):
+    def runtest(self):
+        pass
+
+
+def pytest_collect_file(path, parent):
+    return CustomItem(path, parent)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/custom_item/foo/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/custom_item/foo/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/custom_item/foo/test_foo.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/custom_item/foo/test_foo.py
new file mode 100644
index 00000000000..10c5f605202
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/custom_item/foo/test_foo.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+def test():
+    pass
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/conftest.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/conftest.py
new file mode 100644
index 00000000000..952e7d60a69
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/conftest.py
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+import pytest
+
+
+@pytest.fixture
+def arg1(request):
+    with pytest.raises(Exception):
+        request.getfixturevalue("arg2")
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/test_in_sub1.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/test_in_sub1.py
new file mode 100644
index 00000000000..b824f4e99ef
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/test_in_sub1.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+def test_1(arg1):
+    pass
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/conftest.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/conftest.py
new file mode 100644
index 00000000000..2be90b4dfe7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/conftest.py
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+import pytest
+
+
+@pytest.fixture
+def arg2(request):
+    pytest.raises(Exception, request.getfixturevalue, "arg1")
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/test_in_sub2.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/test_in_sub2.py
new file mode 100644
index 00000000000..a1432042bfd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/test_in_sub2.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+def test_2(arg2):
+    pass
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_detect_recursive_dependency_error.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_detect_recursive_dependency_error.py
new file mode 100644
index 00000000000..d1e54eea7e4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_detect_recursive_dependency_error.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+import pytest
+
+
+@pytest.fixture
+def fix1(fix2):
+    return 1
+
+
+@pytest.fixture
+def fix2(fix1):
+    return 1
+
+
+def test(fix1):
+    pass
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/conftest.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/conftest.py
new file mode 100644
index 00000000000..87756e6491f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/conftest.py
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+import pytest
+
+
+@pytest.fixture
+def spam():
+    return "spam"
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/conftest.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/conftest.py
new file mode 100644
index 00000000000..1cd88524b6f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/conftest.py
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+import pytest
+
+
+@pytest.fixture
+def spam(spam):
+    return spam * 2
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/test_spam.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/test_spam.py
new file mode 100644
index 00000000000..65690c49f23
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/test_spam.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+def test_spam(spam):
+    assert spam == "spamspam"
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/conftest.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/conftest.py
new file mode 100644
index 00000000000..87756e6491f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/conftest.py
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+import pytest
+
+
+@pytest.fixture
+def spam():
+    return "spam"
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/test_extend_fixture_conftest_module.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/test_extend_fixture_conftest_module.py
new file mode 100644
index 00000000000..5b344c122f1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/test_extend_fixture_conftest_module.py
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+import pytest
+
+
+@pytest.fixture
+def spam(spam):
+    return spam * 2
+
+
+def test_spam(spam):
+    assert spam == "spamspam"
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_module_class.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_module_class.py
new file mode 100644
index 00000000000..4332c66017b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_module_class.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+import pytest
+
+
+@pytest.fixture
+def spam():
+    return "spam"
+
+
+class TestSpam(object):
+    @pytest.fixture
+    def spam(self, spam):
+        return spam * 2
+
+    def test_spam(self, spam):
+        assert spam == "spamspam"
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_basic.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_basic.py
new file mode 100644
index 00000000000..ba302c49e6c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_basic.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+import pytest
+
+
+@pytest.fixture
+def some(request):
+    return request.function.__name__
+
+
+@pytest.fixture
+def other(request):
+    return 42
+
+
+def test_func(some, other):
+    pass
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_classlevel.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_classlevel.py
new file mode 100644
index 00000000000..1004d5d1352
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_classlevel.py
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+import pytest
+
+
+class TestClass(object):
+    @pytest.fixture
+    def something(self, request):
+        return request.instance
+
+    def test_method(self, something):
+        assert something is self
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_modulelevel.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_modulelevel.py
new file mode 100644
index 00000000000..79d283e9f66
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_modulelevel.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+import pytest
+
+
+@pytest.fixture
+def something(request):
+    return request.function.__name__
+
+
+class TestClass(object):
+    def test_method(self, something):
+        assert something == "test_method"
+
+
+def test_func(something):
+    assert something == "test_func"
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookupfails.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookupfails.py
new file mode 100644
index 00000000000..18f426af9c9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookupfails.py
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+import pytest
+
+
+@pytest.fixture
+def xyzsomething(request):
+    return 42
+
+
+def test_func(some):
+    pass
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/test_getfixturevalue_dynamic.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/test_getfixturevalue_dynamic.py
new file mode 100644
index 00000000000..219e57421d8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/test_getfixturevalue_dynamic.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+import pytest
+
+
+@pytest.fixture
+def dynamic():
+    pass
+
+
+@pytest.fixture
+def a(request):
+    request.getfixturevalue("dynamic")
+
+
+@pytest.fixture
+def b(a):
+    pass
+
+
+def test(b, request):
+    assert request.fixturenames == ["b", "request", "a", "dynamic"]
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/issue88_initial_file_multinodes/conftest.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/issue88_initial_file_multinodes/conftest.py
new file mode 100644
index 00000000000..8f3e7b4e52a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/issue88_initial_file_multinodes/conftest.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+import pytest
+
+
+class MyFile(pytest.File):
+    def collect(self):
+        return [MyItem("hello", parent=self)]
+
+
+def pytest_collect_file(path, parent):
+    return MyFile(path, parent)
+
+
+class MyItem(pytest.Item):
+    pass
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/issue88_initial_file_multinodes/test_hello.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/issue88_initial_file_multinodes/test_hello.py
new file mode 100644
index 00000000000..653d570a88c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/issue88_initial_file_multinodes/test_hello.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+def test_hello():
+    pass
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/issue_519.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/issue_519.py
new file mode 100644
index 00000000000..24d864a5380
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/issue_519.py
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+import pprint
+
+import pytest
+
+
+def pytest_generate_tests(metafunc):
+    if "arg1" in metafunc.fixturenames:
+        metafunc.parametrize("arg1", ["arg1v1", "arg1v2"], scope="module")
+
+    if "arg2" in metafunc.fixturenames:
+        metafunc.parametrize("arg2", ["arg2v1", "arg2v2"], scope="function")
+
+
+@pytest.fixture(scope="session")
+def checked_order():
+    order = []
+
+    yield order
+    pprint.pprint(order)
+    assert order == [
+        ("testing/example_scripts/issue_519.py", "fix1", "arg1v1"),
+        ("test_one[arg1v1-arg2v1]", "fix2", "arg2v1"),
+        ("test_two[arg1v1-arg2v1]", "fix2", "arg2v1"),
+        ("test_one[arg1v1-arg2v2]", "fix2", "arg2v2"),
+        ("test_two[arg1v1-arg2v2]", "fix2", "arg2v2"),
+        ("testing/example_scripts/issue_519.py", "fix1", "arg1v2"),
+        ("test_one[arg1v2-arg2v1]", "fix2", "arg2v1"),
+        ("test_two[arg1v2-arg2v1]", "fix2", "arg2v1"),
+        ("test_one[arg1v2-arg2v2]", "fix2", "arg2v2"),
+        ("test_two[arg1v2-arg2v2]", "fix2", "arg2v2"),
+    ]
+
+
+@pytest.yield_fixture(scope="module")
+def fix1(request, arg1, checked_order):
+    checked_order.append((request.node.name, "fix1", arg1))
+    yield "fix1-" + arg1
+
+
+@pytest.yield_fixture(scope="function")
+def fix2(request, fix1, arg2, checked_order):
+    checked_order.append((request.node.name, "fix2", arg2))
+    yield "fix2-" + arg2 + fix1
+
+
+def test_one(fix2):
+    pass
+
+
+def test_two(fix2):
+    pass
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/marks/marks_considered_keywords/conftest.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/marks/marks_considered_keywords/conftest.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/marks/marks_considered_keywords/test_marks_as_keywords.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/marks/marks_considered_keywords/test_marks_as_keywords.py
new file mode 100644
index 00000000000..61d969a36b8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/marks/marks_considered_keywords/test_marks_as_keywords.py
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+import pytest
+
+
+@pytest.mark.foo
+def test_mark():
+    pass
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/perf_examples/collect_stats/.gitignore b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/perf_examples/collect_stats/.gitignore
new file mode 100644
index 00000000000..1c45c2ea351
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/perf_examples/collect_stats/.gitignore
@@ -0,0 +1 @@
+foo_*
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/perf_examples/collect_stats/generate_folders.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/perf_examples/collect_stats/generate_folders.py
new file mode 100644
index 00000000000..32ca818ead9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/perf_examples/collect_stats/generate_folders.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+import argparse
+import pathlib
+
+HERE = pathlib.Path(__file__).parent
+TEST_CONTENT = (HERE / "template_test.py").read_bytes()
+
+parser = argparse.ArgumentParser()
+parser.add_argument("numbers", nargs="*", type=int)
+
+
+def generate_folders(root, elements, *more_numbers):
+    fill_len = len(str(elements))
+    if more_numbers:
+        for i in range(elements):
+            new_folder = root.joinpath(f"foo_{i:0>{fill_len}}")
+            new_folder.mkdir()
+            new_folder.joinpath("__init__.py").write_bytes(TEST_CONTENT)
+            generate_folders(new_folder, *more_numbers)
+    else:
+        for i in range(elements):
+            new_test = root.joinpath(f"test_{i:0<{fill_len}}.py")
+            new_test.write_bytes(TEST_CONTENT)
+
+
+if __name__ == "__main__":
+    args = parser.parse_args()
+    generate_folders(HERE, *(args.numbers or (10, 100)))
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/perf_examples/collect_stats/template_test.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/perf_examples/collect_stats/template_test.py
new file mode 100644
index 00000000000..5d0cd5a7164
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/perf_examples/collect_stats/template_test.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+def test_x():
+    pass
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/tmpdir/tmpdir_fixture.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/tmpdir/tmpdir_fixture.py
new file mode 100644
index 00000000000..33f0315d52f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/tmpdir/tmpdir_fixture.py
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+import pytest
+
+
+@pytest.mark.parametrize("a", [r"qwe/\abc"])
+def test_fixture(tmpdir, a):
+    tmpdir.check(dir=1)
+    assert tmpdir.listdir() == []
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/unittest/test_parametrized_fixture_error_message.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/unittest/test_parametrized_fixture_error_message.py
new file mode 100644
index 00000000000..cef950ee782
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/unittest/test_parametrized_fixture_error_message.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+import unittest
+
+import pytest
+
+
+@pytest.fixture(params=[1, 2])
+def two(request):
+    return request.param
+
+
+@pytest.mark.usefixtures("two")
+class TestSomethingElse(unittest.TestCase):
+    def test_two(self):
+        pass
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/unittest/test_setup_skip.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/unittest/test_setup_skip.py
new file mode 100644
index 00000000000..26b6195e96d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/unittest/test_setup_skip.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+"""Skipping an entire subclass with unittest.skip() should *not* call setUp from a base class."""
+import unittest
+
+
+class Base(unittest.TestCase):
+    def setUp(self):
+        assert 0
+
+
+@unittest.skip("skip all tests")
+class Test(Base):
+    def test_foo(self):
+        assert 0
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/unittest/test_setup_skip_class.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/unittest/test_setup_skip_class.py
new file mode 100644
index 00000000000..0c4a3775723
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/unittest/test_setup_skip_class.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+"""Skipping an entire subclass with unittest.skip() should *not* call setUpClass from a base class."""
+import unittest
+
+
+class Base(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        assert 0
+
+
+@unittest.skip("skip all tests")
+class Test(Base):
+    def test_foo(self):
+        assert 0
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/unittest/test_setup_skip_module.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/unittest/test_setup_skip_module.py
new file mode 100644
index 00000000000..abf782a6217
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/unittest/test_setup_skip_module.py
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+"""setUpModule is always called, even if all tests in the module are skipped"""
+import unittest
+
+
+def setUpModule():
+    assert 0
+
+
+@unittest.skip("skip all tests")
+class Base(unittest.TestCase):
+    def test(self):
+        assert 0
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/warnings/test_group_warnings_by_message.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/warnings/test_group_warnings_by_message.py
new file mode 100644
index 00000000000..29d89597452
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/warnings/test_group_warnings_by_message.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+import warnings
+
+import pytest
+
+
+def func():
+    warnings.warn(UserWarning("foo"))
+
+
+@pytest.mark.parametrize("i", range(5))
+def test_foo(i):
+    func()
+
+
+def test_bar():
+    func()
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/examples/test_issue519.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/examples/test_issue519.py
new file mode 100644
index 00000000000..7da1f4ee664
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/examples/test_issue519.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+def test_510(testdir):
+    testdir.copy_example("issue_519.py")
+    testdir.runpytest("issue_519.py")
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/freeze/create_executable.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/freeze/create_executable.py
index 98aa2034c9d..ab8013317b2 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/freeze/create_executable.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/freeze/create_executable.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
 Generates an executable with pytest runner embedded using PyInstaller.
 """
@@ -8,5 +9,6 @@ if __name__ == "__main__":
     hidden = []
     for x in pytest.freeze_includes():
         hidden.extend(["--hidden-import", x])
+    hidden.extend(["--hidden-import", "distutils"])
     args = ["pyinstaller", "--noconfirm"] + hidden + ["runtests_script.py"]
     subprocess.check_call(" ".join(args), shell=True)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/freeze/runtests_script.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/freeze/runtests_script.py
index d03bca8406d..f7381f56863 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/freeze/runtests_script.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/freeze/runtests_script.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
 This is the script that is actually frozen into an executable: simply executes
 py.test main().
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/freeze/tests/test_trivial.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/freeze/tests/test_trivial.py
index 08a55552abb..449dbf9d362 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/freeze/tests/test_trivial.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/freeze/tests/test_trivial.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 def test_upper():
     assert "foo".upper() == "FOO"
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/freeze/tox_run.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/freeze/tox_run.py
index 678a69c858a..29b72792384 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/freeze/tox_run.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/freeze/tox_run.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
 Called by tox.ini: uses the generated executable to run the tests in ./tests/
 directory.
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/io/test_saferepr.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/io/test_saferepr.py
new file mode 100644
index 00000000000..90120308889
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/io/test_saferepr.py
@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+from _pytest._io.saferepr import saferepr
+
+
+def test_simple_repr():
+    assert saferepr(1) == "1"
+    assert saferepr(None) == "None"
+
+
+def test_maxsize():
+    s = saferepr("x" * 50, maxsize=25)
+    assert len(s) == 25
+    expected = repr("x" * 10 + "..." + "x" * 10)
+    assert s == expected
+
+
+def test_maxsize_error_on_instance():
+    class A:
+        def __repr__():
+            raise ValueError("...")
+
+    s = saferepr(("*" * 50, A()), maxsize=25)
+    assert len(s) == 25
+    assert s[0] == "(" and s[-1] == ")"
+
+
+def test_exceptions():
+    class BrokenRepr:
+        def __init__(self, ex):
+            self.ex = ex
+
+        def __repr__(self):
+            raise self.ex
+
+    class BrokenReprException(Exception):
+        __str__ = None
+        __repr__ = None
+
+    assert "Exception" in saferepr(BrokenRepr(Exception("broken")))
+    s = saferepr(BrokenReprException("really broken"))
+    assert "TypeError" in s
+    assert "TypeError" in saferepr(BrokenRepr("string"))
+
+    s2 = saferepr(BrokenRepr(BrokenReprException("omg even worse")))
+    assert "NameError" not in s2
+    assert "unknown" in s2
+
+
+def test_big_repr():
+    from _pytest._io.saferepr import SafeRepr
+
+    assert len(saferepr(range(1000))) <= len("[" + SafeRepr().maxlist * "1000" + "]")
+
+
+def test_repr_on_newstyle():
+    class Function(object):
+        def __repr__(self):
+            return "<%s>" % (self.name)
+
+    assert saferepr(Function())
+
+
+def test_unicode():
+    val = u"£€"
+    reprval = u"'£€'"
+    assert saferepr(val) == reprval
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/logging/test_fixture.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/logging/test_fixture.py
index 8d9ae6b518d..ff772e7ec62 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/logging/test_fixture.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/logging/test_fixture.py
@@ -45,7 +45,7 @@ def test_change_level_undo(testdir):
             assert 0
     """
     )
-    result = testdir.runpytest_subprocess()
+    result = testdir.runpytest()
     result.stdout.fnmatch_lines(["*log from test1*", "*2 failed in *"])
     assert "log from test2" not in result.stdout.str()
 
@@ -73,6 +73,27 @@ def test_log_access(caplog):
     assert "boo arg" in caplog.text
 
 
+def test_messages(caplog):
+    caplog.set_level(logging.INFO)
+    logger.info("boo %s", "arg")
+    logger.info("bar %s\nbaz %s", "arg1", "arg2")
+    assert "boo arg" == caplog.messages[0]
+    assert "bar arg1\nbaz arg2" == caplog.messages[1]
+    assert caplog.text.count("\n") > len(caplog.messages)
+    assert len(caplog.text.splitlines()) > len(caplog.messages)
+
+    try:
+        raise Exception("test")
+    except Exception:
+        logger.exception("oops")
+
+    assert "oops" in caplog.text
+    assert "oops" in caplog.messages[-1]
+    # Tracebacks are stored in the record and not added until the formatter or handler.
+    assert "Exception" in caplog.text
+    assert "Exception" not in caplog.messages[-1]
+
+
 def test_record_tuples(caplog):
     caplog.set_level(logging.INFO)
     logger.info("boo %s", "arg")
@@ -115,5 +136,5 @@ def test_caplog_captures_for_all_stages(caplog, logging_during_setup_and_teardow
 
     assert [x.message for x in caplog.get_records("setup")] == ["a_setup_log"]
 
-    # This reachers into private API, don't use this type of thing in real tests!
+    # This reaches into private API, don't use this type of thing in real tests!
     assert set(caplog._item.catch_log_handlers.keys()) == {"setup", "call"}
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/logging/test_formatter.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/logging/test_formatter.py
index ca2a4106537..c851c34d784 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/logging/test_formatter.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/logging/test_formatter.py
@@ -1,6 +1,10 @@
+# -*- coding: utf-8 -*-
 import logging
 
 import py.io
+import six
+
+import pytest
 from _pytest.logging import ColoredLevelFormatter
 
 
@@ -18,7 +22,6 @@ def test_coloredlogformatter():
     )
 
     class ColorConfig(object):
-
         class option(object):
             pass
 
@@ -26,12 +29,39 @@ def test_coloredlogformatter():
     tw.hasmarkup = True
     formatter = ColoredLevelFormatter(tw, logfmt)
     output = formatter.format(record)
-    assert (
-        output
-        == ("dummypath                   10 " "\x1b[32mINFO    \x1b[0m Test Message")
+    assert output == (
+        "dummypath                   10 \x1b[32mINFO    \x1b[0m Test Message"
     )
 
     tw.hasmarkup = False
     formatter = ColoredLevelFormatter(tw, logfmt)
     output = formatter.format(record)
-    assert output == ("dummypath                   10 " "INFO     Test Message")
+    assert output == ("dummypath                   10 INFO     Test Message")
+
+
+@pytest.mark.skipif(
+    six.PY2, reason="Formatter classes don't support format styles in PY2"
+)
+def test_multiline_message():
+    from _pytest.logging import PercentStyleMultiline
+
+    logfmt = "%(filename)-25s %(lineno)4d %(levelname)-8s %(message)s"
+
+    record = logging.LogRecord(
+        name="dummy",
+        level=logging.INFO,
+        pathname="dummypath",
+        lineno=10,
+        msg="Test Message line1\nline2",
+        args=(),
+        exc_info=False,
+    )
+    # this is called by logging.Formatter.format
+    record.message = record.getMessage()
+
+    style = PercentStyleMultiline(logfmt)
+    output = style.format(record)
+    assert output == (
+        "dummypath                   10 INFO     Test Message line1\n"
+        "                                        line2"
+    )
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/logging/test_reporting.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/logging/test_reporting.py
index 91ed2e4758c..6ff5ccfb55a 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/logging/test_reporting.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/logging/test_reporting.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
-import re
 import os
+import re
+from io import open
 
 import six
 
@@ -53,6 +54,7 @@ def test_root_logger_affected(testdir):
         """
         import logging
         logger = logging.getLogger()
+
         def test_foo():
             logger.info('info text ' + 'going to logger')
             logger.warning('warning text ' + 'going to logger')
@@ -65,15 +67,14 @@ def test_root_logger_affected(testdir):
     result = testdir.runpytest("--log-level=ERROR", "--log-file=pytest.log")
     assert result.ret == 1
 
-    # the capture log calls in the stdout section only contain the
-    # logger.error msg, because --log-level=ERROR
+    # The capture log calls in the stdout section only contain the
+    # logger.error msg, because of --log-level=ERROR.
     result.stdout.fnmatch_lines(["*error text going to logger*"])
-    with pytest.raises(pytest.fail.Exception):
-        result.stdout.fnmatch_lines(["*warning text going to logger*"])
-    with pytest.raises(pytest.fail.Exception):
-        result.stdout.fnmatch_lines(["*info text going to logger*"])
+    stdout = result.stdout.str()
+    assert "warning text going to logger" not in stdout
+    assert "info text going to logger" not in stdout
 
-    # the log file should contain the warning and the error log messages and
+    # The log file should contain the warning and the error log messages and
     # not the info one, because the default level of the root logger is
     # WARNING.
     assert os.path.isfile(log_file)
@@ -247,7 +248,7 @@ def test_log_cli_enabled_disabled(testdir, enabled):
             [
                 "test_log_cli_enabled_disabled.py::test_log_cli ",
                 "*-- live log call --*",
-                "test_log_cli_enabled_disabled.py* CRITICAL critical message logged by test",
+                "CRITICAL *test_log_cli_enabled_disabled.py* critical message logged by test",
                 "PASSED*",
             ]
         )
@@ -281,7 +282,7 @@ def test_log_cli_default_level(testdir):
     result.stdout.fnmatch_lines(
         [
             "test_log_cli_default_level.py::test_log_cli ",
-            "test_log_cli_default_level.py*WARNING message will be shown*",
+            "WARNING*test_log_cli_default_level.py* message will be shown*",
         ]
     )
     assert "INFO message won't be shown" not in result.stdout.str()
@@ -520,16 +521,22 @@ def test_sections_single_new_line_after_test_outcome(testdir, request):
             "=* 1 passed in *=",
         ]
     )
-    assert re.search(
-        r"(.+)live log teardown(.+)\n(.+)WARNING(.+)\n(.+)WARNING(.+)",
-        result.stdout.str(),
-        re.MULTILINE,
-    ) is not None
-    assert re.search(
-        r"(.+)live log finish(.+)\n(.+)WARNING(.+)\n(.+)WARNING(.+)",
-        result.stdout.str(),
-        re.MULTILINE,
-    ) is not None
+    assert (
+        re.search(
+            r"(.+)live log teardown(.+)\nWARNING(.+)\nWARNING(.+)",
+            result.stdout.str(),
+            re.MULTILINE,
+        )
+        is not None
+    )
+    assert (
+        re.search(
+            r"(.+)live log finish(.+)\nWARNING(.+)\nWARNING(.+)",
+            result.stdout.str(),
+            re.MULTILINE,
+        )
+        is not None
+    )
 
 
 def test_log_cli_level(testdir):
@@ -558,7 +565,7 @@ def test_log_cli_level(testdir):
     # fnmatch_lines does an assertion internally
     result.stdout.fnmatch_lines(
         [
-            "test_log_cli_level.py*This log message will be shown",
+            "*test_log_cli_level.py*This log message will be shown",
             "PASSED",  # 'PASSED' on its own line because the log message prints a new line
         ]
     )
@@ -572,7 +579,7 @@ def test_log_cli_level(testdir):
     # fnmatch_lines does an assertion internally
     result.stdout.fnmatch_lines(
         [
-            "test_log_cli_level.py* This log message will be shown",
+            "*test_log_cli_level.py* This log message will be shown",
             "PASSED",  # 'PASSED' on its own line because the log message prints a new line
         ]
     )
@@ -608,7 +615,7 @@ def test_log_cli_ini_level(testdir):
     # fnmatch_lines does an assertion internally
     result.stdout.fnmatch_lines(
         [
-            "test_log_cli_ini_level.py* This log message will be shown",
+            "*test_log_cli_ini_level.py* This log message will be shown",
             "PASSED",  # 'PASSED' on its own line because the log message prints a new line
         ]
     )
@@ -628,7 +635,6 @@ def test_log_cli_auto_enable(testdir, request, cli_args):
     """
     testdir.makepyfile(
         """
-        import pytest
         import logging
 
         def test_log_1():
@@ -646,6 +652,7 @@ def test_log_cli_auto_enable(testdir, request, cli_args):
     )
 
     result = testdir.runpytest(cli_args)
+    stdout = result.stdout.str()
     if cli_args == "--log-cli-level=WARNING":
         result.stdout.fnmatch_lines(
             [
@@ -656,13 +663,13 @@ def test_log_cli_auto_enable(testdir, request, cli_args):
                 "=* 1 passed in *=",
             ]
         )
-        assert "INFO" not in result.stdout.str()
+        assert "INFO" not in stdout
     else:
         result.stdout.fnmatch_lines(
             ["*test_log_cli_auto_enable*100%*", "=* 1 passed in *="]
         )
-        assert "INFO" not in result.stdout.str()
-        assert "WARNING" not in result.stdout.str()
+        assert "INFO" not in stdout
+        assert "WARNING" not in stdout
 
 
 def test_log_file_cli(testdir):
@@ -740,7 +747,7 @@ def test_log_level_not_changed_by_default(testdir):
     """
     )
     result = testdir.runpytest("-s")
-    result.stdout.fnmatch_lines("* 1 passed in *")
+    result.stdout.fnmatch_lines(["* 1 passed in *"])
 
 
 def test_log_file_ini(testdir):
@@ -821,6 +828,43 @@ def test_log_file_ini_level(testdir):
         assert "This log message won't be shown" not in contents
 
 
+def test_log_file_unicode(testdir):
+    log_file = testdir.tmpdir.join("pytest.log").strpath
+
+    testdir.makeini(
+        """
+        [pytest]
+        log_file={}
+        log_file_level = INFO
+        """.format(
+            log_file
+        )
+    )
+    testdir.makepyfile(
+        """
+        # -*- coding: utf-8 -*-
+        from __future__ import unicode_literals
+        import logging
+
+        def test_log_file():
+            logging.getLogger('catchlog').info("Normal message")
+            logging.getLogger('catchlog').info("├")
+            logging.getLogger('catchlog').info("Another normal message")
+    """
+    )
+
+    result = testdir.runpytest()
+
+    # make sure that that we get a '0' exit code for the testsuite
+    assert result.ret == 0
+    assert os.path.isfile(log_file)
+    with open(log_file, encoding="utf-8") as rfh:
+        contents = rfh.read()
+        assert "Normal message" in contents
+        assert u"├" in contents
+        assert "Another normal message" in contents
+
+
 @pytest.mark.parametrize("has_capture_manager", [True, False])
 def test_live_logging_suspends_capture(has_capture_manager, request):
     """Test that capture manager is suspended when we emitting messages for live logging.
@@ -832,25 +876,20 @@ def test_live_logging_suspends_capture(has_capture_manager, request):
     is installed.
     """
     import logging
+    import contextlib
     from functools import partial
-    from _pytest.capture import CaptureManager
     from _pytest.logging import _LiveLoggingStreamHandler
 
     class MockCaptureManager:
         calls = []
 
-        def suspend_global_capture(self):
-            self.calls.append("suspend_global_capture")
-
-        def resume_global_capture(self):
-            self.calls.append("resume_global_capture")
-
-    # sanity check
-    assert CaptureManager.suspend_capture_item
-    assert CaptureManager.resume_global_capture
+        @contextlib.contextmanager
+        def global_and_fixture_disabled(self):
+            self.calls.append("enter disabled")
+            yield
+            self.calls.append("exit disabled")
 
     class DummyTerminal(six.StringIO):
-
         def section(self, *args, **kwargs):
             pass
 
@@ -865,10 +904,259 @@ def test_live_logging_suspends_capture(has_capture_manager, request):
 
     logger.critical("some message")
     if has_capture_manager:
-        assert (
-            MockCaptureManager.calls
-            == ["suspend_global_capture", "resume_global_capture"]
-        )
+        assert MockCaptureManager.calls == ["enter disabled", "exit disabled"]
     else:
         assert MockCaptureManager.calls == []
     assert out_file.getvalue() == "\nsome message\n"
+
+
+def test_collection_live_logging(testdir):
+    testdir.makepyfile(
+        """
+        import logging
+
+        logging.getLogger().info("Normal message")
+    """
+    )
+
+    result = testdir.runpytest("--log-cli-level=INFO")
+    result.stdout.fnmatch_lines(
+        ["*--- live log collection ---*", "*Normal message*", "collected 0 items"]
+    )
+
+
+@pytest.mark.parametrize("verbose", ["", "-q", "-qq"])
+def test_collection_collect_only_live_logging(testdir, verbose):
+    testdir.makepyfile(
+        """
+        def test_simple():
+            pass
+    """
+    )
+
+    result = testdir.runpytest("--collect-only", "--log-cli-level=INFO", verbose)
+
+    expected_lines = []
+
+    if not verbose:
+        expected_lines.extend(
+            [
+                "*collected 1 item*",
+                "*<Module test_collection_collect_only_live_logging.py>*",
+                "*no tests ran*",
+            ]
+        )
+    elif verbose == "-q":
+        assert "collected 1 item*" not in result.stdout.str()
+        expected_lines.extend(
+            [
+                "*test_collection_collect_only_live_logging.py::test_simple*",
+                "no tests ran in * seconds",
+            ]
+        )
+    elif verbose == "-qq":
+        assert "collected 1 item*" not in result.stdout.str()
+        expected_lines.extend(["*test_collection_collect_only_live_logging.py: 1*"])
+
+    result.stdout.fnmatch_lines(expected_lines)
+
+
+def test_collection_logging_to_file(testdir):
+    log_file = testdir.tmpdir.join("pytest.log").strpath
+
+    testdir.makeini(
+        """
+        [pytest]
+        log_file={}
+        log_file_level = INFO
+        """.format(
+            log_file
+        )
+    )
+
+    testdir.makepyfile(
+        """
+        import logging
+
+        logging.getLogger().info("Normal message")
+
+        def test_simple():
+            logging.getLogger().debug("debug message in test_simple")
+            logging.getLogger().info("info message in test_simple")
+    """
+    )
+
+    result = testdir.runpytest()
+
+    assert "--- live log collection ---" not in result.stdout.str()
+
+    assert result.ret == 0
+    assert os.path.isfile(log_file)
+    with open(log_file, encoding="utf-8") as rfh:
+        contents = rfh.read()
+        assert "Normal message" in contents
+        assert "debug message in test_simple" not in contents
+        assert "info message in test_simple" in contents
+
+
+def test_log_in_hooks(testdir):
+    log_file = testdir.tmpdir.join("pytest.log").strpath
+
+    testdir.makeini(
+        """
+        [pytest]
+        log_file={}
+        log_file_level = INFO
+        log_cli=true
+        """.format(
+            log_file
+        )
+    )
+    testdir.makeconftest(
+        """
+        import logging
+
+        def pytest_runtestloop(session):
+            logging.info('runtestloop')
+
+        def pytest_sessionstart(session):
+            logging.info('sessionstart')
+
+        def pytest_sessionfinish(session, exitstatus):
+            logging.info('sessionfinish')
+    """
+    )
+    result = testdir.runpytest()
+    result.stdout.fnmatch_lines(["*sessionstart*", "*runtestloop*", "*sessionfinish*"])
+    with open(log_file) as rfh:
+        contents = rfh.read()
+        assert "sessionstart" in contents
+        assert "runtestloop" in contents
+        assert "sessionfinish" in contents
+
+
+def test_log_in_runtest_logreport(testdir):
+    log_file = testdir.tmpdir.join("pytest.log").strpath
+
+    testdir.makeini(
+        """
+        [pytest]
+        log_file={}
+        log_file_level = INFO
+        log_cli=true
+        """.format(
+            log_file
+        )
+    )
+    testdir.makeconftest(
+        """
+        import logging
+        logger = logging.getLogger(__name__)
+
+        def pytest_runtest_logreport(report):
+            logger.info("logreport")
+    """
+    )
+    testdir.makepyfile(
+        """
+            def test_first():
+                assert True
+        """
+    )
+    testdir.runpytest()
+    with open(log_file) as rfh:
+        contents = rfh.read()
+        assert contents.count("logreport") == 3
+
+
+def test_log_set_path(testdir):
+    report_dir_base = testdir.tmpdir.strpath
+
+    testdir.makeini(
+        """
+        [pytest]
+        log_file_level = DEBUG
+        log_cli=true
+        """
+    )
+    testdir.makeconftest(
+        """
+            import os
+            import pytest
+            @pytest.hookimpl(hookwrapper=True, tryfirst=True)
+            def pytest_runtest_setup(item):
+                config = item.config
+                logging_plugin = config.pluginmanager.get_plugin("logging-plugin")
+                report_file = os.path.join({}, item._request.node.name)
+                logging_plugin.set_log_path(report_file)
+                yield
+        """.format(
+            repr(report_dir_base)
+        )
+    )
+    testdir.makepyfile(
+        """
+            import logging
+            logger = logging.getLogger("testcase-logger")
+            def test_first():
+                logger.info("message from test 1")
+                assert True
+
+            def test_second():
+                logger.debug("message from test 2")
+                assert True
+        """
+    )
+    testdir.runpytest()
+    with open(os.path.join(report_dir_base, "test_first"), "r") as rfh:
+        content = rfh.read()
+        assert "message from test 1" in content
+
+    with open(os.path.join(report_dir_base, "test_second"), "r") as rfh:
+        content = rfh.read()
+        assert "message from test 2" in content
+
+
+def test_colored_captured_log(testdir):
+    """
+    Test that the level names of captured log messages of a failing test are
+    colored.
+    """
+    testdir.makepyfile(
+        """
+        import logging
+
+        logger = logging.getLogger(__name__)
+
+        def test_foo():
+            logger.info('text going to logger from call')
+            assert False
+        """
+    )
+    result = testdir.runpytest("--log-level=INFO", "--color=yes")
+    assert result.ret == 1
+    result.stdout.fnmatch_lines(
+        [
+            "*-- Captured log call --*",
+            "\x1b[32mINFO    \x1b[0m*text going to logger from call",
+        ]
+    )
+
+
+def test_colored_ansi_esc_caplogtext(testdir):
+    """
+    Make sure that caplog.text does not contain ANSI escape sequences.
+    """
+    testdir.makepyfile(
+        """
+        import logging
+
+        logger = logging.getLogger(__name__)
+
+        def test_foo(caplog):
+            logger.info('text going to logger from call')
+            assert '\x1b' not in caplog.text
+        """
+    )
+    result = testdir.runpytest("--log-level=INFO", "--color=yes")
+    assert result.ret == 0
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/approx.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/approx.py
index 9e25feb0b4d..cd8df5d274f 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/approx.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/approx.py
@@ -1,19 +1,19 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-
+import doctest
 import operator
 import sys
-import pytest
-import doctest
-
-from pytest import approx
-from operator import eq, ne
 from decimal import Decimal
 from fractions import Fraction
+from operator import eq
+from operator import ne
+
+import pytest
+from pytest import approx
 
 inf, nan = float("inf"), float("nan")
 
 
 class MyDocTestRunner(doctest.DocTestRunner):
-
     def __init__(self):
         doctest.DocTestRunner.__init__(self)
 
@@ -26,28 +26,27 @@ class MyDocTestRunner(doctest.DocTestRunner):
 
 
 class TestApprox(object):
+    @pytest.fixture
+    def plus_minus(self):
+        return u"\u00b1" if sys.version_info[0] > 2 else u"+-"
 
-    def test_repr_string(self):
-        plus_minus = u"\u00b1" if sys.version_info[0] > 2 else u"+-"
+    def test_repr_string(self, plus_minus):
         tol1, tol2, infr = "1.0e-06", "2.0e-06", "inf"
         assert repr(approx(1.0)) == "1.0 {pm} {tol1}".format(pm=plus_minus, tol1=tol1)
-        assert (
-            repr(approx([1.0, 2.0]))
-            == "approx([1.0 {pm} {tol1}, 2.0 {pm} {tol2}])".format(
-                pm=plus_minus, tol1=tol1, tol2=tol2
-            )
+        assert repr(
+            approx([1.0, 2.0])
+        ) == "approx([1.0 {pm} {tol1}, 2.0 {pm} {tol2}])".format(
+            pm=plus_minus, tol1=tol1, tol2=tol2
         )
-        assert (
-            repr(approx((1.0, 2.0)))
-            == "approx((1.0 {pm} {tol1}, 2.0 {pm} {tol2}))".format(
-                pm=plus_minus, tol1=tol1, tol2=tol2
-            )
+        assert repr(
+            approx((1.0, 2.0))
+        ) == "approx((1.0 {pm} {tol1}, 2.0 {pm} {tol2}))".format(
+            pm=plus_minus, tol1=tol1, tol2=tol2
         )
         assert repr(approx(inf)) == "inf"
         assert repr(approx(1.0, rel=nan)) == "1.0 {pm} ???".format(pm=plus_minus)
-        assert (
-            repr(approx(1.0, rel=inf))
-            == "1.0 {pm} {infr}".format(pm=plus_minus, infr=infr)
+        assert repr(approx(1.0, rel=inf)) == "1.0 {pm} {infr}".format(
+            pm=plus_minus, infr=infr
         )
         assert repr(approx(1.0j, rel=inf)) == "1j"
 
@@ -61,6 +60,22 @@ class TestApprox(object):
             ),
         )
 
+    @pytest.mark.parametrize(
+        "value, repr_string",
+        [
+            (5.0, "approx(5.0 {pm} 5.0e-06)"),
+            ([5.0], "approx([5.0 {pm} 5.0e-06])"),
+            ([[5.0]], "approx([[5.0 {pm} 5.0e-06]])"),
+            ([[5.0, 6.0]], "approx([[5.0 {pm} 5.0e-06, 6.0 {pm} 6.0e-06]])"),
+            ([[5.0], [6.0]], "approx([[5.0 {pm} 5.0e-06], [6.0 {pm} 6.0e-06]])"),
+        ],
+    )
+    def test_repr_nd_array(self, plus_minus, value, repr_string):
+        """Make sure that arrays of all different dimensions are repr'd correctly."""
+        np = pytest.importorskip("numpy")
+        np_array = np.array(value)
+        assert repr(approx(np_array)) == repr_string.format(pm=plus_minus)
+
     def test_operator_overloading(self):
         assert 1 == approx(1, rel=1e-6, abs=1e-12)
         assert not (1 != approx(1, rel=1e-6, abs=1e-12))
@@ -332,6 +347,68 @@ class TestApprox(object):
         assert actual == approx(list(expected), rel=5e-7, abs=0)
         assert actual != approx(list(expected), rel=5e-8, abs=0)
 
+    def test_numpy_tolerance_args(self):
+        """
+        Check that numpy rel/abs args are handled correctly
+        for comparison against an np.array
+        Check both sides of the operator, hopefully it doesn't impact things.
+        Test all permutations of where the approx and np.array() can show up
+        """
+        np = pytest.importorskip("numpy")
+        expected = 100.0
+        actual = 99.0
+        abs_diff = expected - actual
+        rel_diff = (expected - actual) / expected
+
+        tests = [
+            (eq, abs_diff, 0),
+            (eq, 0, rel_diff),
+            (ne, 0, rel_diff / 2.0),  # rel diff fail
+            (ne, abs_diff / 2.0, 0),  # abs diff fail
+        ]
+
+        for op, _abs, _rel in tests:
+            assert op(np.array(actual), approx(expected, abs=_abs, rel=_rel))  # a, b
+            assert op(approx(expected, abs=_abs, rel=_rel), np.array(actual))  # b, a
+
+            assert op(actual, approx(np.array(expected), abs=_abs, rel=_rel))  # a, b
+            assert op(approx(np.array(expected), abs=_abs, rel=_rel), actual)  # b, a
+
+            assert op(np.array(actual), approx(np.array(expected), abs=_abs, rel=_rel))
+            assert op(approx(np.array(expected), abs=_abs, rel=_rel), np.array(actual))
+
+    def test_numpy_expecting_nan(self):
+        np = pytest.importorskip("numpy")
+        examples = [
+            (eq, nan, nan),
+            (eq, -nan, -nan),
+            (eq, nan, -nan),
+            (ne, 0.0, nan),
+            (ne, inf, nan),
+        ]
+        for op, a, x in examples:
+            # Nothing is equal to NaN by default.
+            assert np.array(a) != approx(x)
+            assert a != approx(np.array(x))
+
+            # If ``nan_ok=True``, then NaN is equal to NaN.
+            assert op(np.array(a), approx(x, nan_ok=True))
+            assert op(a, approx(np.array(x), nan_ok=True))
+
+    def test_numpy_expecting_inf(self):
+        np = pytest.importorskip("numpy")
+        examples = [
+            (eq, inf, inf),
+            (eq, -inf, -inf),
+            (ne, inf, -inf),
+            (ne, 0.0, inf),
+            (ne, nan, inf),
+        ]
+        for op, a, x in examples:
+            assert op(np.array(a), approx(x))
+            assert op(a, approx(np.array(x)))
+            assert op(np.array(a), approx(np.array(x)))
+
     def test_numpy_array_wrong_shape(self):
         np = pytest.importorskip("numpy")
 
@@ -367,6 +444,21 @@ class TestApprox(object):
             ["*At index 0 diff: 3 != 4 * {}".format(expected), "=* 1 failed in *="]
         )
 
+    @pytest.mark.parametrize(
+        "x",
+        [
+            pytest.param(None),
+            pytest.param("string"),
+            pytest.param(["string"], id="nested-str"),
+            pytest.param([[1]], id="nested-list"),
+            pytest.param({"key": "string"}, id="dict-with-string"),
+            pytest.param({"key": {"key": 1}}, id="nested-dict"),
+        ],
+    )
+    def test_expected_value_type_error(self, x):
+        with pytest.raises(TypeError):
+            approx(x)
+
     @pytest.mark.parametrize(
         "op",
         [
@@ -404,3 +496,14 @@ class TestApprox(object):
         assert actual != approx(expected, rel=5e-8, abs=0)
         assert approx(expected, rel=5e-7, abs=0) == actual
         assert approx(expected, rel=5e-8, abs=0) != actual
+
+    def test_generic_sized_iterable_object(self):
+        class MySizedIterable(object):
+            def __iter__(self):
+                return iter([1, 2, 3, 4])
+
+            def __len__(self):
+                return 4
+
+        expected = MySizedIterable()
+        assert [1, 2, 3, 4] == approx(expected)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/collect.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/collect.py
index 724504b1af7..501b30a49b0 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/collect.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/collect.py
@@ -1,20 +1,15 @@
 # -*- coding: utf-8 -*-
 import os
 import sys
-from textwrap import dedent
+import textwrap
 
 import _pytest._code
 import pytest
 from _pytest.main import EXIT_NOTESTSCOLLECTED
 from _pytest.nodes import Collector
 
-ignore_parametrized_marks = pytest.mark.filterwarnings(
-    "ignore:Applying marks directly to parameters"
-)
-
 
 class TestModule(object):
-
     def test_failing_import(self, testdir):
         modcol = testdir.getmodulecol("import alksdjalskdjalkjals")
         pytest.raises(Collector.CollectError, modcol.collect)
@@ -39,8 +34,6 @@ class TestModule(object):
         )
 
     def test_import_prepend_append(self, testdir, monkeypatch):
-        syspath = list(sys.path)
-        monkeypatch.setattr(sys, "path", syspath)
         root1 = testdir.mkdir("root1")
         root2 = testdir.mkdir("root2")
         root1.ensure("x456.py")
@@ -48,13 +41,14 @@ class TestModule(object):
         p = root2.join("test_x456.py")
         monkeypatch.syspath_prepend(str(root1))
         p.write(
-            dedent(
+            textwrap.dedent(
                 """\
-            import x456
-            def test():
-                assert x456.__file__.startswith(%r)
-        """
-                % str(root2)
+                import x456
+                def test():
+                    assert x456.__file__.startswith({!r})
+                """.format(
+                    str(root2)
+                )
             )
         )
         with root2.as_cwd():
@@ -141,7 +135,6 @@ class TestModule(object):
 
 
 class TestClass(object):
-
     def test_class_with_init_warning(self, testdir):
         testdir.makepyfile(
             """
@@ -153,7 +146,24 @@ class TestClass(object):
         result = testdir.runpytest("-rw")
         result.stdout.fnmatch_lines(
             [
-                "*cannot collect test class 'TestClass1' because it has a __init__ constructor"
+                "*cannot collect test class 'TestClass1' because it has "
+                "a __init__ constructor (from: test_class_with_init_warning.py)"
+            ]
+        )
+
+    def test_class_with_new_warning(self, testdir):
+        testdir.makepyfile(
+            """
+            class TestClass1(object):
+                def __new__(self):
+                    pass
+        """
+        )
+        result = testdir.runpytest("-rw")
+        result.stdout.fnmatch_lines(
+            [
+                "*cannot collect test class 'TestClass1' because it has "
+                "a __new__ constructor (from: test_class_with_new_warning.py)"
             ]
         )
 
@@ -245,226 +255,14 @@ class TestClass(object):
         assert result.ret == EXIT_NOTESTSCOLLECTED
 
 
-class TestGenerator(object):
-
-    def test_generative_functions(self, testdir):
-        modcol = testdir.getmodulecol(
-            """
-            def func1(arg, arg2):
-                assert arg == arg2
-
-            def test_gen():
-                yield func1, 17, 3*5
-                yield func1, 42, 6*7
-        """
-        )
-        colitems = modcol.collect()
-        assert len(colitems) == 1
-        gencol = colitems[0]
-        assert isinstance(gencol, pytest.Generator)
-        gencolitems = gencol.collect()
-        assert len(gencolitems) == 2
-        assert isinstance(gencolitems[0], pytest.Function)
-        assert isinstance(gencolitems[1], pytest.Function)
-        assert gencolitems[0].name == "[0]"
-        assert gencolitems[0].obj.__name__ == "func1"
-
-    def test_generative_methods(self, testdir):
-        modcol = testdir.getmodulecol(
-            """
-            def func1(arg, arg2):
-                assert arg == arg2
-            class TestGenMethods(object):
-                def test_gen(self):
-                    yield func1, 17, 3*5
-                    yield func1, 42, 6*7
-        """
-        )
-        gencol = modcol.collect()[0].collect()[0].collect()[0]
-        assert isinstance(gencol, pytest.Generator)
-        gencolitems = gencol.collect()
-        assert len(gencolitems) == 2
-        assert isinstance(gencolitems[0], pytest.Function)
-        assert isinstance(gencolitems[1], pytest.Function)
-        assert gencolitems[0].name == "[0]"
-        assert gencolitems[0].obj.__name__ == "func1"
-
-    def test_generative_functions_with_explicit_names(self, testdir):
-        modcol = testdir.getmodulecol(
-            """
-            def func1(arg, arg2):
-                assert arg == arg2
-
-            def test_gen():
-                yield "seventeen", func1, 17, 3*5
-                yield "fortytwo", func1, 42, 6*7
-        """
-        )
-        colitems = modcol.collect()
-        assert len(colitems) == 1
-        gencol = colitems[0]
-        assert isinstance(gencol, pytest.Generator)
-        gencolitems = gencol.collect()
-        assert len(gencolitems) == 2
-        assert isinstance(gencolitems[0], pytest.Function)
-        assert isinstance(gencolitems[1], pytest.Function)
-        assert gencolitems[0].name == "['seventeen']"
-        assert gencolitems[0].obj.__name__ == "func1"
-        assert gencolitems[1].name == "['fortytwo']"
-        assert gencolitems[1].obj.__name__ == "func1"
-
-    def test_generative_functions_unique_explicit_names(self, testdir):
-        # generative
-        modcol = testdir.getmodulecol(
-            """
-            def func(): pass
-            def test_gen():
-                yield "name", func
-                yield "name", func
-        """
-        )
-        colitems = modcol.collect()
-        assert len(colitems) == 1
-        gencol = colitems[0]
-        assert isinstance(gencol, pytest.Generator)
-        pytest.raises(ValueError, "gencol.collect()")
-
-    def test_generative_methods_with_explicit_names(self, testdir):
-        modcol = testdir.getmodulecol(
-            """
-            def func1(arg, arg2):
-                assert arg == arg2
-            class TestGenMethods(object):
-                def test_gen(self):
-                    yield "m1", func1, 17, 3*5
-                    yield "m2", func1, 42, 6*7
-        """
-        )
-        gencol = modcol.collect()[0].collect()[0].collect()[0]
-        assert isinstance(gencol, pytest.Generator)
-        gencolitems = gencol.collect()
-        assert len(gencolitems) == 2
-        assert isinstance(gencolitems[0], pytest.Function)
-        assert isinstance(gencolitems[1], pytest.Function)
-        assert gencolitems[0].name == "['m1']"
-        assert gencolitems[0].obj.__name__ == "func1"
-        assert gencolitems[1].name == "['m2']"
-        assert gencolitems[1].obj.__name__ == "func1"
-
-    def test_order_of_execution_generator_same_codeline(self, testdir, tmpdir):
-        o = testdir.makepyfile(
-            """
-            from __future__ import print_function
-            def test_generative_order_of_execution():
-                import py, pytest
-                test_list = []
-                expected_list = list(range(6))
-
-                def list_append(item):
-                    test_list.append(item)
-
-                def assert_order_of_execution():
-                    print('expected order', expected_list)
-                    print('but got       ', test_list)
-                    assert test_list == expected_list
-
-                for i in expected_list:
-                    yield list_append, i
-                yield assert_order_of_execution
-        """
-        )
-        reprec = testdir.inline_run(o)
-        passed, skipped, failed = reprec.countoutcomes()
-        assert passed == 7
-        assert not skipped and not failed
-
-    def test_order_of_execution_generator_different_codeline(self, testdir):
-        o = testdir.makepyfile(
-            """
-            from __future__ import print_function
-            def test_generative_tests_different_codeline():
-                import py, pytest
-                test_list = []
-                expected_list = list(range(3))
-
-                def list_append_2():
-                    test_list.append(2)
-
-                def list_append_1():
-                    test_list.append(1)
-
-                def list_append_0():
-                    test_list.append(0)
-
-                def assert_order_of_execution():
-                    print('expected order', expected_list)
-                    print('but got       ', test_list)
-                    assert test_list == expected_list
-
-                yield list_append_0
-                yield list_append_1
-                yield list_append_2
-                yield assert_order_of_execution
-        """
-        )
-        reprec = testdir.inline_run(o)
-        passed, skipped, failed = reprec.countoutcomes()
-        assert passed == 4
-        assert not skipped and not failed
-
-    def test_setupstate_is_preserved_134(self, testdir):
-        # yield-based tests are messy wrt to setupstate because
-        # during collection they already invoke setup functions
-        # and then again when they are run.  For now, we want to make sure
-        # that the old 1.3.4 behaviour is preserved such that all
-        # yielded functions all share the same "self" instance that
-        # has been used during collection.
-        o = testdir.makepyfile(
-            """
-            setuplist = []
-            class TestClass(object):
-                def setup_method(self, func):
-                    #print "setup_method", self, func
-                    setuplist.append(self)
-                    self.init = 42
-
-                def teardown_method(self, func):
-                    self.init = None
-
-                def test_func1(self):
-                    pass
-
-                def test_func2(self):
-                    yield self.func2
-                    yield self.func2
-
-                def func2(self):
-                    assert self.init
-
-            def test_setuplist():
-                # once for test_func2 during collection
-                # once for test_func1 during test run
-                # once for test_func2 during test run
-                #print setuplist
-                assert len(setuplist) == 3, len(setuplist)
-                assert setuplist[0] == setuplist[2], setuplist
-                assert setuplist[1] != setuplist[2], setuplist
-        """
-        )
-        reprec = testdir.inline_run(o, "-v")
-        passed, skipped, failed = reprec.countoutcomes()
-        assert passed == 4
-        assert not skipped and not failed
-
-
 class TestFunction(object):
-
     def test_getmodulecollector(self, testdir):
         item = testdir.getitem("def test_func(): pass")
         modcol = item.getparent(pytest.Module)
         assert isinstance(modcol, pytest.Module)
         assert hasattr(modcol.obj, "test_func")
 
+    @pytest.mark.filterwarnings("default")
     def test_function_as_object_instance_ignored(self, testdir):
         testdir.makepyfile(
             """
@@ -475,29 +273,43 @@ class TestFunction(object):
             test_a = A()
         """
         )
-        reprec = testdir.inline_run()
-        reprec.assertoutcome()
+        result = testdir.runpytest()
+        result.stdout.fnmatch_lines(
+            [
+                "collected 0 items",
+                "*test_function_as_object_instance_ignored.py:2: "
+                "*cannot collect 'test_a' because it is not a function.",
+            ]
+        )
 
-    def test_function_equality(self, testdir, tmpdir):
+    @staticmethod
+    def make_function(testdir, **kwargs):
         from _pytest.fixtures import FixtureManager
 
         config = testdir.parseconfigure()
         session = testdir.Session(config)
         session._fixturemanager = FixtureManager(session)
 
+        return pytest.Function(config=config, parent=session, **kwargs)
+
+    def test_function_equality(self, testdir, tmpdir):
         def func1():
             pass
 
         def func2():
             pass
 
-        f1 = pytest.Function(
-            name="name", parent=session, config=config, args=(1,), callobj=func1
-        )
+        f1 = self.make_function(testdir, name="name", args=(1,), callobj=func1)
         assert f1 == f1
-        f2 = pytest.Function(name="name", config=config, callobj=func2, parent=session)
+        f2 = self.make_function(testdir, name="name", callobj=func2)
         assert f1 != f2
 
+    def test_repr_produces_actual_test_id(self, testdir):
+        f = self.make_function(
+            testdir, name=r"test[\xe5]", callobj=self.test_repr_produces_actual_test_id
+        )
+        assert repr(f) == r"<Function test[\xe5]>"
+
     def test_issue197_parametrize_emptyset(self, testdir):
         testdir.makepyfile(
             """
@@ -634,7 +446,37 @@ class TestFunction(object):
         rec = testdir.inline_run()
         rec.assertoutcome(passed=1)
 
-    @ignore_parametrized_marks
+    def test_parametrize_overrides_indirect_dependency_fixture(self, testdir):
+        """Test parametrization when parameter overrides a fixture that a test indirectly depends on"""
+        testdir.makepyfile(
+            """
+            import pytest
+
+            fix3_instantiated = False
+
+            @pytest.fixture
+            def fix1(fix2):
+               return fix2 + '1'
+
+            @pytest.fixture
+            def fix2(fix3):
+               return fix3 + '2'
+
+            @pytest.fixture
+            def fix3():
+               global fix3_instantiated
+               fix3_instantiated = True
+               return '3'
+
+            @pytest.mark.parametrize('fix2', ['2'])
+            def test_it(fix1):
+               assert fix1 == '21'
+               assert not fix3_instantiated
+        """
+        )
+        rec = testdir.inline_run()
+        rec.assertoutcome(passed=1)
+
     def test_parametrize_with_mark(self, testdir):
         items = testdir.getitems(
             """
@@ -642,7 +484,7 @@ class TestFunction(object):
             @pytest.mark.foo
             @pytest.mark.parametrize('arg', [
                 1,
-                pytest.mark.bar(pytest.mark.baz(2))
+                pytest.param(2, marks=[pytest.mark.baz, pytest.mark.bar])
             ])
             def test_function(arg):
                 pass
@@ -673,12 +515,10 @@ class TestFunction(object):
         config = item.config
 
         class MyPlugin1(object):
-
             def pytest_pyfunc_call(self, pyfuncitem):
                 raise ValueError
 
         class MyPlugin2(object):
-
             def pytest_pyfunc_call(self, pyfuncitem):
                 return True
 
@@ -722,7 +562,6 @@ class TestFunction(object):
         assert colitems[2].name == "test2[a-c]"
         assert colitems[3].name == "test2[b-c]"
 
-    @ignore_parametrized_marks
     def test_parametrize_skipif(self, testdir):
         testdir.makepyfile(
             """
@@ -730,15 +569,14 @@ class TestFunction(object):
 
             m = pytest.mark.skipif('True')
 
-            @pytest.mark.parametrize('x', [0, 1, m(2)])
+            @pytest.mark.parametrize('x', [0, 1, pytest.param(2, marks=m)])
             def test_skip_if(x):
                 assert x < 2
         """
         )
         result = testdir.runpytest()
-        result.stdout.fnmatch_lines("* 2 passed, 1 skipped in *")
+        result.stdout.fnmatch_lines(["* 2 passed, 1 skipped in *"])
 
-    @ignore_parametrized_marks
     def test_parametrize_skip(self, testdir):
         testdir.makepyfile(
             """
@@ -746,15 +584,14 @@ class TestFunction(object):
 
             m = pytest.mark.skip('')
 
-            @pytest.mark.parametrize('x', [0, 1, m(2)])
+            @pytest.mark.parametrize('x', [0, 1, pytest.param(2, marks=m)])
             def test_skip(x):
                 assert x < 2
         """
         )
         result = testdir.runpytest()
-        result.stdout.fnmatch_lines("* 2 passed, 1 skipped in *")
+        result.stdout.fnmatch_lines(["* 2 passed, 1 skipped in *"])
 
-    @ignore_parametrized_marks
     def test_parametrize_skipif_no_skip(self, testdir):
         testdir.makepyfile(
             """
@@ -768,9 +605,8 @@ class TestFunction(object):
         """
         )
         result = testdir.runpytest()
-        result.stdout.fnmatch_lines("* 1 failed, 2 passed in *")
+        result.stdout.fnmatch_lines(["* 1 failed, 2 passed in *"])
 
-    @ignore_parametrized_marks
     def test_parametrize_xfail(self, testdir):
         testdir.makepyfile(
             """
@@ -778,15 +614,14 @@ class TestFunction(object):
 
             m = pytest.mark.xfail('True')
 
-            @pytest.mark.parametrize('x', [0, 1, m(2)])
+            @pytest.mark.parametrize('x', [0, 1, pytest.param(2, marks=m)])
             def test_xfail(x):
                 assert x < 2
         """
         )
         result = testdir.runpytest()
-        result.stdout.fnmatch_lines("* 2 passed, 1 xfailed in *")
+        result.stdout.fnmatch_lines(["* 2 passed, 1 xfailed in *"])
 
-    @ignore_parametrized_marks
     def test_parametrize_passed(self, testdir):
         testdir.makepyfile(
             """
@@ -794,15 +629,14 @@ class TestFunction(object):
 
             m = pytest.mark.xfail('True')
 
-            @pytest.mark.parametrize('x', [0, 1, m(2)])
+            @pytest.mark.parametrize('x', [0, 1, pytest.param(2, marks=m)])
             def test_xfail(x):
                 pass
         """
         )
         result = testdir.runpytest()
-        result.stdout.fnmatch_lines("* 2 passed, 1 xpassed in *")
+        result.stdout.fnmatch_lines(["* 2 passed, 1 xpassed in *"])
 
-    @ignore_parametrized_marks
     def test_parametrize_xfail_passed(self, testdir):
         testdir.makepyfile(
             """
@@ -816,7 +650,7 @@ class TestFunction(object):
         """
         )
         result = testdir.runpytest()
-        result.stdout.fnmatch_lines("* 3 passed in *")
+        result.stdout.fnmatch_lines(["* 3 passed in *"])
 
     def test_function_original_name(self, testdir):
         items = testdir.getitems(
@@ -831,7 +665,6 @@ class TestFunction(object):
 
 
 class TestSorting(object):
-
     def test_check_equality(self, testdir):
         modcol = testdir.getmodulecol(
             """
@@ -886,7 +719,6 @@ class TestSorting(object):
 
 
 class TestConftestCustomization(object):
-
     def test_pytest_pycollect_module(self, testdir):
         testdir.makeconftest(
             """
@@ -906,23 +738,23 @@ class TestConftestCustomization(object):
     def test_customized_pymakemodule_issue205_subdir(self, testdir):
         b = testdir.mkdir("a").mkdir("b")
         b.join("conftest.py").write(
-            _pytest._code.Source(
+            textwrap.dedent(
+                """\
+                import pytest
+                @pytest.hookimpl(hookwrapper=True)
+                def pytest_pycollect_makemodule():
+                    outcome = yield
+                    mod = outcome.get_result()
+                    mod.obj.hello = "world"
                 """
-            import pytest
-            @pytest.hookimpl(hookwrapper=True)
-            def pytest_pycollect_makemodule():
-                outcome = yield
-                mod = outcome.get_result()
-                mod.obj.hello = "world"
-        """
             )
         )
         b.join("test_module.py").write(
-            _pytest._code.Source(
+            textwrap.dedent(
+                """\
+                def test_hello():
+                    assert hello == "world"
                 """
-            def test_hello():
-                assert hello == "world"
-        """
             )
         )
         reprec = testdir.inline_run()
@@ -931,31 +763,31 @@ class TestConftestCustomization(object):
     def test_customized_pymakeitem(self, testdir):
         b = testdir.mkdir("a").mkdir("b")
         b.join("conftest.py").write(
-            _pytest._code.Source(
+            textwrap.dedent(
+                """\
+                import pytest
+                @pytest.hookimpl(hookwrapper=True)
+                def pytest_pycollect_makeitem():
+                    outcome = yield
+                    if outcome.excinfo is None:
+                        result = outcome.get_result()
+                        if result:
+                            for func in result:
+                                func._some123 = "world"
                 """
-            import pytest
-            @pytest.hookimpl(hookwrapper=True)
-            def pytest_pycollect_makeitem():
-                outcome = yield
-                if outcome.excinfo is None:
-                    result = outcome.get_result()
-                    if result:
-                        for func in result:
-                            func._some123 = "world"
-        """
             )
         )
         b.join("test_module.py").write(
-            _pytest._code.Source(
-                """
-            import pytest
+            textwrap.dedent(
+                """\
+                import pytest
 
-            @pytest.fixture()
-            def obj(request):
-                return request.node._some123
-            def test_hello(obj):
-                assert obj == "world"
-        """
+                @pytest.fixture()
+                def obj(request):
+                    return request.node._some123
+                def test_hello(obj):
+                    assert obj == "world"
+                """
             )
         )
         reprec = testdir.inline_run()
@@ -980,7 +812,7 @@ class TestConftestCustomization(object):
         modcol = testdir.getmodulecol("def _hello(): pass")
         values = []
         monkeypatch.setattr(
-            pytest.Module, "makeitem", lambda self, name, obj: values.append(name)
+            pytest.Module, "_makeitem", lambda self, name, obj: values.append(name)
         )
         values = modcol.collect()
         assert "_hello" not in values
@@ -1010,42 +842,42 @@ class TestConftestCustomization(object):
         )
         testdir.makefile(
             ".narf",
-            """
+            """\
             def test_something():
                 assert 1 + 1 == 2""",
         )
         # Use runpytest_subprocess, since we're futzing with sys.meta_path.
         result = testdir.runpytest_subprocess()
-        result.stdout.fnmatch_lines("*1 passed*")
+        result.stdout.fnmatch_lines(["*1 passed*"])
 
 
 def test_setup_only_available_in_subdir(testdir):
     sub1 = testdir.mkpydir("sub1")
     sub2 = testdir.mkpydir("sub2")
     sub1.join("conftest.py").write(
-        _pytest._code.Source(
+        textwrap.dedent(
+            """\
+            import pytest
+            def pytest_runtest_setup(item):
+                assert item.fspath.purebasename == "test_in_sub1"
+            def pytest_runtest_call(item):
+                assert item.fspath.purebasename == "test_in_sub1"
+            def pytest_runtest_teardown(item):
+                assert item.fspath.purebasename == "test_in_sub1"
             """
-        import pytest
-        def pytest_runtest_setup(item):
-            assert item.fspath.purebasename == "test_in_sub1"
-        def pytest_runtest_call(item):
-            assert item.fspath.purebasename == "test_in_sub1"
-        def pytest_runtest_teardown(item):
-            assert item.fspath.purebasename == "test_in_sub1"
-    """
         )
     )
     sub2.join("conftest.py").write(
-        _pytest._code.Source(
+        textwrap.dedent(
+            """\
+            import pytest
+            def pytest_runtest_setup(item):
+                assert item.fspath.purebasename == "test_in_sub2"
+            def pytest_runtest_call(item):
+                assert item.fspath.purebasename == "test_in_sub2"
+            def pytest_runtest_teardown(item):
+                assert item.fspath.purebasename == "test_in_sub2"
             """
-        import pytest
-        def pytest_runtest_setup(item):
-            assert item.fspath.purebasename == "test_in_sub2"
-        def pytest_runtest_call(item):
-            assert item.fspath.purebasename == "test_in_sub2"
-        def pytest_runtest_teardown(item):
-            assert item.fspath.purebasename == "test_in_sub2"
-    """
         )
     )
     sub1.join("test_in_sub1.py").write("def test_1(): pass")
@@ -1055,16 +887,16 @@ def test_setup_only_available_in_subdir(testdir):
 
 
 def test_modulecol_roundtrip(testdir):
-    modcol = testdir.getmodulecol("pass", withinit=True)
+    modcol = testdir.getmodulecol("pass", withinit=False)
     trail = modcol.nodeid
     newcol = modcol.session.perform_collect([trail], genitems=0)[0]
     assert modcol.name == newcol.name
 
 
 class TestTracebackCutting(object):
-
     def test_skip_simple(self):
-        excinfo = pytest.raises(pytest.skip.Exception, 'pytest.skip("xxx")')
+        with pytest.raises(pytest.skip.Exception) as excinfo:
+            pytest.skip("xxx")
         assert excinfo.traceback[-1].frame.code.name == "skip"
         assert excinfo.traceback[-1].ishidden()
 
@@ -1143,7 +975,7 @@ class TestTracebackCutting(object):
 
     def test_filter_traceback_generated_code(self):
         """test that filter_traceback() works with the fact that
-        py.code.Code.path attribute might return an str object.
+        _pytest._code.code.Code.path attribute might return an str object.
         In this case, one of the entries on the traceback was produced by
         dynamically generated code.
         See: https://bitbucket.org/pytest-dev/py/issues/71
@@ -1164,7 +996,7 @@ class TestTracebackCutting(object):
 
     def test_filter_traceback_path_no_longer_valid(self, testdir):
         """test that filter_traceback() works with the fact that
-        py.code.Code.path attribute might return an str object.
+        _pytest._code.code.Code.path attribute might return an str object.
         In this case, one of the files in the traceback no longer exists.
         This fixes #1133.
         """
@@ -1191,7 +1023,6 @@ class TestTracebackCutting(object):
 
 
 class TestReportInfo(object):
-
     def test_itemreport_reportinfo(self, testdir, linecomp):
         testdir.makeconftest(
             """
@@ -1229,39 +1060,9 @@ class TestReportInfo(object):
         assert lineno == 1
         assert msg == "TestClass"
 
-    def test_generator_reportinfo(self, testdir):
-        modcol = testdir.getmodulecol(
-            """
-            # lineno 0
-            def test_gen():
-                def check(x):
-                    assert x
-                yield check, 3
-        """
-        )
-        gencol = testdir.collect_by_name(modcol, "test_gen")
-        fspath, lineno, modpath = gencol.reportinfo()
-        assert fspath == modcol.fspath
-        assert lineno == 1
-        assert modpath == "test_gen"
-
-        genitem = gencol.collect()[0]
-        fspath, lineno, modpath = genitem.reportinfo()
-        assert fspath == modcol.fspath
-        assert lineno == 2
-        assert modpath == "test_gen[0]"
-        """
-            def test_func():
-                pass
-            def test_genfunc():
-                def check(x):
-                    pass
-                yield check, 3
-            class TestClass(object):
-                def test_method(self):
-                    pass
-       """
-
+    @pytest.mark.filterwarnings(
+        "ignore:usage of Generator.Function is deprecated, please use pytest.Function instead"
+    )
     def test_reportinfo_with_nasty_getattr(self, testdir):
         # https://github.com/pytest-dev/pytest/issues/1204
         modcol = testdir.getmodulecol(
@@ -1331,56 +1132,6 @@ def test_customized_python_discovery_functions(testdir):
     result.stdout.fnmatch_lines(["*1 passed*"])
 
 
-def test_collector_attributes(testdir):
-    testdir.makeconftest(
-        """
-        import pytest
-        def pytest_pycollect_makeitem(collector):
-            assert collector.Function == pytest.Function
-            assert collector.Class == pytest.Class
-            assert collector.Instance == pytest.Instance
-            assert collector.Module == pytest.Module
-    """
-    )
-    testdir.makepyfile(
-        """
-         def test_hello():
-            pass
-    """
-    )
-    result = testdir.runpytest()
-    result.stdout.fnmatch_lines(["*1 passed*"])
-
-
-def test_customize_through_attributes(testdir):
-    testdir.makeconftest(
-        """
-        import pytest
-        class MyFunction(pytest.Function):
-            pass
-        class MyInstance(pytest.Instance):
-            Function = MyFunction
-        class MyClass(pytest.Class):
-            Instance = MyInstance
-
-        def pytest_pycollect_makeitem(collector, name, obj):
-            if name.startswith("MyTestClass"):
-                return MyClass(name, parent=collector)
-    """
-    )
-    testdir.makepyfile(
-        """
-         class MyTestClass(object):
-            def test_hello(self):
-                pass
-    """
-    )
-    result = testdir.runpytest("--collect-only")
-    result.stdout.fnmatch_lines(
-        ["*MyClass*", "*MyInstance*", "*MyFunction*test_hello*"]
-    )
-
-
 def test_unorderable_types(testdir):
     testdir.makepyfile(
         """
@@ -1446,6 +1197,7 @@ def test_collect_functools_partial(testdir):
     result.assertoutcome(passed=6, failed=2)
 
 
+@pytest.mark.filterwarnings("default")
 def test_dont_collect_non_function_callable(testdir):
     """Test for issue https://github.com/pytest-dev/pytest/issues/331
 
@@ -1468,7 +1220,7 @@ def test_dont_collect_non_function_callable(testdir):
     result.stdout.fnmatch_lines(
         [
             "*collected 1 item*",
-            "*cannot collect 'test_a' because it is not a function*",
+            "*test_dont_collect_non_function_callable.py:2: *cannot collect 'test_a' because it is not a function*",
             "*1 passed, 1 warnings in *",
         ]
     )
@@ -1497,7 +1249,10 @@ def test_class_injection_does_not_break_collection(testdir):
     '''
     )
     result = testdir.runpytest()
-    assert "RuntimeError: dictionary changed size during iteration" not in result.stdout.str()
+    assert (
+        "RuntimeError: dictionary changed size during iteration"
+        not in result.stdout.str()
+    )
     result.stdout.fnmatch_lines(["*1 passed*"])
 
 
@@ -1506,7 +1261,7 @@ def test_syntax_error_with_non_ascii_chars(testdir):
     """
     testdir.makepyfile(
         u"""
-    # -*- coding: UTF-8 -*-
+    # -*- coding: utf-8 -*-
 
     ☃
     """
@@ -1523,12 +1278,12 @@ def test_skip_duplicates_by_default(testdir):
     a = testdir.mkdir("a")
     fh = a.join("test_a.py")
     fh.write(
-        _pytest._code.Source(
+        textwrap.dedent(
+            """\
+            import pytest
+            def test_real():
+                pass
             """
-        import pytest
-        def test_real():
-            pass
-    """
         )
     )
     result = testdir.runpytest(a.strpath, a.strpath)
@@ -1543,13 +1298,101 @@ def test_keep_duplicates(testdir):
     a = testdir.mkdir("a")
     fh = a.join("test_a.py")
     fh.write(
-        _pytest._code.Source(
+        textwrap.dedent(
+            """\
+            import pytest
+            def test_real():
+                pass
             """
-        import pytest
-        def test_real():
-            pass
-    """
         )
     )
     result = testdir.runpytest("--keep-duplicates", a.strpath, a.strpath)
     result.stdout.fnmatch_lines(["*collected 2 item*"])
+
+
+def test_package_collection_infinite_recursion(testdir):
+    testdir.copy_example("collect/package_infinite_recursion")
+    result = testdir.runpytest()
+    result.stdout.fnmatch_lines(["*1 passed*"])
+
+
+def test_package_collection_init_given_as_argument(testdir):
+    """Regression test for #3749"""
+    p = testdir.copy_example("collect/package_init_given_as_arg")
+    result = testdir.runpytest(p / "pkg" / "__init__.py")
+    result.stdout.fnmatch_lines(["*1 passed*"])
+
+
+def test_package_with_modules(testdir):
+    """
+    .
+    └── root
+        ├── __init__.py
+        ├── sub1
+        │   ├── __init__.py
+        │   └── sub1_1
+        │       ├── __init__.py
+        │       └── test_in_sub1.py
+        └── sub2
+            └── test
+                └── test_in_sub2.py
+
+    """
+    root = testdir.mkpydir("root")
+    sub1 = root.mkdir("sub1")
+    sub1.ensure("__init__.py")
+    sub1_test = sub1.mkdir("sub1_1")
+    sub1_test.ensure("__init__.py")
+    sub2 = root.mkdir("sub2")
+    sub2_test = sub2.mkdir("sub2")
+
+    sub1_test.join("test_in_sub1.py").write("def test_1(): pass")
+    sub2_test.join("test_in_sub2.py").write("def test_2(): pass")
+
+    # Execute from .
+    result = testdir.runpytest("-v", "-s")
+    result.assert_outcomes(passed=2)
+
+    # Execute from . with one argument "root"
+    result = testdir.runpytest("-v", "-s", "root")
+    result.assert_outcomes(passed=2)
+
+    # Chdir into package's root and execute with no args
+    root.chdir()
+    result = testdir.runpytest("-v", "-s")
+    result.assert_outcomes(passed=2)
+
+
+def test_package_ordering(testdir):
+    """
+    .
+    └── root
+        ├── Test_root.py
+        ├── __init__.py
+        ├── sub1
+        │   ├── Test_sub1.py
+        │   └── __init__.py
+        └── sub2
+            └── test
+                └── test_sub2.py
+
+    """
+    testdir.makeini(
+        """
+        [pytest]
+        python_files=*.py
+    """
+    )
+    root = testdir.mkpydir("root")
+    sub1 = root.mkdir("sub1")
+    sub1.ensure("__init__.py")
+    sub2 = root.mkdir("sub2")
+    sub2_test = sub2.mkdir("sub2")
+
+    root.join("Test_root.py").write("def test_1(): pass")
+    sub1.join("Test_sub1.py").write("def test_2(): pass")
+    sub2_test.join("test_sub2.py").write("def test_3(): pass")
+
+    # Execute from .
+    result = testdir.runpytest("-v", "-s")
+    result.assert_outcomes(passed=3)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/fixture.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/fixtures.py
similarity index 82%
rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/fixture.py
rename to tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/fixtures.py
index 6d2bb663b6c..4869431c639 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/fixture.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/fixtures.py
@@ -1,14 +1,17 @@
-from textwrap import dedent
+# -*- coding: utf-8 -*-
+import sys
+import textwrap
 
-import _pytest._code
 import pytest
-from _pytest.pytester import get_public_names
-from _pytest.fixtures import FixtureLookupError, FixtureRequest
 from _pytest import fixtures
+from _pytest.fixtures import FixtureLookupError
+from _pytest.fixtures import FixtureRequest
+from _pytest.pathlib import Path
+from _pytest.pytester import get_public_names
+from _pytest.warnings import SHOW_PYTEST_WARNINGS_ARG
 
 
 def test_getfuncargnames():
-
     def f():
         pass
 
@@ -30,7 +33,6 @@ def test_getfuncargnames():
     assert fixtures.getfuncargnames(h) == ("arg1", "arg2")
 
     class A(object):
-
         def f(self, arg1, arg2="hello"):
             pass
 
@@ -42,46 +44,34 @@ def test_getfuncargnames():
     assert fixtures.getfuncargnames(A.static, cls=A) == ("arg1", "arg2")
 
 
+@pytest.mark.pytester_example_path("fixtures/fill_fixtures")
 class TestFillFixtures(object):
-
     def test_fillfuncargs_exposed(self):
         # used by oejskit, kept for compatibility
         assert pytest._fillfuncargs == fixtures.fillfixtures
 
     def test_funcarg_lookupfails(self, testdir):
-        testdir.makepyfile(
-            """
-            import pytest
-
-            @pytest.fixture
-            def xyzsomething(request):
-                return 42
-
-            def test_func(some):
-                pass
-        """
-        )
+        testdir.copy_example()
         result = testdir.runpytest()  # "--collect-only")
         assert result.ret != 0
         result.stdout.fnmatch_lines(
-            ["*def test_func(some)*", "*fixture*some*not found*", "*xyzsomething*"]
+            """
+            *def test_func(some)*
+            *fixture*some*not found*
+            *xyzsomething*
+            """
+        )
+
+    def test_detect_recursive_dependency_error(self, testdir):
+        testdir.copy_example()
+        result = testdir.runpytest()
+        result.stdout.fnmatch_lines(
+            ["*recursive dependency involving fixture 'fix1' detected*"]
         )
 
     def test_funcarg_basic(self, testdir):
-        item = testdir.getitem(
-            """
-            import pytest
-
-            @pytest.fixture
-            def some(request):
-                return request.function.__name__
-            @pytest.fixture
-            def other(request):
-                return 42
-            def test_func(some, other):
-                pass
-        """
-        )
+        testdir.copy_example()
+        item = testdir.getitem(Path("test_funcarg_basic.py"))
         fixtures.fillfixtures(item)
         del item.funcargs["request"]
         assert len(get_public_names(item.funcargs)) == 2
@@ -89,155 +79,39 @@ class TestFillFixtures(object):
         assert item.funcargs["other"] == 42
 
     def test_funcarg_lookup_modulelevel(self, testdir):
-        testdir.makepyfile(
-            """
-            import pytest
-
-            @pytest.fixture
-            def something(request):
-                return request.function.__name__
-
-            class TestClass(object):
-                def test_method(self, something):
-                    assert something == "test_method"
-            def test_func(something):
-                assert something == "test_func"
-        """
-        )
+        testdir.copy_example()
         reprec = testdir.inline_run()
         reprec.assertoutcome(passed=2)
 
     def test_funcarg_lookup_classlevel(self, testdir):
-        p = testdir.makepyfile(
-            """
-            import pytest
-            class TestClass(object):
-
-                @pytest.fixture
-                def something(self, request):
-                    return request.instance
-
-                def test_method(self, something):
-                    assert something is self
-        """
-        )
+        p = testdir.copy_example()
         result = testdir.runpytest(p)
         result.stdout.fnmatch_lines(["*1 passed*"])
 
     def test_conftest_funcargs_only_available_in_subdir(self, testdir):
-        sub1 = testdir.mkpydir("sub1")
-        sub2 = testdir.mkpydir("sub2")
-        sub1.join("conftest.py").write(
-            _pytest._code.Source(
-                """
-            import pytest
-            @pytest.fixture
-            def arg1(request):
-                pytest.raises(Exception, "request.getfixturevalue('arg2')")
-        """
-            )
-        )
-        sub2.join("conftest.py").write(
-            _pytest._code.Source(
-                """
-            import pytest
-            @pytest.fixture
-            def arg2(request):
-                pytest.raises(Exception, "request.getfixturevalue('arg1')")
-        """
-            )
-        )
-
-        sub1.join("test_in_sub1.py").write("def test_1(arg1): pass")
-        sub2.join("test_in_sub2.py").write("def test_2(arg2): pass")
+        testdir.copy_example()
         result = testdir.runpytest("-v")
         result.assert_outcomes(passed=2)
 
     def test_extend_fixture_module_class(self, testdir):
-        testfile = testdir.makepyfile(
-            """
-            import pytest
-
-            @pytest.fixture
-            def spam():
-                return 'spam'
-
-            class TestSpam(object):
-
-                 @pytest.fixture
-                 def spam(self, spam):
-                     return spam * 2
-
-                 def test_spam(self, spam):
-                     assert spam == 'spamspam'
-        """
-        )
+        testfile = testdir.copy_example()
         result = testdir.runpytest()
         result.stdout.fnmatch_lines(["*1 passed*"])
         result = testdir.runpytest(testfile)
         result.stdout.fnmatch_lines(["*1 passed*"])
 
     def test_extend_fixture_conftest_module(self, testdir):
-        testdir.makeconftest(
-            """
-            import pytest
-
-            @pytest.fixture
-            def spam():
-                return 'spam'
-        """
-        )
-        testfile = testdir.makepyfile(
-            """
-            import pytest
-
-            @pytest.fixture
-            def spam(spam):
-                return spam * 2
-
-            def test_spam(spam):
-                assert spam == 'spamspam'
-        """
-        )
+        p = testdir.copy_example()
         result = testdir.runpytest()
         result.stdout.fnmatch_lines(["*1 passed*"])
-        result = testdir.runpytest(testfile)
+        result = testdir.runpytest(next(p.visit("test_*.py")))
         result.stdout.fnmatch_lines(["*1 passed*"])
 
     def test_extend_fixture_conftest_conftest(self, testdir):
-        testdir.makeconftest(
-            """
-            import pytest
-
-            @pytest.fixture
-            def spam():
-                return 'spam'
-        """
-        )
-        pkg = testdir.mkpydir("pkg")
-        pkg.join("conftest.py").write(
-            _pytest._code.Source(
-                """
-            import pytest
-
-            @pytest.fixture
-            def spam(spam):
-                return spam * 2
-        """
-            )
-        )
-        testfile = pkg.join("test_spam.py")
-        testfile.write(
-            _pytest._code.Source(
-                """
-            def test_spam(spam):
-                assert spam == "spamspam"
-        """
-            )
-        )
+        p = testdir.copy_example()
         result = testdir.runpytest()
         result.stdout.fnmatch_lines(["*1 passed*"])
-        result = testdir.runpytest(testfile)
+        result = testdir.runpytest(next(p.visit("test_*.py")))
         result.stdout.fnmatch_lines(["*1 passed*"])
 
     def test_extend_fixture_conftest_plugin(self, testdir):
@@ -344,23 +218,23 @@ class TestFillFixtures(object):
         )
         subdir = testdir.mkpydir("subdir")
         subdir.join("conftest.py").write(
-            _pytest._code.Source(
-                """
-            import pytest
+            textwrap.dedent(
+                """\
+                import pytest
 
-            @pytest.fixture
-            def spam():
-                return 'spam'
-        """
+                @pytest.fixture
+                def spam():
+                    return 'spam'
+                """
             )
         )
         testfile = subdir.join("test_spam.py")
         testfile.write(
-            _pytest._code.Source(
+            textwrap.dedent(
+                """\
+                def test_spam(spam):
+                    assert spam == "spam"
                 """
-            def test_spam(spam):
-                assert spam == "spam"
-        """
             )
         )
         result = testdir.runpytest()
@@ -412,26 +286,26 @@ class TestFillFixtures(object):
         )
         subdir = testdir.mkpydir("subdir")
         subdir.join("conftest.py").write(
-            _pytest._code.Source(
-                """
-            import pytest
+            textwrap.dedent(
+                """\
+                import pytest
 
-            @pytest.fixture(params=[1, 2, 3])
-            def spam(request):
-                return request.param
-        """
+                @pytest.fixture(params=[1, 2, 3])
+                def spam(request):
+                    return request.param
+                """
             )
         )
         testfile = subdir.join("test_spam.py")
         testfile.write(
-            _pytest._code.Source(
-                """
-            params = {'spam': 1}
+            textwrap.dedent(
+                """\
+                params = {'spam': 1}
 
-            def test_spam(spam):
-                assert spam == params['spam']
-                params['spam'] += 1
-        """
+                def test_spam(spam):
+                    assert spam == params['spam']
+                    params['spam'] += 1
+                """
             )
         )
         result = testdir.runpytest()
@@ -456,26 +330,26 @@ class TestFillFixtures(object):
         )
         subdir = testdir.mkpydir("subdir")
         subdir.join("conftest.py").write(
-            _pytest._code.Source(
-                """
-            import pytest
+            textwrap.dedent(
+                """\
+                import pytest
 
-            @pytest.fixture(params=[1, 2, 3])
-            def spam(request):
-                return request.param
-        """
+                @pytest.fixture(params=[1, 2, 3])
+                def spam(request):
+                    return request.param
+                """
             )
         )
         testfile = subdir.join("test_spam.py")
         testfile.write(
-            _pytest._code.Source(
-                """
-            params = {'spam': 1}
+            textwrap.dedent(
+                """\
+                params = {'spam': 1}
 
-            def test_spam(spam):
-                assert spam == params['spam']
-                params['spam'] += 1
-        """
+                def test_spam(spam):
+                    assert spam == params['spam']
+                    params['spam'] += 1
+                """
             )
         )
         result = testdir.runpytest()
@@ -570,7 +444,6 @@ class TestFillFixtures(object):
 
 
 class TestRequestBasic(object):
-
     def test_request_attributes(self, testdir):
         item = testdir.getitem(
             """
@@ -591,7 +464,7 @@ class TestRequestBasic(object):
         assert repr(req).find(req.function.__name__) != -1
 
     def test_request_attributes_method(self, testdir):
-        item, = testdir.getitems(
+        (item,) = testdir.getitems(
             """
             import pytest
             class TestB(object):
@@ -619,13 +492,23 @@ class TestRequestBasic(object):
                     pass
         """
         )
-        item1, = testdir.genitems([modcol])
+        (item1,) = testdir.genitems([modcol])
         assert item1.name == "test_method"
         arg2fixturedefs = fixtures.FixtureRequest(item1)._arg2fixturedefs
         assert len(arg2fixturedefs) == 1
         assert arg2fixturedefs["something"][0].argname == "something"
 
+    @pytest.mark.skipif(
+        hasattr(sys, "pypy_version_info"),
+        reason="this method of test doesn't work on pypy",
+    )
     def test_request_garbage(self, testdir):
+        try:
+            import xdist  # noqa
+        except ImportError:
+            pass
+        else:
+            pytest.xfail("this test is flaky when executed with xdist")
         testdir.makepyfile(
             """
             import sys
@@ -635,33 +518,25 @@ class TestRequestBasic(object):
 
             @pytest.fixture(autouse=True)
             def something(request):
-                # this method of test doesn't work on pypy
-                if hasattr(sys, "pypy_version_info"):
-                    yield
-                else:
-                    original = gc.get_debug()
-                    gc.set_debug(gc.DEBUG_SAVEALL)
+                original = gc.get_debug()
+                gc.set_debug(gc.DEBUG_SAVEALL)
+                gc.collect()
+
+                yield
+
+                try:
                     gc.collect()
-
-                    yield
-
-                    gc.collect()
-                    leaked_types = sum(1 for _ in gc.garbage
-                                       if isinstance(_, PseudoFixtureDef))
-
-                    gc.garbage[:] = []
-
-                    try:
-                        assert leaked_types == 0
-                    finally:
-                        gc.set_debug(original)
+                    leaked = [x for _ in gc.garbage if isinstance(_, PseudoFixtureDef)]
+                    assert leaked == []
+                finally:
+                    gc.set_debug(original)
 
             def test_func():
                 pass
         """
         )
-        reprec = testdir.inline_run()
-        reprec.assertoutcome(passed=1)
+        result = testdir.runpytest_subprocess()
+        result.stdout.fnmatch_lines(["* 1 passed in *"])
 
     def test_getfixturevalue_recursive(self, testdir):
         testdir.makeconftest(
@@ -687,6 +562,44 @@ class TestRequestBasic(object):
         reprec = testdir.inline_run()
         reprec.assertoutcome(passed=1)
 
+    def test_getfixturevalue_teardown(self, testdir):
+        """
+        Issue #1895
+
+        `test_inner` requests `inner` fixture, which in turn requests `resource`
+        using `getfixturevalue`. `test_func` then requests `resource`.
+
+        `resource` is teardown before `inner` because the fixture mechanism won't consider
+        `inner` dependent on `resource` when it is used via `getfixturevalue`: `test_func`
+        will then cause the `resource`'s finalizer to be called first because of this.
+        """
+        testdir.makepyfile(
+            """
+            import pytest
+
+            @pytest.fixture(scope='session')
+            def resource():
+                r = ['value']
+                yield r
+                r.pop()
+
+            @pytest.fixture(scope='session')
+            def inner(request):
+                resource = request.getfixturevalue('resource')
+                assert resource == ['value']
+                yield
+                assert resource == ['value']
+
+            def test_inner(inner):
+                pass
+
+            def test_func(resource):
+                pass
+        """
+        )
+        result = testdir.runpytest()
+        result.stdout.fnmatch_lines(["* 2 passed in *"])
+
     @pytest.mark.parametrize("getfixmethod", ("getfixturevalue", "getfuncargvalue"))
     def test_getfixturevalue(self, testdir, getfixmethod):
         item = testdir.getitem(
@@ -752,25 +665,6 @@ class TestRequestBasic(object):
         print(ss.stack)
         assert teardownlist == [1]
 
-    def test_mark_as_fixture_with_prefix_and_decorator_fails(self, testdir):
-        testdir.makeconftest(
-            """
-            import pytest
-
-            @pytest.fixture
-            def pytest_funcarg__marked_with_prefix_and_decorator():
-                pass
-        """
-        )
-        result = testdir.runpytest_subprocess()
-        assert result.ret != 0
-        result.stdout.fnmatch_lines(
-            [
-                "*AssertionError: fixtures cannot have*@pytest.fixture*",
-                "*pytest_funcarg__marked_with_prefix_and_decorator*",
-            ]
-        )
-
     def test_request_addfinalizer_failing_setup(self, testdir):
         testdir.makepyfile(
             """
@@ -862,7 +756,7 @@ class TestRequestBasic(object):
 
     def test_request_getmodulepath(self, testdir):
         modcol = testdir.getmodulecol("def test_somefunc(): pass")
-        item, = testdir.genitems([modcol])
+        (item,) = testdir.genitems([modcol])
         req = fixtures.FixtureRequest(item)
         assert req.fspath == modcol.fspath
 
@@ -883,12 +777,18 @@ class TestRequestBasic(object):
             def test_function(request, farg):
                 assert set(get_public_names(request.fixturenames)) == \
                        set(["tmpdir", "sarg", "arg1", "request", "farg",
-                            "tmpdir_factory"])
+                            "tmp_path", "tmp_path_factory"])
         """
         )
         reprec = testdir.inline_run()
         reprec.assertoutcome(passed=1)
 
+    def test_request_fixturenames_dynamic_fixture(self, testdir):
+        """Regression test for #3057"""
+        testdir.copy_example("fixtures/test_getfixturevalue_dynamic.py")
+        result = testdir.runpytest()
+        result.stdout.fnmatch_lines(["*1 passed*"])
+
     def test_funcargnames_compatattr(self, testdir):
         testdir.makepyfile(
             """
@@ -944,13 +844,13 @@ class TestRequestBasic(object):
         # this tests that normalization of nodeids takes place
         b = testdir.mkdir("tests").mkdir("unit")
         b.join("conftest.py").write(
-            _pytest._code.Source(
+            textwrap.dedent(
+                """\
+                import pytest
+                @pytest.fixture
+                def arg1():
+                    pass
                 """
-            import pytest
-            @pytest.fixture
-            def arg1():
-                pass
-        """
             )
         )
         p = b.join("test_module.py")
@@ -1003,7 +903,6 @@ class TestRequestBasic(object):
 
 
 class TestRequestMarking(object):
-
     def test_applymarker(self, testdir):
         item1, item2 = testdir.getitems(
             """
@@ -1026,7 +925,8 @@ class TestRequestMarking(object):
         assert "skipif" not in item1.keywords
         req1.applymarker(pytest.mark.skipif)
         assert "skipif" in item1.keywords
-        pytest.raises(ValueError, "req1.applymarker(42)")
+        with pytest.raises(ValueError):
+            req1.applymarker(42)
 
     def test_accesskeywords(self, testdir):
         testdir.makepyfile(
@@ -1072,180 +972,7 @@ class TestRequestMarking(object):
         reprec.assertoutcome(passed=2)
 
 
-class TestRequestCachedSetup(object):
-
-    def test_request_cachedsetup_defaultmodule(self, testdir):
-        reprec = testdir.inline_runsource(
-            """
-            mysetup = ["hello",].pop
-
-            import pytest
-
-            @pytest.fixture
-            def something(request):
-                return request.cached_setup(mysetup, scope="module")
-
-            def test_func1(something):
-                assert something == "hello"
-            class TestClass(object):
-                def test_func1a(self, something):
-                    assert something == "hello"
-        """
-        )
-        reprec.assertoutcome(passed=2)
-
-    def test_request_cachedsetup_class(self, testdir):
-        reprec = testdir.inline_runsource(
-            """
-            mysetup = ["hello", "hello2", "hello3"].pop
-
-            import pytest
-            @pytest.fixture
-            def something(request):
-                return request.cached_setup(mysetup, scope="class")
-            def test_func1(something):
-                assert something == "hello3"
-            def test_func2(something):
-                assert something == "hello2"
-            class TestClass(object):
-                def test_func1a(self, something):
-                    assert something == "hello"
-                def test_func2b(self, something):
-                    assert something == "hello"
-        """
-        )
-        reprec.assertoutcome(passed=4)
-
-    def test_request_cachedsetup_extrakey(self, testdir):
-        item1 = testdir.getitem("def test_func(): pass")
-        req1 = fixtures.FixtureRequest(item1)
-        values = ["hello", "world"]
-
-        def setup():
-            return values.pop()
-
-        ret1 = req1.cached_setup(setup, extrakey=1)
-        ret2 = req1.cached_setup(setup, extrakey=2)
-        assert ret2 == "hello"
-        assert ret1 == "world"
-        ret1b = req1.cached_setup(setup, extrakey=1)
-        ret2b = req1.cached_setup(setup, extrakey=2)
-        assert ret1 == ret1b
-        assert ret2 == ret2b
-
-    def test_request_cachedsetup_cache_deletion(self, testdir):
-        item1 = testdir.getitem("def test_func(): pass")
-        req1 = fixtures.FixtureRequest(item1)
-        values = []
-
-        def setup():
-            values.append("setup")
-
-        def teardown(val):
-            values.append("teardown")
-
-        req1.cached_setup(setup, teardown, scope="function")
-        assert values == ["setup"]
-        # artificial call of finalizer
-        setupstate = req1._pyfuncitem.session._setupstate
-        setupstate._callfinalizers(item1)
-        assert values == ["setup", "teardown"]
-        req1.cached_setup(setup, teardown, scope="function")
-        assert values == ["setup", "teardown", "setup"]
-        setupstate._callfinalizers(item1)
-        assert values == ["setup", "teardown", "setup", "teardown"]
-
-    def test_request_cached_setup_two_args(self, testdir):
-        testdir.makepyfile(
-            """
-            import pytest
-
-            @pytest.fixture
-            def arg1(request):
-                return request.cached_setup(lambda: 42)
-            @pytest.fixture
-            def arg2(request):
-                return request.cached_setup(lambda: 17)
-            def test_two_different_setups(arg1, arg2):
-                assert arg1 != arg2
-        """
-        )
-        result = testdir.runpytest("-v")
-        result.stdout.fnmatch_lines(["*1 passed*"])
-
-    def test_request_cached_setup_getfixturevalue(self, testdir):
-        testdir.makepyfile(
-            """
-            import pytest
-
-            @pytest.fixture
-            def arg1(request):
-                arg1 = request.getfixturevalue("arg2")
-                return request.cached_setup(lambda: arg1 + 1)
-            @pytest.fixture
-            def arg2(request):
-                return request.cached_setup(lambda: 10)
-            def test_two_funcarg(arg1):
-                assert arg1 == 11
-        """
-        )
-        result = testdir.runpytest("-v")
-        result.stdout.fnmatch_lines(["*1 passed*"])
-
-    def test_request_cached_setup_functional(self, testdir):
-        testdir.makepyfile(
-            test_0="""
-            import pytest
-            values = []
-            @pytest.fixture
-            def something(request):
-                val = request.cached_setup(fsetup, fteardown)
-                return val
-            def fsetup(mycache=[1]):
-                values.append(mycache.pop())
-                return values
-            def fteardown(something):
-                values.remove(something[0])
-                values.append(2)
-            def test_list_once(something):
-                assert something == [1]
-            def test_list_twice(something):
-                assert something == [1]
-        """
-        )
-        testdir.makepyfile(
-            test_1="""
-            import test_0 # should have run already
-            def test_check_test0_has_teardown_correct():
-                assert test_0.values == [2]
-        """
-        )
-        result = testdir.runpytest("-v")
-        result.stdout.fnmatch_lines(["*3 passed*"])
-
-    def test_issue117_sessionscopeteardown(self, testdir):
-        testdir.makepyfile(
-            """
-            import pytest
-
-            @pytest.fixture
-            def app(request):
-                app = request.cached_setup(
-                    scope='session',
-                    setup=lambda: 0,
-                    teardown=lambda x: 3/x)
-                return app
-            def test_func(app):
-                pass
-        """
-        )
-        result = testdir.runpytest()
-        assert result.ret != 0
-        result.stdout.fnmatch_lines(["*3/x*", "*ZeroDivisionError*"])
-
-
 class TestFixtureUsages(object):
-
     def test_noargfixturedec(self, testdir):
         testdir.makepyfile(
             """
@@ -1303,8 +1030,8 @@ class TestFixtureUsages(object):
         result.stdout.fnmatch_lines(
             [
                 "*ScopeMismatch*involved factories*",
-                "* def arg2*",
-                "* def arg1*",
+                "test_receives_funcargs_scope_mismatch.py:6:  def arg2(arg1)",
+                "test_receives_funcargs_scope_mismatch.py:2:  def arg1()",
                 "*1 error*",
             ]
         )
@@ -1344,10 +1071,7 @@ class TestFixtureUsages(object):
         )
         result = testdir.runpytest_inprocess()
         result.stdout.fnmatch_lines(
-            (
-                "*ValueError: fixture badscope from test_invalid_scope.py has an unsupported"
-                " scope value 'functions'"
-            )
+            "*Fixture 'badscope' from test_invalid_scope.py got an unexpected scope value 'functions'"
         )
 
     def test_funcarg_parametrized_and_used_twice(self, testdir):
@@ -1415,6 +1139,7 @@ class TestFixtureUsages(object):
         values = reprec.getfailedcollections()
         assert len(values) == 1
 
+    @pytest.mark.filterwarnings("ignore::pytest.PytestDeprecationWarning")
     def test_request_can_be_overridden(self, testdir):
         testdir.makepyfile(
             """
@@ -1538,9 +1263,47 @@ class TestFixtureUsages(object):
         values = reprec.getcalls("pytest_runtest_call")[0].item.module.values
         assert values == [1, 2, 10, 20]
 
+    def test_setup_functions_as_fixtures(self, testdir):
+        """Ensure setup_* methods obey fixture scope rules (#517, #3094)."""
+        testdir.makepyfile(
+            """
+            import pytest
+
+            DB_INITIALIZED = None
+
+            @pytest.yield_fixture(scope="session", autouse=True)
+            def db():
+                global DB_INITIALIZED
+                DB_INITIALIZED = True
+                yield
+                DB_INITIALIZED = False
+
+            def setup_module():
+                assert DB_INITIALIZED
+
+            def teardown_module():
+                assert DB_INITIALIZED
+
+            class TestClass(object):
+
+                def setup_method(self, method):
+                    assert DB_INITIALIZED
+
+                def teardown_method(self, method):
+                    assert DB_INITIALIZED
+
+                def test_printer_1(self):
+                    pass
+
+                def test_printer_2(self):
+                    pass
+        """
+        )
+        result = testdir.runpytest()
+        result.stdout.fnmatch_lines(["* 2 passed in *"])
+
 
 class TestFixtureManagerParseFactories(object):
-
     @pytest.fixture
     def testdir(self, request):
         testdir = request.getfixturevalue("testdir")
@@ -1597,6 +1360,7 @@ class TestFixtureManagerParseFactories(object):
         testdir.makepyfile(
             """
             import pytest
+            import six
 
             @pytest.fixture
             def hello(request):
@@ -1607,8 +1371,9 @@ class TestFixtureManagerParseFactories(object):
                     return "class"
                 def test_hello(self, item, fm):
                     faclist = fm.getfixturedefs("hello", item.nodeid)
-                    print (faclist)
+                    print(faclist)
                     assert len(faclist) == 3
+
                     assert faclist[0].func(item._request) == "conftest"
                     assert faclist[1].func(item._request) == "module"
                     assert faclist[2].func(item._request) == "class"
@@ -1623,41 +1388,41 @@ class TestFixtureManagerParseFactories(object):
         runner = testdir.mkdir("runner")
         package = testdir.mkdir("package")
         package.join("conftest.py").write(
-            dedent(
+            textwrap.dedent(
                 """\
             import pytest
             @pytest.fixture
             def one():
                 return 1
-        """
+            """
             )
         )
         package.join("test_x.py").write(
-            dedent(
+            textwrap.dedent(
                 """\
-            def test_x(one):
-                assert one == 1
-        """
+                def test_x(one):
+                    assert one == 1
+                """
             )
         )
         sub = package.mkdir("sub")
         sub.join("__init__.py").ensure()
         sub.join("conftest.py").write(
-            dedent(
+            textwrap.dedent(
                 """\
-            import pytest
-            @pytest.fixture
-            def one():
-                return 2
-        """
+                import pytest
+                @pytest.fixture
+                def one():
+                    return 2
+                """
             )
         )
         sub.join("test_y.py").write(
-            dedent(
+            textwrap.dedent(
                 """\
-            def test_x(one):
-                assert one == 2
-        """
+                def test_x(one):
+                    assert one == 2
+                """
             )
         )
         reprec = testdir.inline_run()
@@ -1666,9 +1431,105 @@ class TestFixtureManagerParseFactories(object):
             reprec = testdir.inline_run("..")
             reprec.assertoutcome(passed=2)
 
+    def test_package_xunit_fixture(self, testdir):
+        testdir.makepyfile(
+            __init__="""\
+            values = []
+        """
+        )
+        package = testdir.mkdir("package")
+        package.join("__init__.py").write(
+            textwrap.dedent(
+                """\
+                from .. import values
+                def setup_module():
+                    values.append("package")
+                def teardown_module():
+                    values[:] = []
+                """
+            )
+        )
+        package.join("test_x.py").write(
+            textwrap.dedent(
+                """\
+                from .. import values
+                def test_x():
+                    assert values == ["package"]
+                """
+            )
+        )
+        package = testdir.mkdir("package2")
+        package.join("__init__.py").write(
+            textwrap.dedent(
+                """\
+                from .. import values
+                def setup_module():
+                    values.append("package2")
+                def teardown_module():
+                    values[:] = []
+                """
+            )
+        )
+        package.join("test_x.py").write(
+            textwrap.dedent(
+                """\
+                from .. import values
+                def test_x():
+                    assert values == ["package2"]
+                """
+            )
+        )
+        reprec = testdir.inline_run()
+        reprec.assertoutcome(passed=2)
+
+    def test_package_fixture_complex(self, testdir):
+        testdir.makepyfile(
+            __init__="""\
+            values = []
+        """
+        )
+        testdir.syspathinsert(testdir.tmpdir.dirname)
+        package = testdir.mkdir("package")
+        package.join("__init__.py").write("")
+        package.join("conftest.py").write(
+            textwrap.dedent(
+                """\
+                import pytest
+                from .. import values
+                @pytest.fixture(scope="package")
+                def one():
+                    values.append("package")
+                    yield values
+                    values.pop()
+                @pytest.fixture(scope="package", autouse=True)
+                def two():
+                    values.append("package-auto")
+                    yield values
+                    values.pop()
+                """
+            )
+        )
+        package.join("test_x.py").write(
+            textwrap.dedent(
+                """\
+                from .. import values
+                def test_package_autouse():
+                    assert values == ["package-auto"]
+                def test_package(one):
+                    assert values == ["package-auto", "package"]
+                """
+            )
+        )
+        reprec = testdir.inline_run()
+        reprec.assertoutcome(passed=2)
+
+    def test_collect_custom_items(self, testdir):
+        testdir.copy_example("fixtures/custom_item")
+        result = testdir.runpytest("foo")
+        result.stdout.fnmatch_lines(["*passed*"])
+
 
 class TestAutouseDiscovery(object):
-
     @pytest.fixture
     def testdir(self, testdir):
         testdir.makeconftest(
@@ -1845,51 +1706,32 @@ class TestAutouseDiscovery(object):
 
 
 class TestAutouseManagement(object):
-
     def test_autouse_conftest_mid_directory(self, testdir):
         pkgdir = testdir.mkpydir("xyz123")
         pkgdir.join("conftest.py").write(
-            _pytest._code.Source(
+            textwrap.dedent(
+                """\
+                import pytest
+                @pytest.fixture(autouse=True)
+                def app():
+                    import sys
+                    sys._myapp = "hello"
                 """
-            import pytest
-            @pytest.fixture(autouse=True)
-            def app():
-                import sys
-                sys._myapp = "hello"
-        """
             )
         )
         t = pkgdir.ensure("tests", "test_app.py")
         t.write(
-            _pytest._code.Source(
+            textwrap.dedent(
+                """\
+                import sys
+                def test_app():
+                    assert sys._myapp == "hello"
                 """
-            import sys
-            def test_app():
-                assert sys._myapp == "hello"
-        """
             )
         )
         reprec = testdir.inline_run("-s")
         reprec.assertoutcome(passed=1)
 
-    def test_autouse_honored_for_yield(self, testdir):
-        testdir.makepyfile(
-            """
-            import pytest
-            @pytest.fixture(autouse=True)
-            def tst():
-                global x
-                x = 3
-            def test_gen():
-                def f(hello):
-                    assert x == abs(hello)
-                yield f, 3
-                yield f, -3
-        """
-        )
-        reprec = testdir.inline_run()
-        reprec.assertoutcome(passed=2)
-
     def test_funcarg_and_setup(self, testdir):
         testdir.makepyfile(
             """
@@ -2056,7 +1898,7 @@ class TestAutouseManagement(object):
                     values.append("step2-%d" % item)
 
             def test_finish():
-                print (values)
+                print(values)
                 assert values == ["setup-1", "step1-1", "step2-1", "teardown-1",
                              "setup-2", "step1-2", "step2-2", "teardown-2",]
         """
@@ -2083,10 +1925,10 @@ class TestAutouseManagement(object):
         reprec = testdir.inline_run()
         reprec.assertoutcome(passed=1)
 
-    @pytest.mark.issue226
     @pytest.mark.parametrize("param1", ["", "params=[1]"], ids=["p00", "p01"])
     @pytest.mark.parametrize("param2", ["", "params=[1]"], ids=["p10", "p11"])
     def test_ordering_dependencies_torndown_first(self, testdir, param1, param2):
+        """#226"""
         testdir.makepyfile(
             """
             import pytest
@@ -2112,7 +1954,6 @@ class TestAutouseManagement(object):
 
 
 class TestFixtureMarker(object):
-
     def test_parametrize(self, testdir):
         testdir.makepyfile(
             """
@@ -2338,15 +2179,7 @@ class TestFixtureMarker(object):
         reprec = testdir.inline_run()
         reprec.assertoutcome(passed=4)
 
-    @pytest.mark.parametrize(
-        "method",
-        [
-            'request.getfixturevalue("arg")',
-            'request.cached_setup(lambda: None, scope="function")',
-        ],
-        ids=["getfixturevalue", "cached_setup"],
-    )
-    def test_scope_mismatch_various(self, testdir, method):
+    def test_scope_mismatch_various(self, testdir):
         testdir.makeconftest(
             """
             import pytest
@@ -2362,13 +2195,12 @@ class TestFixtureMarker(object):
                 import pytest
                 @pytest.fixture(scope="session")
                 def arg(request):
-                    %s
+                    request.getfixturevalue("arg")
                 def test_1(arg):
                     pass
             """
-            % method
         )
-        result = testdir.runpytest()
+        result = testdir.runpytest(SHOW_PYTEST_WARNINGS_ARG)
         assert result.ret != 0
         result.stdout.fnmatch_lines(
             ["*ScopeMismatch*You tried*function*session*request*"]
@@ -2761,22 +2593,22 @@ class TestFixtureMarker(object):
         )
         b = testdir.mkdir("subdir")
         b.join("test_overridden_fixture_finalizer.py").write(
-            dedent(
-                """
-            import pytest
-            @pytest.fixture
-            def browser(browser):
-                browser['visited'] = True
-                return browser
+            textwrap.dedent(
+                """\
+                import pytest
+                @pytest.fixture
+                def browser(browser):
+                    browser['visited'] = True
+                    return browser
 
-            def test_browser(browser):
-                assert browser['visited'] is True
-        """
+                def test_browser(browser):
+                    assert browser['visited'] is True
+                """
             )
         )
         reprec = testdir.runpytest("-s")
         for test in ["test_browser"]:
-            reprec.stdout.fnmatch_lines("*Finalized*")
+            reprec.stdout.fnmatch_lines(["*Finalized*"])
 
     def test_class_scope_with_normal_tests(self, testdir):
         testpath = testdir.makepyfile(
@@ -2875,9 +2707,9 @@ class TestFixtureMarker(object):
         reprec = testdir.inline_run("-v")
         reprec.assertoutcome(passed=5)
 
-    @pytest.mark.issue246
     @pytest.mark.parametrize("scope", ["session", "function", "module"])
     def test_finalizer_order_on_parametrization(self, scope, testdir):
+        """#246"""
         testdir.makepyfile(
             """
             import pytest
@@ -2897,7 +2729,7 @@ class TestFixtureMarker(object):
             def base(request, fix1):
                 def cleanup_base():
                     values.append("fin_base")
-                    print ("finalizing base")
+                    print("finalizing base")
                 request.addfinalizer(cleanup_base)
 
             def test_begin():
@@ -2912,8 +2744,8 @@ class TestFixtureMarker(object):
         reprec = testdir.inline_run("-lvs")
         reprec.assertoutcome(passed=3)
 
-    @pytest.mark.issue396
     def test_class_scope_parametrization_ordering(self, testdir):
+        """#396"""
         testdir.makepyfile(
             """
             import pytest
@@ -2938,21 +2770,18 @@ class TestFixtureMarker(object):
         reprec = testdir.inline_run()
         reprec.assertoutcome(passed=6)
         values = reprec.getcalls("pytest_runtest_call")[0].item.module.values
-        assert (
-            values
-            == [
-                "test_hello",
-                "fin John",
-                "test_hello",
-                "fin Doe",
-                "test_name",
-                "test_population",
-                "fin John",
-                "test_name",
-                "test_population",
-                "fin Doe",
-            ]
-        )
+        assert values == [
+            "test_hello",
+            "fin John",
+            "test_hello",
+            "fin Doe",
+            "test_name",
+            "test_population",
+            "fin John",
+            "test_name",
+            "test_population",
+            "fin Doe",
+        ]
 
     def test_parametrize_setup_function(self, testdir):
         testdir.makepyfile(
@@ -3036,8 +2865,8 @@ class TestFixtureMarker(object):
         res = testdir.runpytest("-v")
         res.stdout.fnmatch_lines(["*test_foo*alpha*", "*test_foo*beta*"])
 
-    @pytest.mark.issue920
     def test_deterministic_fixture_collection(self, testdir, monkeypatch):
+        """#920"""
         testdir.makepyfile(
             """
             import pytest
@@ -3135,7 +2964,6 @@ class TestRequestScopeAccess(object):
 
 
 class TestErrors(object):
-
     def test_subfactory_missing_funcarg(self, testdir):
         testdir.makepyfile(
             """
@@ -3203,18 +3031,31 @@ class TestErrors(object):
 
 
 class TestShowFixtures(object):
-
     def test_funcarg_compat(self, testdir):
         config = testdir.parseconfigure("--funcargs")
         assert config.option.showfixtures
 
     def test_show_fixtures(self, testdir):
         result = testdir.runpytest("--fixtures")
-        result.stdout.fnmatch_lines(["*tmpdir*", "*temporary directory*"])
+        result.stdout.fnmatch_lines(
+            [
+                "tmpdir_factory [[]session scope[]]",
+                "*for the test session*",
+                "tmpdir",
+                "*temporary directory*",
+            ]
+        )
 
     def test_show_fixtures_verbose(self, testdir):
         result = testdir.runpytest("--fixtures", "-v")
-        result.stdout.fnmatch_lines(["*tmpdir*--*tmpdir.py*", "*temporary directory*"])
+        result.stdout.fnmatch_lines(
+            [
+                "tmpdir_factory [[]session scope[]] -- *tmpdir.py*",
+                "*for the test session*",
+                "tmpdir -- *tmpdir.py*",
+                "*temporary directory*",
+            ]
+        )
 
     def test_show_fixtures_testmodule(self, testdir):
         p = testdir.makepyfile(
@@ -3268,120 +3109,119 @@ class TestShowFixtures(object):
 
     def test_show_fixtures_trimmed_doc(self, testdir):
         p = testdir.makepyfile(
-            dedent(
+            textwrap.dedent(
+                '''\
+                import pytest
+                @pytest.fixture
+                def arg1():
+                    """
+                    line1
+                    line2
+
+                    """
+                @pytest.fixture
+                def arg2():
+                    """
+                    line1
+                    line2
+
+                    """
                 '''
-            import pytest
-            @pytest.fixture
-            def arg1():
-                """
-                line1
-                line2
-
-                """
-            @pytest.fixture
-            def arg2():
-                """
-                line1
-                line2
-
-                """
-        '''
             )
         )
         result = testdir.runpytest("--fixtures", p)
         result.stdout.fnmatch_lines(
-            dedent(
+            textwrap.dedent(
+                """\
+                * fixtures defined from test_show_fixtures_trimmed_doc *
+                arg2
+                    line1
+                    line2
+                arg1
+                    line1
+                    line2
                 """
-            * fixtures defined from test_show_fixtures_trimmed_doc *
-            arg2
-                line1
-                line2
-            arg1
-                line1
-                line2
-
-        """
             )
         )
 
     def test_show_fixtures_indented_doc(self, testdir):
         p = testdir.makepyfile(
-            dedent(
+            textwrap.dedent(
+                '''\
+                import pytest
+                @pytest.fixture
+                def fixture1():
+                    """
+                    line1
+                        indented line
+                    """
                 '''
-            import pytest
-            @pytest.fixture
-            def fixture1():
-                """
-                line1
-                    indented line
-                """
-        '''
             )
         )
         result = testdir.runpytest("--fixtures", p)
         result.stdout.fnmatch_lines(
-            dedent(
+            textwrap.dedent(
+                """\
+                * fixtures defined from test_show_fixtures_indented_doc *
+                fixture1
+                    line1
+                        indented line
                 """
-            * fixtures defined from test_show_fixtures_indented_doc *
-            fixture1
-                line1
-                    indented line
-        """
             )
         )
 
     def test_show_fixtures_indented_doc_first_line_unindented(self, testdir):
         p = testdir.makepyfile(
-            dedent(
+            textwrap.dedent(
+                '''\
+                import pytest
+                @pytest.fixture
+                def fixture1():
+                    """line1
+                    line2
+                        indented line
+                    """
                 '''
-            import pytest
-            @pytest.fixture
-            def fixture1():
-                """line1
-                line2
-                    indented line
-                """
-        '''
             )
         )
         result = testdir.runpytest("--fixtures", p)
         result.stdout.fnmatch_lines(
-            dedent(
+            textwrap.dedent(
+                """\
+                * fixtures defined from test_show_fixtures_indented_doc_first_line_unindented *
+                fixture1
+                    line1
+                    line2
+                        indented line
                 """
-            * fixtures defined from test_show_fixtures_indented_doc_first_line_unindented *
-            fixture1
-                line1
-                line2
-                    indented line
-        """
             )
         )
 
     def test_show_fixtures_indented_in_class(self, testdir):
         p = testdir.makepyfile(
-            dedent(
+            textwrap.dedent(
+                '''\
+                import pytest
+                class TestClass(object):
+                    @pytest.fixture
+                    def fixture1(self):
+                        """line1
+                        line2
+                            indented line
+                        """
                 '''
-            import pytest
-            class TestClass(object):
-                @pytest.fixture
-                def fixture1(self):
-                    """line1
-                    line2
-                        indented line
-                    """
-        '''
             )
         )
         result = testdir.runpytest("--fixtures", p)
         result.stdout.fnmatch_lines(
-            dedent(
+            textwrap.dedent(
+                """\
+                * fixtures defined from test_show_fixtures_indented_in_class *
+                fixture1
+                    line1
+                    line2
+                        indented line
                 """
-            * fixtures defined from test_show_fixtures_indented_in_class *
-            fixture1
-                line1
-                line2
-                    indented line
-        """
             )
         )
 
@@ -3478,26 +3318,40 @@ class TestShowFixtures(object):
                 pass
 
 
-@pytest.mark.parametrize("flavor", ["fixture", "yield_fixture"])
 class TestContextManagerFixtureFuncs(object):
+    @pytest.fixture(params=["fixture", "yield_fixture"])
+    def flavor(self, request, testdir, monkeypatch):
+        monkeypatch.setenv("PYTEST_FIXTURE_FLAVOR", request.param)
+        testdir.makepyfile(
+            test_context="""
+            import os
+            import pytest
+            import warnings
+            VAR = "PYTEST_FIXTURE_FLAVOR"
+            if VAR not in os.environ:
+                warnings.warn("PYTEST_FIXTURE_FLAVOR was not set, assuming fixture")
+                fixture = pytest.fixture
+            else:
+                fixture = getattr(pytest, os.environ[VAR])
+        """
+        )
 
     def test_simple(self, testdir, flavor):
         testdir.makepyfile(
             """
-            import pytest
-            @pytest.{flavor}
+            from __future__ import print_function
+            from test_context import fixture
+            @fixture
             def arg1():
-                print ("setup")
+                print("setup")
                 yield 1
-                print ("teardown")
+                print("teardown")
             def test_1(arg1):
-                print ("test1 %s" % arg1)
+                print("test1", arg1)
             def test_2(arg1):
-                print ("test2 %s" % arg1)
+                print("test2", arg1)
                 assert 0
-        """.format(
-                flavor=flavor
-            )
+        """
         )
         result = testdir.runpytest("-s")
         result.stdout.fnmatch_lines(
@@ -3514,19 +3368,18 @@ class TestContextManagerFixtureFuncs(object):
     def test_scoped(self, testdir, flavor):
         testdir.makepyfile(
             """
-            import pytest
-            @pytest.{flavor}(scope="module")
+            from __future__ import print_function
+            from test_context import fixture
+            @fixture(scope="module")
             def arg1():
-                print ("setup")
+                print("setup")
                 yield 1
-                print ("teardown")
+                print("teardown")
             def test_1(arg1):
-                print ("test1 %s" % arg1)
+                print("test1", arg1)
             def test_2(arg1):
-                print ("test2 %s" % arg1)
-        """.format(
-                flavor=flavor
-            )
+                print("test2", arg1)
+        """
         )
         result = testdir.runpytest("-s")
         result.stdout.fnmatch_lines(
@@ -3541,16 +3394,14 @@ class TestContextManagerFixtureFuncs(object):
     def test_setup_exception(self, testdir, flavor):
         testdir.makepyfile(
             """
-            import pytest
-            @pytest.{flavor}(scope="module")
+            from test_context import fixture
+            @fixture(scope="module")
             def arg1():
                 pytest.fail("setup")
                 yield 1
             def test_1(arg1):
                 pass
-        """.format(
-                flavor=flavor
-            )
+        """
         )
         result = testdir.runpytest("-s")
         result.stdout.fnmatch_lines(
@@ -3563,16 +3414,14 @@ class TestContextManagerFixtureFuncs(object):
     def test_teardown_exception(self, testdir, flavor):
         testdir.makepyfile(
             """
-            import pytest
-            @pytest.{flavor}(scope="module")
+            from test_context import fixture
+            @fixture(scope="module")
             def arg1():
                 yield 1
                 pytest.fail("teardown")
             def test_1(arg1):
                 pass
-        """.format(
-                flavor=flavor
-            )
+        """
         )
         result = testdir.runpytest("-s")
         result.stdout.fnmatch_lines(
@@ -3585,16 +3434,14 @@ class TestContextManagerFixtureFuncs(object):
     def test_yields_more_than_one(self, testdir, flavor):
         testdir.makepyfile(
             """
-            import pytest
-            @pytest.{flavor}(scope="module")
+            from test_context import fixture
+            @fixture(scope="module")
             def arg1():
                 yield 1
                 yield 2
             def test_1(arg1):
                 pass
-        """.format(
-                flavor=flavor
-            )
+        """
         )
         result = testdir.runpytest("-s")
         result.stdout.fnmatch_lines(
@@ -3607,25 +3454,22 @@ class TestContextManagerFixtureFuncs(object):
     def test_custom_name(self, testdir, flavor):
         testdir.makepyfile(
             """
-            import pytest
-            @pytest.{flavor}(name='meow')
+            from test_context import fixture
+            @fixture(name='meow')
             def arg1():
                 return 'mew'
             def test_1(meow):
                 print(meow)
-        """.format(
-                flavor=flavor
-            )
+        """
         )
         result = testdir.runpytest("-s")
-        result.stdout.fnmatch_lines("*mew*")
+        result.stdout.fnmatch_lines(["*mew*"])
 
 
 class TestParameterizedSubRequest(object):
-
     def test_call_from_fixture(self, testdir):
-        testfile = testdir.makepyfile(
-            """
+        testdir.makepyfile(
+            test_call_from_fixture="""
             import pytest
 
             @pytest.fixture(params=[0, 1, 2])
@@ -3642,22 +3486,20 @@ class TestParameterizedSubRequest(object):
         )
         result = testdir.runpytest()
         result.stdout.fnmatch_lines(
-            """
-            E*Failed: The requested fixture has no parameter defined for the current test.
-            E*
-            E*Requested fixture 'fix_with_param' defined in:
-            E*{}:4
-            E*Requested here:
-            E*{}:9
-            *1 error*
-            """.format(
-                testfile.basename, testfile.basename
-            )
+            [
+                "The requested fixture has no parameter defined for test:",
+                "    test_call_from_fixture.py::test_foo",
+                "Requested fixture 'fix_with_param' defined in:",
+                "test_call_from_fixture.py:4",
+                "Requested here:",
+                "test_call_from_fixture.py:9",
+                "*1 error in*",
+            ]
         )
 
     def test_call_from_test(self, testdir):
-        testfile = testdir.makepyfile(
-            """
+        testdir.makepyfile(
+            test_call_from_test="""
             import pytest
 
             @pytest.fixture(params=[0, 1, 2])
@@ -3670,21 +3512,19 @@ class TestParameterizedSubRequest(object):
         )
         result = testdir.runpytest()
         result.stdout.fnmatch_lines(
-            """
-            E*Failed: The requested fixture has no parameter defined for the current test.
-            E*
-            E*Requested fixture 'fix_with_param' defined in:
-            E*{}:4
-            E*Requested here:
-            E*{}:8
-            *1 failed*
-            """.format(
-                testfile.basename, testfile.basename
-            )
+            [
+                "The requested fixture has no parameter defined for test:",
+                "    test_call_from_test.py::test_foo",
+                "Requested fixture 'fix_with_param' defined in:",
+                "test_call_from_test.py:4",
+                "Requested here:",
+                "test_call_from_test.py:8",
+                "*1 failed*",
+            ]
         )
 
     def test_external_fixture(self, testdir):
-        conffile = testdir.makeconftest(
+        testdir.makeconftest(
             """
             import pytest
 
@@ -3694,25 +3534,24 @@ class TestParameterizedSubRequest(object):
             """
         )
 
-        testfile = testdir.makepyfile(
-            """
+        testdir.makepyfile(
+            test_external_fixture="""
             def test_foo(request):
                 request.getfixturevalue('fix_with_param')
             """
         )
         result = testdir.runpytest()
         result.stdout.fnmatch_lines(
-            """
-            E*Failed: The requested fixture has no parameter defined for the current test.
-            E*
-            E*Requested fixture 'fix_with_param' defined in:
-            E*{}:4
-            E*Requested here:
-            E*{}:2
-            *1 failed*
-            """.format(
-                conffile.basename, testfile.basename
-            )
+            [
+                "The requested fixture has no parameter defined for test:",
+                "    test_external_fixture.py::test_foo",
+                "",
+                "Requested fixture 'fix_with_param' defined in:",
+                "conftest.py:4",
+                "Requested here:",
+                "test_external_fixture.py:2",
+                "*1 failed*",
+            ]
         )
 
     def test_non_relative_path(self, testdir):
@@ -3720,26 +3559,26 @@ class TestParameterizedSubRequest(object):
         fixdir = testdir.mkdir("fixtures")
         fixfile = fixdir.join("fix.py")
         fixfile.write(
-            _pytest._code.Source(
-                """
-            import pytest
+            textwrap.dedent(
+                """\
+                import pytest
 
-            @pytest.fixture(params=[0, 1, 2])
-            def fix_with_param(request):
-                return request.param
-            """
+                @pytest.fixture(params=[0, 1, 2])
+                def fix_with_param(request):
+                    return request.param
+                """
             )
         )
 
         testfile = tests_dir.join("test_foos.py")
         testfile.write(
-            _pytest._code.Source(
-                """
-            from fix import fix_with_param
+            textwrap.dedent(
+                """\
+                from fix import fix_with_param
 
-            def test_foo(request):
-                request.getfixturevalue('fix_with_param')
-            """
+                def test_foo(request):
+                    request.getfixturevalue('fix_with_param')
+                """
             )
         )
 
@@ -3747,17 +3586,16 @@ class TestParameterizedSubRequest(object):
         testdir.syspathinsert(fixdir)
         result = testdir.runpytest()
         result.stdout.fnmatch_lines(
-            """
-            E*Failed: The requested fixture has no parameter defined for the current test.
-            E*
-            E*Requested fixture 'fix_with_param' defined in:
-            E*{}:5
-            E*Requested here:
-            E*{}:5
-            *1 failed*
-            """.format(
-                fixfile.strpath, testfile.basename
-            )
+            [
+                "The requested fixture has no parameter defined for test:",
+                "    test_foos.py::test_foo",
+                "",
+                "Requested fixture 'fix_with_param' defined in:",
+                "*fix.py:4",
+                "Requested here:",
+                "test_foos.py:4",
+                "*1 failed*",
+            ]
         )
 
 
@@ -3810,17 +3648,27 @@ def test_pytest_fixture_setup_and_post_finalizer_hook(testdir):
 class TestScopeOrdering(object):
     """Class of tests that ensure fixtures are ordered based on their scopes (#2405)"""
 
-    @pytest.mark.parametrize("use_mark", [True, False])
-    def test_func_closure_module_auto(self, testdir, use_mark):
+    @pytest.mark.parametrize("variant", ["mark", "autouse"])
+    def test_func_closure_module_auto(self, testdir, variant, monkeypatch):
         """Semantically identical to the example posted in #2405 when ``use_mark=True``"""
+        monkeypatch.setenv("FIXTURE_ACTIVATION_VARIANT", variant)
         testdir.makepyfile(
             """
+            import warnings
+            import os
             import pytest
+            VAR = 'FIXTURE_ACTIVATION_VARIANT'
+            VALID_VARS = ('autouse', 'mark')
 
-            @pytest.fixture(scope='module', autouse={autouse})
+            VARIANT = os.environ.get(VAR)
+            if VARIANT is None or VARIANT not in VALID_VARS:
+                warnings.warn("{!r} is not  in {}, assuming autouse".format(VARIANT, VALID_VARS) )
+                variant = 'mark'
+
+            @pytest.fixture(scope='module', autouse=VARIANT == 'autouse')
             def m1(): pass
 
-            if {use_mark}:
+            if VARIANT=='mark':
                 pytestmark = pytest.mark.usefixtures('m1')
 
             @pytest.fixture(scope='function', autouse=True)
@@ -3828,9 +3676,7 @@ class TestScopeOrdering(object):
 
             def test_func(m1):
                 pass
-        """.format(
-                autouse=not use_mark, use_mark=use_mark
-            )
+        """
         )
         items, _ = testdir.inline_genitems()
         request = FixtureRequest(items[0])
@@ -3851,6 +3697,10 @@ class TestScopeOrdering(object):
             def s1():
                 FIXTURE_ORDER.append('s1')
 
+            @pytest.fixture(scope="package")
+            def p1():
+                FIXTURE_ORDER.append('p1')
+
             @pytest.fixture(scope="module")
             def m1():
                 FIXTURE_ORDER.append('m1')
@@ -3871,16 +3721,20 @@ class TestScopeOrdering(object):
             def f2():
                 FIXTURE_ORDER.append('f2')
 
-            def test_foo(f1, m1, f2, s1): pass
+            def test_foo(f1, p1, m1, f2, s1): pass
         """
         )
         items, _ = testdir.inline_genitems()
         request = FixtureRequest(items[0])
         # order of fixtures based on their scope and position in the parameter list
-        assert request.fixturenames == "s1 my_tmpdir_factory m1 f1 f2 my_tmpdir".split()
+        assert (
+            request.fixturenames == "s1 my_tmpdir_factory p1 m1 f1 f2 my_tmpdir".split()
+        )
         testdir.runpytest()
         # actual fixture execution differs: dependent fixtures must be created first ("my_tmpdir")
-        assert pytest.FIXTURE_ORDER == "s1 my_tmpdir_factory m1 my_tmpdir f1 f2".split()
+        assert (
+            pytest.FIXTURE_ORDER == "s1 my_tmpdir_factory p1 m1 my_tmpdir f1 f2".split()
+        )
 
     def test_func_closure_module(self, testdir):
         testdir.makepyfile(
@@ -3949,9 +3803,13 @@ class TestScopeOrdering(object):
                 "sub/conftest.py": """
                 import pytest
 
+                @pytest.fixture(scope='package', autouse=True)
+                def p_sub(): pass
+
                 @pytest.fixture(scope='module', autouse=True)
                 def m_sub(): pass
             """,
+                "sub/__init__.py": "",
                 "sub/test_func.py": """
                 import pytest
 
@@ -3968,7 +3826,7 @@ class TestScopeOrdering(object):
         )
         items, _ = testdir.inline_genitems()
         request = FixtureRequest(items[0])
-        assert request.fixturenames == "m_conf m_sub m_test f1".split()
+        assert request.fixturenames == "p_sub m_conf m_sub m_test f1".split()
 
     def test_func_closure_all_scopes_complex(self, testdir):
         """Complex test involving all scopes and mixing autouse with normal fixtures"""
@@ -3978,8 +3836,12 @@ class TestScopeOrdering(object):
 
             @pytest.fixture(scope='session')
             def s1(): pass
+
+            @pytest.fixture(scope='package', autouse=True)
+            def p1(): pass
         """
         )
+        testdir.makepyfile(**{"__init__.py": ""})
         testdir.makepyfile(
             """
             import pytest
@@ -4008,4 +3870,126 @@ class TestScopeOrdering(object):
         )
         items, _ = testdir.inline_genitems()
         request = FixtureRequest(items[0])
-        assert request.fixturenames == "s1 m1 m2 c1 f2 f1".split()
+        assert request.fixturenames == "s1 p1 m1 m2 c1 f2 f1".split()
+
+    def test_multiple_packages(self, testdir):
+        """Complex test involving multiple package fixtures. Make sure teardowns
+        are executed in order.
+        .
+        └── root
+            ├── __init__.py
+            ├── sub1
+            │   ├── __init__.py
+            │   ├── conftest.py
+            │   └── test_1.py
+            └── sub2
+                ├── __init__.py
+                ├── conftest.py
+                └── test_2.py
+        """
+        root = testdir.mkdir("root")
+        root.join("__init__.py").write("values = []")
+        sub1 = root.mkdir("sub1")
+        sub1.ensure("__init__.py")
+        sub1.join("conftest.py").write(
+            textwrap.dedent(
+                """\
+            import pytest
+            from .. import values
+            @pytest.fixture(scope="package")
+            def fix():
+                values.append("pre-sub1")
+                yield values
+                assert values.pop() == "pre-sub1"
+        """
+            )
+        )
+        sub1.join("test_1.py").write(
+            textwrap.dedent(
+                """\
+            from .. import values
+            def test_1(fix):
+                assert values == ["pre-sub1"]
+        """
+            )
+        )
+        sub2 = root.mkdir("sub2")
+        sub2.ensure("__init__.py")
+        sub2.join("conftest.py").write(
+            textwrap.dedent(
+                """\
+            import pytest
+            from .. import values
+            @pytest.fixture(scope="package")
+            def fix():
+                values.append("pre-sub2")
+                yield values
+                assert values.pop() == "pre-sub2"
+        """
+            )
+        )
+        sub2.join("test_2.py").write(
+            textwrap.dedent(
+                """\
+            from .. import values
+            def test_2(fix):
+                assert values == ["pre-sub2"]
+        """
+            )
+        )
+        reprec = testdir.inline_run()
+        reprec.assertoutcome(passed=2)
+
+
+def test_call_fixture_function_error():
+    """Check if an error is raised if a fixture function is called directly (#4545)"""
+
+    @pytest.fixture
+    def fix():
+        return 1
+
+    with pytest.raises(pytest.fail.Exception):
+        assert fix() == 1
+
+
+def test_fixture_param_shadowing(testdir):
+    """Parametrized arguments would be shadowed if a fixture with the same name also exists (#5036)"""
+    testdir.makepyfile(
+        """
+        import pytest
+
+        @pytest.fixture(params=['a', 'b'])
+        def argroot(request):
+            return request.param
+
+        @pytest.fixture
+        def arg(argroot):
+            return argroot
+
+        # This should only be parametrized directly
+        @pytest.mark.parametrize("arg", [1])
+        def test_direct(arg):
+            assert arg == 1
+
+        # This should be parametrized based on the fixtures
+        def test_normal_fixture(arg):
+            assert isinstance(arg, str)
+
+        # Indirect should still work:
+
+        @pytest.fixture
+        def arg2(request):
+            return 2*request.param
+
+        @pytest.mark.parametrize("arg2", [1], indirect=True)
+        def test_indirect(arg2):
+            assert arg2 == 2
+    """
+    )
+    # Only one test should have run
+    result = testdir.runpytest("-v")
+    result.assert_outcomes(passed=4)
+    result.stdout.fnmatch_lines(["*::test_direct[[]1[]]*"])
+    result.stdout.fnmatch_lines(["*::test_normal_fixture[[]a[]]*"])
+    result.stdout.fnmatch_lines(["*::test_normal_fixture[[]b[]]*"])
+    result.stdout.fnmatch_lines(["*::test_indirect[[]1[]]*"])
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/integration.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/integration.py
index f348fdc29fd..d2fea2dc5ca 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/integration.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/integration.py
@@ -1,10 +1,10 @@
+# -*- coding: utf-8 -*-
 import pytest
 from _pytest import python
 from _pytest import runner
 
 
 class TestOEJSKITSpecials(object):
-
     def test_funcarg_non_pycollectobj(self, testdir):  # rough jstests usage
         testdir.makeconftest(
             """
@@ -70,7 +70,6 @@ class TestOEJSKITSpecials(object):
 
 
 def test_wrapped_getfslineno():
-
     def func():
         pass
 
@@ -89,12 +88,10 @@ def test_wrapped_getfslineno():
 
 
 class TestMockDecoration(object):
-
     def test_wrapped_getfuncargnames(self):
         from _pytest.compat import getfuncargnames
 
         def wrap(f):
-
             def func():
                 pass
 
@@ -115,7 +112,6 @@ class TestMockDecoration(object):
         from _pytest.compat import getfuncargnames
 
         def wrap(f):
-
             def func():
                 pass
 
@@ -269,7 +265,6 @@ class TestMockDecoration(object):
 
 
 class TestReRunTests(object):
-
     def test_rerun(self, testdir):
         testdir.makeconftest(
             """
@@ -289,7 +284,7 @@ class TestReRunTests(object):
                 global count, req
                 assert request != req
                 req = request
-                print ("fix count %s" % count)
+                print("fix count %s" % count)
                 count += 1
             def test_fix(fix):
                 pass
@@ -316,7 +311,6 @@ def test_pytestconfig_is_session_scoped():
 
 
 class TestNoselikeTestAttribute(object):
-
     def test_module_with_global_test(self, testdir):
         testdir.makepyfile(
             """
@@ -400,8 +394,8 @@ class TestNoselikeTestAttribute(object):
         assert not call.items
 
 
-@pytest.mark.issue351
 class TestParameterize(object):
+    """#351"""
 
     def test_idfn_marker(self, testdir):
         testdir.makepyfile(
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/metafunc.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/metafunc.py
index e181d3131f5..d90787894ae 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/metafunc.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/metafunc.py
@@ -1,20 +1,22 @@
 # -*- coding: utf-8 -*-
 import re
 import sys
-import attr
-import _pytest._code
-import py
-import pytest
-from _pytest import python, fixtures
+import textwrap
 
+import attr
 import hypothesis
+import six
 from hypothesis import strategies
 
+import pytest
+from _pytest import fixtures
+from _pytest import python
+from _pytest.warnings import SHOW_PYTEST_WARNINGS_ARG
+
 PY3 = sys.version_info >= (3, 0)
 
 
 class TestMetafunc(object):
-
     def Metafunc(self, func, config=None):
         # the unit tests of this class check if things work correctly
         # on the funcarg level, so we don't need a full blown
@@ -35,7 +37,6 @@ class TestMetafunc(object):
         return python.Metafunc(definition, fixtureinfo, config)
 
     def test_no_funcargs(self, testdir):
-
         def function():
             pass
 
@@ -44,7 +45,6 @@ class TestMetafunc(object):
         repr(metafunc._calls)
 
     def test_function_basic(self):
-
         def func(arg1, arg2="qwe"):
             pass
 
@@ -54,72 +54,7 @@ class TestMetafunc(object):
         assert metafunc.function is func
         assert metafunc.cls is None
 
-    def test_addcall_no_args(self):
-
-        def func(arg1):
-            pass
-
-        metafunc = self.Metafunc(func)
-        metafunc.addcall()
-        assert len(metafunc._calls) == 1
-        call = metafunc._calls[0]
-        assert call.id == "0"
-        assert not hasattr(call, "param")
-
-    def test_addcall_id(self):
-
-        def func(arg1):
-            pass
-
-        metafunc = self.Metafunc(func)
-        pytest.raises(ValueError, "metafunc.addcall(id=None)")
-
-        metafunc.addcall(id=1)
-        pytest.raises(ValueError, "metafunc.addcall(id=1)")
-        pytest.raises(ValueError, "metafunc.addcall(id='1')")
-        metafunc.addcall(id=2)
-        assert len(metafunc._calls) == 2
-        assert metafunc._calls[0].id == "1"
-        assert metafunc._calls[1].id == "2"
-
-    def test_addcall_param(self):
-
-        def func(arg1):
-            pass
-
-        metafunc = self.Metafunc(func)
-
-        class obj(object):
-            pass
-
-        metafunc.addcall(param=obj)
-        metafunc.addcall(param=obj)
-        metafunc.addcall(param=1)
-        assert len(metafunc._calls) == 3
-        assert metafunc._calls[0].getparam("arg1") == obj
-        assert metafunc._calls[1].getparam("arg1") == obj
-        assert metafunc._calls[2].getparam("arg1") == 1
-
-    def test_addcall_funcargs(self):
-
-        def func(x):
-            pass
-
-        metafunc = self.Metafunc(func)
-
-        class obj(object):
-            pass
-
-        metafunc.addcall(funcargs={"x": 2})
-        metafunc.addcall(funcargs={"x": 3})
-        pytest.raises(pytest.fail.Exception, "metafunc.addcall({'xyz': 0})")
-        assert len(metafunc._calls) == 2
-        assert metafunc._calls[0].funcargs == {"x": 2}
-        assert metafunc._calls[1].funcargs == {"x": 3}
-        assert not hasattr(metafunc._calls[1], "param")
-
     def test_parametrize_error(self):
-
         def func(x, y):
             pass
 
@@ -132,18 +67,63 @@ class TestMetafunc(object):
         pytest.raises(ValueError, lambda: metafunc.parametrize("y", [5, 6]))
 
     def test_parametrize_bad_scope(self, testdir):
-
         def func(x):
             pass
 
         metafunc = self.Metafunc(func)
-        try:
+        with pytest.raises(
+            pytest.fail.Exception,
+            match=r"parametrize\(\) call in func got an unexpected scope value 'doggy'",
+        ):
             metafunc.parametrize("x", [1], scope="doggy")
-        except ValueError as ve:
-            assert "has an unsupported scope value 'doggy'" in str(ve)
+
+    def test_find_parametrized_scope(self):
+        """unittest for _find_parametrized_scope (#3941)"""
+        from _pytest.python import _find_parametrized_scope
+
+        @attr.s
+        class DummyFixtureDef(object):
+            scope = attr.ib()
+
+        fixtures_defs = dict(
+            session_fix=[DummyFixtureDef("session")],
+            package_fix=[DummyFixtureDef("package")],
+            module_fix=[DummyFixtureDef("module")],
+            class_fix=[DummyFixtureDef("class")],
+            func_fix=[DummyFixtureDef("function")],
+        )
+
+        # use arguments to determine narrow scope; the cause of the bug is that it would look on all
+        # fixture defs given to the method
+        def find_scope(argnames, indirect):
+            return _find_parametrized_scope(argnames, fixtures_defs, indirect=indirect)
+
+        assert find_scope(["func_fix"], indirect=True) == "function"
+        assert find_scope(["class_fix"], indirect=True) == "class"
+        assert find_scope(["module_fix"], indirect=True) == "module"
+        assert find_scope(["package_fix"], indirect=True) == "package"
+        assert find_scope(["session_fix"], indirect=True) == "session"
+
+        assert find_scope(["class_fix", "func_fix"], indirect=True) == "function"
+        assert find_scope(["func_fix", "session_fix"], indirect=True) == "function"
+        assert find_scope(["session_fix", "class_fix"], indirect=True) == "class"
+        assert find_scope(["package_fix", "session_fix"], indirect=True) == "package"
+        assert find_scope(["module_fix", "session_fix"], indirect=True) == "module"
+
+        # when indirect is False or is not for all scopes, always use function
+        assert find_scope(["session_fix", "module_fix"], indirect=False) == "function"
+        assert (
+            find_scope(["session_fix", "module_fix"], indirect=["module_fix"])
+            == "function"
+        )
+        assert (
+            find_scope(
+                ["session_fix", "module_fix"], indirect=["session_fix", "module_fix"]
+            )
+            == "module"
+        )
 
     def test_parametrize_and_id(self):
-
         def func(x, y):
             pass
 
@@ -166,31 +146,26 @@ class TestMetafunc(object):
         assert ids == [u"basic", u"advanced"]
 
     def test_parametrize_with_wrong_number_of_ids(self, testdir):
-
         def func(x, y):
             pass
 
         metafunc = self.Metafunc(func)
 
-        pytest.raises(
-            ValueError, lambda: metafunc.parametrize("x", [1, 2], ids=["basic"])
-        )
+        with pytest.raises(pytest.fail.Exception):
+            metafunc.parametrize("x", [1, 2], ids=["basic"])
 
-        pytest.raises(
-            ValueError,
-            lambda: metafunc.parametrize(
+        with pytest.raises(pytest.fail.Exception):
+            metafunc.parametrize(
                 ("x", "y"), [("abc", "def"), ("ghi", "jkl")], ids=["one"]
-            ),
-        )
+            )
 
-    @pytest.mark.issue510
     def test_parametrize_empty_list(self):
+        """#510"""
 
         def func(y):
             pass
 
         class MockConfig(object):
-
             def getini(self, name):
                 return ""
 
@@ -206,7 +181,6 @@ class TestMetafunc(object):
         assert "skip" == metafunc._calls[0].marks[0].name
 
     def test_parametrize_with_userobjects(self):
-
         def func(x, y):
             pass
 
@@ -229,12 +203,9 @@ class TestMetafunc(object):
     def test_idval_hypothesis(self, value):
         from _pytest.python import _idval
 
-        escaped = _idval(value, "a", 6, None)
-        assert isinstance(escaped, str)
-        if PY3:
-            escaped.encode("ascii")
-        else:
-            escaped.decode("ascii")
+        escaped = _idval(value, "a", 6, None, item=None, config=None)
+        assert isinstance(escaped, six.text_type)
+        escaped.encode("ascii")
 
     def test_unicode_idval(self):
         """This tests that Unicode strings outside the ASCII character set get
@@ -256,7 +227,37 @@ class TestMetafunc(object):
             ),
         ]
         for val, expected in values:
-            assert _idval(val, "a", 6, None) == expected
+            assert _idval(val, "a", 6, None, item=None, config=None) == expected
+
+    def test_unicode_idval_with_config(self):
+        """unittest for expected behavior to obtain ids with
+        disable_test_id_escaping_and_forfeit_all_rights_to_community_support
+        option. (#5294)
+        """
+        from _pytest.python import _idval
+
+        class MockConfig(object):
+            def __init__(self, config):
+                self.config = config
+
+            @property
+            def hook(self):
+                return self
+
+            def pytest_make_parametrize_id(self, **kw):
+                pass
+
+            def getini(self, name):
+                return self.config[name]
+
+        option = "disable_test_id_escaping_and_forfeit_all_rights_to_community_support"
+
+        values = [
+            (u"ação", MockConfig({option: True}), u"ação"),
+            (u"ação", MockConfig({option: False}), "a\\xe7\\xe3o"),
+        ]
+        for val, config, expected in values:
+            assert _idval(val, "a", 6, None, item=None, config=config) == expected
 
     def test_bytes_idval(self):
         """unittest for the expected behavior to obtain ids for parametrized
@@ -274,7 +275,7 @@ class TestMetafunc(object):
             (u"αρά".encode("utf-8"), "\\xce\\xb1\\xcf\\x81\\xce\\xac"),
         ]
         for val, expected in values:
-            assert _idval(val, "a", 6, None) == expected
+            assert _idval(val, "a", 6, idfn=None, item=None, config=None) == expected
 
     def test_class_or_function_idval(self):
         """unittest for the expected behavior to obtain ids for parametrized
@@ -290,10 +291,10 @@ class TestMetafunc(object):
 
         values = [(TestClass, "TestClass"), (test_function, "test_function")]
         for val, expected in values:
-            assert _idval(val, "a", 6, None) == expected
+            assert _idval(val, "a", 6, None, item=None, config=None) == expected
 
-    @pytest.mark.issue250
     def test_idmaker_autoname(self):
+        """#250"""
         from _pytest.python import idmaker
 
         result = idmaker(
@@ -306,9 +307,7 @@ class TestMetafunc(object):
         )
         assert result == ["a0-1.0", "a1-b1"]
         # unicode mixing, issue250
-        result = idmaker(
-            (py.builtin._totext("a"), "b"), [pytest.param({}, b"\xc3\xb4")]
-        )
+        result = idmaker((u"a", "b"), [pytest.param({}, b"\xc3\xb4")])
         assert result == ["a0-\\xc3\\xb4"]
 
     def test_idmaker_with_bytes_regex(self):
@@ -320,7 +319,6 @@ class TestMetafunc(object):
     def test_idmaker_native_strings(self):
         from _pytest.python import idmaker
 
-        totext = py.builtin._totext
         result = idmaker(
             ("a", "b"),
             [
@@ -335,26 +333,51 @@ class TestMetafunc(object):
                 pytest.param({7}, set("seven")),
                 pytest.param(tuple("eight"), (8, -8, 8)),
                 pytest.param(b"\xc3\xb4", b"name"),
-                pytest.param(b"\xc3\xb4", totext("other")),
+                pytest.param(b"\xc3\xb4", u"other"),
             ],
         )
-        assert (
-            result
-            == [
-                "1.0--1.1",
-                "2--202",
-                "three-three hundred",
-                "True-False",
-                "None-None",
-                "foo-bar",
-                "str-int",
-                "a7-b7",
-                "a8-b8",
-                "a9-b9",
-                "\\xc3\\xb4-name",
-                "\\xc3\\xb4-other",
-            ]
+        assert result == [
+            "1.0--1.1",
+            "2--202",
+            "three-three hundred",
+            "True-False",
+            "None-None",
+            "foo-bar",
+            "str-int",
+            "a7-b7",
+            "a8-b8",
+            "a9-b9",
+            "\\xc3\\xb4-name",
+            "\\xc3\\xb4-other",
+        ]
+
+    def test_idmaker_non_printable_characters(self):
+        from _pytest.python import idmaker
+
+        result = idmaker(
+            ("s", "n"),
+            [
+                pytest.param("\x00", 1),
+                pytest.param("\x05", 2),
+                pytest.param(b"\x00", 3),
+                pytest.param(b"\x05", 4),
+                pytest.param("\t", 5),
+                pytest.param(b"\t", 6),
+            ],
         )
+        assert result == ["\\x00-1", "\\x05-2", "\\x00-3", "\\x05-4", "\\t-5", "\\t-6"]
+
+    def test_idmaker_manual_ids_must_be_printable(self):
+        from _pytest.python import idmaker
+
+        result = idmaker(
+            ("s",),
+            [
+                pytest.param("x00", id="hello \x00"),
+                pytest.param("x05", id="hello \x05"),
+            ],
+        )
+        assert result == ["hello \\x00", "hello \\x05"]
 
     def test_idmaker_enum(self):
         from _pytest.python import idmaker
@@ -364,8 +387,8 @@ class TestMetafunc(object):
         result = idmaker(("a", "b"), [pytest.param(e.one, e.two)])
         assert result == ["Foo.one-Foo.two"]
 
-    @pytest.mark.issue351
     def test_idmaker_idfn(self):
+        """#351"""
         from _pytest.python import idmaker
 
         def ids(val):
@@ -383,8 +406,8 @@ class TestMetafunc(object):
         )
         assert result == ["10.0-IndexError()", "20-KeyError()", "three-b2"]
 
-    @pytest.mark.issue351
     def test_idmaker_idfn_unique_names(self):
+        """#351"""
         from _pytest.python import idmaker
 
         def ids(val):
@@ -401,46 +424,71 @@ class TestMetafunc(object):
         )
         assert result == ["a-a0", "a-a1", "a-a2"]
 
-    @pytest.mark.issue351
-    def test_idmaker_idfn_exception(self):
+    def test_idmaker_with_idfn_and_config(self):
+        """unittest for expected behavior to create ids with idfn and
+        disable_test_id_escaping_and_forfeit_all_rights_to_community_support
+        option. (#5294)
+        """
         from _pytest.python import idmaker
-        from _pytest.recwarn import WarningsRecorder
 
-        class BadIdsException(Exception):
-            pass
+        class MockConfig(object):
+            def __init__(self, config):
+                self.config = config
 
-        def ids(val):
-            raise BadIdsException("ids raised")
+            @property
+            def hook(self):
+                return self
 
-        rec = WarningsRecorder()
-        with rec:
-            idmaker(
-                ("a", "b"),
-                [
-                    pytest.param(10.0, IndexError()),
-                    pytest.param(20, KeyError()),
-                    pytest.param("three", [1, 2, 3]),
-                ],
-                idfn=ids,
+            def pytest_make_parametrize_id(self, **kw):
+                pass
+
+            def getini(self, name):
+                return self.config[name]
+
+        option = "disable_test_id_escaping_and_forfeit_all_rights_to_community_support"
+
+        values = [
+            (MockConfig({option: True}), u"ação"),
+            (MockConfig({option: False}), "a\\xe7\\xe3o"),
+        ]
+        for config, expected in values:
+            result = idmaker(
+                ("a",), [pytest.param("string")], idfn=lambda _: u"ação", config=config
             )
+            assert result == [expected]
 
-        assert (
-            [str(i.message) for i in rec.list]
-            == [
-                "Raised while trying to determine id of parameter a at position 0."
-                "\nUpdate your code as this will raise an error in pytest-4.0.",
-                "Raised while trying to determine id of parameter b at position 0."
-                "\nUpdate your code as this will raise an error in pytest-4.0.",
-                "Raised while trying to determine id of parameter a at position 1."
-                "\nUpdate your code as this will raise an error in pytest-4.0.",
-                "Raised while trying to determine id of parameter b at position 1."
-                "\nUpdate your code as this will raise an error in pytest-4.0.",
-                "Raised while trying to determine id of parameter a at position 2."
-                "\nUpdate your code as this will raise an error in pytest-4.0.",
-                "Raised while trying to determine id of parameter b at position 2."
-                "\nUpdate your code as this will raise an error in pytest-4.0.",
-            ]
-        )
+    def test_idmaker_with_ids_and_config(self):
+        """unittest for expected behavior to create ids with ids and
+        disable_test_id_escaping_and_forfeit_all_rights_to_community_support
+        option. (#5294)
+        """
+        from _pytest.python import idmaker
+
+        class MockConfig(object):
+            def __init__(self, config):
+                self.config = config
+
+            @property
+            def hook(self):
+                return self
+
+            def pytest_make_parametrize_id(self, **kw):
+                pass
+
+            def getini(self, name):
+                return self.config[name]
+
+        option = "disable_test_id_escaping_and_forfeit_all_rights_to_community_support"
+
+        values = [
+            (MockConfig({option: True}), u"ação"),
+            (MockConfig({option: False}), "a\\xe7\\xe3o"),
+        ]
+        for config, expected in values:
+            result = idmaker(
+                ("a",), [pytest.param("string")], ids=[u"ação"], config=config
+            )
+            assert result == [expected]
 
     def test_parametrize_ids_exception(self, testdir):
         """
@@ -459,16 +507,29 @@ class TestMetafunc(object):
                     pass
             """
         )
-        with pytest.warns(DeprecationWarning):
-            result = testdir.runpytest("--collect-only")
+        result = testdir.runpytest()
         result.stdout.fnmatch_lines(
             [
-                "<Module 'test_parametrize_ids_exception.py'>",
-                "  <Function 'test_foo[a]'>",
-                "  <Function 'test_foo[b]'>",
+                "*test_foo: error raised while trying to determine id of parameter 'arg' at position 0",
+                "*Exception: bad ids",
             ]
         )
 
+    def test_parametrize_ids_returns_non_string(self, testdir):
+        testdir.makepyfile(
+            """\
+            import pytest
+
+            def ids(d):
+                return d
+
+            @pytest.mark.parametrize("arg", ({1: 2}, {3, 4}), ids=ids)
+            def test(arg):
+                assert arg
+            """
+        )
+        assert testdir.runpytest().ret == 0
+
     def test_idmaker_with_ids(self):
         from _pytest.python import idmaker
 
@@ -495,22 +556,8 @@ class TestMetafunc(object):
         )
         assert result == ["a0", "a1", "b0", "c", "b1"]
 
-    def test_addcall_and_parametrize(self):
-
-        def func(x, y):
-            pass
-
-        metafunc = self.Metafunc(func)
-        metafunc.addcall({"x": 1})
-        metafunc.parametrize("y", [2, 3])
-        assert len(metafunc._calls) == 2
-        assert metafunc._calls[0].funcargs == {"x": 1, "y": 2}
-        assert metafunc._calls[1].funcargs == {"x": 1, "y": 3}
-        assert metafunc._calls[0].id == "0-2"
-        assert metafunc._calls[1].id == "0-3"
-
-    @pytest.mark.issue714
     def test_parametrize_indirect(self):
+        """#714"""
 
         def func(x, y):
             pass
@@ -524,8 +571,8 @@ class TestMetafunc(object):
         assert metafunc._calls[0].params == dict(x=1, y=2)
         assert metafunc._calls[1].params == dict(x=1, y=3)
 
-    @pytest.mark.issue714
     def test_parametrize_indirect_list(self):
+        """#714"""
 
         def func(x, y):
             pass
@@ -535,8 +582,8 @@ class TestMetafunc(object):
         assert metafunc._calls[0].funcargs == dict(y="b")
         assert metafunc._calls[0].params == dict(x="a")
 
-    @pytest.mark.issue714
     def test_parametrize_indirect_list_all(self):
+        """#714"""
 
         def func(x, y):
             pass
@@ -546,8 +593,8 @@ class TestMetafunc(object):
         assert metafunc._calls[0].funcargs == {}
         assert metafunc._calls[0].params == dict(x="a", y="b")
 
-    @pytest.mark.issue714
     def test_parametrize_indirect_list_empty(self):
+        """#714"""
 
         def func(x, y):
             pass
@@ -557,9 +604,9 @@ class TestMetafunc(object):
         assert metafunc._calls[0].funcargs == dict(x="a", y="b")
         assert metafunc._calls[0].params == {}
 
-    @pytest.mark.issue714
     def test_parametrize_indirect_list_functional(self, testdir):
         """
+        #714
         Test parametrization with 'indirect' parameter applied on
         particular arguments. As y is is direct, its value should
         be used directly rather than being passed to the fixture
@@ -586,22 +633,23 @@ class TestMetafunc(object):
         result = testdir.runpytest("-v")
         result.stdout.fnmatch_lines(["*test_simple*a-b*", "*1 passed*"])
 
-    @pytest.mark.issue714
     def test_parametrize_indirect_list_error(self, testdir):
+        """#714"""
 
         def func(x, y):
             pass
 
         metafunc = self.Metafunc(func)
-        with pytest.raises(ValueError):
+        with pytest.raises(pytest.fail.Exception):
             metafunc.parametrize("x, y", [("a", "b")], indirect=["x", "z"])
 
-    @pytest.mark.issue714
     def test_parametrize_uses_no_fixture_error_indirect_false(self, testdir):
         """The 'uses no fixture' error tells the user at collection time
         that the parametrize data they've set up doesn't correspond to the
         fixtures in their test function, rather than silently ignoring this
         and letting the test potentially pass.
+
+        #714
         """
         testdir.makepyfile(
             """
@@ -615,8 +663,8 @@ class TestMetafunc(object):
         result = testdir.runpytest("--collect-only")
         result.stdout.fnmatch_lines(["*uses no argument 'y'*"])
 
-    @pytest.mark.issue714
     def test_parametrize_uses_no_fixture_error_indirect_true(self, testdir):
+        """#714"""
         testdir.makepyfile(
             """
             import pytest
@@ -635,8 +683,8 @@ class TestMetafunc(object):
         result = testdir.runpytest("--collect-only")
         result.stdout.fnmatch_lines(["*uses no fixture 'y'*"])
 
-    @pytest.mark.issue714
     def test_parametrize_indirect_uses_no_fixture_error_indirect_string(self, testdir):
+        """#714"""
         testdir.makepyfile(
             """
             import pytest
@@ -652,8 +700,8 @@ class TestMetafunc(object):
         result = testdir.runpytest("--collect-only")
         result.stdout.fnmatch_lines(["*uses no fixture 'y'*"])
 
-    @pytest.mark.issue714
     def test_parametrize_indirect_uses_no_fixture_error_indirect_list(self, testdir):
+        """#714"""
         testdir.makepyfile(
             """
             import pytest
@@ -669,8 +717,8 @@ class TestMetafunc(object):
         result = testdir.runpytest("--collect-only")
         result.stdout.fnmatch_lines(["*uses no fixture 'y'*"])
 
-    @pytest.mark.issue714
     def test_parametrize_argument_not_in_indirect_list(self, testdir):
+        """#714"""
         testdir.makepyfile(
             """
             import pytest
@@ -703,21 +751,6 @@ class TestMetafunc(object):
             ["*already takes an argument 'y' with a default value"]
         )
 
-    def test_addcalls_and_parametrize_indirect(self):
-
-        def func(x, y):
-            pass
-
-        metafunc = self.Metafunc(func)
-        metafunc.addcall(param="123")
-        metafunc.parametrize("x", [1], indirect=True)
-        metafunc.parametrize("y", [2, 3], indirect=True)
-        assert len(metafunc._calls) == 2
-        assert metafunc._calls[0].funcargs == {}
-        assert metafunc._calls[1].funcargs == {}
-        assert metafunc._calls[0].params == dict(x=1, y=2)
-        assert metafunc._calls[1].params == dict(x=1, y=3)
-
     def test_parametrize_functional(self, testdir):
         testdir.makepyfile(
             """
@@ -837,7 +870,6 @@ class TestMetafunc(object):
         )
 
     def test_format_args(self):
-
         def function1():
             pass
 
@@ -860,18 +892,16 @@ class TestMetafunc(object):
 
 
 class TestMetafuncFunctional(object):
-
     def test_attributes(self, testdir):
         p = testdir.makepyfile(
             """
             # assumes that generate/provide runs in the same process
-            import sys, pytest
+            import sys, pytest, six
             def pytest_generate_tests(metafunc):
-                metafunc.addcall(param=metafunc)
+                metafunc.parametrize('metafunc', [metafunc])
 
             @pytest.fixture
             def metafunc(request):
-                assert request._pyfuncitem._genid == "0"
                 return request.param
 
             def test_function(metafunc, pytestconfig):
@@ -884,65 +914,34 @@ class TestMetafuncFunctional(object):
                 def test_method(self, metafunc, pytestconfig):
                     assert metafunc.config == pytestconfig
                     assert metafunc.module.__name__ == __name__
-                    if sys.version_info > (3, 0):
-                        unbound = TestClass.test_method
-                    else:
-                        unbound = TestClass.test_method.im_func
-                    # XXX actually have an unbound test function here?
+                    unbound = six.get_unbound_function(TestClass.test_method)
                     assert metafunc.function == unbound
                     assert metafunc.cls == TestClass
         """
         )
-        result = testdir.runpytest(p, "-v")
+        result = testdir.runpytest(p, "-v", SHOW_PYTEST_WARNINGS_ARG)
         result.assert_outcomes(passed=2)
 
-    def test_addcall_with_two_funcargs_generators(self, testdir):
-        testdir.makeconftest(
-            """
-            def pytest_generate_tests(metafunc):
-                assert "arg1" in metafunc.fixturenames
-                metafunc.addcall(funcargs=dict(arg1=1, arg2=2))
-        """
-        )
-        p = testdir.makepyfile(
-            """
-            def pytest_generate_tests(metafunc):
-                metafunc.addcall(funcargs=dict(arg1=1, arg2=1))
-
-            class TestClass(object):
-                def test_myfunc(self, arg1, arg2):
-                    assert arg1 == arg2
-        """
-        )
-        result = testdir.runpytest("-v", p)
-        result.stdout.fnmatch_lines(
-            ["*test_myfunc*0*PASS*", "*test_myfunc*1*FAIL*", "*1 failed, 1 passed*"]
-        )
-
     def test_two_functions(self, testdir):
         p = testdir.makepyfile(
             """
             def pytest_generate_tests(metafunc):
-                metafunc.addcall(param=10)
-                metafunc.addcall(param=20)
-
-            import pytest
-            @pytest.fixture
-            def arg1(request):
-                return request.param
+                metafunc.parametrize('arg1', [10, 20], ids=['0', '1'])
 
             def test_func1(arg1):
                 assert arg1 == 10
+
             def test_func2(arg1):
                 assert arg1 in (10, 20)
         """
         )
-        result = testdir.runpytest("-v", p)
+        result = testdir.runpytest("-v", p, SHOW_PYTEST_WARNINGS_ARG)
         result.stdout.fnmatch_lines(
             [
                 "*test_func1*0*PASS*",
                 "*test_func1*1*FAIL*",
                 "*test_func2*PASS*",
+                "*test_func2*PASS*",
                 "*1 failed, 3 passed*",
             ]
         )
@@ -961,61 +960,25 @@ class TestMetafuncFunctional(object):
         result = testdir.runpytest(p)
         result.assert_outcomes(passed=1)
 
-    def test_generate_plugin_and_module(self, testdir):
-        testdir.makeconftest(
-            """
-            def pytest_generate_tests(metafunc):
-                assert "arg1" in metafunc.fixturenames
-                metafunc.addcall(id="world", param=(2,100))
-        """
-        )
-        p = testdir.makepyfile(
-            """
-            def pytest_generate_tests(metafunc):
-                metafunc.addcall(param=(1,1), id="hello")
-
-            import pytest
-            @pytest.fixture
-            def arg1(request):
-                return request.param[0]
-            @pytest.fixture
-            def arg2(request):
-                return request.param[1]
-
-            class TestClass(object):
-                def test_myfunc(self, arg1, arg2):
-                    assert arg1 == arg2
-        """
-        )
-        result = testdir.runpytest("-v", p)
-        result.stdout.fnmatch_lines(
-            [
-                "*test_myfunc*hello*PASS*",
-                "*test_myfunc*world*FAIL*",
-                "*1 failed, 1 passed*",
-            ]
-        )
-
     def test_generate_tests_in_class(self, testdir):
         p = testdir.makepyfile(
             """
             class TestClass(object):
                 def pytest_generate_tests(self, metafunc):
-                    metafunc.addcall(funcargs={'hello': 'world'}, id="hello")
+                    metafunc.parametrize('hello', ['world'], ids=['hellow'])
 
                 def test_myfunc(self, hello):
                     assert hello == "world"
         """
         )
-        result = testdir.runpytest("-v", p)
+        result = testdir.runpytest("-v", p, SHOW_PYTEST_WARNINGS_ARG)
         result.stdout.fnmatch_lines(["*test_myfunc*hello*PASS*", "*1 passed*"])
 
     def test_two_functions_not_same_instance(self, testdir):
         p = testdir.makepyfile(
             """
             def pytest_generate_tests(metafunc):
-                metafunc.addcall({'arg1': 10})
-                metafunc.addcall({'arg1': 20})
+                metafunc.parametrize('arg1', [10, 20], ids=["0", "1"])
 
             class TestClass(object):
                 def test_func(self, arg1):
@@ -1023,7 +986,7 @@ class TestMetafuncFunctional(object):
                     self.x = 1
         """
         )
-        result = testdir.runpytest("-v", p)
+        result = testdir.runpytest("-v", p, SHOW_PYTEST_WARNINGS_ARG)
         result.stdout.fnmatch_lines(
             ["*test_func*0*PASS*", "*test_func*1*PASS*", "*2 pass*"]
         )
@@ -1032,7 +995,7 @@ class TestMetafuncFunctional(object):
         p = testdir.makepyfile(
             """
             def pytest_generate_tests(metafunc):
-                metafunc.addcall({'arg1': 1})
+                metafunc.parametrize('arg1', [1])
 
             class TestClass(object):
                 def test_method(self, arg1):
@@ -1041,7 +1004,7 @@ class TestMetafuncFunctional(object):
                     self.val = 1
             """
         )
-        result = testdir.runpytest(p)
+        result = testdir.runpytest(p, SHOW_PYTEST_WARNINGS_ARG)
         result.assert_outcomes(passed=1)
 
     def test_parametrize_functional2(self, testdir):
@@ -1216,7 +1179,9 @@ class TestMetafuncFunctional(object):
         )
         result = testdir.runpytest()
         result.stdout.fnmatch_lines(
-            ["*ids must be list of strings, found: 2 (type: int)*"]
+            [
+                "*In test_ids_numbers: ids must be list of strings, found: 2 (type: *'int'>)*"
+            ]
         )
 
     def test_parametrize_with_identical_ids_get_unique_names(self, testdir):
@@ -1301,19 +1266,19 @@ class TestMetafuncFunctional(object):
         sub1 = testdir.mkpydir("sub1")
         sub2 = testdir.mkpydir("sub2")
         sub1.join("conftest.py").write(
-            _pytest._code.Source(
+            textwrap.dedent(
+                """\
+                def pytest_generate_tests(metafunc):
+                    assert metafunc.function.__name__ == "test_1"
                 """
-            def pytest_generate_tests(metafunc):
-                assert metafunc.function.__name__ == "test_1"
-        """
             )
         )
         sub2.join("conftest.py").write(
-            _pytest._code.Source(
+            textwrap.dedent(
+                """\
+                def pytest_generate_tests(metafunc):
+                    assert metafunc.function.__name__ == "test_2"
                 """
-            def pytest_generate_tests(metafunc):
-                assert metafunc.function.__name__ == "test_2"
-        """
             )
         )
         sub1.join("test_in_sub1.py").write("def test_1(): pass")
@@ -1339,9 +1304,9 @@ class TestMetafuncFunctional(object):
         reprec = testdir.runpytest()
         reprec.assert_outcomes(passed=4)
 
-    @pytest.mark.issue463
     @pytest.mark.parametrize("attr", ["parametrise", "parameterize", "parameterise"])
     def test_parametrize_misspelling(self, testdir, attr):
+        """#463"""
         testdir.makepyfile(
             """
             import pytest
@@ -1353,13 +1318,13 @@ class TestMetafuncFunctional(object):
                 attr
             )
         )
-        reprec = testdir.inline_run("--collectonly")
-        failures = reprec.getfailures()
-        assert len(failures) == 1
-        expectederror = "MarkerError: test_foo has '{}', spelling should be 'parametrize'".format(
-            attr
+        result = testdir.runpytest("--collectonly")
+        result.stdout.fnmatch_lines(
+            [
+                "test_foo has '{}' mark, spelling should be 'parametrize'".format(attr),
+                "*1 error in*",
+            ]
         )
-        assert expectederror in failures[0].longrepr.reprcrash.message
 
 
 class TestMetafuncFunctionalAuto(object):
@@ -1456,6 +1421,39 @@ class TestMetafuncFunctionalAuto(object):
         result = testdir.runpytest()
         result.stdout.fnmatch_lines(["* 3 passed *"])
 
+    def test_parametrize_some_arguments_auto_scope(self, testdir, monkeypatch):
+        """Integration test for (#3941)"""
+        class_fix_setup = []
+        monkeypatch.setattr(sys, "class_fix_setup", class_fix_setup, raising=False)
+        func_fix_setup = []
+        monkeypatch.setattr(sys, "func_fix_setup", func_fix_setup, raising=False)
+
+        testdir.makepyfile(
+            """
+            import pytest
+            import sys
+
+            @pytest.fixture(scope='class', autouse=True)
+            def class_fix(request):
+                sys.class_fix_setup.append(request.param)
+
+            @pytest.fixture(autouse=True)
+            def func_fix():
+                sys.func_fix_setup.append(True)
+
+            @pytest.mark.parametrize('class_fix', [10, 20], indirect=True)
+            class Test:
+                def test_foo(self):
+                    pass
+                def test_bar(self):
+                    pass
+            """
+        )
+        result = testdir.runpytest_inprocess()
+        result.stdout.fnmatch_lines(["* 4 passed in *"])
+        assert func_fix_setup == [True] * 4
+        assert class_fix_setup == [10, 20]
+
     def test_parametrize_issue634(self, testdir):
         testdir.makepyfile(
             """
@@ -1491,9 +1489,8 @@ class TestMetafuncFunctionalAuto(object):
         assert output.count("preparing foo-3") == 1
 
 
-@pytest.mark.filterwarnings("ignore:Applying marks directly to parameters")
-@pytest.mark.issue308
 class TestMarkersWithParametrization(object):
+    """#308"""
 
     def test_simple_mark(self, testdir):
         s = """
@@ -1502,7 +1499,7 @@ class TestMarkersWithParametrization(object):
             @pytest.mark.foo
             @pytest.mark.parametrize(("n", "expected"), [
                 (1, 2),
-                pytest.mark.bar((1, 3)),
+                pytest.param(1, 3, marks=pytest.mark.bar),
                 (2, 3),
             ])
             def test_increment(n, expected):
@@ -1522,14 +1519,14 @@ class TestMarkersWithParametrization(object):
 
             @pytest.mark.parametrize(("n", "expected"), [
                 (1, 2),
-                pytest.mark.foo((2, 3)),
+                pytest.param(2, 3, marks=pytest.mark.foo),
                 (3, 4),
             ])
             def test_increment(n, expected):
                 assert n + 1 == expected
         """
         testdir.makepyfile(s)
-        rec = testdir.inline_run("-m", "foo")
+        rec = testdir.inline_run("-m", "foo", SHOW_PYTEST_WARNINGS_ARG)
         passed, skipped, fail = rec.listoutcomes()
         assert len(passed) == 1
         assert len(skipped) == 0
@@ -1562,14 +1559,14 @@ class TestMarkersWithParametrization(object):
 
             @pytest.mark.parametrize(("n", "expected"), [
                 (1, 2),
-                pytest.mark.xfail((1, 3)),
+                pytest.param(1, 3, marks=pytest.mark.xfail),
                 (2, 3),
             ])
             def test_increment(n, expected):
                 assert n + 1 == expected
         """
         testdir.makepyfile(s)
-        reprec = testdir.inline_run()
+        reprec = testdir.inline_run(SHOW_PYTEST_WARNINGS_ARG)
         # xfail is skip??
         reprec.assertoutcome(passed=2, skipped=1)
 
@@ -1579,14 +1576,14 @@ class TestMarkersWithParametrization(object):
 
             @pytest.mark.parametrize("n", [
                 2,
-                pytest.mark.xfail(3),
+                pytest.param(3, marks=pytest.mark.xfail),
                 4,
             ])
             def test_isEven(n):
                 assert n % 2 == 0
         """
         testdir.makepyfile(s)
-        reprec = testdir.inline_run()
+        reprec = testdir.inline_run(SHOW_PYTEST_WARNINGS_ARG)
         reprec.assertoutcome(passed=2, skipped=1)
 
     def test_xfail_with_arg(self, testdir):
@@ -1595,14 +1592,14 @@ class TestMarkersWithParametrization(object):
 
             @pytest.mark.parametrize(("n", "expected"), [
                 (1, 2),
-                pytest.mark.xfail("True")((1, 3)),
+                pytest.param(1, 3, marks=pytest.mark.xfail("True")),
                 (2, 3),
             ])
             def test_increment(n, expected):
                 assert n + 1 == expected
         """
         testdir.makepyfile(s)
-        reprec = testdir.inline_run()
+        reprec = testdir.inline_run(SHOW_PYTEST_WARNINGS_ARG)
         reprec.assertoutcome(passed=2, skipped=1)
 
     def test_xfail_with_kwarg(self, testdir):
@@ -1611,14 +1608,14 @@ class TestMarkersWithParametrization(object):
 
             @pytest.mark.parametrize(("n", "expected"), [
                 (1, 2),
-                pytest.mark.xfail(reason="some bug")((1, 3)),
+                pytest.param(1, 3, marks=pytest.mark.xfail(reason="some bug")),
                 (2, 3),
             ])
             def test_increment(n, expected):
                 assert n + 1 == expected
         """
         testdir.makepyfile(s)
-        reprec = testdir.inline_run()
+        reprec = testdir.inline_run(SHOW_PYTEST_WARNINGS_ARG)
         reprec.assertoutcome(passed=2, skipped=1)
 
     def test_xfail_with_arg_and_kwarg(self, testdir):
@@ -1627,14 +1624,14 @@ class TestMarkersWithParametrization(object):
 
             @pytest.mark.parametrize(("n", "expected"), [
                 (1, 2),
-                pytest.mark.xfail("True", reason="some bug")((1, 3)),
+                pytest.param(1, 3, marks=pytest.mark.xfail("True", reason="some bug")),
                 (2, 3),
             ])
             def test_increment(n, expected):
                 assert n + 1 == expected
         """
         testdir.makepyfile(s)
-        reprec = testdir.inline_run()
+        reprec = testdir.inline_run(SHOW_PYTEST_WARNINGS_ARG)
         reprec.assertoutcome(passed=2, skipped=1)
 
     @pytest.mark.parametrize("strict", [True, False])
@@ -1642,9 +1639,11 @@ class TestMarkersWithParametrization(object):
         s = """
             import pytest
 
+            m = pytest.mark.xfail("sys.version_info > (0, 0, 0)", reason="some bug", strict={strict})
+
             @pytest.mark.parametrize(("n", "expected"), [
                 (1, 2),
-                pytest.mark.xfail("sys.version_info > (0, 0, 0)", reason="some bug", strict={strict})((2, 3)),
+                pytest.param(2, 3, marks=m),
                 (3, 4),
             ])
             def test_increment(n, expected):
@@ -1653,7 +1652,7 @@ class TestMarkersWithParametrization(object):
             strict=strict
         )
         testdir.makepyfile(s)
-        reprec = testdir.inline_run()
+        reprec = testdir.inline_run(SHOW_PYTEST_WARNINGS_ARG)
         passed, failed = (2, 1) if strict else (3, 0)
         reprec.assertoutcome(passed=passed, failed=failed)
 
@@ -1668,7 +1667,7 @@ class TestMarkersWithParametrization(object):
                 failingTestData = [(1, 3),
                                    (2, 2)]
 
-                testData = passingTestData + [pytest.mark.xfail(d)
+                testData = passingTestData + [pytest.param(*d, marks=pytest.mark.xfail)
                                   for d in failingTestData]
                 metafunc.parametrize(("n", "expected"), testData)
 
@@ -1677,11 +1676,11 @@ class TestMarkersWithParametrization(object):
                 assert n + 1 == expected
         """
         testdir.makepyfile(s)
-        reprec = testdir.inline_run()
+        reprec = testdir.inline_run(SHOW_PYTEST_WARNINGS_ARG)
         reprec.assertoutcome(passed=2, skipped=2)
 
-    @pytest.mark.issue290
     def test_parametrize_ID_generation_string_int_works(self, testdir):
+        """#290"""
         testdir.makepyfile(
             """
             import pytest
@@ -1766,3 +1765,16 @@ class TestMarkersWithParametrization(object):
         result.stdout.fnmatch_lines(
             ["*test_func_a*0*PASS*", "*test_func_a*2*PASS*", "*test_func_b*10*PASS*"]
         )
+
+    def test_parametrize_positional_args(self, testdir):
+        testdir.makepyfile(
+            """
+            import pytest
+
+            @pytest.mark.parametrize("a", [1], False)
+            def test_foo(a):
+                pass
+        """
+        )
+        result = testdir.runpytest()
+        result.assert_outcomes(passed=1)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/raises.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/raises.py
index 64199c3b6f5..fa25d9f73ee 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/raises.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/raises.py
@@ -1,30 +1,43 @@
-from _pytest.outcomes import Failed
-import pytest
+# -*- coding: utf-8 -*-
 import sys
 
+import six
+
+import pytest
+from _pytest.compat import dummy_context_manager
+from _pytest.outcomes import Failed
+from _pytest.warning_types import PytestDeprecationWarning
+
 
 class TestRaises(object):
-
     def test_raises(self):
         source = "int('qwe')"
-        excinfo = pytest.raises(ValueError, source)
+        with pytest.warns(PytestDeprecationWarning):
+            excinfo = pytest.raises(ValueError, source)
         code = excinfo.traceback[-1].frame.code
         s = str(code.fullsource)
         assert s == source
 
     def test_raises_exec(self):
-        pytest.raises(ValueError, "a,x = []")
+        with pytest.warns(PytestDeprecationWarning) as warninfo:
+            pytest.raises(ValueError, "a,x = []")
+        assert warninfo[0].filename == __file__
+
+    def test_raises_exec_correct_filename(self):
+        with pytest.warns(PytestDeprecationWarning):
+            excinfo = pytest.raises(ValueError, 'int("s")')
+            assert __file__ in excinfo.traceback[-1].path
 
     def test_raises_syntax_error(self):
-        pytest.raises(SyntaxError, "qwe qwe qwe")
+        with pytest.warns(PytestDeprecationWarning) as warninfo:
+            pytest.raises(SyntaxError, "qwe qwe qwe")
+        assert warninfo[0].filename == __file__
 
     def test_raises_function(self):
         pytest.raises(ValueError, int, "hello")
 
     def test_raises_callable_no_exception(self):
-
         class A(object):
-
             def __call__(self):
                 pass
 
@@ -33,18 +46,39 @@ class TestRaises(object):
         except pytest.raises.Exception:
             pass
 
+    def test_raises_falsey_type_error(self):
+        with pytest.raises(TypeError):
+            with pytest.raises(AssertionError, match=0):
+                raise AssertionError("ohai")
+
+    def test_raises_repr_inflight(self):
+        """Ensure repr() on an exception info inside a pytest.raises with block works (#4386)"""
+
+        class E(Exception):
+            pass
+
+        with pytest.raises(E) as excinfo:
+            # this test prints the inflight uninitialized object
+            # using repr and str as well as pprint to demonstrate
+            # it works
+            print(str(excinfo))
+            print(repr(excinfo))
+            import pprint
+
+            pprint.pprint(excinfo)
+            raise E()
+
     def test_raises_as_contextmanager(self, testdir):
         testdir.makepyfile(
             """
-            from __future__ import with_statement
-            import py, pytest
+            import pytest
             import _pytest._code
 
             def test_simple():
                 with pytest.raises(ZeroDivisionError) as excinfo:
                     assert isinstance(excinfo, _pytest._code.ExceptionInfo)
                     1/0
-                print (excinfo)
+                print(excinfo)
                 assert excinfo.type == ZeroDivisionError
                 assert isinstance(excinfo.value, ZeroDivisionError)
 
@@ -62,6 +96,54 @@ class TestRaises(object):
         result = testdir.runpytest()
         result.stdout.fnmatch_lines(["*3 passed*"])
 
+    def test_does_not_raise(self, testdir):
+        testdir.makepyfile(
+            """
+            from contextlib import contextmanager
+            import pytest
+
+            @contextmanager
+            def does_not_raise():
+                yield
+
+            @pytest.mark.parametrize('example_input,expectation', [
+                (3, does_not_raise()),
+                (2, does_not_raise()),
+                (1, does_not_raise()),
+                (0, pytest.raises(ZeroDivisionError)),
+            ])
+            def test_division(example_input, expectation):
+                '''Test how much I know division.'''
+                with expectation:
+                    assert (6 / example_input) is not None
+        """
+        )
+        result = testdir.runpytest()
+        result.stdout.fnmatch_lines(["*4 passed*"])
+
+    def test_does_not_raise_does_raise(self, testdir):
+        testdir.makepyfile(
+            """
+            from contextlib import contextmanager
+            import pytest
+
+            @contextmanager
+            def does_not_raise():
+                yield
+
+            @pytest.mark.parametrize('example_input,expectation', [
+                (0, does_not_raise()),
+                (1, pytest.raises(ZeroDivisionError)),
+            ])
+            def test_division(example_input, expectation):
+                '''Test how much I know division.'''
+                with expectation:
+                    assert (6 / example_input) is not None
+        """
+        )
+        result = testdir.runpytest()
+        result.stdout.fnmatch_lines(["*2 failed*"])
+
     def test_noclass(self):
         with pytest.raises(TypeError):
             pytest.raises("wrong", lambda: None)
@@ -94,8 +176,9 @@ class TestRaises(object):
     def test_custom_raise_message(self):
         message = "TEST_MESSAGE"
         try:
-            with pytest.raises(ValueError, message=message):
-                pass
+            with pytest.warns(PytestDeprecationWarning):
+                with pytest.raises(ValueError, message=message):
+                    pass
         except pytest.raises.Exception as e:
             assert e.msg == message
         else:
@@ -109,7 +192,6 @@ class TestRaises(object):
         import gc
 
         class T(object):
-
             def __call__(self):
                 raise ValueError
 
@@ -139,7 +221,7 @@ class TestRaises(object):
             int("asdf")
 
         msg = "with base 16"
-        expr = r"Pattern '{}' not found in 'invalid literal for int\(\) with base 10: 'asdf''".format(
+        expr = r"Pattern '{}' not found in \"invalid literal for int\(\) with base 10: 'asdf'\"".format(
             msg
         )
         with pytest.raises(AssertionError, match=expr):
@@ -160,7 +242,6 @@ class TestRaises(object):
         from six import add_metaclass
 
         class Meta(type(object)):
-
             def __getitem__(self, item):
                 return 1 / 0
 
@@ -172,6 +253,73 @@ class TestRaises(object):
             pass
 
         with pytest.raises(
-            Failed, match="DID NOT RAISE <class 'raises.ClassLooksIterableException'>"
+            Failed,
+            match=r"DID NOT RAISE <class 'raises(\..*)*ClassLooksIterableException'>",
         ):
             pytest.raises(ClassLooksIterableException, lambda: None)
+
+    def test_raises_with_raising_dunder_class(self):
+        """Test current behavior with regard to exceptions via __class__ (#4284)."""
+
+        class CrappyClass(Exception):
+            @property
+            def __class__(self):
+                assert False, "via __class__"
+
+        if six.PY2:
+            with pytest.raises(pytest.fail.Exception) as excinfo:
+                with pytest.raises(CrappyClass()):
+                    pass
+            assert "DID NOT RAISE" in excinfo.value.args[0]
+
+            with pytest.raises(CrappyClass) as excinfo:
+                raise CrappyClass()
+        else:
+            with pytest.raises(AssertionError) as excinfo:
+                with pytest.raises(CrappyClass()):
+                    pass
+            assert "via __class__" in excinfo.value.args[0]
+
+
+class TestUnicodeHandling:
+    """Test various combinations of bytes and unicode with pytest.raises (#5478)
+
+    https://github.com/pytest-dev/pytest/pull/5479#discussion_r298852433
+    """
+
+    success = dummy_context_manager
+    py2_only = pytest.mark.skipif(
+        not six.PY2, reason="bytes in raises only supported in Python 2"
+    )
+
+    @pytest.mark.parametrize(
+        "message, match, expectation",
+        [
+            (u"\u2603", u"\u2603", success()),
+            (u"\u2603", u"\u2603foo", pytest.raises(AssertionError)),
+            pytest.param(b"hello", b"hello", success(), marks=py2_only),
+            pytest.param(
+                b"hello", b"world", pytest.raises(AssertionError), marks=py2_only
+            ),
+            pytest.param(u"hello", b"hello", success(), marks=py2_only),
+            pytest.param(
+                u"hello", b"world", pytest.raises(AssertionError), marks=py2_only
+            ),
+            pytest.param(
+                u"😊".encode("UTF-8"),
+                b"world",
+                pytest.raises(AssertionError),
+                marks=py2_only,
+            ),
+            pytest.param(
+                u"world",
+                u"😊".encode("UTF-8"),
+                pytest.raises(AssertionError),
+                marks=py2_only,
+            ),
+        ],
+    )
+    def test_handling(self, message, match, expectation):
+        with expectation:
+            with pytest.raises(RuntimeError, match=match):
+                raise RuntimeError(message)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/setup_only.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/setup_only.py
index 4ae24b15a6d..ba4ceb00fce 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/setup_only.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/setup_only.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import pytest
 
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/setup_plan.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/setup_plan.py
index 0321939a8aa..ad64e42c29c 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/setup_plan.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/setup_plan.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 def test_show_fixtures_and_test(testdir):
     """ Verifies that fixtures are not executed. """
     p = testdir.makepyfile(
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/test_deprecations.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/test_deprecations.py
deleted file mode 100644
index b0c11f0b03b..00000000000
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/test_deprecations.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import pytest
-
-from _pytest.python import PyCollector
-
-
-class PyCollectorMock(PyCollector):
-    """evil hack"""
-
-    def __init__(self):
-        self.called = False
-
-    def _makeitem(self, *k):
-        """hack to disable the actual behaviour"""
-        self.called = True
-
-
-def test_pycollector_makeitem_is_deprecated():
-
-    collector = PyCollectorMock()
-    with pytest.deprecated_call():
-        collector.makeitem("foo", "bar")
-    assert collector.called
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_argcomplete.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_argcomplete.py
index b042de5ce5b..da7758e8e9e 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_argcomplete.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_argcomplete.py
@@ -1,6 +1,11 @@
-from __future__ import absolute_import, division, print_function
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import subprocess
 import sys
+
 import pytest
 
 # test for _argcomplete but not specific for any application
@@ -11,7 +16,7 @@ def equal_with_bash(prefix, ffc, fc, out=None):
     res_bash = set(fc(prefix))
     retval = set(res) == res_bash
     if out:
-        out.write("equal_with_bash %s %s\n" % (retval, res))
+        out.write("equal_with_bash({}) {} {}\n".format(prefix, retval, res))
         if not retval:
             out.write(" python - bash: %s\n" % (set(res) - res_bash))
             out.write(" bash - python: %s\n" % (res_bash - set(res)))
@@ -86,15 +91,20 @@ class FilesCompleter(object):
 
 
 class TestArgComplete(object):
-
     @pytest.mark.skipif("sys.platform in ('win32', 'darwin')")
-    def test_compare_with_compgen(self):
+    def test_compare_with_compgen(self, tmpdir):
         from _pytest._argcomplete import FastFilesCompleter
 
         ffc = FastFilesCompleter()
         fc = FilesCompleter()
-        for x in ["/", "/d", "/data", "qqq", ""]:
-            assert equal_with_bash(x, ffc, fc, out=sys.stdout)
+
+        with tmpdir.as_cwd():
+            assert equal_with_bash("", ffc, fc, out=sys.stdout)
+
+            tmpdir.ensure("data")
+
+            for x in ["d", "data", "doesnotexist", ""]:
+                assert equal_with_bash(x, ffc, fc, out=sys.stdout)
 
     @pytest.mark.skipif("sys.platform in ('win32', 'darwin')")
     def test_remove_dir_prefix(self):
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_assertion.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_assertion.py
index 393cf817c7e..225362e64ef 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_assertion.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_assertion.py
@@ -1,20 +1,25 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import sys
 import textwrap
 
+import attr
+import six
+
 import _pytest.assertion as plugin
-import py
 import pytest
-from _pytest.assertion import util
+from _pytest import outcomes
 from _pytest.assertion import truncate
+from _pytest.assertion import util
+from _pytest.compat import ATTRS_EQ_FIELD
 
 PY3 = sys.version_info >= (3, 0)
 
 
-@pytest.fixture
 def mock_config():
-
     class Config(object):
         verbose = False
 
@@ -27,7 +32,6 @@ def mock_config():
 
 
 class TestImportHookInstallation(object):
-
     @pytest.mark.parametrize("initial_conftest", [True, False])
     @pytest.mark.parametrize("mode", ["plain", "rewrite"])
     def test_conftest_assertion_rewrite(self, testdir, initial_conftest, mode):
@@ -134,12 +138,12 @@ class TestImportHookInstallation(object):
     def test_pytest_plugins_rewrite_module_names_correctly(self, testdir):
         """Test that we match files correctly when they are marked for rewriting (#2939)."""
         contents = {
-            "conftest.py": """
+            "conftest.py": """\
                 pytest_plugins = "ham"
             """,
             "ham.py": "",
             "hamster.py": "",
-            "test_foo.py": """
+            "test_foo.py": """\
                 def test_foo(pytestconfig):
                     assert pytestconfig.pluginmanager.rewrite_hook.find_module('ham') is not None
                     assert pytestconfig.pluginmanager.rewrite_hook.find_module('hamster') is None
@@ -150,13 +154,13 @@ class TestImportHookInstallation(object):
         assert result.ret == 0
 
     @pytest.mark.parametrize("mode", ["plain", "rewrite"])
-    @pytest.mark.parametrize("plugin_state", ["development", "installed"])
-    def test_installed_plugin_rewrite(self, testdir, mode, plugin_state):
+    def test_installed_plugin_rewrite(self, testdir, mode, monkeypatch):
+        monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", raising=False)
         # Make sure the hook is installed early enough so that plugins
         # installed via setuptools are rewritten.
         testdir.tmpdir.join("hampkg").ensure(dir=1)
         contents = {
-            "hampkg/__init__.py": """
+            "hampkg/__init__.py": """\
                 import pytest
 
                 @pytest.fixture
@@ -165,7 +169,7 @@ class TestImportHookInstallation(object):
                         assert values.pop(0) == value
                     return check
             """,
-            "spamplugin.py": """
+            "spamplugin.py": """\
             import pytest
             from hampkg import check_first2
 
@@ -175,46 +179,32 @@ class TestImportHookInstallation(object):
                     assert values.pop(0) == value
                 return check
             """,
-            "mainwrapper.py": """
-            import pytest, pkg_resources
-
-            plugin_state = "{plugin_state}"
-
-            class DummyDistInfo(object):
-                project_name = 'spam'
-                version = '1.0'
-
-                def _get_metadata(self, name):
-                    # 'RECORD' meta-data only available in installed plugins
-                    if name == 'RECORD' and plugin_state == "installed":
-                        return ['spamplugin.py,sha256=abc,123',
-                                'hampkg/__init__.py,sha256=abc,123']
-                    # 'SOURCES.txt' meta-data only available for plugins in development mode
-                    elif name == 'SOURCES.txt' and plugin_state == "development":
-                        return ['spamplugin.py',
-                                'hampkg/__init__.py']
-                    return []
+            "mainwrapper.py": """\
+            import pytest
+            from _pytest.compat import importlib_metadata
 
             class DummyEntryPoint(object):
                 name = 'spam'
                 module_name = 'spam.py'
-                attrs = ()
-                extras = None
-                dist = DummyDistInfo()
+                group = 'pytest11'
 
-                def load(self, require=True, *args, **kwargs):
+                def load(self):
                     import spamplugin
                     return spamplugin
 
-            def iter_entry_points(name):
-                yield DummyEntryPoint()
+            class DummyDistInfo(object):
+                version = '1.0'
+                files = ('spamplugin.py', 'hampkg/__init__.py')
+                entry_points = (DummyEntryPoint(),)
+                metadata = {'name': 'foo'}
 
-            pkg_resources.iter_entry_points = iter_entry_points
+            def distributions():
+                return (DummyDistInfo(),)
+
+            importlib_metadata.distributions = distributions
             pytest.main()
-            """.format(
-                plugin_state=plugin_state
-            ),
-            "test_foo.py": """
+            """,
+            "test_foo.py": """\
             def test(check_first):
                 check_first([10, 30], 30)
 
@@ -288,7 +278,6 @@ class TestImportHookInstallation(object):
 
 
 class TestBinReprIntegration(object):
-
     def test_pytest_assertrepr_compare_called(self, testdir):
         testdir.makeconftest(
             """
@@ -321,7 +310,6 @@ def callequal(left, right, verbose=False):
 
 
 class TestAssert_reprcompare(object):
-
     def test_different_types(self):
         assert callequal([0, 1], "foo") is None
 
@@ -444,6 +432,50 @@ class TestAssert_reprcompare(object):
         assert "Omitting" not in lines[1]
         assert lines[2] == "{'b': 1}"
 
+    def test_dict_different_items(self):
+        lines = callequal({"a": 0}, {"b": 1, "c": 2}, verbose=2)
+        assert lines == [
+            "{'a': 0} == {'b': 1, 'c': 2}",
+            "Left contains 1 more item:",
+            "{'a': 0}",
+            "Right contains 2 more items:",
+            "{'b': 1, 'c': 2}",
+            "Full diff:",
+            "- {'a': 0}",
+            "+ {'b': 1, 'c': 2}",
+        ]
+        lines = callequal({"b": 1, "c": 2}, {"a": 0}, verbose=2)
+        assert lines == [
+            "{'b': 1, 'c': 2} == {'a': 0}",
+            "Left contains 2 more items:",
+            "{'b': 1, 'c': 2}",
+            "Right contains 1 more item:",
+            "{'a': 0}",
+            "Full diff:",
+            "- {'b': 1, 'c': 2}",
+            "+ {'a': 0}",
+        ]
+
+    def test_sequence_different_items(self):
+        lines = callequal((1, 2), (3, 4, 5), verbose=2)
+        assert lines == [
+            "(1, 2) == (3, 4, 5)",
+            "At index 0 diff: 1 != 3",
+            "Right contains one more item: 5",
+            "Full diff:",
+            "- (1, 2)",
+            "+ (3, 4, 5)",
+        ]
+        lines = callequal((1, 2, 3), (4,), verbose=2)
+        assert lines == [
+            "(1, 2, 3) == (4,)",
+            "At index 0 diff: 1 != 4",
+            "Left contains 2 more items, first extra item: 2",
+            "Full diff:",
+            "- (1, 2, 3)",
+            "+ (4,)",
+        ]
+
     def test_set(self):
         expl = callequal({0, 1}, {0, 2})
         assert len(expl) > 1
@@ -453,13 +485,15 @@ class TestAssert_reprcompare(object):
         assert len(expl) > 1
 
     def test_Sequence(self):
-        col = py.builtin._tryimport("collections.abc", "collections", "sys")
-        if not hasattr(col, "MutableSequence"):
+        if sys.version_info >= (3, 3):
+            import collections.abc as collections_abc
+        else:
+            import collections as collections_abc
+        if not hasattr(collections_abc, "MutableSequence"):
             pytest.skip("cannot import MutableSequence")
-        MutableSequence = col.MutableSequence
+        MutableSequence = collections_abc.MutableSequence
 
         class TestSequence(MutableSequence):  # works with a Sequence subclass
-
             def __init__(self, iterable):
                 self.elements = list(iterable)
 
@@ -487,10 +521,32 @@ class TestAssert_reprcompare(object):
         expl = callequal([(1, 2)], [])
         assert len(expl) > 1
 
+    def test_repr_verbose(self):
+        class Nums:
+            def __init__(self, nums):
+                self.nums = nums
+
+            def __repr__(self):
+                return str(self.nums)
+
+        list_x = list(range(5000))
+        list_y = list(range(5000))
+        list_y[len(list_y) // 2] = 3
+        nums_x = Nums(list_x)
+        nums_y = Nums(list_y)
+
+        assert callequal(nums_x, nums_y) is None
+
+        expl = callequal(nums_x, nums_y, verbose=1)
+        assert "-" + repr(nums_x) in expl
+        assert "+" + repr(nums_y) in expl
+
+        expl = callequal(nums_x, nums_y, verbose=2)
+        assert "-" + repr(nums_x) in expl
+        assert "+" + repr(nums_y) in expl
+
     def test_list_bad_repr(self):
-
         class A(object):
-
             def __repr__(self):
                 raise ValueError(42)
 
@@ -506,7 +562,6 @@ class TestAssert_reprcompare(object):
         """
 
         class A(str):
-
             def __repr__(self):
                 return ""
 
@@ -518,12 +573,12 @@ class TestAssert_reprcompare(object):
         assert "raised in repr()" not in expl
 
     def test_unicode(self):
-        left = py.builtin._totext("£€", "utf-8")
-        right = py.builtin._totext("£", "utf-8")
+        left = u"£€"
+        right = u"£"
         expl = callequal(left, right)
-        assert expl[0] == py.builtin._totext("'£€' == '£'", "utf-8")
-        assert expl[1] == py.builtin._totext("- £€", "utf-8")
-        assert expl[2] == py.builtin._totext("+ £", "utf-8")
+        assert expl[0] == u"'£€' == '£'"
+        assert expl[1] == u"- £€"
+        assert expl[2] == u"+ £"
 
     def test_nonascii_text(self):
         """
@@ -532,32 +587,139 @@ class TestAssert_reprcompare(object):
         """
 
         class A(str):
-
             def __repr__(self):
                 return "\xff"
 
         expl = callequal(A(), "1")
-        assert expl
+        if PY3:
+            assert expl == ["ÿ == '1'", "+ 1"]
+        else:
+            assert expl == [u"\ufffd == '1'", u"+ 1"]
 
     def test_format_nonascii_explanation(self):
         assert util.format_explanation("λ")
 
     def test_mojibake(self):
         # issue 429
-        left = "e"
-        right = "\xc3\xa9"
-        if not isinstance(left, bytes):
-            left = bytes(left, "utf-8")
-            right = bytes(right, "utf-8")
+        left = b"e"
+        right = b"\xc3\xa9"
         expl = callequal(left, right)
         for line in expl:
-            assert isinstance(line, py.builtin.text)
-        msg = py.builtin._totext("\n").join(expl)
+            assert isinstance(line, six.text_type)
+        msg = u"\n".join(expl)
         assert msg
 
 
-class TestFormatExplanation(object):
+class TestAssert_reprcompare_dataclass(object):
+    @pytest.mark.skipif(sys.version_info < (3, 7), reason="Dataclasses in Python3.7+")
+    def test_dataclasses(self, testdir):
+        p = testdir.copy_example("dataclasses/test_compare_dataclasses.py")
+        result = testdir.runpytest(p)
+        result.assert_outcomes(failed=1, passed=0)
+        result.stdout.fnmatch_lines(
+            [
+                "*Omitting 1 identical items, use -vv to show*",
+                "*Differing attributes:*",
+                "*field_b: 'b' != 'c'*",
+            ]
+        )
 
+    @pytest.mark.skipif(sys.version_info < (3, 7), reason="Dataclasses in Python3.7+")
+    def test_dataclasses_verbose(self, testdir):
+        p = testdir.copy_example("dataclasses/test_compare_dataclasses_verbose.py")
+        result = testdir.runpytest(p, "-vv")
+        result.assert_outcomes(failed=1, passed=0)
+        result.stdout.fnmatch_lines(
+            [
+                "*Matching attributes:*",
+                "*['field_a']*",
+                "*Differing attributes:*",
+                "*field_b: 'b' != 'c'*",
+            ]
+        )
+
+    @pytest.mark.skipif(sys.version_info < (3, 7), reason="Dataclasses in Python3.7+")
+    def test_dataclasses_with_attribute_comparison_off(self, testdir):
+        p = testdir.copy_example(
+            "dataclasses/test_compare_dataclasses_field_comparison_off.py"
+        )
+        result = testdir.runpytest(p, "-vv")
+        result.assert_outcomes(failed=0, passed=1)
+
+    @pytest.mark.skipif(sys.version_info < (3, 7), reason="Dataclasses in Python3.7+")
+    def test_comparing_two_different_data_classes(self, testdir):
+        p = testdir.copy_example(
+            "dataclasses/test_compare_two_different_dataclasses.py"
+        )
+        result = testdir.runpytest(p, "-vv")
+        result.assert_outcomes(failed=0, passed=1)
+
+
+class TestAssert_reprcompare_attrsclass(object):
+    def test_attrs(self):
+        @attr.s
+        class SimpleDataObject(object):
+            field_a = attr.ib()
+            field_b = attr.ib()
+
+        left = SimpleDataObject(1, "b")
+        right = SimpleDataObject(1, "c")
+
+        lines = callequal(left, right)
+        assert lines[1].startswith("Omitting 1 identical item")
+        assert "Matching attributes" not in lines
+        for line in lines[1:]:
+            assert "field_a" not in line
+
+    def test_attrs_verbose(self):
+        @attr.s
+        class SimpleDataObject(object):
+            field_a = attr.ib()
+            field_b = attr.ib()
+
+        left = SimpleDataObject(1, "b")
+        right = SimpleDataObject(1, "c")
+
+        lines = callequal(left, right, verbose=2)
+        assert lines[1].startswith("Matching attributes:")
+        assert "Omitting" not in lines[1]
+        assert lines[2] == "['field_a']"
+
+    def test_attrs_with_attribute_comparison_off(self):
+        @attr.s
+        class SimpleDataObject(object):
+            field_a = attr.ib()
+            field_b = attr.ib(**{ATTRS_EQ_FIELD: False})
+
+        left = SimpleDataObject(1, "b")
+        right = SimpleDataObject(1, "b")
+
+        lines = callequal(left, right, verbose=2)
+        assert lines[1].startswith("Matching attributes:")
+        assert "Omitting" not in lines[1]
+        assert lines[2] == "['field_a']"
+        for line in lines[2:]:
+            assert "field_b" not in line
+
+    def test_comparing_two_different_attrs_classes(self):
+        @attr.s
+        class SimpleDataObjectOne(object):
+            field_a = attr.ib()
+            field_b = attr.ib()
+
+        @attr.s
+        class SimpleDataObjectTwo(object):
+            field_a = attr.ib()
+            field_b = attr.ib()
+
+        left = SimpleDataObjectOne(1, "b")
+        right = SimpleDataObjectTwo(1, "c")
+
+        lines = callequal(left, right)
+        assert lines is None
+
+
+class TestFormatExplanation(object):
     def test_special_chars_full(self, testdir):
         # Issue 453, for the bug this would raise IndexError
         testdir.makepyfile(
@@ -778,27 +940,22 @@ def test_rewritten(testdir):
     assert testdir.runpytest().ret == 0
 
 
-def test_reprcompare_notin(mock_config):
-    detail = plugin.pytest_assertrepr_compare(
-        mock_config, "not in", "foo", "aaafoobbb"
-    )[
-        1:
-    ]
+def test_reprcompare_notin():
+    config = mock_config()
+    detail = plugin.pytest_assertrepr_compare(config, "not in", "foo", "aaafoobbb")[1:]
     assert detail == ["'foo' is contained here:", "  aaafoobbb", "?    +++"]
 
 
-def test_reprcompare_whitespaces(mock_config):
-    detail = plugin.pytest_assertrepr_compare(mock_config, "==", "\r\n", "\n")
-    assert (
-        detail
-        == [
-            r"'\r\n' == '\n'",
-            r"Strings contain only whitespace, escaping them using repr()",
-            r"- '\r\n'",
-            r"?  --",
-            r"+ '\n'",
-        ]
-    )
+def test_reprcompare_whitespaces():
+    config = mock_config()
+    detail = plugin.pytest_assertrepr_compare(config, "==", "\r\n", "\n")
+    assert detail == [
+        r"'\r\n' == '\n'",
+        r"Strings contain only whitespace, escaping them using repr()",
+        r"- '\r\n'",
+        r"?  --",
+        r"+ '\n'",
+    ]
 
 
 def test_pytest_assertrepr_compare_integration(testdir):
@@ -1036,7 +1193,6 @@ def test_AssertionError_message(testdir):
 def test_set_with_unsortable_elements():
     # issue #718
     class UnsortableKey(object):
-
         def __init__(self, name):
             self.name = name
 
@@ -1091,17 +1247,27 @@ def test_diff_newline_at_end(monkeypatch, testdir):
     )
 
 
+@pytest.mark.filterwarnings("default")
 def test_assert_tuple_warning(testdir):
+    msg = "assertion is always true"
     testdir.makepyfile(
         """
         def test_tuple():
             assert(False, 'you shall not pass')
     """
     )
-    result = testdir.runpytest("-rw")
-    result.stdout.fnmatch_lines(
-        ["*test_assert_tuple_warning.py:2", "*assertion is always true*"]
+    result = testdir.runpytest()
+    result.stdout.fnmatch_lines(["*test_assert_tuple_warning.py:2:*{}*".format(msg)])
+
+    # tuples with size != 2 should not trigger the warning
+    testdir.makepyfile(
+        """
+        def test_tuple():
+            assert ()
+    """
     )
+    result = testdir.runpytest()
+    assert msg not in result.stdout.str()
 
 
 def test_assert_indirect_tuple_no_warning(testdir):
@@ -1169,4 +1335,17 @@ def test_issue_1944(testdir):
     )
     result = testdir.runpytest()
     result.stdout.fnmatch_lines(["*1 error*"])
-    assert "AttributeError: 'Module' object has no attribute '_obj'" not in result.stdout.str()
+    assert (
+        "AttributeError: 'Module' object has no attribute '_obj'"
+        not in result.stdout.str()
+    )
+
+
+def test_exit_from_assertrepr_compare(monkeypatch):
+    def raise_exit(obj):
+        outcomes.exit("Quitting debugger")
+
+    monkeypatch.setattr(util, "istext", raise_exit)
+
+    with pytest.raises(outcomes.Exit, match="Quitting debugger"):
+        callequal(1, 1)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_assertrewrite.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_assertrewrite.py
index 144f625bc6c..87dada213d6 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_assertrewrite.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_assertrewrite.py
@@ -1,4 +1,7 @@
-from __future__ import absolute_import, division, print_function
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import glob
 import os
@@ -7,16 +10,16 @@ import stat
 import sys
 import textwrap
 import zipfile
+
 import py
-import pytest
+import six
 
 import _pytest._code
+import pytest
 from _pytest.assertion import util
-from _pytest.assertion.rewrite import (
-    rewrite_asserts,
-    PYTEST_TAG,
-    AssertionRewritingHook,
-)
+from _pytest.assertion.rewrite import AssertionRewritingHook
+from _pytest.assertion.rewrite import PYTEST_TAG
+from _pytest.assertion.rewrite import rewrite_asserts
 from _pytest.main import EXIT_NOTESTSCOLLECTED
 
 ast = pytest.importorskip("ast")
@@ -49,14 +52,14 @@ def getmsg(f, extra_ns=None, must_pass=False):
     ns = {}
     if extra_ns is not None:
         ns.update(extra_ns)
-    py.builtin.exec_(code, ns)
+    exec(code, ns)
     func = ns[f.__name__]
     try:
         func()
     except AssertionError:
         if must_pass:
             pytest.fail("shouldn't have raised")
-        s = str(sys.exc_info()[1])
+        s = six.text_type(sys.exc_info()[1])
         if not s.startswith("assert"):
             return "AssertionError: " + s
         return s
@@ -65,41 +68,17 @@ def getmsg(f, extra_ns=None, must_pass=False):
             pytest.fail("function didn't raise at all")
 
 
-def adjust_body_for_new_docstring_in_module_node(m):
-    """Module docstrings in 3.8 are part of Module node.
-    This was briefly in 3.7 as well but got reverted in beta 5.
-
-    It's not in the body so we remove it so the following body items have
-    the same indexes on all Python versions:
-
-    TODO:
-
-    We have a complicated sys.version_info if in here to ease testing on
-    various Python 3.7 versions, but we should remove the 3.7 check after
-    3.7 is released as stable to make this check more straightforward.
-    """
-    if (
-        sys.version_info < (3, 8)
-        and not ((3, 7) <= sys.version_info <= (3, 7, 0, "beta", 4))
-    ):
-        assert len(m.body) > 1
-        assert isinstance(m.body[0], ast.Expr)
-        assert isinstance(m.body[0].value, ast.Str)
-        del m.body[0]
-
-
 class TestAssertionRewrite(object):
-
     def test_place_initial_imports(self):
         s = """'Doc string'\nother = stuff"""
         m = rewrite(s)
-        adjust_body_for_new_docstring_in_module_node(m)
-        for imp in m.body[0:2]:
+        assert isinstance(m.body[0], ast.Expr)
+        for imp in m.body[1:3]:
             assert isinstance(imp, ast.Import)
             assert imp.lineno == 2
             assert imp.col_offset == 0
-        assert isinstance(m.body[2], ast.Assign)
-        s = """from __future__ import with_statement\nother_stuff"""
+        assert isinstance(m.body[3], ast.Assign)
+        s = """from __future__ import division\nother_stuff"""
         m = rewrite(s)
         assert isinstance(m.body[0], ast.ImportFrom)
         for imp in m.body[1:3]:
@@ -107,26 +86,26 @@ class TestAssertionRewrite(object):
             assert imp.lineno == 2
             assert imp.col_offset == 0
         assert isinstance(m.body[3], ast.Expr)
-        s = """'doc string'\nfrom __future__ import with_statement"""
+        s = """'doc string'\nfrom __future__ import division"""
         m = rewrite(s)
-        adjust_body_for_new_docstring_in_module_node(m)
-        assert isinstance(m.body[0], ast.ImportFrom)
-        for imp in m.body[1:3]:
+        assert isinstance(m.body[0], ast.Expr)
+        assert isinstance(m.body[1], ast.ImportFrom)
+        for imp in m.body[2:4]:
             assert isinstance(imp, ast.Import)
             assert imp.lineno == 2
             assert imp.col_offset == 0
-        s = """'doc string'\nfrom __future__ import with_statement\nother"""
+        s = """'doc string'\nfrom __future__ import division\nother"""
         m = rewrite(s)
-        adjust_body_for_new_docstring_in_module_node(m)
-        assert isinstance(m.body[0], ast.ImportFrom)
-        for imp in m.body[1:3]:
+        assert isinstance(m.body[0], ast.Expr)
+        assert isinstance(m.body[1], ast.ImportFrom)
+        for imp in m.body[2:4]:
             assert isinstance(imp, ast.Import)
             assert imp.lineno == 3
             assert imp.col_offset == 0
-        assert isinstance(m.body[3], ast.Expr)
+        assert isinstance(m.body[4], ast.Expr)
         s = """from . import relative\nother_stuff"""
         m = rewrite(s)
-        for imp in m.body[0:2]:
+        for imp in m.body[:2]:
             assert isinstance(imp, ast.Import)
             assert imp.lineno == 1
             assert imp.col_offset == 0
@@ -135,9 +114,8 @@ class TestAssertionRewrite(object):
     def test_dont_rewrite(self):
         s = """'PYTEST_DONT_REWRITE'\nassert 14"""
         m = rewrite(s)
-        adjust_body_for_new_docstring_in_module_node(m)
-        assert len(m.body) == 1
-        assert m.body[0].msg is None
+        assert len(m.body) == 2
+        assert m.body[1].msg is None
 
     def test_dont_rewrite_plugin(self, testdir):
         contents = {
@@ -149,8 +127,7 @@ class TestAssertionRewrite(object):
         result = testdir.runpytest_subprocess()
         assert "warnings" not in "".join(result.outlines)
 
-    def test_name(self):
-
+    def test_name(self, request):
         def f():
             assert False
 
@@ -170,18 +147,68 @@ class TestAssertionRewrite(object):
         def f():
             assert sys == 42
 
-        assert getmsg(f, {"sys": sys}) == "assert sys == 42"
+        verbose = request.config.getoption("verbose")
+        msg = getmsg(f, {"sys": sys})
+        if verbose > 0:
+            assert msg == (
+                "assert <module 'sys' (built-in)> == 42\n"
+                "  -<module 'sys' (built-in)>\n"
+                "  +42"
+            )
+        else:
+            assert msg == "assert sys == 42"
 
         def f():
-            assert cls == 42  # noqa
+            assert cls == 42  # noqa: F821
 
         class X(object):
             pass
 
-        assert getmsg(f, {"cls": X}) == "assert cls == 42"
+        msg = getmsg(f, {"cls": X}).splitlines()
+        if verbose > 0:
+            if six.PY2:
+                assert msg == [
+                    "assert <class 'test_assertrewrite.X'> == 42",
+                    "  -<class 'test_assertrewrite.X'>",
+                    "  +42",
+                ]
+            else:
+                assert msg == [
+                    "assert <class 'test_...e.<locals>.X'> == 42",
+                    "  -<class 'test_assertrewrite.TestAssertionRewrite.test_name.<locals>.X'>",
+                    "  +42",
+                ]
+        else:
+            assert msg == ["assert cls == 42"]
+
+    def test_dont_rewrite_if_hasattr_fails(self, request):
+        class Y(object):
+            """ A class whos getattr fails, but not with `AttributeError` """
+
+            def __getattr__(self, attribute_name):
+                raise KeyError()
+
+            def __repr__(self):
+                return "Y"
+
+            def __init__(self):
+                self.foo = 3
+
+        def f():
+            assert cls().foo == 2  # noqa
+
+        # XXX: looks like the "where" should also be there in verbose mode?!
+        message = getmsg(f, {"cls": Y}).splitlines()
+        if request.config.getoption("verbose") > 0:
+            assert message == ["assert 3 == 2", "  -3", "  +2"]
+        else:
+            assert message == [
+                "assert 3 == 2",
+                " +  where 3 = Y.foo",
+                " +    where Y = cls()",
+            ]
 
     def test_assert_already_has_message(self):
-
         def f():
             assert False, "something bad!"
 
@@ -250,8 +277,16 @@ class TestAssertionRewrite(object):
             ["*AssertionError: To be escaped: %", "*assert 1 == 2"]
         )
 
-    def test_boolop(self):
+    @pytest.mark.skipif(
+        sys.version_info < (3,), reason="bytes is a string type in python 2"
+    )
+    def test_assertion_messages_bytes(self, testdir):
+        testdir.makepyfile("def test_bytes_assertion():\n    assert False, b'ohai!'\n")
+        result = testdir.runpytest()
+        assert result.ret == 1
+        result.stdout.fnmatch_lines(["*AssertionError: b'ohai!'", "*assert False"])
 
+    def test_boolop(self):
         def f():
             f = g = False
             assert f and g
@@ -331,7 +366,6 @@ class TestAssertionRewrite(object):
         getmsg(f, must_pass=True)
 
     def test_short_circuit_evaluation(self):
-
         def f():
             assert True or explode  # noqa
 
@@ -344,7 +378,6 @@ class TestAssertionRewrite(object):
         getmsg(f, must_pass=True)
 
     def test_unary_op(self):
-
         def f():
             x = True
             assert not x
@@ -370,7 +403,6 @@ class TestAssertionRewrite(object):
         assert getmsg(f) == "assert (+0 + 0)"
 
     def test_binary_op(self):
-
         def f():
             x = 1
             y = -1
@@ -384,7 +416,6 @@ class TestAssertionRewrite(object):
         assert getmsg(f) == "assert not (5 % 4)"
 
     def test_boolop_percent(self):
-
         def f():
             assert 3 % 2 and False
 
@@ -410,8 +441,20 @@ class TestAssertionRewrite(object):
         )
         testdir.runpytest().assert_outcomes(passed=1)
 
-    def test_call(self):
+    @pytest.mark.skipif("sys.version_info < (3,5)")
+    def test_starred_with_side_effect(self, testdir):
+        """See #4412"""
+        testdir.makepyfile(
+            """\
+            def test():
+                f = lambda x: x
+                x = iter([1, 2, 3])
+                assert 2 * next(x) == f(*[next(x)])
+            """
+        )
+        testdir.runpytest().assert_outcomes(passed=1)
 
+    def test_call(self):
         def g(a=42, *args, **kwargs):
             return False
 
@@ -483,7 +526,6 @@ class TestAssertionRewrite(object):
         )
 
     def test_attribute(self):
-
         class X(object):
             g = 3
 
@@ -509,7 +551,6 @@ class TestAssertionRewrite(object):
         )
 
     def test_comparisons(self):
-
         def f():
             a, b = range(2)
             assert b < a
@@ -541,19 +582,18 @@ class TestAssertionRewrite(object):
 
         getmsg(f, must_pass=True)
 
-    def test_len(self):
-
+    def test_len(self, request):
         def f():
             values = list(range(10))
             assert len(values) == 11
 
-        assert getmsg(f).startswith(
-            """assert 10 == 11
- +  where 10 = len(["""
-        )
+        msg = getmsg(f)
+        if request.config.getoption("verbose") > 0:
+            assert msg == "assert 10 == 11\n  -10\n  +11"
+        else:
+            assert msg == "assert 10 == 11\n +  where 10 = len([0, 1, 2, 3, 4, 5, ...])"
 
     def test_custom_reprcompare(self, monkeypatch):
-
         def my_reprcompare(op, left, right):
             return "42"
 
@@ -565,7 +605,7 @@ class TestAssertionRewrite(object):
         assert getmsg(f) == "assert 42"
 
         def my_reprcompare(op, left, right):
-            return "%s %s %s" % (left, op, right)
+            return "{} {} {}".format(left, op, right)
 
         monkeypatch.setattr(util, "_reprcompare", my_reprcompare)
 
@@ -575,11 +615,8 @@ class TestAssertionRewrite(object):
         assert getmsg(f) == "assert 5 <= 4"
 
     def test_assert_raising_nonzero_in_comparison(self):
-
         def f():
-
             class A(object):
-
                 def __nonzero__(self):
                     raise ValueError(42)
 
@@ -597,16 +634,13 @@ class TestAssertionRewrite(object):
         assert "<MY42 object> < 0" in getmsg(f)
 
     def test_formatchar(self):
-
         def f():
             assert "%test" == "test"
 
         assert getmsg(f).startswith("assert '%test' == 'test'")
 
-    def test_custom_repr(self):
-
+    def test_custom_repr(self, request):
         def f():
-
             class Foo(object):
                 a = 1
 
@@ -616,11 +650,29 @@ class TestAssertionRewrite(object):
             f = Foo()
             assert 0 == f.a
 
-        assert r"where 1 = \n{ \n~ \n}.a" in util._format_lines([getmsg(f)])[0]
+        lines = util._format_lines([getmsg(f)])
+        if request.config.getoption("verbose") > 0:
+            assert lines == ["assert 0 == 1\n  -0\n  +1"]
+        else:
+            assert lines == ["assert 0 == 1\n +  where 1 = \\n{ \\n~ \\n}.a"]
+
+    def test_custom_repr_non_ascii(self):
+        def f():
+            class A(object):
+                name = u"ä"
+
+                def __repr__(self):
+                    return self.name.encode("UTF-8")  # only legal in python2
+
+            a = A()
+            assert not a.name
+
+        msg = getmsg(f)
+        assert "UnicodeDecodeError" not in msg
+        assert "UnicodeEncodeError" not in msg
 
 
 class TestRewriteOnImport(object):
-
     def test_pycache_is_a_file(self, testdir):
         testdir.tmpdir.join("__pycache__").write("Hello")
         testdir.makepyfile(
@@ -666,14 +718,10 @@ class TestRewriteOnImport(object):
     def test_readonly(self, testdir):
         sub = testdir.mkdir("testing")
         sub.join("test_readonly.py").write(
-            py.builtin._totext(
-                """
+            b"""
 def test_rewritten():
     assert "@py_builtins" in globals()
-            """
-            ).encode(
-                "utf-8"
-            ),
+            """,
             "wb",
         )
         old_mode = sub.stat().mode
@@ -774,16 +822,16 @@ def test_rewritten():
         testdir.makepyfile("import a_package_without_init_py.module")
         assert testdir.runpytest().ret == EXIT_NOTESTSCOLLECTED
 
-    def test_rewrite_warning(self, pytestconfig, monkeypatch):
-        hook = AssertionRewritingHook(pytestconfig)
-        warnings = []
-
-        def mywarn(code, msg):
-            warnings.append((code, msg))
-
-        monkeypatch.setattr(hook.config, "warn", mywarn)
-        hook.mark_rewrite("_pytest")
-        assert "_pytest" in warnings[0][1]
+    def test_rewrite_warning(self, testdir):
+        testdir.makeconftest(
+            """
+            import pytest
+            pytest.register_assert_rewrite("_pytest")
+        """
+        )
+        # needs to be a subprocess because pytester explicitly disables this warning
+        result = testdir.runpytest_subprocess()
+        result.stdout.fnmatch_lines(["*Module already imported*: _pytest"])
 
     def test_rewrite_module_imported_from_conftest(self, testdir):
         testdir.makeconftest(
@@ -808,7 +856,9 @@ def test_rewritten():
         testdir.makepyfile(test_remember_rewritten_modules="")
         warnings = []
         hook = AssertionRewritingHook(pytestconfig)
-        monkeypatch.setattr(hook.config, "warn", lambda code, msg: warnings.append(msg))
+        monkeypatch.setattr(
+            hook, "_warn_already_imported", lambda code, msg: warnings.append(msg)
+        )
         hook.find_module("test_remember_rewritten_modules")
         hook.load_module("test_remember_rewritten_modules")
         hook.mark_rewrite("test_remember_rewritten_modules")
@@ -870,7 +920,6 @@ def test_rewritten():
 
 
 class TestAssertionRewriteHookDetails(object):
-
     def test_loader_is_package_false_for_module(self, testdir):
         testdir.makepyfile(
             test_fun="""
@@ -965,7 +1014,7 @@ class TestAssertionRewriteHookDetails(object):
             e = IOError()
             e.errno = 10
             raise e
-            yield  # noqa
+            yield
 
         monkeypatch.setattr(atomicwrites, "atomic_write", atomic_write_failed)
         assert not _write_pyc(state, [1], source_path.stat(), pycpath)
@@ -1050,24 +1099,66 @@ class TestAssertionRewriteHookDetails(object):
         result = testdir.runpytest("-s")
         result.stdout.fnmatch_lines(["* 1 passed*"])
 
+    def test_reload_reloads(self, testdir):
+        """Reloading a module after change picks up the change."""
+        testdir.tmpdir.join("file.py").write(
+            textwrap.dedent(
+                """
+            def reloaded():
+                return False
+
+            def rewrite_self():
+                with open(__file__, 'w') as self:
+                    self.write('def reloaded(): return True')
+        """
+            )
+        )
+        testdir.tmpdir.join("pytest.ini").write(
+            textwrap.dedent(
+                """
+            [pytest]
+            python_files = *.py
+        """
+            )
+        )
+
+        testdir.makepyfile(
+            test_fun="""
+            import sys
+            try:
+                from imp import reload
+            except ImportError:
+                pass
+
+            def test_loader():
+                import file
+                assert not file.reloaded()
+                file.rewrite_self()
+                reload(file)
+                assert file.reloaded()
+            """
+        )
+        result = testdir.runpytest("-s")
+        result.stdout.fnmatch_lines(["* 1 passed*"])
+
     def test_get_data_support(self, testdir):
         """Implement optional PEP302 api (#808).
         """
         path = testdir.mkpydir("foo")
         path.join("test_foo.py").write(
-            _pytest._code.Source(
+            textwrap.dedent(
+                """\
+                class Test(object):
+                    def test_foo(self):
+                        import pkgutil
+                        data = pkgutil.get_data('foo.test_foo', 'data.txt')
+                        assert data == b'Hey'
                 """
-            class Test(object):
-                def test_foo(self):
-                    import pkgutil
-                    data = pkgutil.get_data('foo.test_foo', 'data.txt')
-                    assert data == b'Hey'
-        """
             )
         )
         path.join("data.txt").write("Hey")
         result = testdir.runpytest()
-        result.stdout.fnmatch_lines("*1 passed*")
+        result.stdout.fnmatch_lines(["*1 passed*"])
 
 
 def test_issue731(testdir):
@@ -1090,7 +1181,6 @@ def test_issue731(testdir):
 
 
 class TestIssue925(object):
-
     def test_simple_case(self, testdir):
         testdir.makepyfile(
             """
@@ -1099,7 +1189,7 @@ class TestIssue925(object):
         """
         )
         result = testdir.runpytest()
-        result.stdout.fnmatch_lines("*E*assert (False == False) == False")
+        result.stdout.fnmatch_lines(["*E*assert (False == False) == False"])
 
     def test_long_case(self, testdir):
         testdir.makepyfile(
@@ -1109,7 +1199,7 @@ class TestIssue925(object):
         """
         )
         result = testdir.runpytest()
-        result.stdout.fnmatch_lines("*E*assert (False == True) == True")
+        result.stdout.fnmatch_lines(["*E*assert (False == True) == True"])
 
     def test_many_brackets(self, testdir):
         testdir.makepyfile(
@@ -1119,26 +1209,189 @@ class TestIssue925(object):
             """
         )
         result = testdir.runpytest()
-        result.stdout.fnmatch_lines("*E*assert True == ((False == True) == True)")
+        result.stdout.fnmatch_lines(["*E*assert True == ((False == True) == True)"])
 
 
-class TestIssue2121():
-
-    def test_simple(self, testdir):
-        testdir.tmpdir.join("tests/file.py").ensure().write(
-            """
-def test_simple_failure():
-    assert 1 + 1 == 3
-"""
-        )
-        testdir.tmpdir.join("pytest.ini").write(
-            textwrap.dedent(
+class TestIssue2121:
+    def test_rewrite_python_files_contain_subdirs(self, testdir):
+        testdir.makepyfile(
+            **{
+                "tests/file.py": """
+                def test_simple_failure():
+                    assert 1 + 1 == 3
                 """
-            [pytest]
-            python_files = tests/**.py
-        """
-            )
+            }
+        )
+        testdir.makeini(
+            """
+                [pytest]
+                python_files = tests/**.py
+            """
         )
-
         result = testdir.runpytest()
-        result.stdout.fnmatch_lines("*E*assert (1 + 1) == 3")
+        result.stdout.fnmatch_lines(["*E*assert (1 + 1) == 3"])
+
+
+@pytest.mark.skipif(
+    sys.maxsize <= (2 ** 31 - 1), reason="Causes OverflowError on 32bit systems"
+)
+@pytest.mark.parametrize("offset", [-1, +1])
+def test_source_mtime_long_long(testdir, offset):
+    """Support modification dates after 2038 in rewritten files (#4903).
+
+    pytest would crash with:
+
+            fp.write(struct.pack("<ll", mtime, size))
+        E   struct.error: argument out of range
+    """
+    p = testdir.makepyfile(
+        """
+        def test(): pass
+    """
+    )
+    # use unsigned long timestamp which overflows signed long,
+    # which was the cause of the bug
+    # +1 offset also tests masking of 0xFFFFFFFF
+    timestamp = 2 ** 32 + offset
+    os.utime(str(p), (timestamp, timestamp))
+    result = testdir.runpytest()
+    assert result.ret == 0
+
+
+def test_rewrite_infinite_recursion(testdir, pytestconfig, monkeypatch):
+    """Fix infinite recursion when writing pyc files: if an import happens to be triggered when writing the pyc
+    file, this would cause another call to the hook, which would trigger another pyc writing, which could
+    trigger another import, and so on. (#3506)"""
+    from _pytest.assertion import rewrite
+
+    testdir.syspathinsert()
+    testdir.makepyfile(test_foo="def test_foo(): pass")
+    testdir.makepyfile(test_bar="def test_bar(): pass")
+
+    original_write_pyc = rewrite._write_pyc
+
+    write_pyc_called = []
+
+    def spy_write_pyc(*args, **kwargs):
+        # make a note that we have called _write_pyc
+        write_pyc_called.append(True)
+        # try to import a module at this point: we should not try to rewrite this module
+        assert hook.find_module("test_bar") is None
+        return original_write_pyc(*args, **kwargs)
+
+    monkeypatch.setattr(rewrite, "_write_pyc", spy_write_pyc)
+    monkeypatch.setattr(sys, "dont_write_bytecode", False)
+
+    hook = AssertionRewritingHook(pytestconfig)
+    assert hook.find_module("test_foo") is not None
+    assert len(write_pyc_called) == 1
+
+
+class TestEarlyRewriteBailout(object):
+    @pytest.fixture
+    def hook(self, pytestconfig, monkeypatch, testdir):
+        """Returns a patched AssertionRewritingHook instance so we can configure its initial paths and track
+        if imp.find_module has been called.
+        """
+        import imp
+
+        self.find_module_calls = []
+        self.initial_paths = set()
+
+        class StubSession(object):
+            _initialpaths = self.initial_paths
+
+            def isinitpath(self, p):
+                return p in self._initialpaths
+
+        def spy_imp_find_module(name, path):
+            self.find_module_calls.append(name)
+            return imp.find_module(name, path)
+
+        hook = AssertionRewritingHook(pytestconfig)
+        # use default patterns, otherwise we inherit pytest's testing config
+        hook.fnpats[:] = ["test_*.py", "*_test.py"]
+        monkeypatch.setattr(hook, "_imp_find_module", spy_imp_find_module)
+        hook.set_session(StubSession())
+        testdir.syspathinsert()
+        return hook
+
+    def test_basic(self, testdir, hook):
+        """
+        Ensure we avoid calling imp.find_module when we know for sure a certain module will not be rewritten
+        to optimize assertion rewriting (#3918).
+        """
+        testdir.makeconftest(
+            """
+            import pytest
+            @pytest.fixture
+            def fix(): return 1
+        """
+        )
+        testdir.makepyfile(test_foo="def test_foo(): pass")
+        testdir.makepyfile(bar="def bar(): pass")
+        foobar_path = testdir.makepyfile(foobar="def foobar(): pass")
+        self.initial_paths.add(foobar_path)
+
+        # conftest files should always be rewritten
+        assert hook.find_module("conftest") is not None
+        assert self.find_module_calls == ["conftest"]
+
+        # files matching "python_files" mask should always be rewritten
+        assert hook.find_module("test_foo") is not None
+        assert self.find_module_calls == ["conftest", "test_foo"]
+
+        # file does not match "python_files": early bailout
+        assert hook.find_module("bar") is None
+        assert self.find_module_calls == ["conftest", "test_foo"]
+
+        # file is an initial path (passed on the command-line): should be rewritten
+        assert hook.find_module("foobar") is not None
+        assert self.find_module_calls == ["conftest", "test_foo", "foobar"]
+
+    def test_pattern_contains_subdirectories(self, testdir, hook):
+        """If one of the python_files patterns contain subdirectories ("tests/**.py") we can't bailout early
+        because we need to match with the full path, which can only be found by calling imp.find_module.
+        """
+        p = testdir.makepyfile(
+            **{
+                "tests/file.py": """
+                        def test_simple_failure():
+                            assert 1 + 1 == 3
+                        """
+            }
+        )
+        testdir.syspathinsert(p.dirpath())
+        hook.fnpats[:] = ["tests/**.py"]
+        assert hook.find_module("file") is not None
+        assert self.find_module_calls == ["file"]
+
+    @pytest.mark.skipif(
+        sys.platform.startswith("win32"), reason="cannot remove cwd on Windows"
+    )
+    def test_cwd_changed(self, testdir, monkeypatch):
+        # Setup conditions for py's fspath trying to import pathlib on py34
+        # always (previously triggered via xdist only).
+        # Ref: https://github.com/pytest-dev/py/pull/207
+        monkeypatch.syspath_prepend("")
+        monkeypatch.delitem(sys.modules, "pathlib", raising=False)
+
+        testdir.makepyfile(
+            **{
+                "test_setup_nonexisting_cwd.py": """
+                import os
+                import shutil
+                import tempfile
+
+                d = tempfile.mkdtemp()
+                os.chdir(d)
+                shutil.rmtree(d)
+            """,
+                "test_test.py": """
+                def test():
+                    pass
+            """,
+            }
+        )
+        result = testdir.runpytest()
+        result.stdout.fnmatch_lines(["* 1 passed in *"])
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_cacheprovider.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_cacheprovider.py
index 33d1dd8448c..6de0b312929 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_cacheprovider.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_cacheprovider.py
@@ -1,16 +1,22 @@
-from __future__ import absolute_import, division, print_function
-import sys
-import py
-import _pytest
-import pytest
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import os
 import shutil
+import sys
+import textwrap
 
-pytest_plugins = "pytester",
+import py
+
+import pytest
+from _pytest.main import EXIT_NOTESTSCOLLECTED
+
+pytest_plugins = ("pytester",)
 
 
 class TestNewAPI(object):
-
     def test_config_cache_makedir(self, testdir):
         testdir.makeini("[pytest]")
         config = testdir.parseconfigure()
@@ -26,10 +32,11 @@ class TestNewAPI(object):
         cache = config.cache
         pytest.raises(TypeError, lambda: cache.set("key/name", cache))
         config.cache.set("key/name", 0)
-        config.cache._getvaluepath("key/name").write("123invalid")
+        config.cache._getvaluepath("key/name").write_bytes(b"123invalid")
         val = config.cache.get("key/name", -2)
         assert val == -2
 
+    @pytest.mark.filterwarnings("default")
     def test_cache_writefail_cachfile_silent(self, testdir):
         testdir.makeini("[pytest]")
         testdir.tmpdir.join(".pytest_cache").write("gone wrong")
@@ -38,6 +45,9 @@ class TestNewAPI(object):
         cache.set("test/broken", [])
 
     @pytest.mark.skipif(sys.platform.startswith("win"), reason="no chmod on windows")
+    @pytest.mark.filterwarnings(
+        "ignore:could not create cache path:pytest.PytestWarning"
+    )
     def test_cache_writefail_permissions(self, testdir):
         testdir.makeini("[pytest]")
         testdir.tmpdir.ensure_dir(".pytest_cache").chmod(0)
@@ -46,6 +56,7 @@ class TestNewAPI(object):
         cache.set("test/broken", [])
 
     @pytest.mark.skipif(sys.platform.startswith("win"), reason="no chmod on windows")
+    @pytest.mark.filterwarnings("default")
     def test_cache_failure_warns(self, testdir):
         testdir.tmpdir.ensure_dir(".pytest_cache").chmod(0)
         testdir.makepyfile(
@@ -57,7 +68,8 @@ class TestNewAPI(object):
         )
         result = testdir.runpytest("-rw")
         assert result.ret == 1
-        result.stdout.fnmatch_lines(["*could not create cache path*", "*2 warnings*"])
+        # warnings from nodeids, lastfailed, and stepwise
+        result.stdout.fnmatch_lines(["*could not create cache path*", "*3 warnings*"])
 
     def test_config_cache(self, testdir):
         testdir.makeconftest(
@@ -138,15 +150,43 @@ class TestNewAPI(object):
         assert testdir.tmpdir.join("custom_cache_dir").isdir()
 
 
-def test_cache_reportheader(testdir):
+@pytest.mark.parametrize("env", ((), ("TOX_ENV_DIR", "/tox_env_dir")))
+def test_cache_reportheader(env, testdir, monkeypatch):
+    testdir.makepyfile("""def test_foo(): pass""")
+    if env:
+        monkeypatch.setenv(*env)
+        expected = os.path.join(env[1], ".pytest_cache")
+    else:
+        monkeypatch.delenv("TOX_ENV_DIR", raising=False)
+        expected = ".pytest_cache"
+    result = testdir.runpytest("-v")
+    result.stdout.fnmatch_lines(["cachedir: %s" % expected])
+
+
+def test_cache_reportheader_external_abspath(testdir, tmpdir_factory):
+    external_cache = tmpdir_factory.mktemp(
+        "test_cache_reportheader_external_abspath_abs"
+    )
+
     testdir.makepyfile(
         """
         def test_hello():
             pass
     """
     )
+    testdir.makeini(
+        """
+    [pytest]
+    cache_dir = {abscache}
+    """.format(
+            abscache=external_cache
+        )
+    )
+
     result = testdir.runpytest("-v")
-    result.stdout.fnmatch_lines(["cachedir: .pytest_cache"])
+    result.stdout.fnmatch_lines(
+        ["cachedir: {abscache}".format(abscache=external_cache)]
+    )
 
 
 def test_cache_show(testdir):
@@ -157,6 +197,7 @@ def test_cache_show(testdir):
         """
         def pytest_configure(config):
             config.cache.set("my/name", [1,2,3])
+            config.cache.set("my/hello", "world")
             config.cache.set("other/some", {1:2})
             dp = config.cache.makedir("mydb")
             dp.ensure("hello")
@@ -165,26 +206,44 @@ def test_cache_show(testdir):
     )
     result = testdir.runpytest()
     assert result.ret == 5  # no tests executed
+
     result = testdir.runpytest("--cache-show")
-    result.stdout.fnmatch_lines_random(
+    result.stdout.fnmatch_lines(
         [
             "*cachedir:*",
-            "-*cache values*-",
-            "*my/name contains:",
+            "*- cache values for '[*]' -*",
+            "cache/nodeids contains:",
+            "my/name contains:",
             "  [1, 2, 3]",
-            "*other/some contains*",
-            "  {*1*: 2}",
-            "-*cache directories*-",
+            "other/some contains:",
+            "  {*'1': 2}",
+            "*- cache directories for '[*]' -*",
             "*mydb/hello*length 0*",
             "*mydb/world*length 0*",
         ]
     )
+    assert result.ret == 0
+
+    result = testdir.runpytest("--cache-show", "*/hello")
+    result.stdout.fnmatch_lines(
+        [
+            "*cachedir:*",
+            "*- cache values for '[*]/hello' -*",
+            "my/hello contains:",
+            "  *'world'",
+            "*- cache directories for '[*]/hello' -*",
+            "d/mydb/hello*length 0*",
+        ]
+    )
+    stdout = result.stdout.str()
+    assert "other/some" not in stdout
+    assert "d/mydb/world" not in stdout
+    assert result.ret == 0
 
 
 class TestLastFailed(object):
-
     def test_lastfailed_usecase(self, testdir, monkeypatch):
-        monkeypatch.setenv("PYTHONDONTWRITEBYTECODE", 1)
+        monkeypatch.setenv("PYTHONDONTWRITEBYTECODE", "1")
         p = testdir.makepyfile(
             """
             def test_1():
@@ -198,23 +257,29 @@ class TestLastFailed(object):
         result = testdir.runpytest()
         result.stdout.fnmatch_lines(["*2 failed*"])
         p.write(
-            _pytest._code.Source(
+            textwrap.dedent(
+                """\
+                def test_1():
+                    assert 1
+
+                def test_2():
+                    assert 1
+
+                def test_3():
+                    assert 0
                 """
-            def test_1():
-                assert 1
-
-            def test_2():
-                assert 1
-
-            def test_3():
-                assert 0
-        """
             )
         )
         result = testdir.runpytest("--lf")
         result.stdout.fnmatch_lines(["*2 passed*1 desel*"])
         result = testdir.runpytest("--lf")
-        result.stdout.fnmatch_lines(["*1 failed*2 passed*"])
+        result.stdout.fnmatch_lines(
+            [
+                "collected 3 items",
+                "run-last-failure: no previously failed tests, not deselecting items.",
+                "*1 failed*2 passed*",
+            ]
+        )
         result = testdir.runpytest("--lf", "--cache-clear")
         result.stdout.fnmatch_lines(["*1 failed*2 passed*"])
 
@@ -226,19 +291,19 @@ class TestLastFailed(object):
 
     def test_failedfirst_order(self, testdir):
         testdir.tmpdir.join("test_a.py").write(
-            _pytest._code.Source(
+            textwrap.dedent(
+                """\
+                def test_always_passes():
+                    assert 1
                 """
-            def test_always_passes():
-                assert 1
-        """
             )
         )
         testdir.tmpdir.join("test_b.py").write(
-            _pytest._code.Source(
+            textwrap.dedent(
+                """\
+                def test_always_fails():
+                    assert 0
                 """
-            def test_always_fails():
-                assert 0
-        """
             )
         )
         result = testdir.runpytest()
@@ -251,14 +316,14 @@ class TestLastFailed(object):
     def test_lastfailed_failedfirst_order(self, testdir):
         testdir.makepyfile(
             **{
-                "test_a.py": """
+                "test_a.py": """\
                 def test_always_passes():
                     assert 1
-            """,
-                "test_b.py": """
+                """,
+                "test_b.py": """\
                 def test_always_fails():
                     assert 0
-            """,
+                """,
             }
         )
         result = testdir.runpytest()
@@ -270,18 +335,18 @@ class TestLastFailed(object):
         assert "test_a.py" not in result.stdout.str()
 
     def test_lastfailed_difference_invocations(self, testdir, monkeypatch):
-        monkeypatch.setenv("PYTHONDONTWRITEBYTECODE", 1)
+        monkeypatch.setenv("PYTHONDONTWRITEBYTECODE", "1")
         testdir.makepyfile(
-            test_a="""
+            test_a="""\
             def test_a1():
                 assert 0
             def test_a2():
                 assert 1
-        """,
-            test_b="""
+            """,
+            test_b="""\
             def test_b1():
                 assert 0
-        """,
+            """,
         )
         p = testdir.tmpdir.join("test_a.py")
         p2 = testdir.tmpdir.join("test_b.py")
@@ -291,11 +356,11 @@ class TestLastFailed(object):
         result = testdir.runpytest("--lf", p2)
         result.stdout.fnmatch_lines(["*1 failed*"])
         p2.write(
-            _pytest._code.Source(
+            textwrap.dedent(
+                """\
+                def test_b1():
+                    assert 1
                 """
-            def test_b1():
-                assert 1
-        """
             )
         )
         result = testdir.runpytest("--lf", p2)
@@ -304,20 +369,20 @@ class TestLastFailed(object):
         result.stdout.fnmatch_lines(["*1 failed*1 desel*"])
 
     def test_lastfailed_usecase_splice(self, testdir, monkeypatch):
-        monkeypatch.setenv("PYTHONDONTWRITEBYTECODE", 1)
+        monkeypatch.setenv("PYTHONDONTWRITEBYTECODE", "1")
         testdir.makepyfile(
-            """
+            """\
             def test_1():
                 assert 0
-        """
+            """
         )
         p2 = testdir.tmpdir.join("test_something.py")
         p2.write(
-            _pytest._code.Source(
+            textwrap.dedent(
+                """\
+                def test_2():
+                    assert 0
                 """
-            def test_2():
-                assert 0
-        """
             )
         )
         result = testdir.runpytest()
@@ -356,7 +421,7 @@ class TestLastFailed(object):
         """
         )
         result = testdir.runpytest()
-        result.stdout.fnmatch_lines("*1 failed in*")
+        result.stdout.fnmatch_lines(["*1 failed in*"])
 
     def test_terminal_report_lastfailed(self, testdir):
         test_a = testdir.makepyfile(
@@ -381,9 +446,9 @@ class TestLastFailed(object):
         result = testdir.runpytest("--lf")
         result.stdout.fnmatch_lines(
             [
-                "collected 4 items / 2 deselected",
-                "run-last-failure: rerun previous 2 failures",
-                "*2 failed, 2 deselected in*",
+                "collected 2 items",
+                "run-last-failure: rerun previous 2 failures (skipped 1 file)",
+                "*2 failed in*",
             ]
         )
 
@@ -391,7 +456,7 @@ class TestLastFailed(object):
         result.stdout.fnmatch_lines(
             [
                 "collected 2 items",
-                "run-last-failure: run all (no recorded failures)",
+                "run-last-failure: 2 known failures not in selected tests",
                 "*2 passed in*",
             ]
         )
@@ -449,8 +514,8 @@ class TestLastFailed(object):
         )
 
         def rlf(fail_import, fail_run):
-            monkeypatch.setenv("FAILIMPORT", fail_import)
-            monkeypatch.setenv("FAILTEST", fail_run)
+            monkeypatch.setenv("FAILIMPORT", str(fail_import))
+            monkeypatch.setenv("FAILTEST", str(fail_run))
 
             testdir.runpytest("-q")
             config = testdir.parseconfigure()
@@ -494,8 +559,8 @@ class TestLastFailed(object):
         )
 
         def rlf(fail_import, fail_run, args=()):
-            monkeypatch.setenv("FAILIMPORT", fail_import)
-            monkeypatch.setenv("FAILTEST", fail_run)
+            monkeypatch.setenv("FAILIMPORT", str(fail_import))
+            monkeypatch.setenv("FAILTEST", str(fail_run))
 
             result = testdir.runpytest("-q", "--lf", *args)
             config = testdir.parseconfigure()
@@ -543,7 +608,7 @@ class TestLastFailed(object):
         """
         )
         result = testdir.runpytest()
-        result.stdout.fnmatch_lines("*1 xfailed*")
+        result.stdout.fnmatch_lines(["*1 xfailed*"])
         assert self.get_cached_last_failed(testdir) == []
 
     def test_xfail_strict_considered_failure(self, testdir):
@@ -556,11 +621,10 @@ class TestLastFailed(object):
         """
         )
         result = testdir.runpytest()
-        result.stdout.fnmatch_lines("*1 failed*")
-        assert (
-            self.get_cached_last_failed(testdir)
-            == ["test_xfail_strict_considered_failure.py::test"]
-        )
+        result.stdout.fnmatch_lines(["*1 failed*"])
+        assert self.get_cached_last_failed(testdir) == [
+            "test_xfail_strict_considered_failure.py::test"
+        ]
 
     @pytest.mark.parametrize("mark", ["mark.xfail", "mark.skip"])
     def test_failed_changed_to_xfail_or_skip(self, testdir, mark):
@@ -572,10 +636,9 @@ class TestLastFailed(object):
         """
         )
         result = testdir.runpytest()
-        assert (
-            self.get_cached_last_failed(testdir)
-            == ["test_failed_changed_to_xfail_or_skip.py::test"]
-        )
+        assert self.get_cached_last_failed(testdir) == [
+            "test_failed_changed_to_xfail_or_skip.py::test"
+        ]
         assert result.ret == 1
 
         testdir.makepyfile(
@@ -593,6 +656,23 @@ class TestLastFailed(object):
         assert self.get_cached_last_failed(testdir) == []
         assert result.ret == 0
 
+    @pytest.mark.parametrize("quiet", [True, False])
+    @pytest.mark.parametrize("opt", ["--ff", "--lf"])
+    def test_lf_and_ff_prints_no_needless_message(self, quiet, opt, testdir):
+        # Issue 3853
+        testdir.makepyfile("def test(): assert 0")
+        args = [opt]
+        if quiet:
+            args.append("-q")
+        result = testdir.runpytest(*args)
+        assert "run all" not in result.stdout.str()
+
+        result = testdir.runpytest(*args)
+        if quiet:
+            assert "run all" not in result.stdout.str()
+        else:
+            assert "rerun previous" in result.stdout.str()
+
     def get_cached_last_failed(self, testdir):
         config = testdir.parseconfigure()
         return sorted(config.cache.get("cache/lastfailed", {}))
@@ -619,10 +699,10 @@ class TestLastFailed(object):
         """
         )
         testdir.runpytest()
-        assert (
-            self.get_cached_last_failed(testdir)
-            == ["test_bar.py::test_bar_2", "test_foo.py::test_foo_4"]
-        )
+        assert self.get_cached_last_failed(testdir) == [
+            "test_bar.py::test_bar_2",
+            "test_foo.py::test_foo_4",
+        ]
 
         # 2. fix test_bar_2, run only test_bar.py
         testdir.makepyfile(
@@ -634,12 +714,12 @@ class TestLastFailed(object):
         """
         )
         result = testdir.runpytest(test_bar)
-        result.stdout.fnmatch_lines("*2 passed*")
+        result.stdout.fnmatch_lines(["*2 passed*"])
         # ensure cache does not forget that test_foo_4 failed once before
         assert self.get_cached_last_failed(testdir) == ["test_foo.py::test_foo_4"]
 
         result = testdir.runpytest("--last-failed")
-        result.stdout.fnmatch_lines("*1 failed, 3 deselected*")
+        result.stdout.fnmatch_lines(["*1 failed, 1 deselected*"])
         assert self.get_cached_last_failed(testdir) == ["test_foo.py::test_foo_4"]
 
         # 3. fix test_foo_4, run only test_foo.py
@@ -652,11 +732,11 @@ class TestLastFailed(object):
         """
         )
         result = testdir.runpytest(test_foo, "--last-failed")
-        result.stdout.fnmatch_lines("*1 passed, 1 deselected*")
+        result.stdout.fnmatch_lines(["*1 passed, 1 deselected*"])
         assert self.get_cached_last_failed(testdir) == []
 
         result = testdir.runpytest("--last-failed")
-        result.stdout.fnmatch_lines("*4 passed*")
+        result.stdout.fnmatch_lines(["*4 passed*"])
         assert self.get_cached_last_failed(testdir) == []
 
     def test_lastfailed_no_failures_behavior_all_passed(self, testdir):
@@ -675,7 +755,14 @@ class TestLastFailed(object):
         result = testdir.runpytest("--lf", "--lfnf", "all")
         result.stdout.fnmatch_lines(["*2 passed*"])
         result = testdir.runpytest("--lf", "--lfnf", "none")
-        result.stdout.fnmatch_lines(["*2 desel*"])
+        result.stdout.fnmatch_lines(
+            [
+                "collected 2 items / 2 deselected",
+                "run-last-failure: no previously failed tests, deselecting all items.",
+                "* 2 deselected in *",
+            ]
+        )
+        assert result.ret == EXIT_NOTESTSCOLLECTED
 
     def test_lastfailed_no_failures_behavior_empty_cache(self, testdir):
         testdir.makepyfile(
@@ -693,9 +780,102 @@ class TestLastFailed(object):
         result = testdir.runpytest("--lf", "--cache-clear", "--lfnf", "none")
         result.stdout.fnmatch_lines(["*2 desel*"])
 
+    def test_lastfailed_skip_collection(self, testdir):
+        """
+        Test --lf behavior regarding skipping collection of files that are not marked as
+        failed in the cache (#5172).
+        """
+        testdir.makepyfile(
+            **{
+                "pkg1/test_1.py": """
+                import pytest
+
+                @pytest.mark.parametrize('i', range(3))
+                def test_1(i): pass
+            """,
+                "pkg2/test_2.py": """
+                import pytest
+
+                @pytest.mark.parametrize('i', range(5))
+                def test_1(i):
+                    assert i not in (1, 3)
+            """,
+            }
+        )
+        # first run: collects 8 items (test_1: 3, test_2: 5)
+        result = testdir.runpytest()
+        result.stdout.fnmatch_lines(["collected 8 items", "*2 failed*6 passed*"])
+        # second run: collects only 5 items from test_2, because all tests from test_1 have passed
+        result = testdir.runpytest("--lf")
+        result.stdout.fnmatch_lines(
+            [
+                "collected 5 items / 3 deselected / 2 selected",
+                "run-last-failure: rerun previous 2 failures (skipped 1 file)",
+                "*2 failed*3 deselected*",
+            ]
+        )
+
+        # add another file and check if message is correct when skipping more than 1 file
+        testdir.makepyfile(
+            **{
+                "pkg1/test_3.py": """
+                def test_3(): pass
+            """
+            }
+        )
+        result = testdir.runpytest("--lf")
+        result.stdout.fnmatch_lines(
+            [
+                "collected 5 items / 3 deselected / 2 selected",
+                "run-last-failure: rerun previous 2 failures (skipped 2 files)",
+                "*2 failed*3 deselected*",
+            ]
+        )
+
+    def test_lastfailed_with_known_failures_not_being_selected(self, testdir):
+        testdir.makepyfile(
+            **{
+                "pkg1/test_1.py": """def test_1(): assert 0""",
+                "pkg1/test_2.py": """def test_2(): pass""",
+            }
+        )
+        result = testdir.runpytest()
+        result.stdout.fnmatch_lines(["collected 2 items", "* 1 failed, 1 passed in *"])
+
+        py.path.local("pkg1/test_1.py").remove()
+        result = testdir.runpytest("--lf")
+        result.stdout.fnmatch_lines(
+            [
+                "collected 1 item",
+                "run-last-failure: 1 known failures not in selected tests",
+                "* 1 passed in *",
+            ]
+        )
+
+        # Recreate file with known failure.
+        testdir.makepyfile(**{"pkg1/test_1.py": """def test_1(): assert 0"""})
+        result = testdir.runpytest("--lf")
+        result.stdout.fnmatch_lines(
+            [
+                "collected 1 item",
+                "run-last-failure: rerun previous 1 failure (skipped 1 file)",
+                "* 1 failed in *",
+            ]
+        )
+
+        # Remove/rename test.
+        testdir.makepyfile(**{"pkg1/test_1.py": """def test_renamed(): assert 0"""})
+        result = testdir.runpytest("--lf")
+        result.stdout.fnmatch_lines(
+            [
+                "collected 1 item",
+                "run-last-failure: 1 known failures not in selected tests (skipped 1 file)",
+                "* 1 failed in *",
+            ]
+        )
+
 
 class TestNewFirst(object):
-
     def test_newfirst_usecase(self, testdir):
         testdir.makepyfile(
             **{
@@ -818,3 +998,77 @@ class TestNewFirst(object):
                 "*test_1/test_1.py::test_1[2*",
             ]
         )
+
+
+class TestReadme(object):
+    def check_readme(self, testdir):
+        config = testdir.parseconfigure()
+        readme = config.cache._cachedir.joinpath("README.md")
+        return readme.is_file()
+
+    def test_readme_passed(self, testdir):
+        testdir.makepyfile(
+            """
+            def test_always_passes():
+                assert 1
+        """
+        )
+        testdir.runpytest()
+        assert self.check_readme(testdir) is True
+
+    def test_readme_failed(self, testdir):
+        testdir.makepyfile(
+            """
+            def test_always_fails():
+                assert 0
+        """
+        )
+        testdir.runpytest()
+        assert self.check_readme(testdir) is True
+
+
+def test_gitignore(testdir):
+    """Ensure we automatically create .gitignore file in the pytest_cache directory (#3286)."""
+    from _pytest.cacheprovider import Cache
+
+    config = testdir.parseconfig()
+    cache = Cache.for_config(config)
+    cache.set("foo", "bar")
+    msg = "# Created by pytest automatically.\n*"
+    gitignore_path = cache._cachedir.joinpath(".gitignore")
+    assert gitignore_path.read_text(encoding="UTF-8") == msg
+
+    # Does not overwrite existing/custom one.
+    gitignore_path.write_text(u"custom")
+    cache.set("something", "else")
+    assert gitignore_path.read_text(encoding="UTF-8") == "custom"
+
+
+def test_does_not_create_boilerplate_in_existing_dirs(testdir):
+    from _pytest.cacheprovider import Cache
+
+    testdir.makeini(
+        """
+        [pytest]
+        cache_dir = .
+        """
+    )
+    config = testdir.parseconfig()
+    cache = Cache.for_config(config)
+    cache.set("foo", "bar")
+
+    assert os.path.isdir("v")  # cache contents
+    assert not os.path.exists(".gitignore")
+    assert not os.path.exists("README.md")
+
+
+def test_cachedir_tag(testdir):
+    """Ensure we automatically create CACHEDIR.TAG file in the pytest_cache directory (#4278)."""
+    from _pytest.cacheprovider import Cache
+    from _pytest.cacheprovider import CACHEDIR_TAG_CONTENT
+
+    config = testdir.parseconfig()
+    cache = Cache.for_config(config)
+    cache.set("foo", "bar")
+    cachedir_tag_path = cache._cachedir.joinpath("CACHEDIR.TAG")
+    assert cachedir_tag_path.read_bytes() == CACHEDIR_TAG_CONTENT
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_capture.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_capture.py
index e14b3af7851..01123bf5b40 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_capture.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_capture.py
@@ -1,42 +1,33 @@
-from __future__ import absolute_import, division, print_function
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import contextlib
+import io
+import os
+import pickle
+import subprocess
+import sys
+import textwrap
+from io import UnsupportedOperation
+
+import py
+from six import text_type
+
+import pytest
+from _pytest import capture
+from _pytest.capture import CaptureManager
+from _pytest.compat import _PY3
+from _pytest.main import EXIT_NOTESTSCOLLECTED
 
 # note: py.io capture tests where copied from
 # pylib 1.4.20.dev2 (rev 13d9af95547e)
-from __future__ import with_statement
-import pickle
-import os
-import sys
-from io import UnsupportedOperation
-
-import _pytest._code
-import py
-import pytest
-import contextlib
-from six import binary_type, text_type
-from _pytest import capture
-from _pytest.capture import CaptureManager
-from _pytest.main import EXIT_NOTESTSCOLLECTED
 
 
-needsosdup = pytest.mark.xfail("not hasattr(os, 'dup')")
-
-
-def tobytes(obj):
-    if isinstance(obj, text_type):
-        obj = obj.encode("UTF-8")
-    assert isinstance(obj, binary_type)
-    return obj
-
-
-def totext(obj):
-    if isinstance(obj, binary_type):
-        obj = text_type(obj, "UTF-8")
-    assert isinstance(obj, text_type)
-    return obj
-
-
-def oswritebytes(fd, obj):
-    os.write(fd, tobytes(obj))
+needsosdup = pytest.mark.skipif(
+    not hasattr(os, "dup"), reason="test needs os.dup, not available on this platform"
+)
 
 
 def StdCaptureFD(out=True, err=True, in_=True):
@@ -48,7 +39,6 @@ def StdCapture(out=True, err=True, in_=True):
 
 
 class TestCaptureManager(object):
-
     def test_getmethod_default_no_fd(self, monkeypatch):
         from _pytest.capture import pytest_addoption
         from _pytest.config.argparsing import Parser
@@ -62,9 +52,8 @@ class TestCaptureManager(object):
         pytest_addoption(parser)
         assert parser._groups[0].options[0].default == "sys"
 
-    @needsosdup
     @pytest.mark.parametrize(
-        "method", ["no", "sys", pytest.mark.skipif('not hasattr(os, "dup")', "fd")]
+        "method", ["no", "sys", pytest.param("fd", marks=needsosdup)]
     )
     def test_capturing_basic_api(self, method):
         capouter = StdCaptureFD()
@@ -72,19 +61,23 @@ class TestCaptureManager(object):
         try:
             capman = CaptureManager(method)
             capman.start_global_capturing()
-            outerr = capman.suspend_global_capture()
+            capman.suspend_global_capture()
+            outerr = capman.read_global_capture()
             assert outerr == ("", "")
-            outerr = capman.suspend_global_capture()
+            capman.suspend_global_capture()
+            outerr = capman.read_global_capture()
             assert outerr == ("", "")
             print("hello")
-            out, err = capman.suspend_global_capture()
+            capman.suspend_global_capture()
+            out, err = capman.read_global_capture()
             if method == "no":
                 assert old == (sys.stdout, sys.stderr, sys.stdin)
             else:
                 assert not out
             capman.resume_global_capture()
             print("hello")
-            out, err = capman.suspend_global_capture()
+            capman.suspend_global_capture()
+            out, err = capman.read_global_capture()
             if method != "no":
                 assert out == "hello\n"
             capman.stop_global_capturing()
@@ -97,7 +90,7 @@ class TestCaptureManager(object):
         try:
             capman = CaptureManager("fd")
             capman.start_global_capturing()
-            pytest.raises(AssertionError, "capman.start_global_capturing()")
+            pytest.raises(AssertionError, capman.start_global_capturing)
             capman.stop_global_capturing()
         finally:
             capouter.stop_capturing()
@@ -113,12 +106,12 @@ def test_capturing_unicode(testdir, method):
         obj = "u'\u00f6y'"
     testdir.makepyfile(
         """
-        # coding=utf8
+        # -*- coding: utf-8 -*-
         # taken from issue 227 from nosetests
         def test_unicode():
             import sys
-            print (sys.stdout)
-            print (%s)
+            print(sys.stdout)
+            print(%s)
     """
         % obj
     )
@@ -131,7 +124,7 @@ def test_capturing_bytes_in_utf8_encoding(testdir, method):
     testdir.makepyfile(
         """
         def test_unicode():
-            print ('b\\u00f6y')
+            print('b\\u00f6y')
     """
     )
     result = testdir.runpytest("--capture=%s" % method)
@@ -141,28 +134,37 @@ def test_capturing_bytes_in_utf8_encoding(testdir, method):
 def test_collect_capturing(testdir):
     p = testdir.makepyfile(
         """
-        print ("collect %s failure" % 13)
+        import sys
+
+        print("collect %s failure" % 13)
+        sys.stderr.write("collect %s_stderr failure" % 13)
         import xyz42123
     """
     )
     result = testdir.runpytest(p)
-    result.stdout.fnmatch_lines(["*Captured stdout*", "*collect 13 failure*"])
+    result.stdout.fnmatch_lines(
+        [
+            "*Captured stdout*",
+            "collect 13 failure",
+            "*Captured stderr*",
+            "collect 13_stderr failure",
+        ]
+    )
 
 
 class TestPerTestCapturing(object):
-
     def test_capture_and_fixtures(self, testdir):
         p = testdir.makepyfile(
             """
             def setup_module(mod):
-                print ("setup module")
+                print("setup module")
             def setup_function(function):
-                print ("setup " + function.__name__)
+                print("setup " + function.__name__)
             def test_func1():
-                print ("in func1")
+                print("in func1")
                 assert 0
             def test_func2():
-                print ("in func2")
+                print("in func2")
                 assert 0
         """
         )
@@ -183,14 +185,14 @@ class TestPerTestCapturing(object):
             """
             import sys
             def setup_module(func):
-                print ("module-setup")
+                print("module-setup")
             def setup_function(func):
-                print ("function-setup")
+                print("function-setup")
             def test_func():
-                print ("in function")
+                print("in function")
                 assert 0
             def teardown_function(func):
-                print ("in teardown")
+                print("in teardown")
         """
         )
         result = testdir.runpytest(p)
@@ -209,9 +211,9 @@ class TestPerTestCapturing(object):
         p = testdir.makepyfile(
             """
             def test_func1():
-                print ("in func1")
+                print("in func1")
             def test_func2():
-                print ("in func2")
+                print("in func2")
                 assert 0
         """
         )
@@ -224,12 +226,12 @@ class TestPerTestCapturing(object):
         p = testdir.makepyfile(
             """
             def setup_function(function):
-                print ("setup func1")
+                print("setup func1")
             def teardown_function(function):
-                print ("teardown func1")
+                print("teardown func1")
                 assert 0
             def test_func1():
-                print ("in func1")
+                print("in func1")
                 pass
         """
         )
@@ -249,7 +251,7 @@ class TestPerTestCapturing(object):
         p = testdir.makepyfile(
             """
             def teardown_module(mod):
-                print ("teardown module")
+                print("teardown module")
                 assert 0
             def test_func():
                 pass
@@ -267,16 +269,16 @@ class TestPerTestCapturing(object):
 
     def test_capturing_outerr(self, testdir):
         p1 = testdir.makepyfile(
-            """
+            """\
             import sys
             def test_capturing():
-                print (42)
+                print(42)
                 sys.stderr.write(str(23))
             def test_capturing_error():
-                print (1)
+                print(1)
                 sys.stderr.write(str(2))
                 raise ValueError
-        """
+            """
         )
         result = testdir.runpytest(p1)
         result.stdout.fnmatch_lines(
@@ -294,36 +296,35 @@ class TestPerTestCapturing(object):
 
 
 class TestLoggingInteraction(object):
-
     def test_logging_stream_ownership(self, testdir):
         p = testdir.makepyfile(
-            """
+            """\
             def test_logging():
                 import logging
                 import pytest
                 stream = capture.CaptureIO()
                 logging.basicConfig(stream=stream)
                 stream.close() # to free memory/release resources
-        """
+            """
         )
         result = testdir.runpytest_subprocess(p)
         assert result.stderr.str().find("atexit") == -1
 
     def test_logging_and_immediate_setupteardown(self, testdir):
         p = testdir.makepyfile(
-            """
+            """\
             import logging
             def setup_function(function):
-                logging.warn("hello1")
+                logging.warning("hello1")
 
             def test_logging():
-                logging.warn("hello2")
+                logging.warning("hello2")
                 assert 0
 
             def teardown_function(function):
-                logging.warn("hello3")
+                logging.warning("hello3")
                 assert 0
-        """
+            """
         )
         for optargs in (("--capture=sys",), ("--capture=fd",)):
             print(optargs)
@@ -337,19 +338,19 @@ class TestLoggingInteraction(object):
 
     def test_logging_and_crossscope_fixtures(self, testdir):
         p = testdir.makepyfile(
-            """
+            """\
             import logging
             def setup_module(function):
-                logging.warn("hello1")
+                logging.warning("hello1")
 
             def test_logging():
-                logging.warn("hello2")
+                logging.warning("hello2")
                 assert 0
 
             def teardown_module(function):
-                logging.warn("hello3")
+                logging.warning("hello3")
                 assert 0
-        """
+            """
         )
         for optargs in (("--capture=sys",), ("--capture=fd",)):
             print(optargs)
@@ -363,11 +364,11 @@ class TestLoggingInteraction(object):
 
     def test_conftestlogging_is_shown(self, testdir):
         testdir.makeconftest(
-            """
+            """\
                 import logging
                 logging.basicConfig()
-                logging.warn("hello435")
-        """
+                logging.warning("hello435")
+            """
         )
         # make sure that logging is still captured in tests
         result = testdir.runpytest_subprocess("-s", "-p", "no:capturelog")
@@ -377,19 +378,19 @@ class TestLoggingInteraction(object):
 
     def test_conftestlogging_and_test_logging(self, testdir):
         testdir.makeconftest(
-            """
+            """\
                 import logging
                 logging.basicConfig()
-        """
+            """
         )
         # make sure that logging is still captured in tests
         p = testdir.makepyfile(
-            """
+            """\
             def test_hello():
                 import logging
-                logging.warn("hello433")
+                logging.warning("hello433")
                 assert 0
-        """
+            """
         )
         result = testdir.runpytest_subprocess(p, "-p", "no:capturelog")
         assert result.ret != 0
@@ -397,30 +398,63 @@ class TestLoggingInteraction(object):
         assert "something" not in result.stderr.str()
         assert "operation on closed file" not in result.stderr.str()
 
+    def test_logging_after_cap_stopped(self, testdir):
+        testdir.makeconftest(
+            """\
+                import pytest
+                import logging
+
+                log = logging.getLogger(__name__)
+
+                @pytest.fixture
+                def log_on_teardown():
+                    yield
+                    log.warning('Logging on teardown')
+            """
+        )
+        # make sure that logging is still captured in tests
+        p = testdir.makepyfile(
+            """\
+            def test_hello(log_on_teardown):
+                import logging
+                logging.warning("hello433")
+                assert 1
+                raise KeyboardInterrupt()
+            """
+        )
+        result = testdir.runpytest_subprocess(p, "--log-cli-level", "info")
+        assert result.ret != 0
+        result.stdout.fnmatch_lines(
+            ["*WARNING*hello433*", "*WARNING*Logging on teardown*"]
+        )
+        assert (
+            "AttributeError: 'NoneType' object has no attribute 'resume_capturing'"
+            not in result.stderr.str()
+        )
+
 
 class TestCaptureFixture(object):
-
     @pytest.mark.parametrize("opt", [[], ["-s"]])
     def test_std_functional(self, testdir, opt):
         reprec = testdir.inline_runsource(
-            """
+            """\
             def test_hello(capsys):
-                print (42)
+                print(42)
                 out, err = capsys.readouterr()
                 assert out.startswith("42")
-        """,
+            """,
             *opt
         )
         reprec.assertoutcome(passed=1)
 
     def test_capsyscapfd(self, testdir):
         p = testdir.makepyfile(
-            """
+            """\
             def test_one(capsys, capfd):
                 pass
             def test_two(capfd, capsys):
                 pass
-        """
+            """
         )
         result = testdir.runpytest(p)
         result.stdout.fnmatch_lines(
@@ -438,12 +472,12 @@ class TestCaptureFixture(object):
         in the same test is an error.
         """
         testdir.makepyfile(
-            """
+            """\
             def test_one(capsys, request):
                 request.getfixturevalue("capfd")
             def test_two(capfd, request):
                 request.getfixturevalue("capsys")
-        """
+            """
         )
         result = testdir.runpytest()
         result.stdout.fnmatch_lines(
@@ -458,10 +492,10 @@ class TestCaptureFixture(object):
 
     def test_capsyscapfdbinary(self, testdir):
         p = testdir.makepyfile(
-            """
+            """\
             def test_one(capsys, capfdbinary):
                 pass
-        """
+            """
         )
         result = testdir.runpytest(p)
         result.stdout.fnmatch_lines(
@@ -471,12 +505,13 @@ class TestCaptureFixture(object):
     @pytest.mark.parametrize("method", ["sys", "fd"])
     def test_capture_is_represented_on_failure_issue128(self, testdir, method):
         p = testdir.makepyfile(
-            """
-            def test_hello(cap%s):
-                print ("xxx42xxx")
+            """\
+            def test_hello(cap{}):
+                print("xxx42xxx")
                 assert 0
-        """
-            % method
+            """.format(
+                method
+            )
         )
         result = testdir.runpytest(p)
         result.stdout.fnmatch_lines(["xxx42xxx"])
@@ -484,21 +519,21 @@ class TestCaptureFixture(object):
     @needsosdup
     def test_stdfd_functional(self, testdir):
         reprec = testdir.inline_runsource(
-            """
+            """\
             def test_hello(capfd):
                 import os
                 os.write(1, "42".encode('ascii'))
                 out, err = capfd.readouterr()
                 assert out.startswith("42")
                 capfd.close()
-        """
+            """
         )
         reprec.assertoutcome(passed=1)
 
     @needsosdup
     def test_capfdbinary(self, testdir):
         reprec = testdir.inline_runsource(
-            """
+            """\
             def test_hello(capfdbinary):
                 import os
                 # some likely un-decodable bytes
@@ -506,7 +541,7 @@ class TestCaptureFixture(object):
                 out, err = capfdbinary.readouterr()
                 assert out == b'\\xfe\\x98\\x20'
                 assert err == b''
-        """
+            """
         )
         reprec.assertoutcome(passed=1)
 
@@ -515,7 +550,7 @@ class TestCaptureFixture(object):
     )
     def test_capsysbinary(self, testdir):
         reprec = testdir.inline_runsource(
-            """
+            """\
             def test_hello(capsysbinary):
                 import sys
                 # some likely un-decodable bytes
@@ -523,7 +558,7 @@ class TestCaptureFixture(object):
                 out, err = capsysbinary.readouterr()
                 assert out == b'\\xfe\\x98\\x20'
                 assert err == b''
-        """
+            """
         )
         reprec.assertoutcome(passed=1)
 
@@ -532,26 +567,26 @@ class TestCaptureFixture(object):
     )
     def test_capsysbinary_forbidden_in_python2(self, testdir):
         testdir.makepyfile(
-            """
+            """\
             def test_hello(capsysbinary):
                 pass
-        """
+            """
         )
         result = testdir.runpytest()
         result.stdout.fnmatch_lines(
             [
                 "*test_hello*",
-                "*capsysbinary is only supported on python 3*",
+                "*capsysbinary is only supported on Python 3*",
                 "*1 error in*",
             ]
         )
 
     def test_partial_setup_failure(self, testdir):
         p = testdir.makepyfile(
-            """
+            """\
             def test_hello(capsys, missingarg):
                 pass
-        """
+            """
         )
         result = testdir.runpytest(p)
         result.stdout.fnmatch_lines(["*test_partial_setup_failure*", "*1 error*"])
@@ -559,21 +594,21 @@ class TestCaptureFixture(object):
     @needsosdup
     def test_keyboardinterrupt_disables_capturing(self, testdir):
         p = testdir.makepyfile(
-            """
+            """\
             def test_hello(capfd):
                 import os
                 os.write(1, str(42).encode('ascii'))
                 raise KeyboardInterrupt()
-        """
+            """
         )
         result = testdir.runpytest_subprocess(p)
         result.stdout.fnmatch_lines(["*KeyboardInterrupt*"])
         assert result.ret == 2
 
-    @pytest.mark.issue14
     def test_capture_and_logging(self, testdir):
+        """#14"""
         p = testdir.makepyfile(
-            """
+            """\
             import logging
             def test_log(capsys):
                 logging.error('x')
@@ -586,7 +621,7 @@ class TestCaptureFixture(object):
     @pytest.mark.parametrize("no_capture", [True, False])
     def test_disabled_capture_fixture(self, testdir, fixture, no_capture):
         testdir.makepyfile(
-            """
+            """\
             def test_disabled({fixture}):
                 print('captured before')
                 with {fixture}.disabled():
@@ -620,7 +655,7 @@ class TestCaptureFixture(object):
         Ensure that capsys and capfd can be used by other fixtures during setup and teardown.
         """
         testdir.makepyfile(
-            """
+            """\
             from __future__ import print_function
             import sys
             import pytest
@@ -648,19 +683,47 @@ class TestCaptureFixture(object):
             )
         )
         result = testdir.runpytest_subprocess()
-        result.stdout.fnmatch_lines("*1 passed*")
+        result.stdout.fnmatch_lines(["*1 passed*"])
         assert "stdout contents begin" not in result.stdout.str()
         assert "stderr contents begin" not in result.stdout.str()
 
+    @pytest.mark.parametrize("cap", ["capsys", "capfd"])
+    def test_fixture_use_by_other_fixtures_teardown(self, testdir, cap):
+        """Ensure we can access setup and teardown buffers from teardown when using capsys/capfd (##3033)"""
+        testdir.makepyfile(
+            """\
+            import sys
+            import pytest
+            import os
+
+            @pytest.fixture()
+            def fix({cap}):
+                print("setup out")
+                sys.stderr.write("setup err\\n")
+                yield
+                out, err = {cap}.readouterr()
+                assert out == 'setup out\\ncall out\\n'
+                assert err == 'setup err\\ncall err\\n'
+
+            def test_a(fix):
+                print("call out")
+                sys.stderr.write("call err\\n")
+        """.format(
+                cap=cap
+            )
+        )
+        reprec = testdir.inline_run()
+        reprec.assertoutcome(passed=1)
+
 
 def test_setup_failure_does_not_kill_capturing(testdir):
     sub1 = testdir.mkpydir("sub1")
     sub1.join("conftest.py").write(
-        _pytest._code.Source(
+        textwrap.dedent(
+            """\
+            def pytest_runtest_setup(item):
+                raise ValueError(42)
             """
-        def pytest_runtest_setup(item):
-            raise ValueError(42)
-    """
         )
     )
     sub1.join("test_mod.py").write("def test_func1(): pass")
@@ -686,7 +749,7 @@ def test_capture_conftest_runtest_setup(testdir):
     testdir.makeconftest(
         """
         def pytest_runtest_setup():
-            print ("hello19")
+            print("hello19")
     """
     )
     testdir.makepyfile("def test_func(): pass")
@@ -721,7 +784,7 @@ def test_capture_early_option_parsing(testdir):
     testdir.makeconftest(
         """
         def pytest_runtest_setup():
-            print ("hello19")
+            print("hello19")
     """
     )
     testdir.makepyfile("def test_func(): pass")
@@ -756,22 +819,21 @@ def test_error_during_readouterr(testdir):
     testdir.makepyfile(
         pytest_xyz="""
         from _pytest.capture import FDCapture
+
         def bad_snap(self):
             raise Exception('boom')
+
         assert FDCapture.snap
         FDCapture.snap = bad_snap
     """
     )
-    result = testdir.runpytest_subprocess(
-        "-p", "pytest_xyz", "--version", syspathinsert=True
-    )
+    result = testdir.runpytest_subprocess("-p", "pytest_xyz", "--version")
     result.stderr.fnmatch_lines(
         ["*in bad_snap", "    raise Exception('boom')", "Exception: boom"]
     )
 
 
 class TestCaptureIO(object):
-
     def test_text(self):
         f = capture.CaptureIO()
         f.write("hello")
@@ -783,10 +845,10 @@ class TestCaptureIO(object):
         f = capture.CaptureIO()
         if sys.version_info >= (3, 0):
             f.write("\u00f6")
-            pytest.raises(TypeError, "f.write(bytes('hello', 'UTF-8'))")
+            pytest.raises(TypeError, f.write, b"hello")
         else:
-            f.write(text_type("\u00f6", "UTF-8"))
-            f.write("hello")  # bytes
+            f.write(u"\u00f6")
+            f.write(b"hello")
             s = f.getvalue()
             f.close()
             assert isinstance(s, text_type)
@@ -801,14 +863,6 @@ class TestCaptureIO(object):
         assert f.getvalue() == "foo\r\n"
 
 
-def test_bytes_io():
-    f = py.io.BytesIO()
-    f.write(tobytes("hello"))
-    pytest.raises(TypeError, "f.write(totext('hello'))")
-    s = f.getvalue()
-    assert s == tobytes("hello")
-
-
 def test_dontreadfrominput():
     from _pytest.capture import DontReadFromInput
 
@@ -883,18 +937,18 @@ def test_dupfile(tmpfile):
 
 
 def test_dupfile_on_bytesio():
-    io = py.io.BytesIO()
-    f = capture.safe_text_dupfile(io, "wb")
+    bio = io.BytesIO()
+    f = capture.safe_text_dupfile(bio, "wb")
     f.write("hello")
-    assert io.getvalue() == b"hello"
+    assert bio.getvalue() == b"hello"
     assert "BytesIO object" in f.name
 
 
 def test_dupfile_on_textio():
-    io = py.io.TextIO()
-    f = capture.safe_text_dupfile(io, "wb")
+    tio = py.io.TextIO()
+    f = capture.safe_text_dupfile(tio, "wb")
     f.write("hello")
-    assert io.getvalue() == "hello"
+    assert tio.getvalue() == "hello"
     assert not hasattr(f, "name")
 
 
@@ -902,12 +956,12 @@ def test_dupfile_on_textio():
 def lsof_check():
     pid = os.getpid()
     try:
-        out = py.process.cmdexec("lsof -p %d" % pid)
-    except (py.process.cmdexec.Error, UnicodeDecodeError):
+        out = subprocess.check_output(("lsof", "-p", str(pid))).decode()
+    except (OSError, subprocess.CalledProcessError, UnicodeDecodeError):
         # about UnicodeDecodeError, see note on pytester
         pytest.skip("could not run 'lsof'")
     yield
-    out2 = py.process.cmdexec("lsof -p %d" % pid)
+    out2 = subprocess.check_output(("lsof", "-p", str(pid))).decode()
     len1 = len([x for x in out.split("\n") if "REG" in x])
     len2 = len([x for x in out2.split("\n") if "REG" in x])
     assert len2 < len1 + 3, out2
@@ -919,7 +973,7 @@ class TestFDCapture(object):
     def test_simple(self, tmpfile):
         fd = tmpfile.fileno()
         cap = capture.FDCapture(fd)
-        data = tobytes("hello")
+        data = b"hello"
         os.write(fd, data)
         s = cap.snap()
         cap.done()
@@ -959,10 +1013,10 @@ class TestFDCapture(object):
         cap.start()
         x = os.read(0, 100).strip()
         cap.done()
-        assert x == tobytes("")
+        assert x == b""
 
     def test_writeorg(self, tmpfile):
-        data1, data2 = tobytes("foo"), tobytes("bar")
+        data1, data2 = b"foo", b"bar"
         cap = capture.FDCapture(tmpfile.fileno())
         cap.start()
         tmpfile.write(data1)
@@ -970,7 +1024,7 @@ class TestFDCapture(object):
         cap.writeorg(data2)
         scap = cap.snap()
         cap.done()
-        assert scap == totext(data1)
+        assert scap == data1.decode("ascii")
         with open(tmpfile.name, "rb") as stmp_file:
             stmp = stmp_file.read()
             assert stmp == data2
@@ -979,17 +1033,17 @@ class TestFDCapture(object):
         with saved_fd(1):
             cap = capture.FDCapture(1)
             cap.start()
-            data = tobytes("hello")
+            data = b"hello"
             os.write(1, data)
             sys.stdout.write("whatever")
             s = cap.snap()
             assert s == "hellowhatever"
             cap.suspend()
-            os.write(1, tobytes("world"))
+            os.write(1, b"world")
             sys.stdout.write("qlwkej")
             assert not cap.snap()
             cap.resume()
-            os.write(1, tobytes("but now"))
+            os.write(1, b"but now")
             sys.stdout.write(" yes\n")
             s = cap.snap()
             assert s == "but now yes\n"
@@ -997,6 +1051,9 @@ class TestFDCapture(object):
             cap.done()
             pytest.raises(AttributeError, cap.suspend)
 
+    def test_capfd_sys_stdout_mode(self, capfd):
+        assert "b" not in sys.stdout.mode
+
 
 @contextlib.contextmanager
 def saved_fd(fd):
@@ -1057,9 +1114,9 @@ class TestStdCapture(object):
 
     def test_capturing_readouterr_unicode(self):
         with self.getcapture() as cap:
-            print("hx\xc4\x85\xc4\x87")
+            print("hxąć")
             out, err = cap.readouterr()
-        assert out == py.builtin._totext("hx\xc4\x85\xc4\x87\n", "utf8")
+        assert out == u"hxąć\n"
 
     @pytest.mark.skipif(
         "sys.version_info >= (3,)", reason="text output different for bytes on python3"
@@ -1069,7 +1126,7 @@ class TestStdCapture(object):
             # triggered an internal error in pytest
             print("\xa6")
             out, err = cap.readouterr()
-        assert out == py.builtin._totext("\ufffd\n", "unicode-escape")
+        assert out == u"\ufffd\n"
 
     def test_reset_twice_error(self):
         with self.getcapture() as cap:
@@ -1133,7 +1190,7 @@ class TestStdCapture(object):
         print("XXX which indicates an error in the underlying capturing")
         print("XXX mechanisms")
         with self.getcapture():
-            pytest.raises(IOError, "sys.stdin.read()")
+            pytest.raises(IOError, sys.stdin.read)
 
 
 class TestStdCaptureFD(TestStdCapture):
@@ -1160,14 +1217,14 @@ class TestStdCaptureFD(TestStdCapture):
 
     def test_intermingling(self):
         with self.getcapture() as cap:
-            oswritebytes(1, "1")
+            os.write(1, b"1")
             sys.stdout.write(str(2))
             sys.stdout.flush()
-            oswritebytes(1, "3")
-            oswritebytes(2, "a")
+            os.write(1, b"3")
+            os.write(2, b"a")
             sys.stderr.write("b")
             sys.stderr.flush()
-            oswritebytes(2, "c")
+            os.write(2, b"c")
             out, err = cap.readouterr()
         assert out == "123"
         assert err == "abc"
@@ -1187,20 +1244,26 @@ class TestStdCaptureFDinvalidFD(object):
             """
             import os
             from _pytest import capture
+
             def StdCaptureFD(out=True, err=True, in_=True):
-                return capture.MultiCapture(out, err, in_,
-                                              Capture=capture.FDCapture)
+                return capture.MultiCapture(out, err, in_, Capture=capture.FDCapture)
+
             def test_stdout():
                 os.close(1)
                 cap = StdCaptureFD(out=True, err=False, in_=False)
+                assert repr(cap.out) == "<FDCapture 1 oldfd=None _state=None>"
                 cap.stop_capturing()
+
             def test_stderr():
                 os.close(2)
                 cap = StdCaptureFD(out=False, err=True, in_=False)
+                assert repr(cap.err) == "<FDCapture 2 oldfd=None _state=None>"
                 cap.stop_capturing()
+
             def test_stdin():
                 os.close(0)
                 cap = StdCaptureFD(out=False, err=False, in_=True)
+                assert repr(cap.in_) == "<FDCapture 0 oldfd=None _state=None>"
                 cap.stop_capturing()
         """
         )
@@ -1284,16 +1347,16 @@ def test_capturing_and_logging_fundamentals(testdir, method):
                                      Capture=capture.%s)
         cap.start_capturing()
 
-        logging.warn("hello1")
+        logging.warning("hello1")
         outerr = cap.readouterr()
-        print ("suspend, captured %%s" %%(outerr,))
-        logging.warn("hello2")
+        print("suspend, captured %%s" %%(outerr,))
+        logging.warning("hello2")
 
         cap.pop_outerr_to_orig()
-        logging.warn("hello3")
+        logging.warning("hello3")
 
         outerr = cap.readouterr()
-        print ("suspend2, captured %%s" %% (outerr,))
+        print("suspend2, captured %%s" %% (outerr,))
     """
         % (method,)
     )
@@ -1337,7 +1400,6 @@ def test_py36_windowsconsoleio_workaround_non_standard_streams():
     from _pytest.capture import _py36_windowsconsoleio_workaround
 
     class DummyStream(object):
-
         def write(self, s):
             pass
 
@@ -1360,28 +1422,36 @@ def test_dontreadfrominput_has_encoding(testdir):
 
 
 def test_crash_on_closing_tmpfile_py27(testdir):
-    testdir.makepyfile(
+    p = testdir.makepyfile(
         """
         from __future__ import print_function
-        import time
         import threading
         import sys
 
+        printing = threading.Event()
+
         def spam():
             f = sys.stderr
-            while True:
-                print('.', end='', file=f)
+            print('SPAMBEFORE', end='', file=f)
+            printing.set()
 
-        def test_silly():
+            while True:
+                try:
+                    f.flush()
+                except (OSError, ValueError):
+                    break
+
+        def test_spam_in_thread():
             t = threading.Thread(target=spam)
             t.daemon = True
             t.start()
-            time.sleep(0.5)
 
+            printing.wait()
     """
     )
-    result = testdir.runpytest_subprocess()
+    result = testdir.runpytest_subprocess(str(p))
     assert result.ret == 0
+    assert result.stderr.str() == ""
     assert "IOError" not in result.stdout.str()
 
 
@@ -1392,3 +1462,118 @@ def test_pickling_and_unpickling_encoded_file():
     ef = capture.EncodedFile(None, None)
     ef_as_str = pickle.dumps(ef)
     pickle.loads(ef_as_str)
+
+
+def test_global_capture_with_live_logging(testdir):
+    # Issue 3819
+    # capture should work with live cli logging
+
+    # Teardown report seems to have the capture for the whole process (setup, capture, teardown)
+    testdir.makeconftest(
+        """
+        def pytest_runtest_logreport(report):
+            if "test_global" in report.nodeid:
+                if report.when == "teardown":
+                    with open("caplog", "w") as f:
+                        f.write(report.caplog)
+                    with open("capstdout", "w") as f:
+                        f.write(report.capstdout)
+        """
+    )
+
+    testdir.makepyfile(
+        """
+        import logging
+        import sys
+        import pytest
+
+        logger = logging.getLogger(__name__)
+
+        @pytest.fixture
+        def fix1():
+            print("fix setup")
+            logging.info("fix setup")
+            yield
+            logging.info("fix teardown")
+            print("fix teardown")
+
+        def test_global(fix1):
+            print("begin test")
+            logging.info("something in test")
+            print("end test")
+        """
+    )
+    result = testdir.runpytest_subprocess("--log-cli-level=INFO")
+    assert result.ret == 0
+
+    with open("caplog", "r") as f:
+        caplog = f.read()
+
+    assert "fix setup" in caplog
+    assert "something in test" in caplog
+    assert "fix teardown" in caplog
+
+    with open("capstdout", "r") as f:
+        capstdout = f.read()
+
+    assert "fix setup" in capstdout
+    assert "begin test" in capstdout
+    assert "end test" in capstdout
+    assert "fix teardown" in capstdout
+
+
+@pytest.mark.parametrize("capture_fixture", ["capsys", "capfd"])
+def test_capture_with_live_logging(testdir, capture_fixture):
+    # Issue 3819
+    # capture should work with live cli logging
+
+    testdir.makepyfile(
+        """
+        import logging
+        import sys
+
+        logger = logging.getLogger(__name__)
+
+        def test_capture({0}):
+            print("hello")
+            sys.stderr.write("world\\n")
+            captured = {0}.readouterr()
+            assert captured.out == "hello\\n"
+            assert captured.err == "world\\n"
+
+            logging.info("something")
+            print("next")
+            logging.info("something")
+
+            captured = {0}.readouterr()
+            assert captured.out == "next\\n"
+        """.format(
+            capture_fixture
+        )
+    )
+
+    result = testdir.runpytest_subprocess("--log-cli-level=INFO")
+    assert result.ret == 0
+
+
+def test_typeerror_encodedfile_write(testdir):
+    """It should behave the same with and without output capturing (#4861)."""
+    p = testdir.makepyfile(
+        """
+        def test_fails():
+            import sys
+            sys.stdout.write(b"foo")
+    """
+    )
+    result_without_capture = testdir.runpytest("-s", str(p))
+
+    result_with_capture = testdir.runpytest(str(p))
+
+    assert result_with_capture.ret == result_without_capture.ret
+
+    if _PY3:
+        result_with_capture.stdout.fnmatch_lines(
+            ["E           TypeError: write() argument must be str, not bytes"]
+        )
+    else:
+        assert result_with_capture.ret == 0
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_collection.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_collection.py
index 657d64c74e2..0fbbbec54df 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_collection.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_collection.py
@@ -1,34 +1,29 @@
-from __future__ import absolute_import, division, print_function
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import os
 import pprint
 import sys
-import pytest
+import textwrap
 
-import _pytest._code
-from _pytest.main import Session, EXIT_NOTESTSCOLLECTED, _in_venv
+import py
+
+import pytest
+from _pytest.main import _in_venv
+from _pytest.main import EXIT_INTERRUPTED
+from _pytest.main import EXIT_NOTESTSCOLLECTED
+from _pytest.main import Session
 
 
 class TestCollector(object):
-
     def test_collect_versus_item(self):
         from pytest import Collector, Item
 
         assert not issubclass(Collector, Item)
         assert not issubclass(Item, Collector)
 
-    def test_compat_attributes(self, testdir, recwarn):
-        modcol = testdir.getmodulecol(
-            """
-            def test_pass(): pass
-            def test_fail(): assert 0
-        """
-        )
-        recwarn.clear()
-        assert modcol.Module == pytest.Module
-        assert modcol.Class == pytest.Class
-        assert modcol.Item == pytest.Item
-        assert modcol.File == pytest.File
-        assert modcol.Function == pytest.Function
-
     def test_check_equality(self, testdir):
         modcol = testdir.getmodulecol(
             """
@@ -115,7 +110,6 @@ class TestCollector(object):
 
 
 class TestCollectFS(object):
-
     def test_ignored_certain_directories(self, testdir):
         tmpdir = testdir.tmpdir
         tmpdir.ensure("build", "test_notfound.py")
@@ -253,12 +247,10 @@ class TestCollectFS(object):
 
 
 class TestCollectPluginHookRelay(object):
-
     def test_pytest_collect_file(self, testdir):
         wascalled = []
 
         class Plugin(object):
-
             def pytest_collect_file(self, path, parent):
                 if not path.basename.startswith("."):
                     # Ignore hidden files, e.g. .testmondata.
@@ -273,7 +265,6 @@ class TestCollectPluginHookRelay(object):
         wascalled = []
 
         class Plugin(object):
-
             def pytest_collect_directory(self, path, parent):
                 wascalled.append(path.basename)
 
@@ -285,7 +276,6 @@ class TestCollectPluginHookRelay(object):
 
 
 class TestPrunetraceback(object):
-
     def test_custom_repr_failure(self, testdir):
         p = testdir.makepyfile(
             """
@@ -335,7 +325,6 @@ class TestPrunetraceback(object):
 
 
 class TestCustomConftests(object):
-
     def test_ignore_collect_path(self, testdir):
         testdir.makeconftest(
             """
@@ -363,10 +352,10 @@ class TestCustomConftests(object):
         p = testdir.makepyfile("def test_hello(): pass")
         result = testdir.runpytest(p)
         assert result.ret == 0
-        result.stdout.fnmatch_lines("*1 passed*")
+        result.stdout.fnmatch_lines(["*1 passed*"])
         result = testdir.runpytest()
         assert result.ret == EXIT_NOTESTSCOLLECTED
-        result.stdout.fnmatch_lines("*collected 0 items*")
+        result.stdout.fnmatch_lines(["*collected 0 items*"])
 
     def test_collectignore_exclude_on_option(self, testdir):
         testdir.makeconftest(
@@ -388,6 +377,26 @@ class TestCustomConftests(object):
         assert result.ret == 0
         assert "passed" in result.stdout.str()
 
+    def test_collectignoreglob_exclude_on_option(self, testdir):
+        testdir.makeconftest(
+            """
+            collect_ignore_glob = ['*w*l[dt]*']
+            def pytest_addoption(parser):
+                parser.addoption("--XX", action="store_true", default=False)
+            def pytest_configure(config):
+                if config.getvalue("XX"):
+                    collect_ignore_glob[:] = []
+        """
+        )
+        testdir.makepyfile(test_world="def test_hello(): pass")
+        testdir.makepyfile(test_welt="def test_hallo(): pass")
+        result = testdir.runpytest()
+        assert result.ret == EXIT_NOTESTSCOLLECTED
+        result.stdout.fnmatch_lines(["*collected 0 items*"])
+        result = testdir.runpytest("--XX")
+        assert result.ret == 0
+        result.stdout.fnmatch_lines(["*2 passed*"])
+
     def test_pytest_fs_collect_hooks_are_seen(self, testdir):
         testdir.makeconftest(
             """
@@ -437,7 +446,6 @@ class TestCustomConftests(object):
 
 
 class TestSession(object):
-
     def test_parsearg(self, testdir):
         p = testdir.makepyfile("def test_func(): pass")
         subdir = testdir.mkdir("sub")
@@ -486,7 +494,7 @@ class TestSession(object):
         p = testdir.makepyfile("def test_func(): pass")
         id = "::".join([p.basename, "test_func"])
         items, hookrec = testdir.inline_genitems(id)
-        item, = items
+        (item,) = items
         assert item.name == "test_func"
         newid = item.nodeid
         assert newid == id
@@ -513,13 +521,8 @@ class TestSession(object):
                     pass
         """
         )
-        normid = p.basename + "::TestClass::()::test_method"
-        for id in [
-            p.basename,
-            p.basename + "::TestClass",
-            p.basename + "::TestClass::()",
-            normid,
-        ]:
+        normid = p.basename + "::TestClass::test_method"
+        for id in [p.basename, p.basename + "::TestClass", normid]:
             items, hookrec = testdir.inline_genitems(id)
             assert len(items) == 1
             assert items[0].name == "test_method"
@@ -610,9 +613,9 @@ class TestSession(object):
         testdir.makepyfile("def test_func(): pass")
         items, hookrec = testdir.inline_genitems()
         assert len(items) == 1
-        item, = items
+        (item,) = items
         items2, hookrec = testdir.inline_genitems(item.nodeid)
-        item2, = items2
+        (item2,) = items2
         assert item2.name == item.name
         assert item2.fspath == item.fspath
 
@@ -627,14 +630,13 @@ class TestSession(object):
         arg = p.basename + "::TestClass::test_method"
         items, hookrec = testdir.inline_genitems(arg)
         assert len(items) == 1
-        item, = items
-        assert item.nodeid.endswith("TestClass::()::test_method")
+        (item,) = items
+        assert item.nodeid.endswith("TestClass::test_method")
         # ensure we are reporting the collection of the single test item (#2464)
         assert [x.name for x in self.get_reported_items(hookrec)] == ["test_method"]
 
 
 class Test_getinitialnodes(object):
-
     def test_global_file(self, testdir, tmpdir):
         x = tmpdir.ensure("x.py")
         with tmpdir.as_cwd():
@@ -647,6 +649,10 @@ class Test_getinitialnodes(object):
             assert col.config is config
 
     def test_pkgfile(self, testdir):
+        """Verify nesting when a module is within a package.
+        The parent chain should match: Module<x.py> -> Package<subdir> -> Session.
+            Session's parent should always be None.
+        """
         tmpdir = testdir.tmpdir
         subdir = tmpdir.join("subdir")
         x = subdir.ensure("x.py")
@@ -654,15 +660,17 @@ class Test_getinitialnodes(object):
         with subdir.as_cwd():
             config = testdir.parseconfigure(x)
         col = testdir.getnode(config, x)
-        assert isinstance(col, pytest.Module)
         assert col.name == "x.py"
-        assert col.parent.parent is None
+        assert isinstance(col, pytest.Module)
+        assert isinstance(col.parent, pytest.Package)
+        assert isinstance(col.parent.parent, pytest.Session)
+        # session is batman (has no parents)
+        assert col.parent.parent.parent is None
         for col in col.listchain():
             assert col.config is config
 
 
 class Test_genitems(object):
-
     def test_check_collect_hashes(self, testdir):
         p = testdir.makepyfile(
             """
@@ -776,7 +784,6 @@ def test_matchnodes_two_collections_same_file(testdir):
 
 
 class TestNodekeywords(object):
-
     def test_no_under(self, testdir):
         modcol = testdir.getmodulecol(
             """
@@ -915,15 +922,15 @@ def test_continue_on_collection_errors_maxfail(testdir):
 
 def test_fixture_scope_sibling_conftests(testdir):
     """Regression test case for https://github.com/pytest-dev/pytest/issues/2836"""
-    foo_path = testdir.mkpydir("foo")
+    foo_path = testdir.mkdir("foo")
     foo_path.join("conftest.py").write(
-        _pytest._code.Source(
+        textwrap.dedent(
+            """\
+            import pytest
+            @pytest.fixture
+            def fix():
+                return 1
             """
-        import pytest
-        @pytest.fixture
-        def fix():
-            return 1
-    """
         )
     )
     foo_path.join("test_foo.py").write("def test_foo(fix): assert fix == 1")
@@ -942,3 +949,319 @@ def test_fixture_scope_sibling_conftests(testdir):
             "*1 passed, 1 error*",
         ]
     )
+
+
+def test_collect_init_tests(testdir):
+    """Check that we collect files from __init__.py files when they patch the 'python_files' (#3773)"""
+    p = testdir.copy_example("collect/collect_init_tests")
+    result = testdir.runpytest(p, "--collect-only")
+    result.stdout.fnmatch_lines(
+        [
+            "collected 2 items",
+            "<Package *",
+            "  <Module __init__.py>",
+            "    <Function test_init>",
+            "  <Module test_foo.py>",
+            "    <Function test_foo>",
+        ]
+    )
+    result = testdir.runpytest("./tests", "--collect-only")
+    result.stdout.fnmatch_lines(
+        [
+            "collected 2 items",
+            "<Package *",
+            "  <Module __init__.py>",
+            "    <Function test_init>",
+            "  <Module test_foo.py>",
+            "    <Function test_foo>",
+        ]
+    )
+    # Ignores duplicates with "." and pkginit (#4310).
+    result = testdir.runpytest("./tests", ".", "--collect-only")
+    result.stdout.fnmatch_lines(
+        [
+            "collected 2 items",
+            "<Package */tests>",
+            "  <Module __init__.py>",
+            "    <Function test_init>",
+            "  <Module test_foo.py>",
+            "    <Function test_foo>",
+        ]
+    )
+    # Same as before, but different order.
+    result = testdir.runpytest(".", "tests", "--collect-only")
+    result.stdout.fnmatch_lines(
+        [
+            "collected 2 items",
+            "<Package */tests>",
+            "  <Module __init__.py>",
+            "    <Function test_init>",
+            "  <Module test_foo.py>",
+            "    <Function test_foo>",
+        ]
+    )
+    result = testdir.runpytest("./tests/test_foo.py", "--collect-only")
+    result.stdout.fnmatch_lines(
+        ["<Package */tests>", "  <Module test_foo.py>", "    <Function test_foo>"]
+    )
+    assert "test_init" not in result.stdout.str()
+    result = testdir.runpytest("./tests/__init__.py", "--collect-only")
+    result.stdout.fnmatch_lines(
+        ["<Package */tests>", "  <Module __init__.py>", "    <Function test_init>"]
+    )
+    assert "test_foo" not in result.stdout.str()
+
+
+def test_collect_invalid_signature_message(testdir):
+    """Check that we issue a proper message when we can't determine the signature of a test
+    function (#4026).
+    """
+    testdir.makepyfile(
+        """
+        import pytest
+
+        class TestCase:
+            @pytest.fixture
+            def fix():
+                pass
+    """
+    )
+    result = testdir.runpytest()
+    result.stdout.fnmatch_lines(
+        ["Could not determine arguments of *.fix *: invalid method signature"]
+    )
+
+
+def test_collect_handles_raising_on_dunder_class(testdir):
+    """Handle proxy classes like Django's LazySettings that might raise on
+    ``isinstance`` (#4266).
+    """
+    testdir.makepyfile(
+        """
+        class ImproperlyConfigured(Exception):
+            pass
+
+        class RaisesOnGetAttr(object):
+            def raises(self):
+                raise ImproperlyConfigured
+
+            __class__ = property(raises)
+
+        raises = RaisesOnGetAttr()
+
+
+        def test_1():
+            pass
+    """
+    )
+    result = testdir.runpytest()
+    result.stdout.fnmatch_lines(["*1 passed in*"])
+    assert result.ret == 0
+
+
+def test_collect_with_chdir_during_import(testdir):
+    subdir = testdir.tmpdir.mkdir("sub")
+    testdir.tmpdir.join("conftest.py").write(
+        textwrap.dedent(
+            """
+            import os
+            os.chdir(%r)
+            """
+            % (str(subdir),)
+        )
+    )
+    testdir.makepyfile(
+        """
+        def test_1():
+            import os
+            assert os.getcwd() == %r
+        """
+        % (str(subdir),)
+    )
+    with testdir.tmpdir.as_cwd():
+        result = testdir.runpytest()
+    result.stdout.fnmatch_lines(["*1 passed in*"])
+    assert result.ret == 0
+
+    # Handles relative testpaths.
+    testdir.makeini(
+        """
+        [pytest]
+        testpaths = .
+    """
+    )
+    with testdir.tmpdir.as_cwd():
+        result = testdir.runpytest("--collect-only")
+    result.stdout.fnmatch_lines(["collected 1 item"])
+
+
+def test_collect_pyargs_with_testpaths(testdir, monkeypatch):
+    testmod = testdir.mkdir("testmod")
+    # NOTE: __init__.py is not collected since it does not match python_files.
+    testmod.ensure("__init__.py").write("def test_func(): pass")
+    testmod.ensure("test_file.py").write("def test_func(): pass")
+
+    root = testdir.mkdir("root")
+    root.ensure("pytest.ini").write(
+        textwrap.dedent(
+            """
+        [pytest]
+        addopts = --pyargs
+        testpaths = testmod
+    """
+        )
+    )
+    monkeypatch.setenv("PYTHONPATH", str(testdir.tmpdir), prepend=os.pathsep)
+    with root.as_cwd():
+        result = testdir.runpytest_subprocess()
+    result.stdout.fnmatch_lines(["*1 passed in*"])
+
+
+@pytest.mark.skipif(
+    not hasattr(py.path.local, "mksymlinkto"),
+    reason="symlink not available on this platform",
+)
+def test_collect_symlink_file_arg(testdir):
+    """Test that collecting a direct symlink, where the target does not match python_files works (#4325)."""
+    real = testdir.makepyfile(
+        real="""
+        def test_nodeid(request):
+            assert request.node.nodeid == "real.py::test_nodeid"
+        """
+    )
+    symlink = testdir.tmpdir.join("symlink.py")
+    symlink.mksymlinkto(real)
+    result = testdir.runpytest("-v", symlink)
+    result.stdout.fnmatch_lines(["real.py::test_nodeid PASSED*", "*1 passed in*"])
+    assert result.ret == 0
+
+
+@pytest.mark.skipif(
+    not hasattr(py.path.local, "mksymlinkto"),
+    reason="symlink not available on this platform",
+)
+def test_collect_symlink_out_of_tree(testdir):
+    """Test collection of symlink via out-of-tree rootdir."""
+    sub = testdir.tmpdir.join("sub")
+    real = sub.join("test_real.py")
+    real.write(
+        textwrap.dedent(
+            """
+        def test_nodeid(request):
+            # Should not contain sub/ prefix.
+            assert request.node.nodeid == "test_real.py::test_nodeid"
+        """
+        ),
+        ensure=True,
+    )
+
+    out_of_tree = testdir.tmpdir.join("out_of_tree").ensure(dir=True)
+    symlink_to_sub = out_of_tree.join("symlink_to_sub")
+    symlink_to_sub.mksymlinkto(sub)
+    sub.chdir()
+    result = testdir.runpytest("-vs", "--rootdir=%s" % sub, symlink_to_sub)
+    result.stdout.fnmatch_lines(
+        [
+            # Should not contain "sub/"!
+            "test_real.py::test_nodeid PASSED"
+        ]
+    )
+    assert result.ret == 0
+
+
+def test_collectignore_via_conftest(testdir, monkeypatch):
+    """collect_ignore in parent conftest skips importing child (issue #4592)."""
+    tests = testdir.mkpydir("tests")
+    tests.ensure("conftest.py").write("collect_ignore = ['ignore_me']")
+
+    ignore_me = tests.mkdir("ignore_me")
+    ignore_me.ensure("__init__.py")
+    ignore_me.ensure("conftest.py").write("assert 0, 'should_not_be_called'")
+
+    result = testdir.runpytest()
+    assert result.ret == EXIT_NOTESTSCOLLECTED
+
+
+def test_collect_pkg_init_and_file_in_args(testdir):
+    subdir = testdir.mkdir("sub")
+    init = subdir.ensure("__init__.py")
+    init.write("def test_init(): pass")
+    p = subdir.ensure("test_file.py")
+    p.write("def test_file(): pass")
+
+    # NOTE: without "-o python_files=*.py" this collects test_file.py twice.
+    # This changed/broke with "Add package scoped fixtures #2283" (2b1410895)
+    # initially (causing a RecursionError).
+    result = testdir.runpytest("-v", str(init), str(p))
+    result.stdout.fnmatch_lines(
+        [
+            "sub/test_file.py::test_file PASSED*",
+            "sub/test_file.py::test_file PASSED*",
+            "*2 passed in*",
+        ]
+    )
+
+    result = testdir.runpytest("-v", "-o", "python_files=*.py", str(init), str(p))
+    result.stdout.fnmatch_lines(
+        [
+            "sub/__init__.py::test_init PASSED*",
+            "sub/test_file.py::test_file PASSED*",
+            "*2 passed in*",
+        ]
+    )
+
+
+def test_collect_pkg_init_only(testdir):
+    subdir = testdir.mkdir("sub")
+    init = subdir.ensure("__init__.py")
+    init.write("def test_init(): pass")
+
+    result = testdir.runpytest(str(init))
+    result.stdout.fnmatch_lines(["*no tests ran in*"])
+
+    result = testdir.runpytest("-v", "-o", "python_files=*.py", str(init))
+    result.stdout.fnmatch_lines(["sub/__init__.py::test_init PASSED*", "*1 passed in*"])
+
+
+@pytest.mark.skipif(
+    not hasattr(py.path.local, "mksymlinkto"),
+    reason="symlink not available on this platform",
+)
+@pytest.mark.parametrize("use_pkg", (True, False))
+def test_collect_sub_with_symlinks(use_pkg, testdir):
+    sub = testdir.mkdir("sub")
+    if use_pkg:
+        sub.ensure("__init__.py")
+    sub.ensure("test_file.py").write("def test_file(): pass")
+
+    # Create a broken symlink.
+    sub.join("test_broken.py").mksymlinkto("test_doesnotexist.py")
+
+    # Symlink that gets collected.
+    sub.join("test_symlink.py").mksymlinkto("test_file.py")
+
+    result = testdir.runpytest("-v", str(sub))
+    result.stdout.fnmatch_lines(
+        [
+            "sub/test_file.py::test_file PASSED*",
+            "sub/test_symlink.py::test_file PASSED*",
+            "*2 passed in*",
+        ]
+    )
+
+
+def test_collector_respects_tbstyle(testdir):
+    p1 = testdir.makepyfile("assert 0")
+    result = testdir.runpytest(p1, "--tb=native")
+    assert result.ret == EXIT_INTERRUPTED
+    result.stdout.fnmatch_lines(
+        [
+            "*_ ERROR collecting test_collector_respects_tbstyle.py _*",
+            "Traceback (most recent call last):",
+            '  File "*/test_collector_respects_tbstyle.py", line 1, in <module>',
+            "    assert 0",
+            "AssertionError: assert 0",
+            "*! Interrupted: 1 errors during collection !*",
+            "*= 1 error in *",
+        ]
+    )
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_compat.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_compat.py
index 550a8f1b354..b4298d1531d 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_compat.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_compat.py
@@ -1,27 +1,35 @@
-from __future__ import absolute_import, division, print_function
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import sys
+from functools import wraps
+
+import six
 
 import pytest
-from _pytest.compat import is_generator, get_real_func, safe_getattr
+from _pytest.compat import _PytestWrapper
+from _pytest.compat import get_real_func
+from _pytest.compat import is_generator
+from _pytest.compat import safe_getattr
+from _pytest.compat import safe_isclass
 from _pytest.outcomes import OutcomeException
 
 
 def test_is_generator():
-
     def zap():
-        yield
+        yield  # pragma: no cover
 
     def foo():
-        pass
+        pass  # pragma: no cover
 
     assert is_generator(zap)
     assert not is_generator(foo)
 
 
 def test_real_func_loop_limit():
-
     class Evil(object):
-
         def __init__(self):
             self.left = 1000
 
@@ -30,15 +38,47 @@ def test_real_func_loop_limit():
 
         def __getattr__(self, attr):
             if not self.left:
-                raise RuntimeError("its over")
+                raise RuntimeError("it's over")  # pragma: no cover
             self.left -= 1
             return self
 
     evil = Evil()
 
-    with pytest.raises(ValueError):
-        res = get_real_func(evil)
-        print(res)
+    with pytest.raises(
+        ValueError,
+        match=(
+            "could not find real function of <Evil left=800>\n"
+            "stopped at <Evil left=800>"
+        ),
+    ):
+        get_real_func(evil)
+
+
+def test_get_real_func():
+    """Check that get_real_func correctly unwraps decorators until reaching the real function"""
+
+    def decorator(f):
+        @wraps(f)
+        def inner():
+            pass  # pragma: no cover
+
+        if six.PY2:
+            inner.__wrapped__ = f
+        return inner
+
+    def func():
+        pass  # pragma: no cover
+
+    wrapped_func = decorator(decorator(func))
+    assert get_real_func(wrapped_func) is func
+
+    wrapped_func2 = decorator(decorator(wrapped_func))
+    assert get_real_func(wrapped_func2) is func
+
+    # special case for __pytest_wrapped__ attribute: used to obtain the function up until the point
+    # a function was wrapped by pytest itself
+    wrapped_func2.__pytest_wrapped__ = _PytestWrapper(wrapped_func)
+    assert get_real_func(wrapped_func2) is wrapped_func
 
 
 @pytest.mark.skipif(
@@ -86,7 +126,6 @@ def test_is_generator_async_syntax(testdir):
 
 
 class ErrorsHelper(object):
-
     @property
     def raise_exception(self):
         raise Exception("exception should be catched")
@@ -108,3 +147,14 @@ def test_safe_getattr():
     helper = ErrorsHelper()
     assert safe_getattr(helper, "raise_exception", "default") == "default"
     assert safe_getattr(helper, "raise_fail", "default") == "default"
+
+
+def test_safe_isclass():
+    assert safe_isclass(type) is True
+
+    class CrappyClass(Exception):
+        @property
+        def __class__(self):
+            assert False, "Should be ignored"
+
+    assert safe_isclass(CrappyClass()) is False
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_config.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_config.py
index 5fb048364f7..d13f119b020 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_config.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_config.py
@@ -1,16 +1,28 @@
-from __future__ import absolute_import, division, print_function
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import sys
 import textwrap
-import pytest
 
 import _pytest._code
-from _pytest.config.findpaths import getcfg, get_common_ancestor, determine_setup
+import pytest
+from _pytest.compat import importlib_metadata
 from _pytest.config import _iter_rewritable_modules
+from _pytest.config.exceptions import UsageError
+from _pytest.config.findpaths import determine_setup
+from _pytest.config.findpaths import get_common_ancestor
+from _pytest.config.findpaths import getcfg
+from _pytest.main import EXIT_INTERRUPTED
 from _pytest.main import EXIT_NOTESTSCOLLECTED
+from _pytest.main import EXIT_OK
+from _pytest.main import EXIT_TESTSFAILED
+from _pytest.main import EXIT_USAGEERROR
+from _pytest.pathlib import Path
 
 
 class TestParseIni(object):
-
     @pytest.mark.parametrize(
         "section, filename", [("pytest", "pytest.ini"), ("tool:pytest", "setup.cfg")]
     )
@@ -18,11 +30,11 @@ class TestParseIni(object):
         sub = tmpdir.mkdir("sub")
         sub.chdir()
         tmpdir.join(filename).write(
-            _pytest._code.Source(
-                """
-            [{section}]
-            name = value
-        """.format(
+            textwrap.dedent(
+                """\
+                [{section}]
+                name = value
+                """.format(
                     section=section
                 )
             )
@@ -36,14 +48,30 @@ class TestParseIni(object):
         """correctly handle zero length arguments (a la pytest '')"""
         getcfg([""])
 
+    def test_setupcfg_uses_toolpytest_with_pytest(self, testdir):
+        p1 = testdir.makepyfile("def test(): pass")
+        testdir.makefile(
+            ".cfg",
+            setup="""
+                [tool:pytest]
+                testpaths=%s
+                [pytest]
+                testpaths=ignored
+        """
+            % p1.basename,
+        )
+        result = testdir.runpytest()
+        result.stdout.fnmatch_lines(["*, inifile: setup.cfg, *", "* 1 passed in *"])
+        assert result.ret == 0
+
     def test_append_parse_args(self, testdir, tmpdir, monkeypatch):
         monkeypatch.setenv("PYTEST_ADDOPTS", '--color no -rs --tb="short"')
         tmpdir.join("pytest.ini").write(
-            _pytest._code.Source(
+            textwrap.dedent(
+                """\
+                [pytest]
+                addopts = --verbose
                 """
-            [pytest]
-            addopts = --verbose
-        """
             )
         )
         config = testdir.parseconfig(tmpdir)
@@ -103,6 +131,12 @@ class TestParseIni(object):
         config = testdir.parseconfigure(sub)
         assert config.getini("minversion") == "2.0"
 
+    def test_ini_parse_error(self, testdir):
+        testdir.tmpdir.join("pytest.ini").write("addopts = -x")
+        result = testdir.runpytest()
+        assert result.ret != 0
+        result.stderr.fnmatch_lines(["ERROR: *pytest.ini:1: no section header defined"])
+
     @pytest.mark.xfail(reason="probably not needed")
     def test_confcutdir(self, testdir):
         sub = testdir.mkdir("sub")
@@ -118,7 +152,6 @@ class TestParseIni(object):
 
 
 class TestConfigCmdlineParsing(object):
-
     def test_parsing_again_fails(self, testdir):
         config = testdir.parseconfig()
         pytest.raises(AssertionError, lambda: config.parse([]))
@@ -137,13 +170,13 @@ class TestConfigCmdlineParsing(object):
         """
         )
         testdir.makefile(
-            ".cfg",
+            ".ini",
             custom="""
             [pytest]
             custom = 1
         """,
         )
-        config = testdir.parseconfig("-c", "custom.cfg")
+        config = testdir.parseconfig("-c", "custom.ini")
         assert config.getini("custom") == "1"
 
         testdir.makefile(
@@ -157,8 +190,8 @@ class TestConfigCmdlineParsing(object):
         assert config.getini("custom") == "1"
 
     def test_absolute_win32_path(self, testdir):
-        temp_cfg_file = testdir.makefile(
-            ".cfg",
+        temp_ini_file = testdir.makefile(
+            ".ini",
             custom="""
             [pytest]
             addopts = --version
@@ -166,13 +199,12 @@ class TestConfigCmdlineParsing(object):
         )
         from os.path import normpath
 
-        temp_cfg_file = normpath(str(temp_cfg_file))
-        ret = pytest.main("-c " + temp_cfg_file)
+        temp_ini_file = normpath(str(temp_ini_file))
+        ret = pytest.main(["-c", temp_ini_file])
         assert ret == _pytest.main.EXIT_OK
 
 
 class TestConfigAPI(object):
-
     def test_config_trace(self, testdir):
         config = testdir.parseconfig()
         values = []
@@ -191,7 +223,7 @@ class TestConfigAPI(object):
         config = testdir.parseconfig("--hello=this")
         for x in ("hello", "--hello", "-X"):
             assert config.getoption(x) == "this"
-        pytest.raises(ValueError, "config.getoption('qweqwe')")
+        pytest.raises(ValueError, config.getoption, "qweqwe")
 
     @pytest.mark.skipif("sys.version_info[0] < 3")
     def test_config_getoption_unicode(self, testdir):
@@ -208,7 +240,7 @@ class TestConfigAPI(object):
 
     def test_config_getvalueorskip(self, testdir):
         config = testdir.parseconfig()
-        pytest.raises(pytest.skip.Exception, "config.getvalueorskip('hello')")
+        pytest.raises(pytest.skip.Exception, config.getvalueorskip, "hello")
         verbose = config.getvalueorskip("verbose")
         assert verbose == config.option.verbose
 
@@ -400,20 +432,25 @@ class TestConfigAPI(object):
     @pytest.mark.parametrize(
         "names, expected",
         [
+            # dist-info based distributions root are files as will be put in PYTHONPATH
             (["bar.py"], ["bar"]),
-            (["foo", "bar.py"], []),
-            (["foo", "bar.pyc"], []),
-            (["foo", "__init__.py"], ["foo"]),
-            (["foo", "bar", "__init__.py"], []),
+            (["foo/bar.py"], ["bar"]),
+            (["foo/bar.pyc"], []),
+            (["foo/__init__.py"], ["foo"]),
+            (["bar/__init__.py", "xz.py"], ["bar", "xz"]),
+            (["setup.py"], []),
+            # egg based distributions root contain the files from the dist root
+            (["src/bar/__init__.py"], ["bar"]),
+            (["src/bar/__init__.py", "setup.py"], ["bar"]),
+            (["source/python/bar/__init__.py", "setup.py"], ["bar"]),
         ],
     )
     def test_iter_rewritable_modules(self, names, expected):
-        assert list(_iter_rewritable_modules(["/".join(names)])) == expected
+        assert list(_iter_rewritable_modules(names)) == expected
 
 
 class TestConfigFromdictargs(object):
-
-    def test_basic_behavior(self):
+    def test_basic_behavior(self, _sys_snapshot):
         from _pytest.config import Config
 
         option_dict = {"verbose": 444, "foo": "bar", "capture": "no"}
@@ -427,7 +464,7 @@ class TestConfigFromdictargs(object):
         assert config.option.capture == "no"
         assert config.args == args
 
-    def test_origargs(self):
+    def test_origargs(self, _sys_snapshot):
         """Show that fromdictargs can handle args in their "orig" format"""
         from _pytest.config import Config
 
@@ -442,11 +479,11 @@ class TestConfigFromdictargs(object):
 
     def test_inifilename(self, tmpdir):
         tmpdir.join("foo/bar.ini").ensure().write(
-            _pytest._code.Source(
+            textwrap.dedent(
+                """\
+                [pytest]
+                name = value
                 """
-            [pytest]
-            name = value
-        """
             )
         )
 
@@ -457,12 +494,12 @@ class TestConfigFromdictargs(object):
 
         cwd = tmpdir.join("a/b")
         cwd.join("pytest.ini").ensure().write(
-            _pytest._code.Source(
+            textwrap.dedent(
+                """\
+                [pytest]
+                name = wrong-value
+                should_not_be_set = true
                 """
-            [pytest]
-            name = wrong-value
-            should_not_be_set = true
-        """
             )
         )
         with cwd.ensure(dir=True).as_cwd():
@@ -479,7 +516,6 @@ class TestConfigFromdictargs(object):
 
 
 def test_options_on_small_file_do_not_blow_up(testdir):
-
     def runfiletest(opts):
         reprec = testdir.inline_run(*opts)
         passed, skipped, failed = reprec.countoutcomes()
@@ -509,32 +545,26 @@ def test_options_on_small_file_do_not_blow_up(testdir):
 
 
 def test_preparse_ordering_with_setuptools(testdir, monkeypatch):
-    pkg_resources = pytest.importorskip("pkg_resources")
+    monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", raising=False)
 
-    def my_iter(name):
-        assert name == "pytest11"
+    class EntryPoint(object):
+        name = "mytestplugin"
+        group = "pytest11"
 
-        class Dist(object):
-            project_name = "spam"
-            version = "1.0"
+        def load(self):
+            class PseudoPlugin(object):
+                x = 42
 
-            def _get_metadata(self, name):
-                return ["foo.txt,sha256=abc,123"]
+            return PseudoPlugin()
 
-        class EntryPoint(object):
-            name = "mytestplugin"
-            dist = Dist()
+    class Dist(object):
+        files = ()
+        entry_points = (EntryPoint(),)
 
-            def load(self):
+    def my_dists():
+        return (Dist,)
 
-                class PseudoPlugin(object):
-                    x = 42
-
-                return PseudoPlugin()
-
-        return iter([EntryPoint()])
-
-    monkeypatch.setattr(pkg_resources, "iter_entry_points", my_iter)
+    monkeypatch.setattr(importlib_metadata, "distributions", my_dists)
     testdir.makeconftest(
         """
         pytest_plugins = "mytestplugin",
@@ -547,58 +577,73 @@ def test_preparse_ordering_with_setuptools(testdir, monkeypatch):
 
 
 def test_setuptools_importerror_issue1479(testdir, monkeypatch):
-    pkg_resources = pytest.importorskip("pkg_resources")
+    monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", raising=False)
 
-    def my_iter(name):
-        assert name == "pytest11"
+    class DummyEntryPoint(object):
+        name = "mytestplugin"
+        group = "pytest11"
 
-        class Dist(object):
-            project_name = "spam"
-            version = "1.0"
+        def load(self):
+            raise ImportError("Don't hide me!")
 
-            def _get_metadata(self, name):
-                return ["foo.txt,sha256=abc,123"]
+    class Distribution(object):
+        version = "1.0"
+        files = ("foo.txt",)
+        entry_points = (DummyEntryPoint(),)
 
-        class EntryPoint(object):
-            name = "mytestplugin"
-            dist = Dist()
+    def distributions():
+        return (Distribution(),)
 
-            def load(self):
-                raise ImportError("Don't hide me!")
-
-        return iter([EntryPoint()])
-
-    monkeypatch.setattr(pkg_resources, "iter_entry_points", my_iter)
+    monkeypatch.setattr(importlib_metadata, "distributions", distributions)
     with pytest.raises(ImportError):
         testdir.parseconfig()
 
 
+def test_importlib_metadata_broken_distribution(testdir, monkeypatch):
+    """Integration test for broken distributions with 'files' metadata being None (#5389)"""
+    monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", raising=False)
+
+    class DummyEntryPoint:
+        name = "mytestplugin"
+        group = "pytest11"
+
+        def load(self):
+            return object()
+
+    class Distribution:
+        version = "1.0"
+        files = None
+        entry_points = (DummyEntryPoint(),)
+
+    def distributions():
+        return (Distribution(),)
+
+    monkeypatch.setattr(importlib_metadata, "distributions", distributions)
+    testdir.parseconfig()
+
+
 @pytest.mark.parametrize("block_it", [True, False])
 def test_plugin_preparse_prevents_setuptools_loading(testdir, monkeypatch, block_it):
-    pkg_resources = pytest.importorskip("pkg_resources")
+    monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", raising=False)
 
     plugin_module_placeholder = object()
 
-    def my_iter(name):
-        assert name == "pytest11"
+    class DummyEntryPoint(object):
+        name = "mytestplugin"
+        group = "pytest11"
 
-        class Dist(object):
-            project_name = "spam"
-            version = "1.0"
+        def load(self):
+            return plugin_module_placeholder
 
-            def _get_metadata(self, name):
-                return ["foo.txt,sha256=abc,123"]
+    class Distribution(object):
+        version = "1.0"
+        files = ("foo.txt",)
+        entry_points = (DummyEntryPoint(),)
 
-        class EntryPoint(object):
-            name = "mytestplugin"
-            dist = Dist()
+    def distributions():
+        return (Distribution(),)
 
-            def load(self):
-                return plugin_module_placeholder
-
-        return iter([EntryPoint()])
-
-    monkeypatch.setattr(pkg_resources, "iter_entry_points", my_iter)
+    monkeypatch.setattr(importlib_metadata, "distributions", distributions)
     args = ("-p", "no:mytestplugin") if block_it else ()
     config = testdir.parseconfig(*args)
     config.pluginmanager.import_plugin("mytestplugin")
@@ -606,9 +651,39 @@ def test_plugin_preparse_prevents_setuptools_loading(testdir, monkeypatch, block
         assert "mytestplugin" not in sys.modules
         assert config.pluginmanager.get_plugin("mytestplugin") is None
     else:
-        assert config.pluginmanager.get_plugin(
-            "mytestplugin"
-        ) is plugin_module_placeholder
+        assert (
+            config.pluginmanager.get_plugin("mytestplugin") is plugin_module_placeholder
+        )
+
+
+@pytest.mark.parametrize(
+    "parse_args,should_load", [(("-p", "mytestplugin"), True), ((), False)]
+)
+def test_disable_plugin_autoload(testdir, monkeypatch, parse_args, should_load):
+    class DummyEntryPoint(object):
+        project_name = name = "mytestplugin"
+        group = "pytest11"
+        version = "1.0"
+
+        def load(self):
+            return sys.modules[self.name]
+
+    class Distribution(object):
+        entry_points = (DummyEntryPoint(),)
+        files = ()
+
+    class PseudoPlugin(object):
+        x = 42
+
+    def distributions():
+        return (Distribution(),)
+
+    monkeypatch.setenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", "1")
+    monkeypatch.setattr(importlib_metadata, "distributions", distributions)
+    monkeypatch.setitem(sys.modules, "mytestplugin", PseudoPlugin())
+    config = testdir.parseconfig(*parse_args)
+    has_loaded = config.pluginmanager.get_plugin("mytestplugin") is not None
+    assert has_loaded == should_load
 
 
 def test_cmdline_processargs_simple(testdir):
@@ -650,9 +725,9 @@ def test_invalid_options_show_extra_information(testdir):
         ["-v", "dir2", "dir1"],
     ],
 )
-def test_consider_args_after_options_for_rootdir_and_inifile(testdir, args):
+def test_consider_args_after_options_for_rootdir(testdir, args):
     """
-    Consider all arguments in the command-line for rootdir and inifile
+    Consider all arguments in the command-line for rootdir
     discovery, even if they happen to occur after an option. #949
     """
     # replace "dir1" and "dir2" from "args" into their real directory
@@ -666,7 +741,7 @@ def test_consider_args_after_options_for_rootdir_and_inifile(testdir, args):
             args[i] = d2
     with root.as_cwd():
         result = testdir.runpytest(*args)
-    result.stdout.fnmatch_lines(["*rootdir: *myroot, inifile:"])
+    result.stdout.fnmatch_lines(["*rootdir: *myroot"])
 
 
 @pytest.mark.skipif("sys.platform == 'win32'")
@@ -690,10 +765,10 @@ def test_config_in_subdirectory_colon_command_line_issue2148(testdir):
         **{
             "conftest": conftest_source,
             "subdir/conftest": conftest_source,
-            "subdir/test_foo": """
+            "subdir/test_foo": """\
             def test_foo(pytestconfig):
                 assert pytestconfig.getini('foo') == 'subdir'
-        """,
+            """,
         }
     )
 
@@ -703,29 +778,39 @@ def test_config_in_subdirectory_colon_command_line_issue2148(testdir):
 
 def test_notify_exception(testdir, capfd):
     config = testdir.parseconfig()
-    excinfo = pytest.raises(ValueError, "raise ValueError(1)")
-    config.notify_exception(excinfo)
+    with pytest.raises(ValueError) as excinfo:
+        raise ValueError(1)
+    config.notify_exception(excinfo, config.option)
     out, err = capfd.readouterr()
     assert "ValueError" in err
 
     class A(object):
-
         def pytest_internalerror(self, excrepr):
             return True
 
     config.pluginmanager.register(A())
-    config.notify_exception(excinfo)
+    config.notify_exception(excinfo, config.option)
     out, err = capfd.readouterr()
     assert not err
 
+    config = testdir.parseconfig("-p", "no:terminal")
+    with pytest.raises(ValueError) as excinfo:
+        raise ValueError(1)
+    config.notify_exception(excinfo, config.option)
+    out, err = capfd.readouterr()
+    assert "ValueError" in err
 
-def test_load_initial_conftest_last_ordering(testdir):
-    from _pytest.config import get_config
 
-    pm = get_config().pluginmanager
+def test_no_terminal_discovery_error(testdir):
+    testdir.makepyfile("raise TypeError('oops!')")
+    result = testdir.runpytest("-p", "no:terminal", "--collect-only")
+    assert result.ret == EXIT_INTERRUPTED
+
+
+def test_load_initial_conftest_last_ordering(testdir, _config_for_test):
+    pm = _config_for_test.pluginmanager
 
     class My(object):
-
         def pytest_load_initial_conftests(self):
             pass
 
@@ -753,58 +838,25 @@ def test_get_plugin_specs_as_list():
     assert _get_plugin_specs_as_list(("foo", "bar")) == ["foo", "bar"]
 
 
-class TestWarning(object):
+def test_collect_pytest_prefix_bug_integration(testdir):
+    """Integration test for issue #3775"""
+    p = testdir.copy_example("config/collect_pytest_prefix")
+    result = testdir.runpytest(p)
+    result.stdout.fnmatch_lines(["* 1 passed *"])
 
-    def test_warn_config(self, testdir):
-        testdir.makeconftest(
-            """
-            values = []
-            def pytest_configure(config):
-                config.warn("C1", "hello")
-            def pytest_logwarning(code, message):
-                if message == "hello" and code == "C1":
-                    values.append(1)
-        """
-        )
-        testdir.makepyfile(
-            """
-            def test_proper(pytestconfig):
-                import conftest
-                assert conftest.values == [1]
-        """
-        )
-        reprec = testdir.inline_run()
-        reprec.assertoutcome(passed=1)
 
-    def test_warn_on_test_item_from_request(self, testdir, request):
-        testdir.makepyfile(
-            """
-            import pytest
+def test_collect_pytest_prefix_bug(pytestconfig):
+    """Ensure we collect only actual functions from conftest files (#3775)"""
 
-            @pytest.fixture
-            def fix(request):
-                request.node.warn("T1", "hello")
+    class Dummy(object):
+        class pytest_something(object):
+            pass
 
-            def test_hello(fix):
-                pass
-        """
-        )
-        result = testdir.runpytest("--disable-pytest-warnings")
-        assert result.parseoutcomes()["warnings"] > 0
-        assert "hello" not in result.stdout.str()
-
-        result = testdir.runpytest()
-        result.stdout.fnmatch_lines(
-            """
-            ===*warnings summary*===
-            *test_warn_on_test_item_from_request.py::test_hello*
-            *hello*
-        """
-        )
+    pm = pytestconfig.pluginmanager
+    assert pm.parse_hookimpl_opts(Dummy(), "pytest_something") is None
 
 
 class TestRootdir(object):
-
     def test_simple_noini(self, tmpdir):
         assert get_common_ancestor([tmpdir]) == tmpdir
         a = tmpdir.mkdir("a")
@@ -819,7 +871,7 @@ class TestRootdir(object):
     @pytest.mark.parametrize("name", "setup.cfg tox.ini pytest.ini".split())
     def test_with_ini(self, tmpdir, name):
         inifile = tmpdir.join(name)
-        inifile.write("[pytest]\n")
+        inifile.write("[pytest]\n" if name != "setup.cfg" else "[tool:pytest]\n")
 
         a = tmpdir.mkdir("a")
         b = a.mkdir("b")
@@ -832,7 +884,7 @@ class TestRootdir(object):
         assert inifile == inifile
 
     @pytest.mark.parametrize("name", "setup.cfg tox.ini".split())
-    def test_pytestini_overides_empty_other(self, tmpdir, name):
+    def test_pytestini_overrides_empty_other(self, tmpdir, name):
         inifile = tmpdir.ensure("pytest.ini")
         a = tmpdir.mkdir("a")
         a.ensure(name)
@@ -863,14 +915,16 @@ class TestRootdir(object):
 
 
 class TestOverrideIniArgs(object):
-
     @pytest.mark.parametrize("name", "setup.cfg tox.ini pytest.ini".split())
     def test_override_ini_names(self, testdir, name):
+        section = "[pytest]" if name != "setup.cfg" else "[tool:pytest]"
         testdir.tmpdir.join(name).write(
             textwrap.dedent(
                 """
-            [pytest]
-            custom = 1.0"""
+            {section}
+            custom = 1.0""".format(
+                    section=section
+                )
             )
         )
         testdir.makeconftest(
@@ -1026,20 +1080,44 @@ class TestOverrideIniArgs(object):
             assert rootdir == tmpdir
             assert inifile is None
 
-    def test_addopts_before_initini(self, monkeypatch):
+    def test_addopts_before_initini(self, monkeypatch, _config_for_test, _sys_snapshot):
         cache_dir = ".custom_cache"
         monkeypatch.setenv("PYTEST_ADDOPTS", "-o cache_dir=%s" % cache_dir)
-        from _pytest.config import get_config
-
-        config = get_config()
+        config = _config_for_test
         config._preparse([], addopts=True)
         assert config._override_ini == ["cache_dir=%s" % cache_dir]
 
-    def test_override_ini_does_not_contain_paths(self):
-        """Check that -o no longer swallows all options after it (#3103)"""
-        from _pytest.config import get_config
+    def test_addopts_from_env_not_concatenated(self, monkeypatch, _config_for_test):
+        """PYTEST_ADDOPTS should not take values from normal args (#4265)."""
+        monkeypatch.setenv("PYTEST_ADDOPTS", "-o")
+        config = _config_for_test
+        with pytest.raises(UsageError) as excinfo:
+            config._preparse(["cache_dir=ignored"], addopts=True)
+        assert (
+            "error: argument -o/--override-ini: expected one argument (via PYTEST_ADDOPTS)"
+            in excinfo.value.args[0]
+        )
 
-        config = get_config()
+    def test_addopts_from_ini_not_concatenated(self, testdir):
+        """addopts from ini should not take values from normal args (#4265)."""
+        testdir.makeini(
+            """
+            [pytest]
+            addopts=-o
+        """
+        )
+        result = testdir.runpytest("cache_dir=ignored")
+        result.stderr.fnmatch_lines(
+            [
+                "%s: error: argument -o/--override-ini: expected one argument (via addopts config)"
+                % (testdir.request.config._parser.optparser.prog,)
+            ]
+        )
+        assert result.ret == _pytest.main.EXIT_USAGEERROR
+
+    def test_override_ini_does_not_contain_paths(self, _config_for_test, _sys_snapshot):
+        """Check that -o no longer swallows all options after it (#3103)"""
+        config = _config_for_test
         config._preparse(["-o", "cache_dir=/cache", "/some/test/path"])
         assert config._override_ini == ["cache_dir=/cache"]
 
@@ -1066,3 +1144,148 @@ class TestOverrideIniArgs(object):
         result = testdir.runpytest("-o", "foo=1", "-o", "bar=0", "test_foo.py")
         assert "ERROR:" not in result.stderr.str()
         result.stdout.fnmatch_lines(["collected 1 item", "*= 1 passed in *="])
+
+
+def test_help_via_addopts(testdir):
+    testdir.makeini(
+        """
+        [pytest]
+        addopts = --unknown-option-should-allow-for-help --help
+    """
+    )
+    result = testdir.runpytest()
+    assert result.ret == 0
+    result.stdout.fnmatch_lines(
+        [
+            "usage: *",
+            "positional arguments:",
+            # Displays full/default help.
+            "to see available markers type: pytest --markers",
+        ]
+    )
+
+
+def test_help_and_version_after_argument_error(testdir):
+    testdir.makeconftest(
+        """
+        def validate(arg):
+            raise argparse.ArgumentTypeError("argerror")
+
+        def pytest_addoption(parser):
+            group = parser.getgroup('cov')
+            group.addoption(
+                "--invalid-option-should-allow-for-help",
+                type=validate,
+            )
+        """
+    )
+    testdir.makeini(
+        """
+        [pytest]
+        addopts = --invalid-option-should-allow-for-help
+    """
+    )
+    result = testdir.runpytest("--help")
+    result.stdout.fnmatch_lines(
+        [
+            "usage: *",
+            "positional arguments:",
+            "NOTE: displaying only minimal help due to UsageError.",
+        ]
+    )
+    result.stderr.fnmatch_lines(
+        [
+            "ERROR: usage: *",
+            "%s: error: argument --invalid-option-should-allow-for-help: expected one argument"
+            % (testdir.request.config._parser.optparser.prog,),
+        ]
+    )
+    # Does not display full/default help.
+    assert "to see available markers type: pytest --markers" not in result.stdout.lines
+    assert result.ret == EXIT_USAGEERROR
+
+    result = testdir.runpytest("--version")
+    result.stderr.fnmatch_lines(
+        ["*pytest*{}*imported from*".format(pytest.__version__)]
+    )
+    assert result.ret == EXIT_USAGEERROR
+
+
+def test_config_does_not_load_blocked_plugin_from_args(testdir):
+    """This tests that pytest's config setup handles "-p no:X"."""
+    p = testdir.makepyfile("def test(capfd): pass")
+    result = testdir.runpytest(str(p), "-pno:capture")
+    result.stdout.fnmatch_lines(["E       fixture 'capfd' not found"])
+    assert result.ret == EXIT_TESTSFAILED
+
+    result = testdir.runpytest(str(p), "-pno:capture", "-s")
+    result.stderr.fnmatch_lines(["*: error: unrecognized arguments: -s"])
+    assert result.ret == EXIT_USAGEERROR
+
+
+def test_invocation_args(testdir):
+    """Ensure that Config.invocation_* arguments are correctly defined"""
+
+    class DummyPlugin(object):
+        pass
+
+    p = testdir.makepyfile("def test(): pass")
+    plugin = DummyPlugin()
+    rec = testdir.inline_run(p, "-v", plugins=[plugin])
+    calls = rec.getcalls("pytest_runtest_protocol")
+    assert len(calls) == 1
+    call = calls[0]
+    config = call.item.config
+
+    assert config.invocation_params.args == [p, "-v"]
+    assert config.invocation_params.dir == Path(str(testdir.tmpdir))
+
+    plugins = config.invocation_params.plugins
+    assert len(plugins) == 2
+    assert plugins[0] is plugin
+    assert type(plugins[1]).__name__ == "Collect"  # installed by testdir.inline_run()
+
+
+@pytest.mark.parametrize(
+    "plugin",
+    [
+        x
+        for x in _pytest.config.default_plugins
+        if x not in _pytest.config.essential_plugins
+    ],
+)
+def test_config_blocked_default_plugins(testdir, plugin):
+    if plugin == "debugging":
+        # Fixed in xdist master (after 1.27.0).
+        # https://github.com/pytest-dev/pytest-xdist/pull/422
+        try:
+            import xdist  # noqa: F401
+        except ImportError:
+            pass
+        else:
+            pytest.skip("does not work with xdist currently")
+
+    p = testdir.makepyfile("def test(): pass")
+    result = testdir.runpytest(str(p), "-pno:%s" % plugin)
+
+    if plugin == "python":
+        assert result.ret == EXIT_USAGEERROR
+        result.stderr.fnmatch_lines(
+            [
+                "ERROR: not found: */test_config_blocked_default_plugins.py",
+                "(no name '*/test_config_blocked_default_plugins.py' in any of [])",
+            ]
+        )
+        return
+
+    assert result.ret == EXIT_OK
+    if plugin != "terminal":
+        result.stdout.fnmatch_lines(["* 1 passed in *"])
+
+    p = testdir.makepyfile("def test(): assert 0")
+    result = testdir.runpytest(str(p), "-pno:%s" % plugin)
+    assert result.ret == EXIT_TESTSFAILED
+    if plugin != "terminal":
+        result.stdout.fnmatch_lines(["* 1 failed in *"])
+    else:
+        assert result.stdout.lines == [""]
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_conftest.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_conftest.py
index 61b640976f1..f8e3dfa92e4 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_conftest.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_conftest.py
@@ -1,24 +1,17 @@
-from __future__ import absolute_import, division, print_function
-from textwrap import dedent
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import textwrap
 
-import _pytest._code
 import py
+
 import pytest
 from _pytest.config import PytestPluginManager
-from _pytest.main import EXIT_NOTESTSCOLLECTED, EXIT_USAGEERROR
-
-
-@pytest.fixture(scope="module", params=["global", "inpackage"])
-def basedir(request, tmpdir_factory):
-    from _pytest.tmpdir import tmpdir
-
-    tmpdir = tmpdir(request, tmpdir_factory)
-    tmpdir.ensure("adir/conftest.py").write("a=1 ; Directory = 3")
-    tmpdir.ensure("adir/b/conftest.py").write("b=2 ; a = 1.5")
-    if request.param == "inpackage":
-        tmpdir.ensure("adir/__init__.py")
-        tmpdir.ensure("adir/b/__init__.py")
-    return tmpdir
+from _pytest.main import EXIT_NOTESTSCOLLECTED
+from _pytest.main import EXIT_OK
+from _pytest.main import EXIT_USAGEERROR
 
 
 def ConftestWithSetinitial(path):
@@ -28,18 +21,28 @@ def ConftestWithSetinitial(path):
 
 
 def conftest_setinitial(conftest, args, confcutdir=None):
-
     class Namespace(object):
-
         def __init__(self):
             self.file_or_dir = args
             self.confcutdir = str(confcutdir)
             self.noconftest = False
+            self.pyargs = False
 
     conftest._set_initial_conftests(Namespace())
 
 
+@pytest.mark.usefixtures("_sys_snapshot")
 class TestConftestValueAccessGlobal(object):
+    @pytest.fixture(scope="module", params=["global", "inpackage"])
+    def basedir(self, request, tmpdir_factory):
+        tmpdir = tmpdir_factory.mktemp("basedir", numbered=True)
+        tmpdir.ensure("adir/conftest.py").write("a=1 ; Directory = 3")
+        tmpdir.ensure("adir/b/conftest.py").write("b=2 ; a = 1.5")
+        if request.param == "inpackage":
+            tmpdir.ensure("adir/__init__.py")
+            tmpdir.ensure("adir/b/__init__.py")
+
+        yield tmpdir
 
     def test_basic_init(self, basedir):
         conftest = PytestPluginManager()
@@ -48,14 +51,14 @@ class TestConftestValueAccessGlobal(object):
 
     def test_immediate_initialiation_and_incremental_are_the_same(self, basedir):
         conftest = PytestPluginManager()
-        len(conftest._path2confmods)
+        assert not len(conftest._dirpath2confmods)
         conftest._getconftestmodules(basedir)
-        snap1 = len(conftest._path2confmods)
-        # assert len(conftest._path2confmods) == snap1 + 1
+        snap1 = len(conftest._dirpath2confmods)
+        assert snap1 == 1
         conftest._getconftestmodules(basedir.join("adir"))
-        assert len(conftest._path2confmods) == snap1 + 1
+        assert len(conftest._dirpath2confmods) == snap1 + 1
         conftest._getconftestmodules(basedir.join("b"))
-        assert len(conftest._path2confmods) == snap1 + 2
+        assert len(conftest._dirpath2confmods) == snap1 + 2
 
     def test_value_access_not_existing(self, basedir):
         conftest = ConftestWithSetinitial(basedir)
@@ -79,7 +82,7 @@ class TestConftestValueAccessGlobal(object):
         assert path.purebasename.startswith("conftest")
 
 
-def test_conftest_in_nonpkg_with_init(tmpdir):
+def test_conftest_in_nonpkg_with_init(tmpdir, _sys_snapshot):
     tmpdir.ensure("adir-1.0/conftest.py").write("a=1 ; Directory = 3")
     tmpdir.ensure("adir-1.0/b/conftest.py").write("b=2 ; a = 1.5")
     tmpdir.ensure("adir-1.0/b/__init__.py")
@@ -179,11 +182,11 @@ def test_conftest_confcutdir(testdir):
     testdir.makeconftest("assert 0")
     x = testdir.mkdir("x")
     x.join("conftest.py").write(
-        _pytest._code.Source(
+        textwrap.dedent(
+            """\
+            def pytest_addoption(parser):
+                parser.addoption("--xyz", action="store_true")
             """
-        def pytest_addoption(parser):
-            parser.addoption("--xyz", action="store_true")
-    """
         )
     )
     result = testdir.runpytest("-h", "--confcutdir=%s" % x, x)
@@ -191,6 +194,94 @@ def test_conftest_confcutdir(testdir):
     assert "warning: could not load initial" not in result.stdout.str()
 
 
+@pytest.mark.skipif(
+    not hasattr(py.path.local, "mksymlinkto"),
+    reason="symlink not available on this platform",
+)
+def test_conftest_symlink(testdir):
+    """Ensure that conftest.py is used for resolved symlinks."""
+    real = testdir.tmpdir.mkdir("real")
+    realtests = real.mkdir("app").mkdir("tests")
+    testdir.tmpdir.join("symlinktests").mksymlinkto(realtests)
+    testdir.tmpdir.join("symlink").mksymlinkto(real)
+    testdir.makepyfile(
+        **{
+            "real/app/tests/test_foo.py": "def test1(fixture): pass",
+            "real/conftest.py": textwrap.dedent(
+                """
+                import pytest
+
+                print("conftest_loaded")
+
+                @pytest.fixture
+                def fixture():
+                    print("fixture_used")
+                """
+            ),
+        }
+    )
+    result = testdir.runpytest("-vs", "symlinktests")
+    result.stdout.fnmatch_lines(
+        [
+            "*conftest_loaded*",
+            "real/app/tests/test_foo.py::test1 fixture_used",
+            "PASSED",
+        ]
+    )
+    assert result.ret == EXIT_OK
+
+    # Should not cause "ValueError: Plugin already registered" (#4174).
+    result = testdir.runpytest("-vs", "symlink")
+    assert result.ret == EXIT_OK
+
+    realtests.ensure("__init__.py")
+    result = testdir.runpytest("-vs", "symlinktests/test_foo.py::test1")
+    result.stdout.fnmatch_lines(
+        [
+            "*conftest_loaded*",
+            "real/app/tests/test_foo.py::test1 fixture_used",
+            "PASSED",
+        ]
+    )
+    assert result.ret == EXIT_OK
+
+
+@pytest.mark.skipif(
+    not hasattr(py.path.local, "mksymlinkto"),
+    reason="symlink not available on this platform",
+)
+def test_conftest_symlink_files(testdir):
+    """Check conftest.py loading when running in directory with symlinks."""
+    real = testdir.tmpdir.mkdir("real")
+    source = {
+        "app/test_foo.py": "def test1(fixture): pass",
+        "app/__init__.py": "",
+        "app/conftest.py": textwrap.dedent(
+            """
+            import pytest
+
+            print("conftest_loaded")
+
+            @pytest.fixture
+            def fixture():
+                print("fixture_used")
+            """
+        ),
+    }
+    testdir.makepyfile(**{"real/%s" % k: v for k, v in source.items()})
+
+    # Create a build directory that contains symlinks to actual files
+    # but doesn't symlink actual directories.
+    build = testdir.tmpdir.mkdir("build")
+    build.mkdir("app")
+    for f in source:
+        build.join(f).mksymlinkto(real.join(f))
+    build.chdir()
+    result = testdir.runpytest("-vs", "app/test_foo.py")
+    result.stdout.fnmatch_lines(["*conftest_loaded*", "PASSED"])
+    assert result.ret == EXIT_OK
+
+
 def test_no_conftest(testdir):
     testdir.makeconftest("assert 0")
     result = testdir.runpytest("--noconftest")
@@ -203,11 +294,11 @@ def test_no_conftest(testdir):
 def test_conftest_existing_resultlog(testdir):
     x = testdir.mkdir("tests")
     x.join("conftest.py").write(
-        _pytest._code.Source(
+        textwrap.dedent(
+            """\
+            def pytest_addoption(parser):
+                parser.addoption("--xyz", action="store_true")
             """
-        def pytest_addoption(parser):
-            parser.addoption("--xyz", action="store_true")
-    """
         )
     )
     testdir.makefile(ext=".log", result="")  # Writes result.log
@@ -218,11 +309,11 @@ def test_conftest_existing_resultlog(testdir):
 def test_conftest_existing_junitxml(testdir):
     x = testdir.mkdir("tests")
     x.join("conftest.py").write(
-        _pytest._code.Source(
+        textwrap.dedent(
+            """\
+            def pytest_addoption(parser):
+                parser.addoption("--xyz", action="store_true")
             """
-        def pytest_addoption(parser):
-            parser.addoption("--xyz", action="store_true")
-    """
         )
     )
     testdir.makefile(ext=".xml", junit="")  # Writes junit.xml
@@ -252,38 +343,38 @@ def test_fixture_dependency(testdir, monkeypatch):
     sub = testdir.mkdir("sub")
     sub.join("__init__.py").write("")
     sub.join("conftest.py").write(
-        dedent(
+        textwrap.dedent(
+            """\
+            import pytest
+
+            @pytest.fixture
+            def not_needed():
+                assert False, "Should not be called!"
+
+            @pytest.fixture
+            def foo():
+                assert False, "Should not be called!"
+
+            @pytest.fixture
+            def bar(foo):
+                return 'bar'
             """
-        import pytest
-
-        @pytest.fixture
-        def not_needed():
-            assert False, "Should not be called!"
-
-        @pytest.fixture
-        def foo():
-            assert False, "Should not be called!"
-
-        @pytest.fixture
-        def bar(foo):
-            return 'bar'
-    """
         )
     )
     subsub = sub.mkdir("subsub")
     subsub.join("__init__.py").write("")
     subsub.join("test_bar.py").write(
-        dedent(
+        textwrap.dedent(
+            """\
+            import pytest
+
+            @pytest.fixture
+            def bar():
+                return 'sub bar'
+
+            def test_event_fixture(bar):
+                assert bar == 'sub bar'
             """
-        import pytest
-
-        @pytest.fixture
-        def bar():
-            return 'sub bar'
-
-        def test_event_fixture(bar):
-            assert bar == 'sub bar'
-    """
         )
     )
     result = testdir.runpytest("sub")
@@ -293,11 +384,11 @@ def test_fixture_dependency(testdir, monkeypatch):
 def test_conftest_found_with_double_dash(testdir):
     sub = testdir.mkdir("sub")
     sub.join("conftest.py").write(
-        dedent(
+        textwrap.dedent(
+            """\
+            def pytest_addoption(parser):
+                parser.addoption("--hello-world", action="store_true")
             """
-        def pytest_addoption(parser):
-            parser.addoption("--hello-world", action="store_true")
-    """
         )
     )
     p = sub.join("test_hello.py")
@@ -311,7 +402,6 @@ def test_conftest_found_with_double_dash(testdir):
 
 
 class TestConftestVisibility(object):
-
     def _setup_tree(self, testdir):  # for issue616
         # example mostly taken from:
         # https://mail.python.org/pipermail/pytest-dev/2014-September/002617.html
@@ -319,56 +409,54 @@ class TestConftestVisibility(object):
         package = testdir.mkdir("package")
 
         package.join("conftest.py").write(
-            dedent(
+            textwrap.dedent(
                 """\
-            import pytest
-            @pytest.fixture
-            def fxtr():
-                return "from-package"
-        """
+                import pytest
+                @pytest.fixture
+                def fxtr():
+                    return "from-package"
+                """
             )
         )
         package.join("test_pkgroot.py").write(
-            dedent(
+            textwrap.dedent(
                 """\
-            def test_pkgroot(fxtr):
-                assert fxtr == "from-package"
-        """
+                def test_pkgroot(fxtr):
+                    assert fxtr == "from-package"
+                """
             )
         )
 
         swc = package.mkdir("swc")
         swc.join("__init__.py").ensure()
         swc.join("conftest.py").write(
-            dedent(
+            textwrap.dedent(
                 """\
-            import pytest
-            @pytest.fixture
-            def fxtr():
-                return "from-swc"
-        """
+                import pytest
+                @pytest.fixture
+                def fxtr():
+                    return "from-swc"
+                """
             )
         )
         swc.join("test_with_conftest.py").write(
-            dedent(
+            textwrap.dedent(
                 """\
-            def test_with_conftest(fxtr):
-                assert fxtr == "from-swc"
-
-        """
+                def test_with_conftest(fxtr):
+                    assert fxtr == "from-swc"
+                """
             )
         )
 
         snc = package.mkdir("snc")
         snc.join("__init__.py").ensure()
         snc.join("test_no_conftest.py").write(
-            dedent(
+            textwrap.dedent(
                 """\
-            def test_no_conftest(fxtr):
-                assert fxtr == "from-package"   # No local conftest.py, so should
-                                                # use value from parent dir's
-
-        """
+                def test_no_conftest(fxtr):
+                    assert fxtr == "from-package"   # No local conftest.py, so should
+                                                    # use value from parent dir's
+                """
             )
         )
         print("created directory structure:")
@@ -404,10 +492,10 @@ class TestConftestVisibility(object):
             ("snc", ".", 1),
         ],
     )
-    @pytest.mark.issue616
     def test_parsefactories_relative_node_ids(
         self, testdir, chdir, testarg, expect_ntests_passed
     ):
+        """#616"""
         dirs = self._setup_tree(testdir)
         print("pytest run in cwd: %s" % (dirs[chdir].relto(testdir.tmpdir)))
         print("pytestarg        : %s" % (testarg))
@@ -428,31 +516,31 @@ def test_search_conftest_up_to_inifile(testdir, confcutdir, passed, error):
     src = root.join("src").ensure(dir=1)
     src.join("pytest.ini").write("[pytest]")
     src.join("conftest.py").write(
-        _pytest._code.Source(
+        textwrap.dedent(
+            """\
+            import pytest
+            @pytest.fixture
+            def fix1(): pass
             """
-        import pytest
-        @pytest.fixture
-        def fix1(): pass
-    """
         )
     )
     src.join("test_foo.py").write(
-        _pytest._code.Source(
+        textwrap.dedent(
+            """\
+            def test_1(fix1):
+                pass
+            def test_2(out_of_reach):
+                pass
             """
-        def test_1(fix1):
-            pass
-        def test_2(out_of_reach):
-            pass
-    """
         )
     )
     root.join("conftest.py").write(
-        _pytest._code.Source(
+        textwrap.dedent(
+            """\
+            import pytest
+            @pytest.fixture
+            def out_of_reach(): pass
             """
-        import pytest
-        @pytest.fixture
-        def out_of_reach(): pass
-    """
         )
     )
 
@@ -470,19 +558,19 @@ def test_search_conftest_up_to_inifile(testdir, confcutdir, passed, error):
 
 def test_issue1073_conftest_special_objects(testdir):
     testdir.makeconftest(
-        """
+        """\
         class DontTouchMe(object):
             def __getattr__(self, x):
                 raise Exception('cant touch me')
 
         x = DontTouchMe()
-    """
+        """
     )
     testdir.makepyfile(
-        """
+        """\
         def test_some():
             pass
-    """
+        """
     )
     res = testdir.runpytest()
     assert res.ret == 0
@@ -490,15 +578,15 @@ def test_issue1073_conftest_special_objects(testdir):
 
 def test_conftest_exception_handling(testdir):
     testdir.makeconftest(
-        """
+        """\
         raise ValueError()
-    """
+        """
     )
     testdir.makepyfile(
-        """
+        """\
         def test_some():
             pass
-    """
+        """
     )
     res = testdir.runpytest()
     assert res.ret == 4
@@ -513,7 +601,7 @@ def test_hook_proxy(testdir):
         **{
             "root/demo-0/test_foo1.py": "def test1(): pass",
             "root/demo-a/test_foo2.py": "def test1(): pass",
-            "root/demo-a/conftest.py": """
+            "root/demo-a/conftest.py": """\
             def pytest_ignore_collect(path, config):
                 return True
             """,
@@ -531,11 +619,11 @@ def test_required_option_help(testdir):
     testdir.makeconftest("assert 0")
     x = testdir.mkdir("x")
     x.join("conftest.py").write(
-        _pytest._code.Source(
+        textwrap.dedent(
+            """\
+            def pytest_addoption(parser):
+                parser.addoption("--xyz", action="store_true", required=True)
             """
-        def pytest_addoption(parser):
-            parser.addoption("--xyz", action="store_true", required=True)
-    """
         )
     )
     result = testdir.runpytest("-h", x)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_doctest.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_doctest.py
index 7f3aff3b0e1..723f1fe9642 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_doctest.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_doctest.py
@@ -1,14 +1,22 @@
-# encoding: utf-8
-from __future__ import absolute_import, division, print_function
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import inspect
 import sys
-import _pytest._code
-from _pytest.compat import MODULE_NOT_FOUND_ERROR
-from _pytest.doctest import DoctestItem, DoctestModule, DoctestTextfile
+import textwrap
+
 import pytest
+from _pytest.compat import MODULE_NOT_FOUND_ERROR
+from _pytest.doctest import _is_mocked
+from _pytest.doctest import _patch_unwrap_mock_aware
+from _pytest.doctest import DoctestItem
+from _pytest.doctest import DoctestModule
+from _pytest.doctest import DoctestTextfile
 
 
 class TestDoctests(object):
-
     def test_collect_testtextfile(self, testdir):
         w = testdir.maketxtfile(whatever="")
         checkfile = testdir.maketxtfile(
@@ -183,6 +191,18 @@ class TestDoctests(object):
             ]
         )
 
+    def test_doctest_skip(self, testdir):
+        testdir.maketxtfile(
+            """
+            >>> 1
+            1
+            >>> import pytest
+            >>> pytest.skip("")
+        """
+        )
+        result = testdir.runpytest("--doctest-modules")
+        result.stdout.fnmatch_lines(["*1 skipped*"])
+
     def test_docstring_partial_context_around_error(self, testdir):
         """Test that we show some context before the actual line of a failing
         doctest.
@@ -259,16 +279,16 @@ class TestDoctests(object):
 
     def test_doctest_linedata_missing(self, testdir):
         testdir.tmpdir.join("hello.py").write(
-            _pytest._code.Source(
+            textwrap.dedent(
+                """\
+                class Fun(object):
+                    @property
+                    def test(self):
+                        '''
+                        >>> a = 1
+                        >>> 1/0
+                        '''
                 """
-            class Fun(object):
-                @property
-                def test(self):
-                    '''
-                    >>> a = 1
-                    >>> 1/0
-                    '''
-            """
             )
         )
         result = testdir.runpytest("--doctest-modules")
@@ -301,10 +321,10 @@ class TestDoctests(object):
 
     def test_doctest_unex_importerror_with_module(self, testdir):
         testdir.tmpdir.join("hello.py").write(
-            _pytest._code.Source(
+            textwrap.dedent(
+                """\
+                import asdalsdkjaslkdjasd
                 """
-            import asdalsdkjaslkdjasd
-        """
             )
         )
         testdir.maketxtfile(
@@ -340,27 +360,27 @@ class TestDoctests(object):
     def test_doctestmodule_external_and_issue116(self, testdir):
         p = testdir.mkpydir("hello")
         p.join("__init__.py").write(
-            _pytest._code.Source(
+            textwrap.dedent(
+                """\
+                def somefunc():
+                    '''
+                        >>> i = 0
+                        >>> i + 1
+                        2
+                    '''
                 """
-            def somefunc():
-                '''
-                    >>> i = 0
-                    >>> i + 1
-                    2
-                '''
-        """
             )
         )
         result = testdir.runpytest(p, "--doctest-modules")
         result.stdout.fnmatch_lines(
             [
-                "004 *>>> i = 0",
-                "005 *>>> i + 1",
+                "003 *>>> i = 0",
+                "004 *>>> i + 1",
                 "*Expected:",
                 "*    2",
                 "*Got:",
                 "*    1",
-                "*:5: DocTestFailure",
+                "*:4: DocTestFailure",
             ]
         )
 
@@ -564,7 +584,7 @@ class TestDoctests(object):
         """
         testdir.makepyfile(
             u'''
-            # encoding: utf-8
+            # -*- coding: utf-8 -*-
             def foo():
                 """
                 >>> name = 'с' # not letter 'c' but instead Cyrillic 's'.
@@ -641,7 +661,7 @@ class TestDoctests(object):
         """
         p = testdir.makepyfile(
             test_unicode_doctest_module="""
-            # -*- encoding: utf-8 -*-
+            # -*- coding: utf-8 -*-
             from __future__ import unicode_literals
 
             def fix_bad_unicode(text):
@@ -723,7 +743,6 @@ class TestDoctests(object):
 
 
 class TestLiterals(object):
-
     @pytest.mark.parametrize("config_mode", ["ini", "comment"])
     def test_allow_unicode(self, testdir, config_mode):
         """Test that doctests which output unicode work in all python versions
@@ -841,7 +860,6 @@ class TestDoctestSkips(object):
 
     @pytest.fixture(params=["text", "module"])
     def makedoctest(self, testdir, request):
-
         def makeit(doctest):
             mode = request.param
             if mode == "text":
@@ -953,7 +971,7 @@ class TestDoctestAutoUseFixtures(object):
         """
         )
         result = testdir.runpytest("--doctest-modules")
-        result.stdout.fnmatch_lines("*2 passed*")
+        result.stdout.fnmatch_lines(["*2 passed*"])
 
     @pytest.mark.parametrize("scope", SCOPES)
     @pytest.mark.parametrize("enable_doctest", [True, False])
@@ -1122,7 +1140,6 @@ class TestDoctestNamespaceFixture(object):
 
 
 class TestDoctestReportingOption(object):
-
     def _run_doctest_report(self, testdir, format):
         testdir.makepyfile(
             """
@@ -1204,3 +1221,44 @@ class TestDoctestReportingOption(object):
                 "*error: argument --doctest-report: invalid choice: 'obviously_invalid_format' (choose from*"
             ]
         )
+
+
+@pytest.mark.parametrize("mock_module", ["mock", "unittest.mock"])
+def test_doctest_mock_objects_dont_recurse_missbehaved(mock_module, testdir):
+    pytest.importorskip(mock_module)
+    testdir.makepyfile(
+        """
+        from {mock_module} import call
+        class Example(object):
+            '''
+            >>> 1 + 1
+            2
+            '''
+        """.format(
+            mock_module=mock_module
+        )
+    )
+    result = testdir.runpytest("--doctest-modules")
+    result.stdout.fnmatch_lines(["* 1 passed *"])
+
+
+class Broken:
+    def __getattr__(self, _):
+        raise KeyError("This should be an AttributeError")
+
+
+@pytest.mark.skipif(not hasattr(inspect, "unwrap"), reason="nothing to patch")
+@pytest.mark.parametrize(  # pragma: no branch (lambdas are not called)
+    "stop", [None, _is_mocked, lambda f: None, lambda f: False, lambda f: True]
+)
+def test_warning_on_unwrap_of_broken_object(stop):
+    bad_instance = Broken()
+    assert inspect.unwrap.__module__ == "inspect"
+    with _patch_unwrap_mock_aware():
+        assert inspect.unwrap.__module__ != "inspect"
+        with pytest.warns(
+            pytest.PytestWarning, match="^Got KeyError.* when unwrapping"
+        ):
+            with pytest.raises(KeyError):
+                inspect.unwrap(bad_instance, stop=stop)
+    assert inspect.unwrap.__module__ == "inspect"
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_entry_points.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_entry_points.py
index 8f734778faa..95ebc415b15 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_entry_points.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_entry_points.py
@@ -1,14 +1,12 @@
-from __future__ import absolute_import, division, print_function
-import pkg_resources
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
-import pytest
-
-
-@pytest.mark.parametrize("entrypoint", ["py.test", "pytest"])
-def test_entry_point_exist(entrypoint):
-    assert entrypoint in pkg_resources.get_entry_map("pytest")["console_scripts"]
+from _pytest.compat import importlib_metadata
 
 
 def test_pytest_entry_points_are_identical():
-    entryMap = pkg_resources.get_entry_map("pytest")["console_scripts"]
-    assert entryMap["pytest"].module_name == entryMap["py.test"].module_name
+    dist = importlib_metadata.distribution("pytest")
+    entry_map = {ep.name: ep for ep in dist.entry_points}
+    assert entry_map["pytest"].value == entry_map["py.test"].value
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_helpconfig.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_helpconfig.py
index b5424235b16..75888fe14cb 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_helpconfig.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_helpconfig.py
@@ -1,13 +1,19 @@
-from __future__ import absolute_import, division, print_function
-from _pytest.main import EXIT_NOTESTSCOLLECTED
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import pytest
+from _pytest.main import EXIT_NOTESTSCOLLECTED
 
 
 def test_version(testdir, pytestconfig):
     result = testdir.runpytest("--version")
     assert result.ret == 0
     # p = py.path.local(py.__file__).dirpath()
-    result.stderr.fnmatch_lines(["*pytest*%s*imported from*" % (pytest.__version__,)])
+    result.stderr.fnmatch_lines(
+        ["*pytest*{}*imported from*".format(pytest.__version__)]
+    )
     if pytestconfig.pluginmanager.list_plugin_distinfo():
         result.stderr.fnmatch_lines(["*setuptools registered plugins:", "*at*"])
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_junitxml.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_junitxml.py
index d0be5f26759..ba529cf331d 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_junitxml.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_junitxml.py
@@ -1,11 +1,19 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-from xml.dom import minidom
-import py
-import sys
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import os
-from _pytest.junitxml import LogXML
+import platform
+import sys
+from datetime import datetime
+from xml.dom import minidom
+
+import py
+
 import pytest
+from _pytest.junitxml import LogXML
+from _pytest.reports import BaseReport
 
 
 def runandparse(testdir, *args):
@@ -29,7 +37,6 @@ def assert_attr(node, **kwargs):
 
 
 class DomNode(object):
-
     def __init__(self, dom):
         self.__node = dom
 
@@ -42,6 +49,16 @@ class DomNode(object):
     def _by_tag(self, tag):
         return self.__node.getElementsByTagName(tag)
 
+    @property
+    def children(self):
+        return [type(self)(x) for x in self.__node.childNodes]
+
+    @property
+    def get_unique_child(self):
+        children = self.children
+        assert len(children) == 1
+        return children[0]
+
     def find_nth_by_tag(self, tag, n):
         items = self._by_tag(tag)
         try:
@@ -76,12 +93,11 @@ class DomNode(object):
         return self.__node.tagName
 
     @property
-    def next_siebling(self):
+    def next_sibling(self):
         return type(self)(self.__node.nextSibling)
 
 
 class TestPython(object):
-
     def test_summing_simple(self, testdir):
         testdir.makepyfile(
             """
@@ -103,7 +119,7 @@ class TestPython(object):
         result, dom = runandparse(testdir)
         assert result.ret
         node = dom.find_first_by_tag("testsuite")
-        node.assert_attr(name="pytest", errors=0, failures=1, skips=2, tests=5)
+        node.assert_attr(name="pytest", errors=0, failures=1, skipped=2, tests=5)
 
     def test_summing_simple_with_errors(self, testdir):
         testdir.makepyfile(
@@ -129,7 +145,31 @@ class TestPython(object):
         result, dom = runandparse(testdir)
         assert result.ret
         node = dom.find_first_by_tag("testsuite")
-        node.assert_attr(name="pytest", errors=1, failures=2, skips=1, tests=5)
+        node.assert_attr(name="pytest", errors=1, failures=2, skipped=1, tests=5)
+
+    def test_hostname_in_xml(self, testdir):
+        testdir.makepyfile(
+            """
+            def test_pass():
+                pass
+        """
+        )
+        result, dom = runandparse(testdir)
+        node = dom.find_first_by_tag("testsuite")
+        node.assert_attr(hostname=platform.node())
+
+    def test_timestamp_in_xml(self, testdir):
+        testdir.makepyfile(
+            """
+            def test_pass():
+                pass
+        """
+        )
+        start_time = datetime.now()
+        result, dom = runandparse(testdir)
+        node = dom.find_first_by_tag("testsuite")
+        timestamp = datetime.strptime(node["timestamp"], "%Y-%m-%dT%H:%M:%S.%f")
+        assert start_time <= timestamp < datetime.now()
 
     def test_timing_function(self, testdir):
         testdir.makepyfile(
@@ -149,6 +189,37 @@ class TestPython(object):
         val = tnode["time"]
         assert round(float(val), 2) >= 0.03
 
+    @pytest.mark.parametrize("duration_report", ["call", "total"])
+    def test_junit_duration_report(self, testdir, monkeypatch, duration_report):
+
+        # mock LogXML.node_reporter so it always sets a known duration to each test report object
+        original_node_reporter = LogXML.node_reporter
+
+        def node_reporter_wrapper(s, report):
+            report.duration = 1.0
+            reporter = original_node_reporter(s, report)
+            return reporter
+
+        monkeypatch.setattr(LogXML, "node_reporter", node_reporter_wrapper)
+
+        testdir.makepyfile(
+            """
+            def test_foo():
+                pass
+        """
+        )
+        result, dom = runandparse(
+            testdir, "-o", "junit_duration_report={}".format(duration_report)
+        )
+        node = dom.find_first_by_tag("testsuite")
+        tnode = node.find_first_by_tag("testcase")
+        val = float(tnode["time"])
+        if duration_report == "total":
+            assert val == 3.0
+        else:
+            assert duration_report == "call"
+            assert val == 1.0
+
     def test_setup_error(self, testdir):
         testdir.makepyfile(
             """
@@ -166,12 +237,7 @@ class TestPython(object):
         node = dom.find_first_by_tag("testsuite")
         node.assert_attr(errors=1, tests=1)
         tnode = node.find_first_by_tag("testcase")
-        tnode.assert_attr(
-            file="test_setup_error.py",
-            line="5",
-            classname="test_setup_error",
-            name="test_function",
-        )
+        tnode.assert_attr(classname="test_setup_error", name="test_function")
         fnode = tnode.find_first_by_tag("error")
         fnode.assert_attr(message="test setup failure")
         assert "ValueError" in fnode.toxml()
@@ -193,12 +259,7 @@ class TestPython(object):
         assert result.ret
         node = dom.find_first_by_tag("testsuite")
         tnode = node.find_first_by_tag("testcase")
-        tnode.assert_attr(
-            file="test_teardown_error.py",
-            line="6",
-            classname="test_teardown_error",
-            name="test_function",
-        )
+        tnode.assert_attr(classname="test_teardown_error", name="test_function")
         fnode = tnode.find_first_by_tag("error")
         fnode.assert_attr(message="test teardown failure")
         assert "ValueError" in fnode.toxml()
@@ -239,14 +300,9 @@ class TestPython(object):
         result, dom = runandparse(testdir)
         assert result.ret == 0
         node = dom.find_first_by_tag("testsuite")
-        node.assert_attr(skips=1)
+        node.assert_attr(skipped=1)
         tnode = node.find_first_by_tag("testcase")
-        tnode.assert_attr(
-            file="test_skip_contains_name_reason.py",
-            line="1",
-            classname="test_skip_contains_name_reason",
-            name="test_skip",
-        )
+        tnode.assert_attr(classname="test_skip_contains_name_reason", name="test_skip")
         snode = tnode.find_first_by_tag("skipped")
         snode.assert_attr(type="pytest.skip", message="hello23")
 
@@ -262,13 +318,10 @@ class TestPython(object):
         result, dom = runandparse(testdir)
         assert result.ret == 0
         node = dom.find_first_by_tag("testsuite")
-        node.assert_attr(skips=1)
+        node.assert_attr(skipped=1)
         tnode = node.find_first_by_tag("testcase")
         tnode.assert_attr(
-            file="test_mark_skip_contains_name_reason.py",
-            line="1",
-            classname="test_mark_skip_contains_name_reason",
-            name="test_skip",
+            classname="test_mark_skip_contains_name_reason", name="test_skip"
         )
         snode = tnode.find_first_by_tag("skipped")
         snode.assert_attr(type="pytest.skip", message="hello24")
@@ -286,13 +339,10 @@ class TestPython(object):
         result, dom = runandparse(testdir)
         assert result.ret == 0
         node = dom.find_first_by_tag("testsuite")
-        node.assert_attr(skips=1)
+        node.assert_attr(skipped=1)
         tnode = node.find_first_by_tag("testcase")
         tnode.assert_attr(
-            file="test_mark_skipif_contains_name_reason.py",
-            line="2",
-            classname="test_mark_skipif_contains_name_reason",
-            name="test_skip",
+            classname="test_mark_skipif_contains_name_reason", name="test_skip"
         )
         snode = tnode.find_first_by_tag("skipped")
         snode.assert_attr(type="pytest.skip", message="hello25")
@@ -325,10 +375,7 @@ class TestPython(object):
         node.assert_attr(failures=1)
         tnode = node.find_first_by_tag("testcase")
         tnode.assert_attr(
-            file="test_classname_instance.py",
-            line="1",
-            classname="test_classname_instance.TestClass",
-            name="test_method",
+            classname="test_classname_instance.TestClass", name="test_method"
         )
 
     def test_classname_nested_dir(self, testdir):
@@ -339,12 +386,7 @@ class TestPython(object):
         node = dom.find_first_by_tag("testsuite")
         node.assert_attr(failures=1)
         tnode = node.find_first_by_tag("testcase")
-        tnode.assert_attr(
-            file=os.path.join("sub", "test_hello.py"),
-            line="0",
-            classname="sub.test_hello",
-            name="test_func",
-        )
+        tnode.assert_attr(classname="sub.test_hello", name="test_func")
 
     def test_internal_error(self, testdir):
         testdir.makeconftest("def pytest_runtest_protocol(): 0 / 0")
@@ -367,7 +409,7 @@ class TestPython(object):
             import sys
 
             def test_fail():
-                print ("hello-stdout")
+                print("hello-stdout")
                 sys.stderr.write("hello-stderr\\n")
                 logging.info('info msg')
                 logging.warning('warning msg')
@@ -380,20 +422,15 @@ class TestPython(object):
         node = dom.find_first_by_tag("testsuite")
         node.assert_attr(failures=1, tests=1)
         tnode = node.find_first_by_tag("testcase")
-        tnode.assert_attr(
-            file="test_failure_function.py",
-            line="3",
-            classname="test_failure_function",
-            name="test_fail",
-        )
+        tnode.assert_attr(classname="test_failure_function", name="test_fail")
         fnode = tnode.find_first_by_tag("failure")
         fnode.assert_attr(message="ValueError: 42")
         assert "ValueError" in fnode.toxml()
-        systemout = fnode.next_siebling
+        systemout = fnode.next_sibling
         assert systemout.tag == "system-out"
         assert "hello-stdout" in systemout.toxml()
         assert "info msg" not in systemout.toxml()
-        systemerr = systemout.next_siebling
+        systemerr = systemout.next_sibling
         assert systemerr.tag == "system-err"
         assert "hello-stderr" in systemerr.toxml()
         assert "info msg" not in systemerr.toxml()
@@ -442,10 +479,7 @@ class TestPython(object):
 
             tnode = node.find_nth_by_tag("testcase", index)
             tnode.assert_attr(
-                file="test_failure_escape.py",
-                line="1",
-                classname="test_failure_escape",
-                name="test_func[%s]" % char,
+                classname="test_failure_escape", name="test_func[%s]" % char
             )
             sysout = tnode.find_first_by_tag("system-out")
             text = sysout.text
@@ -466,18 +500,10 @@ class TestPython(object):
         node = dom.find_first_by_tag("testsuite")
         node.assert_attr(failures=1, tests=2)
         tnode = node.find_first_by_tag("testcase")
-        tnode.assert_attr(
-            file="test_junit_prefixing.py",
-            line="0",
-            classname="xyz.test_junit_prefixing",
-            name="test_func",
-        )
+        tnode.assert_attr(classname="xyz.test_junit_prefixing", name="test_func")
         tnode = node.find_nth_by_tag("testcase", 1)
         tnode.assert_attr(
-            file="test_junit_prefixing.py",
-            line="3",
-            classname="xyz.test_junit_prefixing." "TestHello",
-            name="test_hello",
+            classname="xyz.test_junit_prefixing.TestHello", name="test_hello"
         )
 
     def test_xfailure_function(self, testdir):
@@ -491,18 +517,31 @@ class TestPython(object):
         result, dom = runandparse(testdir)
         assert not result.ret
         node = dom.find_first_by_tag("testsuite")
-        node.assert_attr(skips=1, tests=1)
+        node.assert_attr(skipped=1, tests=1)
         tnode = node.find_first_by_tag("testcase")
-        tnode.assert_attr(
-            file="test_xfailure_function.py",
-            line="1",
-            classname="test_xfailure_function",
-            name="test_xfail",
-        )
+        tnode.assert_attr(classname="test_xfailure_function", name="test_xfail")
         fnode = tnode.find_first_by_tag("skipped")
-        fnode.assert_attr(message="expected test failure")
+        fnode.assert_attr(type="pytest.xfail", message="42")
         # assert "ValueError" in fnode.toxml()
 
+    def test_xfailure_marker(self, testdir):
+        testdir.makepyfile(
+            """
+            import pytest
+            @pytest.mark.xfail(reason="42")
+            def test_xfail():
+                assert False
+        """
+        )
+        result, dom = runandparse(testdir)
+        assert not result.ret
+        node = dom.find_first_by_tag("testsuite")
+        node.assert_attr(skipped=1, tests=1)
+        tnode = node.find_first_by_tag("testcase")
+        tnode.assert_attr(classname="test_xfailure_marker", name="test_xfail")
+        fnode = tnode.find_first_by_tag("skipped")
+        fnode.assert_attr(type="pytest.xfail", message="42")
+
     def test_xfail_captures_output_once(self, testdir):
         testdir.makepyfile(
             """
@@ -534,14 +573,9 @@ class TestPython(object):
         result, dom = runandparse(testdir)
         # assert result.ret
         node = dom.find_first_by_tag("testsuite")
-        node.assert_attr(skips=0, tests=1)
+        node.assert_attr(skipped=0, tests=1)
         tnode = node.find_first_by_tag("testcase")
-        tnode.assert_attr(
-            file="test_xfailure_xpass.py",
-            line="1",
-            classname="test_xfailure_xpass",
-            name="test_xpass",
-        )
+        tnode.assert_attr(classname="test_xfailure_xpass", name="test_xpass")
 
     def test_xfailure_xpass_strict(self, testdir):
         testdir.makepyfile(
@@ -555,14 +589,9 @@ class TestPython(object):
         result, dom = runandparse(testdir)
         # assert result.ret
         node = dom.find_first_by_tag("testsuite")
-        node.assert_attr(skips=0, tests=1)
+        node.assert_attr(skipped=0, tests=1)
         tnode = node.find_first_by_tag("testcase")
-        tnode.assert_attr(
-            file="test_xfailure_xpass_strict.py",
-            line="1",
-            classname="test_xfailure_xpass_strict",
-            name="test_xpass",
-        )
+        tnode.assert_attr(classname="test_xfailure_xpass_strict", name="test_xpass")
         fnode = tnode.find_first_by_tag("failure")
         fnode.assert_attr(message="[XPASS(strict)] This needs to fail!")
 
@@ -573,8 +602,6 @@ class TestPython(object):
         node = dom.find_first_by_tag("testsuite")
         node.assert_attr(errors=1, tests=1)
         tnode = node.find_first_by_tag("testcase")
-        tnode.assert_attr(file="test_collect_error.py", name="test_collect_error")
-        assert tnode["line"] is None
         fnode = tnode.find_first_by_tag("error")
         fnode.assert_attr(message="collection failure")
         assert "SyntaxError" in fnode.toxml()
@@ -585,7 +612,7 @@ class TestPython(object):
             """
             # coding: latin1
             def test_hello():
-                print (%r)
+                print(%r)
                 assert 0
         """
             % value
@@ -713,7 +740,6 @@ def test_dont_configure_on_slaves(tmpdir):
     gotten = []
 
     class FakeConfig(object):
-
         def __init__(self):
             self.pluginmanager = self
             self.option = self
@@ -737,7 +763,6 @@ def test_dont_configure_on_slaves(tmpdir):
 
 
 class TestNonPython(object):
-
     def test_summing_simple(self, testdir):
         testdir.makeconftest(
             """
@@ -759,7 +784,7 @@ class TestNonPython(object):
         result, dom = runandparse(testdir)
         assert result.ret
         node = dom.find_first_by_tag("testsuite")
-        node.assert_attr(errors=0, failures=1, skips=0, tests=1)
+        node.assert_attr(errors=0, failures=1, skipped=0, tests=1)
         tnode = node.find_first_by_tag("testcase")
         tnode.assert_attr(name="myfile.xyz")
         fnode = tnode.find_first_by_tag("failure")
@@ -847,14 +872,11 @@ def test_invalid_xml_escape():
 
 def test_logxml_path_expansion(tmpdir, monkeypatch):
     home_tilde = py.path.local(os.path.expanduser("~")).join("test.xml")
-
     xml_tilde = LogXML("~%stest.xml" % tmpdir.sep, None)
     assert xml_tilde.logfile == home_tilde
 
-    # this is here for when $HOME is not set correct
-    monkeypatch.setenv("HOME", tmpdir)
+    monkeypatch.setenv("HOME", str(tmpdir))
     home_var = os.path.normpath(os.path.expandvars("$HOME/test.xml"))
-
     xml_var = LogXML("$HOME%stest.xml" % tmpdir.sep, None)
     assert xml_var.logfile == home_var
 
@@ -943,8 +965,7 @@ def test_double_colon_split_method_issue469(testdir):
 def test_unicode_issue368(testdir):
     path = testdir.tmpdir.join("test.xml")
     log = LogXML(str(path), None)
-    ustr = py.builtin._totext("ВНИ!", "utf-8")
-    from _pytest.runner import BaseReport
+    ustr = u"ВНИ!"
 
     class Report(BaseReport):
         longrepr = ustr
@@ -1008,7 +1029,28 @@ def test_record_property_same_name(testdir):
     pnodes[1].assert_attr(name="foo", value="baz")
 
 
+@pytest.mark.parametrize("fixture_name", ["record_property", "record_xml_attribute"])
+def test_record_fixtures_without_junitxml(testdir, fixture_name):
+    testdir.makepyfile(
+        """
+        def test_record({fixture_name}):
+            {fixture_name}("foo", "bar")
+    """.format(
+            fixture_name=fixture_name
+        )
+    )
+    result = testdir.runpytest()
+    assert result.ret == 0
+
+
+@pytest.mark.filterwarnings("default")
 def test_record_attribute(testdir):
+    testdir.makeini(
+        """
+        [pytest]
+        junit_family = xunit1
+    """
+    )
     testdir.makepyfile(
         """
         import pytest
@@ -1026,16 +1068,57 @@ def test_record_attribute(testdir):
     tnode.assert_attr(bar="1")
     tnode.assert_attr(foo="<1")
     result.stdout.fnmatch_lines(
-        ["test_record_attribute.py::test_record", "*record_xml_attribute*experimental*"]
+        ["*test_record_attribute.py:6:*record_xml_attribute is an experimental feature"]
     )
 
 
-def test_random_report_log_xdist(testdir):
+@pytest.mark.filterwarnings("default")
+@pytest.mark.parametrize("fixture_name", ["record_xml_attribute", "record_property"])
+def test_record_fixtures_xunit2(testdir, fixture_name):
+    """Ensure record_xml_attribute and record_property drop values when outside of legacy family
+    """
+    testdir.makeini(
+        """
+        [pytest]
+        junit_family = xunit2
+    """
+    )
+    testdir.makepyfile(
+        """
+        import pytest
+
+        @pytest.fixture
+        def other({fixture_name}):
+            {fixture_name}("bar", 1)
+        def test_record({fixture_name}, other):
+            {fixture_name}("foo", "<1");
+    """.format(
+            fixture_name=fixture_name
+        )
+    )
+
+    result, dom = runandparse(testdir, "-rw")
+    expected_lines = []
+    if fixture_name == "record_xml_attribute":
+        expected_lines.append(
+            "*test_record_fixtures_xunit2.py:6:*record_xml_attribute is an experimental feature"
+        )
+    expected_lines = [
+        "*test_record_fixtures_xunit2.py:6:*{fixture_name} is incompatible "
+        "with junit_family 'xunit2' (use 'legacy' or 'xunit1')".format(
+            fixture_name=fixture_name
+        )
+    ]
+    result.stdout.fnmatch_lines(expected_lines)
+
+
+def test_random_report_log_xdist(testdir, monkeypatch):
     """xdist calls pytest_runtest_logreport as they are executed by the slaves,
     with nodes from several nodes overlapping, so junitxml must cope with that
     to produce correct reports. #1064
     """
     pytest.importorskip("xdist")
+    monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", raising=False)
     testdir.makepyfile(
         """
         import pytest, time
@@ -1054,6 +1137,20 @@ def test_random_report_log_xdist(testdir):
     assert failed == ["test_x[22]"]
 
 
+def test_root_testsuites_tag(testdir):
+    testdir.makepyfile(
+        """
+        def test_x():
+            pass
+    """
+    )
+    _, dom = runandparse(testdir)
+    root = dom.get_unique_child
+    assert root.tag == "testsuites"
+    suite_node = root.get_unique_child
+    assert suite_node.tag == "testsuite"
+
+
 def test_runs_twice(testdir):
     f = testdir.makepyfile(
         """
@@ -1121,30 +1218,24 @@ def test_fancy_items_regression(testdir):
 
     assert "INTERNALERROR" not in result.stdout.str()
 
-    items = sorted(
-        "%(classname)s %(name)s %(file)s" % x for x in dom.find_by_tag("testcase")
-    )
+    items = sorted("%(classname)s %(name)s" % x for x in dom.find_by_tag("testcase"))
     import pprint
 
     pprint.pprint(items)
-    assert (
-        items
-        == [
-            u"conftest a conftest.py",
-            u"conftest a conftest.py",
-            u"conftest b conftest.py",
-            u"test_fancy_items_regression a test_fancy_items_regression.py",
-            u"test_fancy_items_regression a test_fancy_items_regression.py",
-            u"test_fancy_items_regression b test_fancy_items_regression.py",
-            u"test_fancy_items_regression test_pass" u" test_fancy_items_regression.py",
-        ]
-    )
+    assert items == [
+        u"conftest a",
+        u"conftest a",
+        u"conftest b",
+        u"test_fancy_items_regression a",
+        u"test_fancy_items_regression a",
+        u"test_fancy_items_regression b",
+        u"test_fancy_items_regression test_pass",
+    ]
 
 
 def test_global_properties(testdir):
     path = testdir.tmpdir.join("test_global_properties.xml")
     log = LogXML(str(path), None)
-    from _pytest.runner import BaseReport
 
     class Report(BaseReport):
         sections = []
@@ -1180,7 +1271,6 @@ def test_url_property(testdir):
     test_url = "http://www.github.com/pytest-dev"
     path = testdir.tmpdir.join("test_url_property.xml")
     log = LogXML(str(path), None)
-    from _pytest.runner import BaseReport
 
     class Report(BaseReport):
         longrepr = "FooBarBaz"
@@ -1203,6 +1293,53 @@ def test_url_property(testdir):
     ), "The URL did not get written to the xml"
 
 
+def test_record_testsuite_property(testdir):
+    testdir.makepyfile(
+        """
+        def test_func1(record_testsuite_property):
+            record_testsuite_property("stats", "all good")
+
+        def test_func2(record_testsuite_property):
+            record_testsuite_property("stats", 10)
+    """
+    )
+    result, dom = runandparse(testdir)
+    assert result.ret == 0
+    node = dom.find_first_by_tag("testsuite")
+    properties_node = node.find_first_by_tag("properties")
+    p1_node = properties_node.find_nth_by_tag("property", 0)
+    p2_node = properties_node.find_nth_by_tag("property", 1)
+    p1_node.assert_attr(name="stats", value="all good")
+    p2_node.assert_attr(name="stats", value="10")
+
+
+def test_record_testsuite_property_junit_disabled(testdir):
+    testdir.makepyfile(
+        """
+        def test_func1(record_testsuite_property):
+            record_testsuite_property("stats", "all good")
+    """
+    )
+    result = testdir.runpytest()
+    assert result.ret == 0
+
+
+@pytest.mark.parametrize("junit", [True, False])
+def test_record_testsuite_property_type_checking(testdir, junit):
+    testdir.makepyfile(
+        """
+        def test_func1(record_testsuite_property):
+            record_testsuite_property(1, 2)
+    """
+    )
+    args = ("--junitxml=tests.xml",) if junit else ()
+    result = testdir.runpytest(*args)
+    assert result.ret == 1
+    result.stdout.fnmatch_lines(
+        ["*TypeError: name parameter needs to be a string, but int given"]
+    )
+
+
 @pytest.mark.parametrize("suite_name", ["my_suite", ""])
 def test_set_suite_name(testdir, suite_name):
     if suite_name:
@@ -1229,3 +1366,82 @@ def test_set_suite_name(testdir, suite_name):
     assert result.ret == 0
     node = dom.find_first_by_tag("testsuite")
     node.assert_attr(name=expected)
+
+
+def test_escaped_skipreason_issue3533(testdir):
+    testdir.makepyfile(
+        """
+        import pytest
+        @pytest.mark.skip(reason='1 <> 2')
+        def test_skip():
+            pass
+    """
+    )
+    _, dom = runandparse(testdir)
+    node = dom.find_first_by_tag("testcase")
+    snode = node.find_first_by_tag("skipped")
+    assert "1 <> 2" in snode.text
+    snode.assert_attr(message="1 <> 2")
+
+
+def test_logging_passing_tests_disabled_does_not_log_test_output(testdir):
+    testdir.makeini(
+        """
+        [pytest]
+        junit_log_passing_tests=False
+        junit_logging=system-out
+    """
+    )
+    testdir.makepyfile(
+        """
+        import pytest
+        import logging
+        import sys
+
+        def test_func():
+            sys.stdout.write('This is stdout')
+            sys.stderr.write('This is stderr')
+            logging.warning('hello')
+    """
+    )
+    result, dom = runandparse(testdir)
+    assert result.ret == 0
+    node = dom.find_first_by_tag("testcase")
+    assert len(node.find_by_tag("system-err")) == 0
+    assert len(node.find_by_tag("system-out")) == 0
+
+
+@pytest.mark.parametrize("junit_logging", ["no", "system-out", "system-err"])
+def test_logging_passing_tests_disabled_logs_output_for_failing_test_issue5430(
+    testdir, junit_logging
+):
+    testdir.makeini(
+        """
+        [pytest]
+        junit_log_passing_tests=False
+    """
+    )
+    testdir.makepyfile(
+        """
+        import pytest
+        import logging
+        import sys
+
+        def test_func():
+            logging.warning('hello')
+            assert 0
+    """
+    )
+    result, dom = runandparse(testdir, "-o", "junit_logging=%s" % junit_logging)
+    assert result.ret == 1
+    node = dom.find_first_by_tag("testcase")
+    if junit_logging == "system-out":
+        assert len(node.find_by_tag("system-err")) == 0
+        assert len(node.find_by_tag("system-out")) == 1
+    elif junit_logging == "system-err":
+        assert len(node.find_by_tag("system-err")) == 1
+        assert len(node.find_by_tag("system-out")) == 0
+    else:
+        assert junit_logging == "no"
+        assert len(node.find_by_tag("system-err")) == 0
+        assert len(node.find_by_tag("system-out")) == 0
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_mark.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_mark.py
index e2e7369dc79..727bd9420c2 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_mark.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_mark.py
@@ -1,29 +1,33 @@
-from __future__ import absolute_import, division, print_function
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import os
 import sys
-import mock
+
+import six
+
 import pytest
-from _pytest.mark import (
-    MarkGenerator as Mark,
-    ParameterSet,
-    transfer_markers,
-    EMPTY_PARAMETERSET_OPTION,
-)
+from _pytest.main import EXIT_INTERRUPTED
+from _pytest.mark import EMPTY_PARAMETERSET_OPTION
+from _pytest.mark import MarkGenerator as Mark
+from _pytest.nodes import Collector
 from _pytest.nodes import Node
+from _pytest.warning_types import PytestDeprecationWarning
+from _pytest.warnings import SHOW_PYTEST_WARNINGS_ARG
+
+try:
+    import mock
+except ImportError:
+    import unittest.mock as mock
 
 ignore_markinfo = pytest.mark.filterwarnings(
-    "ignore:MarkInfo objects:_pytest.deprecated.RemovedInPytest4Warning"
+    "ignore:MarkInfo objects:pytest.RemovedInPytest4Warning"
 )
 
 
 class TestMark(object):
-
-    def test_markinfo_repr(self):
-        from _pytest.mark import MarkInfo, Mark
-
-        m = MarkInfo.for_mark(Mark("hello", (1, 2), {}))
-        repr(m)
-
     @pytest.mark.parametrize("attr", ["mark", "param"])
     @pytest.mark.parametrize("modulename", ["py.test", "pytest"])
     def test_pytest_exists_in_namespace_all(self, attr, modulename):
@@ -35,107 +39,22 @@ class TestMark(object):
         pytest.raises((AttributeError, TypeError), mark)
 
     def test_mark_with_param(self):
-
         def some_function(abc):
             pass
 
         class SomeClass(object):
             pass
 
-        assert pytest.mark.fun(some_function) is some_function
-        assert pytest.mark.fun.with_args(some_function) is not some_function
+        assert pytest.mark.foo(some_function) is some_function
+        assert pytest.mark.foo.with_args(some_function) is not some_function
 
-        assert pytest.mark.fun(SomeClass) is SomeClass
-        assert pytest.mark.fun.with_args(SomeClass) is not SomeClass
+        assert pytest.mark.foo(SomeClass) is SomeClass
+        assert pytest.mark.foo.with_args(SomeClass) is not SomeClass
 
     def test_pytest_mark_name_starts_with_underscore(self):
         mark = Mark()
-        pytest.raises(AttributeError, getattr, mark, "_some_name")
-
-    def test_pytest_mark_bare(self):
-        mark = Mark()
-
-        def f():
-            pass
-
-        mark.hello(f)
-        assert f.hello
-
-    @ignore_markinfo
-    def test_pytest_mark_keywords(self):
-        mark = Mark()
-
-        def f():
-            pass
-
-        mark.world(x=3, y=4)(f)
-        assert f.world
-        assert f.world.kwargs["x"] == 3
-        assert f.world.kwargs["y"] == 4
-
-    @ignore_markinfo
-    def test_apply_multiple_and_merge(self):
-        mark = Mark()
-
-        def f():
-            pass
-
-        mark.world
-        mark.world(x=3)(f)
-        assert f.world.kwargs["x"] == 3
-        mark.world(y=4)(f)
-        assert f.world.kwargs["x"] == 3
-        assert f.world.kwargs["y"] == 4
-        mark.world(y=1)(f)
-        assert f.world.kwargs["y"] == 1
-        assert len(f.world.args) == 0
-
-    @ignore_markinfo
-    def test_pytest_mark_positional(self):
-        mark = Mark()
-
-        def f():
-            pass
-
-        mark.world("hello")(f)
-        assert f.world.args[0] == "hello"
-        mark.world("world")(f)
-
-    @ignore_markinfo
-    def test_pytest_mark_positional_func_and_keyword(self):
-        mark = Mark()
-
-        def f():
-            raise Exception
-
-        m = mark.world(f, omega="hello")
-
-        def g():
-            pass
-
-        assert m(g) == g
-        assert g.world.args[0] is f
-        assert g.world.kwargs["omega"] == "hello"
-
-    @ignore_markinfo
-    def test_pytest_mark_reuse(self):
-        mark = Mark()
-
-        def f():
-            pass
-
-        w = mark.some
-        w("hello", reason="123")(f)
-        assert f.some.args[0] == "hello"
-        assert f.some.kwargs["reason"] == "123"
-
-        def g():
-            pass
-
-        w("world", reason2="456")(g)
-        assert g.some.args[0] == "world"
-        assert "reason" not in g.some.kwargs
-        assert g.some.kwargs["reason2"] == "456"
+        with pytest.raises(AttributeError):
+            mark._some_name
 
 
 def test_marked_class_run_twice(testdir, request):
@@ -169,7 +88,7 @@ def test_ini_markers(testdir):
         """
         def test_markers(pytestconfig):
             markers = pytestconfig.getini("markers")
-            print (markers)
+            print(markers)
             assert len(markers) >= 2
             assert markers[0].startswith("a1:")
             assert markers[1].startswith("a2:")
@@ -212,7 +131,7 @@ def test_ini_markers_whitespace(testdir):
             assert True
     """
     )
-    rec = testdir.inline_run("--strict", "-m", "a1")
+    rec = testdir.inline_run("--strict-markers", "-m", "a1")
     rec.assertoutcome(passed=1)
 
 
@@ -232,7 +151,7 @@ def test_marker_without_description(testdir):
     )
     ftdir = testdir.mkdir("ft1_dummy")
     testdir.tmpdir.join("conftest.py").move(ftdir.join("conftest.py"))
-    rec = testdir.runpytest_subprocess("--strict")
+    rec = testdir.runpytest("--strict-markers")
     rec.assert_outcomes()
 
 
@@ -276,7 +195,8 @@ def test_mark_on_pseudo_function(testdir):
     reprec.assertoutcome(passed=1)
 
 
-def test_strict_prohibits_unregistered_markers(testdir):
+@pytest.mark.parametrize("option_name", ["--strict-markers", "--strict"])
+def test_strict_prohibits_unregistered_markers(testdir, option_name):
     testdir.makepyfile(
         """
         import pytest
@@ -285,9 +205,11 @@ def test_strict_prohibits_unregistered_markers(testdir):
             pass
     """
     )
-    result = testdir.runpytest("--strict")
+    result = testdir.runpytest(option_name)
     assert result.ret != 0
-    result.stdout.fnmatch_lines(["*unregisteredmark*not*registered*"])
+    result.stdout.fnmatch_lines(
+        ["'unregisteredmark' not found in `markers` configuration option"]
+    )
 
 
 @pytest.mark.parametrize(
@@ -376,6 +298,13 @@ def test_keyword_option_custom(spec, testdir):
     assert list(passed) == list(passed_result)
 
 
+def test_keyword_option_considers_mark(testdir):
+    testdir.copy_example("marks/marks_considered_keywords")
+    rec = testdir.inline_run("-k", "foo")
+    passed = rec.listoutcomes()[0]
+    assert len(passed) == 1
+
+
 @pytest.mark.parametrize(
     "spec",
     [
@@ -456,8 +385,10 @@ def test_parametrized_collect_with_wrong_args(testdir):
     result = testdir.runpytest(py_file)
     result.stdout.fnmatch_lines(
         [
-            'E   ValueError: In "parametrize" the number of values ((1, 2, 3)) '
-            "must be equal to the number of names (['foo', 'bar'])"
+            'test_parametrized_collect_with_wrong_args.py::test_func: in "parametrize" the number of names (2):',
+            "  ['foo', 'bar']",
+            "must be equal to the number of values (3):",
+            "  (1, 2, 3)",
         ]
     )
 
@@ -482,118 +413,29 @@ def test_parametrized_with_kwargs(testdir):
     assert result.ret == 0
 
 
+def test_parametrize_iterator(testdir):
+    """parametrize should work with generators (#5354)."""
+    py_file = testdir.makepyfile(
+        """\
+        import pytest
+
+        def gen():
+            yield 1
+            yield 2
+            yield 3
+
+        @pytest.mark.parametrize('a', gen())
+        def test(a):
+            assert a >= 1
+        """
+    )
+    result = testdir.runpytest(py_file)
+    assert result.ret == 0
+    # should not skip any tests
+    result.stdout.fnmatch_lines(["*3 passed*"])
+
+
 class TestFunctional(object):
-
-    def test_mark_per_function(self, testdir):
-        p = testdir.makepyfile(
-            """
-            import pytest
-            @pytest.mark.hello
-            def test_hello():
-                assert hasattr(test_hello, 'hello')
-        """
-        )
-        result = testdir.runpytest(p)
-        result.stdout.fnmatch_lines(["*1 passed*"])
-
-    def test_mark_per_module(self, testdir):
-        item = testdir.getitem(
-            """
-            import pytest
-            pytestmark = pytest.mark.hello
-            def test_func():
-                pass
-        """
-        )
-        keywords = item.keywords
-        assert "hello" in keywords
-
-    def test_marklist_per_class(self, testdir):
-        item = testdir.getitem(
-            """
-            import pytest
-            class TestClass(object):
-                pytestmark = [pytest.mark.hello, pytest.mark.world]
-                def test_func(self):
-                    assert TestClass.test_func.hello
-                    assert TestClass.test_func.world
-        """
-        )
-        keywords = item.keywords
-        assert "hello" in keywords
-
-    def test_marklist_per_module(self, testdir):
-        item = testdir.getitem(
-            """
-            import pytest
-            pytestmark = [pytest.mark.hello, pytest.mark.world]
-            class TestClass(object):
-                def test_func(self):
-                    assert TestClass.test_func.hello
-                    assert TestClass.test_func.world
-        """
-        )
-        keywords = item.keywords
-        assert "hello" in keywords
-        assert "world" in keywords
-
-    def test_mark_per_class_decorator(self, testdir):
-        item = testdir.getitem(
-            """
-            import pytest
-            @pytest.mark.hello
-            class TestClass(object):
-                def test_func(self):
-                    assert TestClass.test_func.hello
-        """
-        )
-        keywords = item.keywords
-        assert "hello" in keywords
-
-    def test_mark_per_class_decorator_plus_existing_dec(self, testdir):
-        item = testdir.getitem(
-            """
-            import pytest
-            @pytest.mark.hello
-            class TestClass(object):
-                pytestmark = pytest.mark.world
-                def test_func(self):
-                    assert TestClass.test_func.hello
-                    assert TestClass.test_func.world
-        """
-        )
-        keywords = item.keywords
-        assert "hello" in keywords
-        assert "world" in keywords
-
-    @ignore_markinfo
-    def test_merging_markers(self, testdir):
-        p = testdir.makepyfile(
-            """
-            import pytest
-            pytestmark = pytest.mark.hello("pos1", x=1, y=2)
-            class TestClass(object):
-                # classlevel overrides module level
-                pytestmark = pytest.mark.hello(x=3)
-                @pytest.mark.hello("pos0", z=4)
-                def test_func(self):
-                    pass
-        """
-        )
-        items, rec = testdir.inline_genitems(p)
-        item, = items
-        keywords = item.keywords
-        marker = keywords["hello"]
-        assert marker.args == ("pos0", "pos1")
-        assert marker.kwargs == {"x": 1, "y": 2, "z": 4}
-
-        # test the new __iter__ interface
-        values = list(marker)
-        assert len(values) == 3
-        assert values[0].args == ("pos0",)
-        assert values[1].args == ()
-        assert values[2].args == ("pos1",)
-
     def test_merging_markers_deep(self, testdir):
         # issue 199 - propagate markers into nested classes
         p = testdir.makepyfile(
@@ -633,8 +475,8 @@ class TestFunctional(object):
         items, rec = testdir.inline_genitems(p)
         self.assert_markers(items, test_foo=("a", "b"), test_bar=("a",))
 
-    @pytest.mark.issue568
     def test_mark_should_not_pass_to_siebling_class(self, testdir):
+        """#568"""
         p = testdir.makepyfile(
             """
             import pytest
@@ -656,11 +498,6 @@ class TestFunctional(object):
         items, rec = testdir.inline_genitems(p)
         base_item, sub_item, sub_item_other = items
         print(items, [x.nodeid for x in items])
-        # legacy api smears
-        assert hasattr(base_item.obj, "b")
-        assert hasattr(sub_item_other.obj, "b")
-        assert hasattr(sub_item.obj, "b")
-
         # new api seregates
         assert not list(base_item.iter_markers(name="b"))
         assert not list(sub_item_other.iter_markers(name="b"))
@@ -746,26 +583,6 @@ class TestFunctional(object):
         result = testdir.runpytest()
         result.stdout.fnmatch_lines(["keyword: *hello*"])
 
-    @ignore_markinfo
-    def test_merging_markers_two_functions(self, testdir):
-        p = testdir.makepyfile(
-            """
-            import pytest
-            @pytest.mark.hello("pos1", z=4)
-            @pytest.mark.hello("pos0", z=3)
-            def test_func():
-                pass
-        """
-        )
-        items, rec = testdir.inline_genitems(p)
-        item, = items
-        keywords = item.keywords
-        marker = keywords["hello"]
-        values = list(marker)
-        assert len(values) == 2
-        assert values[0].args == ("pos0",)
-        assert values[1].args == ("pos1",)
-
     def test_no_marker_match_on_unmarked_names(self, testdir):
         p = testdir.makepyfile(
             """
@@ -785,6 +602,18 @@ class TestFunctional(object):
         deselected_tests = dlist[0].items
         assert len(deselected_tests) == 2
 
+    def test_invalid_m_option(self, testdir):
+        testdir.makepyfile(
+            """
+            def test_a():
+                pass
+        """
+        )
+        result = testdir.runpytest("-m bogus/")
+        result.stdout.fnmatch_lines(
+            ["INTERNALERROR> Marker expression must be valid Python!"]
+        )
+
     def test_keywords_at_node_level(self, testdir):
         testdir.makepyfile(
             """
@@ -827,13 +656,13 @@ class TestFunctional(object):
                 assert "mark2" in request.keywords
                 assert "mark3" in request.keywords
                 assert 10 not in request.keywords
-                marker = request.node.get_marker("mark1")
+                marker = request.node.get_closest_marker("mark1")
                 assert marker.name == "mark1"
                 assert marker.args == ()
                 assert marker.kwargs == {}
         """
         )
-        reprec = testdir.inline_run("-m", "mark1")
+        reprec = testdir.inline_run("-m", "mark1", SHOW_PYTEST_WARNINGS_ARG)
         reprec.assertoutcome(passed=1)
 
     def assert_markers(self, items, **expected):
@@ -843,19 +672,15 @@ class TestFunctional(object):
         .. note:: this could be moved to ``testdir`` if proven to be useful
         to other modules.
         """
-        from _pytest.mark import MarkInfo
 
         items = {x.name: x for x in items}
         for name, expected_markers in expected.items():
-            markers = items[name].keywords._markers
-            marker_names = {
-                name for (name, v) in markers.items() if isinstance(v, MarkInfo)
-            }
-            assert marker_names == set(expected_markers)
+            markers = {m.name for m in items[name].iter_markers()}
+            assert markers == set(expected_markers)
 
-    @pytest.mark.issue1540
     @pytest.mark.filterwarnings("ignore")
     def test_mark_from_parameters(self, testdir):
+        """#1540"""
         testdir.makepyfile(
             """
             import pytest
@@ -875,12 +700,11 @@ class TestFunctional(object):
                 assert True
         """
         )
-        reprec = testdir.inline_run()
+        reprec = testdir.inline_run(SHOW_PYTEST_WARNINGS_ARG)
         reprec.assertoutcome(skipped=1)
 
 
 class TestKeywordSelection(object):
-
     def test_select_simple(self, testdir):
         file_test = testdir.makepyfile(
             """
@@ -1011,50 +835,7 @@ class TestKeywordSelection(object):
         assert_test_is_not_selected("()")
 
 
-@pytest.mark.parametrize(
-    "argval, expected",
-    [
-        (
-            pytest.mark.skip()((1, 2)),
-            ParameterSet(values=(1, 2), marks=[pytest.mark.skip], id=None),
-        ),
-        (
-            pytest.mark.xfail(pytest.mark.skip()((1, 2))),
-            ParameterSet(
-                values=(1, 2), marks=[pytest.mark.xfail, pytest.mark.skip], id=None
-            ),
-        ),
-    ],
-)
-@pytest.mark.filterwarnings("ignore")
-def test_parameterset_extractfrom(argval, expected):
-    extracted = ParameterSet.extract_from(argval)
-    assert extracted == expected
-
-
-def test_legacy_transfer():
-
-    class FakeModule(object):
-        pytestmark = []
-
-    class FakeClass(object):
-        pytestmark = pytest.mark.nofun
-
-    @pytest.mark.fun
-    def fake_method(self):
-        pass
-
-    transfer_markers(fake_method, FakeClass, FakeModule)
-
-    # legacy marks transfer smeared
-    assert fake_method.nofun
-    assert fake_method.fun
-    # pristine marks dont transfer
-    assert fake_method.pytestmark == [pytest.mark.fun.mark]
-
-
 class TestMarkDecorator(object):
-
     @pytest.mark.parametrize(
         "lhs, rhs, expected",
         [
@@ -1071,7 +852,14 @@ class TestMarkDecorator(object):
 @pytest.mark.parametrize("mark", [None, "", "skip", "xfail"])
 def test_parameterset_for_parametrize_marks(testdir, mark):
     if mark is not None:
-        testdir.makeini("[pytest]\n{}={}".format(EMPTY_PARAMETERSET_OPTION, mark))
+        testdir.makeini(
+            """
+        [pytest]
+        {}={}
+        """.format(
+                EMPTY_PARAMETERSET_OPTION, mark
+            )
+        )
 
     config = testdir.parseconfig()
     from _pytest.mark import pytest_configure, get_empty_parameterset_mark
@@ -1087,6 +875,48 @@ def test_parameterset_for_parametrize_marks(testdir, mark):
         assert result_mark.kwargs.get("run") is False
 
 
+def test_parameterset_for_fail_at_collect(testdir):
+    testdir.makeini(
+        """
+    [pytest]
+    {}=fail_at_collect
+    """.format(
+            EMPTY_PARAMETERSET_OPTION
+        )
+    )
+
+    config = testdir.parseconfig()
+    from _pytest.mark import pytest_configure, get_empty_parameterset_mark
+
+    pytest_configure(config)
+
+    with pytest.raises(
+        Collector.CollectError,
+        match=r"Empty parameter set in 'pytest_configure' at line \d\d+",
+    ):
+        get_empty_parameterset_mark(config, ["a"], pytest_configure)
+
+    p1 = testdir.makepyfile(
+        """
+        import pytest
+
+        @pytest.mark.parametrize("empty", [])
+        def test():
+            pass
+        """
+    )
+    result = testdir.runpytest(str(p1))
+    result.stdout.fnmatch_lines(
+        [
+            "collected 0 items / 1 errors",
+            "* ERROR collecting test_parameterset_for_fail_at_collect.py *",
+            "Empty parameter set in 'test' at line 3",
+            "*= 1 error in *",
+        ]
+    )
+    assert result.ret == EXIT_INTERRUPTED
+
+
 def test_parameterset_for_parametrize_bad_markname(testdir):
     with pytest.raises(pytest.UsageError):
         test_parameterset_for_parametrize_marks(testdir, "bad")
@@ -1119,16 +949,84 @@ def test_mark_expressions_no_smear(testdir):
     deselected_tests = dlist[0].items
     assert len(deselected_tests) == 1
 
+    # todo: fixed
     # keywords smear - expected behaviour
-    reprec_keywords = testdir.inline_run("-k", "FOO")
-    passed_k, skipped_k, failed_k = reprec_keywords.countoutcomes()
-    assert passed_k == 2
-    assert skipped_k == failed_k == 0
+    # reprec_keywords = testdir.inline_run("-k", "FOO")
+    # passed_k, skipped_k, failed_k = reprec_keywords.countoutcomes()
+    # assert passed_k == 2
+    # assert skipped_k == failed_k == 0
 
 
-def test_addmarker_getmarker():
+def test_addmarker_order():
     node = Node("Test", config=mock.Mock(), session=mock.Mock(), nodeid="Test")
-    node.add_marker(pytest.mark.a(1))
-    node.add_marker("b")
-    node.get_marker("a").combined
-    node.get_marker("b").combined
+    node.add_marker("foo")
+    node.add_marker("bar")
+    node.add_marker("baz", append=False)
+    extracted = [x.name for x in node.iter_markers()]
+    assert extracted == ["baz", "foo", "bar"]
+
+
+@pytest.mark.filterwarnings("ignore")
+def test_markers_from_parametrize(testdir):
+    """#3605"""
+    testdir.makepyfile(
+        """
+        from __future__ import print_function
+        import pytest
+
+        first_custom_mark = pytest.mark.custom_marker
+        custom_mark = pytest.mark.custom_mark
+        @pytest.fixture(autouse=True)
+        def trigger(request):
+            custom_mark = list(request.node.iter_markers('custom_mark'))
+            print("Custom mark %s" % custom_mark)
+
+        @custom_mark("custom mark non parametrized")
+        def test_custom_mark_non_parametrized():
+            print("Hey from test")
+
+        @pytest.mark.parametrize(
+            "obj_type",
+            [
+                first_custom_mark("first custom mark")("template"),
+                pytest.param( # Think this should be recommended way?
+                    "disk",
+                    marks=custom_mark('custom mark1')
+                ),
+                custom_mark("custom mark2")("vm"),  # Tried also this
+            ]
+        )
+        def test_custom_mark_parametrized(obj_type):
+            print("obj_type is:", obj_type)
+    """
+    )
+
+    result = testdir.runpytest(SHOW_PYTEST_WARNINGS_ARG)
+    result.assert_outcomes(passed=4)
+
+
+def test_pytest_param_id_requires_string():
+    with pytest.raises(TypeError) as excinfo:
+        pytest.param(id=True)
+    (msg,) = excinfo.value.args
+    if six.PY2:
+        assert msg == "Expected id to be a string, got <type 'bool'>: True"
+    else:
+        assert msg == "Expected id to be a string, got <class 'bool'>: True"
+
+
+@pytest.mark.parametrize("s", (None, "hello world"))
+def test_pytest_param_id_allows_none_or_string(s):
+    assert pytest.param(id=s)
+
+
+def test_pytest_param_warning_on_unknown_kwargs():
+    with pytest.warns(PytestDeprecationWarning) as warninfo:
+        # typo, should be marks=
+        pytest.param(1, 2, mark=pytest.mark.xfail())
+    assert warninfo[0].filename == __file__
+    (msg,) = warninfo[0].message.args
+    assert msg == (
+        "pytest.param() got unexpected keyword arguments: ['mark'].\n"
+        "This will be an error in future versions."
+    )
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_modimport.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_modimport.py
index f7b92a0b6f6..5dd057c55e2 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_modimport.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_modimport.py
@@ -1,8 +1,13 @@
-import py
+# -*- coding: utf-8 -*-
 import subprocess
 import sys
-import pytest
+
+import py
+
 import _pytest
+import pytest
+
+pytestmark = pytest.mark.slow
 
 MODSET = [
     x
@@ -17,13 +22,20 @@ def test_fileimport(modfile):
     # without needing the pytest namespace being set
     # this is critical for the initialization of xdist
 
-    res = subprocess.call(
+    p = subprocess.Popen(
         [
             sys.executable,
             "-c",
             "import sys, py; py.path.local(sys.argv[1]).pyimport()",
             modfile.strpath,
-        ]
+        ],
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+    )
+    (out, err) = p.communicate()
+    assert p.returncode == 0, "importing %s failed (exitcode %d): out=%r, err=%r" % (
+        modfile,
+        p.returncode,
+        out,
+        err,
     )
-    if res:
-        pytest.fail("command result %s" % res)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_monkeypatch.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_monkeypatch.py
index c298ce0d929..961c57e06a3 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_monkeypatch.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_monkeypatch.py
@@ -1,8 +1,15 @@
-from __future__ import absolute_import, division, print_function
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import os
+import re
 import sys
 import textwrap
 
+import six
+
 import pytest
 from _pytest.monkeypatch import MonkeyPatch
 
@@ -17,12 +24,11 @@ def mp():
 
 
 def test_setattr():
-
     class A(object):
         x = 1
 
     monkeypatch = MonkeyPatch()
-    pytest.raises(AttributeError, "monkeypatch.setattr(A, 'notexists', 2)")
+    pytest.raises(AttributeError, monkeypatch.setattr, A, "notexists", 2)
     monkeypatch.setattr(A, "y", 2, raising=False)
     assert A.y == 2
     monkeypatch.undo()
@@ -42,7 +48,6 @@ def test_setattr():
 
 
 class TestSetattrWithImportPath(object):
-
     def test_string_expression(self, monkeypatch):
         monkeypatch.setattr("os.path.abspath", lambda x: "hello2")
         assert os.path.abspath("123") == "hello2"
@@ -84,7 +89,6 @@ class TestSetattrWithImportPath(object):
 
 
 def test_delattr():
-
     class A(object):
         x = 1
 
@@ -96,7 +100,7 @@ def test_delattr():
 
     monkeypatch = MonkeyPatch()
     monkeypatch.delattr(A, "x")
-    pytest.raises(AttributeError, "monkeypatch.delattr(A, 'y')")
+    pytest.raises(AttributeError, monkeypatch.delattr, A, "y")
     monkeypatch.delattr(A, "y", raising=False)
     monkeypatch.setattr(A, "x", 5, raising=False)
     assert A.x == 5
@@ -153,7 +157,7 @@ def test_delitem():
     monkeypatch.delitem(d, "x")
     assert "x" not in d
     monkeypatch.delitem(d, "y", raising=False)
-    pytest.raises(KeyError, "monkeypatch.delitem(d, 'y')")
+    pytest.raises(KeyError, monkeypatch.delitem, d, "y")
     assert not d
     monkeypatch.setitem(d, "y", 1700)
     assert d["y"] == 1700
@@ -166,7 +170,8 @@ def test_delitem():
 
 def test_setenv():
     monkeypatch = MonkeyPatch()
-    monkeypatch.setenv("XYZ123", 2)
+    with pytest.warns(pytest.PytestWarning):
+        monkeypatch.setenv("XYZ123", 2)
     import os
 
     assert os.environ["XYZ123"] == "2"
@@ -178,7 +183,7 @@ def test_delenv():
     name = "xyz1234"
     assert name not in os.environ
     monkeypatch = MonkeyPatch()
-    pytest.raises(KeyError, "monkeypatch.delenv(%r, raising=True)" % name)
+    pytest.raises(KeyError, monkeypatch.delenv, name, raising=True)
     monkeypatch.delenv(name, raising=False)
     monkeypatch.undo()
     os.environ[name] = "1"
@@ -195,13 +200,50 @@ def test_delenv():
             del os.environ[name]
 
 
+class TestEnvironWarnings(object):
+    """
+    os.environ keys and values should be native strings, otherwise it will cause problems with other modules (notably
+    subprocess). On Python 2 os.environ accepts anything without complaining, while Python 3 does the right thing
+    and raises an error.
+    """
+
+    VAR_NAME = u"PYTEST_INTERNAL_MY_VAR"
+
+    @pytest.mark.skipif(not six.PY2, reason="Python 2 only test")
+    def test_setenv_unicode_key(self, monkeypatch):
+        with pytest.warns(
+            pytest.PytestWarning,
+            match="Environment variable name {!r} should be str".format(self.VAR_NAME),
+        ):
+            monkeypatch.setenv(self.VAR_NAME, "2")
+
+    @pytest.mark.skipif(not six.PY2, reason="Python 2 only test")
+    def test_delenv_unicode_key(self, monkeypatch):
+        with pytest.warns(
+            pytest.PytestWarning,
+            match="Environment variable name {!r} should be str".format(self.VAR_NAME),
+        ):
+            monkeypatch.delenv(self.VAR_NAME, raising=False)
+
+    def test_setenv_non_str_warning(self, monkeypatch):
+        value = 2
+        msg = (
+            "Value of environment variable PYTEST_INTERNAL_MY_VAR type should be str, "
+            "but got 2 (type: int); converted to str implicitly"
+        )
+        with pytest.warns(pytest.PytestWarning, match=re.escape(msg)):
+            monkeypatch.setenv(str(self.VAR_NAME), value)
+
+
 def test_setenv_prepend():
     import os
 
     monkeypatch = MonkeyPatch()
-    monkeypatch.setenv("XYZ123", 2, prepend="-")
+    with pytest.warns(pytest.PytestWarning):
+        monkeypatch.setenv("XYZ123", 2, prepend="-")
     assert os.environ["XYZ123"] == "2"
-    monkeypatch.setenv("XYZ123", 3, prepend="-")
+    with pytest.warns(pytest.PytestWarning):
+        monkeypatch.setenv("XYZ123", 3, prepend="-")
     assert os.environ["XYZ123"] == "3-2"
     monkeypatch.undo()
     assert "XYZ123" not in os.environ
@@ -231,11 +273,15 @@ def test_syspath_prepend(mp):
 
 
 def test_syspath_prepend_double_undo(mp):
-    mp.syspath_prepend("hello world")
-    mp.undo()
-    sys.path.append("more hello world")
-    mp.undo()
-    assert sys.path[-1] == "more hello world"
+    old_syspath = sys.path[:]
+    try:
+        mp.syspath_prepend("hello world")
+        mp.undo()
+        sys.path.append("more hello world")
+        mp.undo()
+        assert sys.path[-1] == "more hello world"
+    finally:
+        sys.path[:] = old_syspath
 
 
 def test_chdir_with_path_local(mp, tmpdir):
@@ -311,7 +357,6 @@ def test_importerror(testdir):
 
 
 class SampleNew(object):
-
     @staticmethod
     def hello():
         return True
@@ -347,6 +392,33 @@ def test_issue156_undo_staticmethod(Sample):
     assert Sample.hello()
 
 
+def test_undo_class_descriptors_delattr():
+    class SampleParent(object):
+        @classmethod
+        def hello(_cls):
+            pass
+
+        @staticmethod
+        def world():
+            pass
+
+    class SampleChild(SampleParent):
+        pass
+
+    monkeypatch = MonkeyPatch()
+
+    original_hello = SampleChild.hello
+    original_world = SampleChild.world
+    monkeypatch.delattr(SampleParent, "hello")
+    monkeypatch.delattr(SampleParent, "world")
+    assert getattr(SampleParent, "hello", None) is None
+    assert getattr(SampleParent, "world", None) is None
+
+    monkeypatch.undo()
+    assert original_hello == SampleChild.hello
+    assert original_world == SampleChild.world
+
+
 def test_issue1338_name_resolving():
     pytest.importorskip("requests")
     monkeypatch = MonkeyPatch()
@@ -366,3 +438,35 @@ def test_context():
         m.setattr(functools, "partial", 3)
         assert not inspect.isclass(functools.partial)
     assert inspect.isclass(functools.partial)
+
+
+def test_syspath_prepend_with_namespace_packages(testdir, monkeypatch):
+    for dirname in "hello", "world":
+        d = testdir.mkdir(dirname)
+        ns = d.mkdir("ns_pkg")
+        ns.join("__init__.py").write(
+            "__import__('pkg_resources').declare_namespace(__name__)"
+        )
+        lib = ns.mkdir(dirname)
+        lib.join("__init__.py").write("def check(): return %r" % dirname)
+
+    monkeypatch.syspath_prepend("hello")
+    import ns_pkg.hello
+
+    assert ns_pkg.hello.check() == "hello"
+
+    with pytest.raises(ImportError):
+        import ns_pkg.world
+
+    # Prepending should call fixup_namespace_packages.
+    monkeypatch.syspath_prepend("world")
+    import ns_pkg.world
+
+    assert ns_pkg.world.check() == "world"
+
+    # Should invalidate caches via importlib.invalidate_caches.
+    tmpdir = testdir.tmpdir
+    modules_tmpdir = tmpdir.mkdir("modules_tmpdir")
+    monkeypatch.syspath_prepend(str(modules_tmpdir))
+    modules_tmpdir.join("main_app.py").write("app = True")
+    from main_app import app  # noqa: F401
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_nodes.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_nodes.py
index eee3ac8e9e4..e86bd5f793e 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_nodes.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_nodes.py
@@ -1,5 +1,7 @@
-import pytest
+# -*- coding: utf-8 -*-
+import py
 
+import pytest
 from _pytest import nodes
 
 
@@ -9,13 +11,44 @@ from _pytest import nodes
         ("", "", True),
         ("", "foo", True),
         ("", "foo/bar", True),
-        ("", "foo/bar::TestBaz::()", True),
+        ("", "foo/bar::TestBaz", True),
         ("foo", "food", False),
-        ("foo/bar::TestBaz::()", "foo/bar", False),
-        ("foo/bar::TestBaz::()", "foo/bar::TestBop::()", False),
-        ("foo/bar", "foo/bar::TestBop::()", True),
+        ("foo/bar::TestBaz", "foo/bar", False),
+        ("foo/bar::TestBaz", "foo/bar::TestBop", False),
+        ("foo/bar", "foo/bar::TestBop", True),
     ),
 )
 def test_ischildnode(baseid, nodeid, expected):
     result = nodes.ischildnode(baseid, nodeid)
     assert result is expected
+
+
+def test_std_warn_not_pytestwarning(testdir):
+    items = testdir.getitems(
+        """
+        def test():
+            pass
+    """
+    )
+    with pytest.raises(ValueError, match=".*instance of PytestWarning.*"):
+        items[0].warn(UserWarning("some warning"))
+
+
+def test__check_initialpaths_for_relpath():
+    """Ensure that it handles dirs, and does not always use dirname."""
+    cwd = py.path.local()
+
+    class FakeSession:
+        _initialpaths = [cwd]
+
+    assert nodes._check_initialpaths_for_relpath(FakeSession, cwd) == ""
+
+    sub = cwd.join("file")
+
+    class FakeSession:
+        _initialpaths = [cwd]
+
+    assert nodes._check_initialpaths_for_relpath(FakeSession, sub) == "file"
+
+    outside = py.path.local("/outside")
+    assert nodes._check_initialpaths_for_relpath(FakeSession, outside) is None
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_nose.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_nose.py
index abe7323754e..6eb5f085e84 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_nose.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_nose.py
@@ -1,4 +1,8 @@
-from __future__ import absolute_import, division, print_function
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import pytest
 
 
@@ -33,7 +37,6 @@ def test_setup_func_with_setup_decorator():
     values = []
 
     class A(object):
-
         @pytest.fixture(autouse=True)
         def f(self):
             values.append(1)
@@ -68,11 +71,11 @@ def test_nose_setup_func(testdir):
 
         @with_setup(my_setup, my_teardown)
         def test_hello():
-            print (values)
+            print(values)
             assert values == [1]
 
         def test_world():
-            print (values)
+            print(values)
             assert values == [1,2]
 
     """
@@ -92,11 +95,11 @@ def test_nose_setup_func_failure(testdir):
 
         @with_setup(my_setup, my_teardown)
         def test_hello():
-            print (values)
+            print(values)
             assert values == [1]
 
         def test_world():
-            print (values)
+            print(values)
             assert values == [1,2]
 
     """
@@ -144,11 +147,11 @@ def test_nose_setup_partial(testdir):
         my_teardown_partial = partial(my_teardown, 2)
 
         def test_hello():
-            print (values)
+            print(values)
             assert values == [1]
 
         def test_world():
-            print (values)
+            print(values)
             assert values == [1,2]
 
         test_hello.setup = my_setup_partial
@@ -159,73 +162,6 @@ def test_nose_setup_partial(testdir):
     result.stdout.fnmatch_lines(["*2 passed*"])
 
 
-def test_nose_test_generator_fixtures(testdir):
-    p = testdir.makepyfile(
-        """
-        # taken from nose-0.11.1 unit_tests/test_generator_fixtures.py
-        from nose.tools import eq_
-        called = []
-
-        def outer_setup():
-            called.append('outer_setup')
-
-        def outer_teardown():
-            called.append('outer_teardown')
-
-        def inner_setup():
-            called.append('inner_setup')
-
-        def inner_teardown():
-            called.append('inner_teardown')
-
-        def test_gen():
-            called[:] = []
-            for i in range(0, 5):
-                yield check, i
-
-        def check(i):
-            expect = ['outer_setup']
-            for x in range(0, i):
-                expect.append('inner_setup')
-                expect.append('inner_teardown')
-            expect.append('inner_setup')
-            eq_(called, expect)
-
-
-        test_gen.setup = outer_setup
-        test_gen.teardown = outer_teardown
-        check.setup = inner_setup
-        check.teardown = inner_teardown
-
-        class TestClass(object):
-            def setup(self):
-                print ("setup called in %s" % self)
-                self.called = ['setup']
-
-            def teardown(self):
-                print ("teardown called in %s" % self)
-                eq_(self.called, ['setup'])
-                self.called.append('teardown')
-
-            def test(self):
-                print ("test called in %s" % self)
-                for i in range(0, 5):
-                    yield self.check, i
-
-            def check(self, i):
-                print ("check called in %s" % self)
-                expect = ['setup']
-                #for x in range(0, i):
-                #    expect.append('setup')
-                #    expect.append('teardown')
-                #expect.append('setup')
-                eq_(self.called, expect)
-    """
-    )
-    result = testdir.runpytest(p, "-p", "nose")
-    result.stdout.fnmatch_lines(["*10 passed*"])
-
-
 def test_module_level_setup(testdir):
     testdir.makepyfile(
         """
@@ -431,3 +367,17 @@ def test_nottest_class_decorator(testdir):
     assert not reprec.getfailedcollections()
     calls = reprec.getreports("pytest_runtest_logreport")
     assert not calls
+
+
+def test_skip_test_with_unicode(testdir):
+    testdir.makepyfile(
+        """
+        # -*- coding: utf-8 -*-
+        import unittest
+        class TestClass():
+            def test_io(self):
+                raise unittest.SkipTest(u'😊')
+    """
+    )
+    result = testdir.runpytest()
+    result.stdout.fnmatch_lines(["* 1 skipped *"])
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_parseopt.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_parseopt.py
index 79076cafd81..c570ed60b2f 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_parseopt.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_parseopt.py
@@ -1,10 +1,18 @@
-from __future__ import absolute_import, division, print_function
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import argparse
-import sys
+import distutils.spawn
 import os
+import sys
+
 import py
+
 import pytest
 from _pytest.config import argparsing as parseopt
+from _pytest.config.exceptions import UsageError
 
 
 @pytest.fixture
@@ -13,12 +21,15 @@ def parser():
 
 
 class TestParser(object):
-
-    def test_no_help_by_default(self, capsys):
+    def test_no_help_by_default(self):
         parser = parseopt.Parser(usage="xyz")
-        pytest.raises(SystemExit, lambda: parser.parse(["-h"]))
-        out, err = capsys.readouterr()
-        assert err.find("error: unrecognized arguments") != -1
+        pytest.raises(UsageError, lambda: parser.parse(["-h"]))
+
+    def test_custom_prog(self, parser):
+        """Custom prog can be set for `argparse.ArgumentParser`."""
+        assert parser._getparser().prog == os.path.basename(sys.argv[0])
+        parser.prog = "custom-prog"
+        assert parser._getparser().prog == "custom-prog"
 
     def test_argument(self):
         with pytest.raises(parseopt.ArgumentError):
@@ -34,9 +45,8 @@ class TestParser(object):
         assert argument.dest == "test"
         argument = parseopt.Argument("-t", "--test", dest="abc")
         assert argument.dest == "abc"
-        assert (
-            str(argument)
-            == ("Argument(_short_opts: ['-t'], _long_opts: ['--test'], dest: 'abc')")
+        assert str(argument) == (
+            "Argument(_short_opts: ['-t'], _long_opts: ['--test'], dest: 'abc')"
         )
 
     def test_argument_type(self):
@@ -97,12 +107,8 @@ class TestParser(object):
 
     def test_group_shortopt_lowercase(self, parser):
         group = parser.getgroup("hello")
-        pytest.raises(
-            ValueError,
-            """
+        with pytest.raises(ValueError):
             group.addoption("-x", action="store_true")
-        """,
-        )
         assert len(group.options) == 0
         group._addoption("-x", action="store_true")
         assert len(group.options) == 1
@@ -180,7 +186,6 @@ class TestParser(object):
         assert args.S is False
 
     def test_parse_defaultgetter(self):
-
         def defaultget(option):
             if not hasattr(option, "type"):
                 return
@@ -204,15 +209,11 @@ class TestParser(object):
         )
         parser.add_argument(
             "-t", "--twoword", "--duo", "--two-word", "--two", help="foo"
-        ).map_long_option = {
-            "two": "two-word"
-        }
+        ).map_long_option = {"two": "two-word"}
         # throws error on --deux only!
         parser.add_argument(
             "-d", "--deuxmots", "--deux-mots", action="store_true", help="foo"
-        ).map_long_option = {
-            "deux": "deux-mots"
-        }
+        ).map_long_option = {"deux": "deux-mots"}
         parser.add_argument("-s", action="store_true", help="single short")
         parser.add_argument("--abc", "-a", action="store_true", help="bar")
         parser.add_argument("--klm", "-k", "--kl-m", action="store_true", help="bar")
@@ -224,9 +225,7 @@ class TestParser(object):
         )
         parser.add_argument(
             "-x", "--exit-on-first", "--exitfirst", action="store_true", help="spam"
-        ).map_long_option = {
-            "exitfirst": "exit-on-first"
-        }
+        ).map_long_option = {"exitfirst": "exit-on-first"}
         parser.add_argument("files_and_dirs", nargs="*")
         args = parser.parse_args(["-k", "--duo", "hallo", "--exitfirst"])
         assert args.twoword == "hallo"
@@ -298,18 +297,15 @@ class TestParser(object):
 
 
 def test_argcomplete(testdir, monkeypatch):
-    if not py.path.local.sysfind("bash"):
+    if not distutils.spawn.find_executable("bash"):
         pytest.skip("bash not available")
     script = str(testdir.tmpdir.join("test_argcomplete"))
-    pytest_bin = sys.argv[0]
-    if "pytest" not in os.path.basename(pytest_bin):
-        pytest.skip("need to be run with pytest executable, not %s" % (pytest_bin,))
 
     with open(str(script), "w") as fp:
         # redirect output from argcomplete to stdin and stderr is not trivial
         # http://stackoverflow.com/q/12589419/1307905
         # so we use bash
-        fp.write('COMP_WORDBREAKS="$COMP_WORDBREAKS" %s 8>&1 9>&2' % pytest_bin)
+        fp.write('COMP_WORDBREAKS="$COMP_WORDBREAKS" python -m pytest 8>&1 9>&2')
     # alternative would be exteneded Testdir.{run(),_run(),popen()} to be able
     # to handle a keyword argument env that replaces os.environ in popen or
     # extends the copy, advantage: could not forget to restore
@@ -325,7 +321,11 @@ def test_argcomplete(testdir, monkeypatch):
         # argcomplete not found
         pytest.skip("argcomplete not available")
     elif not result.stdout.str():
-        pytest.skip("bash provided no output, argcomplete not available?")
+        pytest.skip(
+            "bash provided no output on stdout, argcomplete not available? (stderr={!r})".format(
+                result.stderr.str()
+            )
+        )
     else:
         result.stdout.fnmatch_lines(["--funcargs", "--fulltrace"])
     os.mkdir("test_argcomplete.d")
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_pastebin.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_pastebin.py
index ad7c4d0c1c0..02efdb55407 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_pastebin.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_pastebin.py
@@ -1,11 +1,14 @@
-# encoding: utf-8
-from __future__ import absolute_import, division, print_function
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import sys
+
 import pytest
 
 
 class TestPasteCapture(object):
-
     @pytest.fixture
     def pastebinlist(self, monkeypatch, request):
         pastebinlist = []
@@ -65,13 +68,13 @@ class TestPasteCapture(object):
         """
         testdir.makepyfile(
             test_unicode="""
-            # encoding: utf-8
+            # -*- coding: utf-8 -*-
             def test():
                 assert '☺' == 1
         """
         )
         result = testdir.runpytest("--pastebin=all")
-        if sys.version_info[0] == 3:
+        if sys.version_info[0] >= 3:
             expected_msg = "*assert '☺' == 1*"
         else:
             expected_msg = "*assert '\\xe2\\x98\\xba' == 1*"
@@ -85,7 +88,6 @@ class TestPasteCapture(object):
 
 
 class TestPaste(object):
-
     @pytest.fixture
     def pastebin(self, request):
         return request.config.pluginmanager.getplugin("pastebin")
@@ -102,7 +104,6 @@ class TestPaste(object):
             calls.append((url, data))
 
             class DummyFile(object):
-
                 def read(self):
                     # part of html of a normal response
                     return b'View <a href="/raw/3c0c6750bd">raw</a>.'
@@ -125,7 +126,7 @@ class TestPaste(object):
         assert len(mocked_urlopen) == 1
         url, data = mocked_urlopen[0]
         assert type(data) is bytes
-        lexer = "python3" if sys.version_info[0] == 3 else "python"
+        lexer = "text"
         assert url == "https://bpaste.net"
         assert "lexer=%s" % lexer in data.decode()
         assert "code=full-paste-contents" in data.decode()
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_pathlib.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_pathlib.py
new file mode 100644
index 00000000000..541d289f777
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_pathlib.py
@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+import sys
+
+import py
+
+import pytest
+from _pytest.pathlib import fnmatch_ex
+from _pytest.pathlib import get_lock_path
+from _pytest.pathlib import maybe_delete_a_numbered_dir
+from _pytest.pathlib import Path
+
+
+class TestPort:
+    """Test that our port of py.common.FNMatcher (fnmatch_ex) produces the same results as the
+    original py.path.local.fnmatch method.
+    """
+
+    @pytest.fixture(params=["pathlib", "py.path"])
+    def match(self, request):
+        if request.param == "py.path":
+
+            def match_(pattern, path):
+                return py.path.local(path).fnmatch(pattern)
+
+        else:
+            assert request.param == "pathlib"
+
+            def match_(pattern, path):
+                return fnmatch_ex(pattern, path)
+
+        return match_
+
+    if sys.platform == "win32":
+        drv1 = "c:"
+        drv2 = "d:"
+    else:
+        drv1 = "/c"
+        drv2 = "/d"
+
+    @pytest.mark.parametrize(
+        "pattern, path",
+        [
+            ("*.py", "foo.py"),
+            ("*.py", "bar/foo.py"),
+            ("test_*.py", "foo/test_foo.py"),
+            ("tests/*.py", "tests/foo.py"),
+            (drv1 + "/*.py", drv1 + "/foo.py"),
+            (drv1 + "/foo/*.py", drv1 + "/foo/foo.py"),
+            ("tests/**/test*.py", "tests/foo/test_foo.py"),
+            ("tests/**/doc/test*.py", "tests/foo/bar/doc/test_foo.py"),
+            ("tests/**/doc/**/test*.py", "tests/foo/doc/bar/test_foo.py"),
+        ],
+    )
+    def test_matching(self, match, pattern, path):
+        assert match(pattern, path)
+
+    @pytest.mark.parametrize(
+        "pattern, path",
+        [
+            ("*.py", "foo.pyc"),
+            ("*.py", "foo/foo.pyc"),
+            ("tests/*.py", "foo/foo.py"),
+            (drv1 + "/*.py", drv2 + "/foo.py"),
+            (drv1 + "/foo/*.py", drv2 + "/foo/foo.py"),
+            ("tests/**/test*.py", "tests/foo.py"),
+            ("tests/**/test*.py", "foo/test_foo.py"),
+            ("tests/**/doc/test*.py", "tests/foo/bar/doc/foo.py"),
+            ("tests/**/doc/test*.py", "tests/foo/bar/test_foo.py"),
+        ],
+    )
+    def test_not_matching(self, match, pattern, path):
+        assert not match(pattern, path)
+
+
+def test_access_denied_during_cleanup(tmp_path, monkeypatch):
+    """Ensure that deleting a numbered dir does not fail because of OSErrors (#4262)."""
+    path = tmp_path / "temp-1"
+    path.mkdir()
+
+    def renamed_failed(*args):
+        raise OSError("access denied")
+
+    monkeypatch.setattr(Path, "rename", renamed_failed)
+
+    lock_path = get_lock_path(path)
+    maybe_delete_a_numbered_dir(path)
+    assert not lock_path.is_file()
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_pdb.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_pdb.py
index 615d52e8345..d31d60469cd 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_pdb.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_pdb.py
@@ -1,11 +1,23 @@
-from __future__ import absolute_import, division, print_function
-import sys
-import platform
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import os
+import sys
+
+import six
 
 import _pytest._code
-from _pytest.debugging import SUPPORTS_BREAKPOINT_BUILTIN
 import pytest
+from _pytest.debugging import _validate_usepdb_cls
+
+try:
+    breakpoint
+except NameError:
+    SUPPORTS_BREAKPOINT_BUILTIN = False
+else:
+    SUPPORTS_BREAKPOINT_BUILTIN = True
 
 
 _ENVIRON_PYTHONBREAKPOINT = os.environ.get("PYTHONBREAKPOINT", "")
@@ -25,6 +37,7 @@ def custom_pdb_calls():
 
     # install dummy debugger class and track which methods were called on it
     class _CustomPdb(object):
+        quitting = False
 
         def __init__(self, *args, **kwargs):
             called.append("init")
@@ -45,7 +58,6 @@ def custom_debugger_hook():
 
     # install dummy debugger class and track which methods were called on it
     class _CustomDebugger(object):
-
         def __init__(self, *args, **kwargs):
             called.append("init")
 
@@ -65,7 +77,6 @@ def custom_debugger_hook():
 
 
 class TestPDB(object):
-
     @pytest.fixture
     def pdblist(self, request):
         monkeypatch = request.getfixturevalue("monkeypatch")
@@ -139,30 +150,13 @@ class TestPDB(object):
         assert rep.failed
         assert len(pdblist) == 1
 
-    def test_pdb_interaction(self, testdir):
-        p1 = testdir.makepyfile(
-            """
-            def test_1():
-                i = 0
-                assert i == 1
-        """
-        )
-        child = testdir.spawn_pytest("--pdb %s" % p1)
-        child.expect(".*def test_1")
-        child.expect(".*i = 0")
-        child.expect("(Pdb)")
-        child.sendeof()
-        rest = child.read().decode("utf8")
-        assert "1 failed" in rest
-        assert "def test_1" not in rest
-        self.flush(child)
-
     @staticmethod
     def flush(child):
-        if platform.system() == "Darwin":
-            return
         if child.isalive():
+            # Read if the test has not (e.g. test_pdb_unittest_skip).
+            child.read()
             child.wait()
+        assert not child.isalive()
 
     def test_pdb_unittest_postmortem(self, testdir):
         p1 = testdir.makepyfile(
@@ -177,7 +171,7 @@ class TestPDB(object):
         """
         )
         child = testdir.spawn_pytest("--pdb %s" % p1)
-        child.expect("(Pdb)")
+        child.expect("Pdb")
         child.sendline("p self.filename")
         child.sendeof()
         rest = child.read().decode("utf8")
@@ -201,40 +195,32 @@ class TestPDB(object):
         child.sendeof()
         self.flush(child)
 
-    def test_pdb_print_captured_stdout(self, testdir):
-        p1 = testdir.makepyfile(
-            """
-            def test_1():
-                print("get\\x20rekt")
-                assert False
-        """
-        )
-        child = testdir.spawn_pytest("--pdb %s" % p1)
-        child.expect("captured stdout")
-        child.expect("get rekt")
-        child.expect("(Pdb)")
-        child.sendeof()
-        rest = child.read().decode("utf8")
-        assert "1 failed" in rest
-        assert "get rekt" not in rest
-        self.flush(child)
-
-    def test_pdb_print_captured_stderr(self, testdir):
+    def test_pdb_print_captured_stdout_and_stderr(self, testdir):
         p1 = testdir.makepyfile(
             """
             def test_1():
                 import sys
                 sys.stderr.write("get\\x20rekt")
+                print("get\\x20rekt")
                 assert False
+
+            def test_not_called_due_to_quit():
+                pass
         """
         )
         child = testdir.spawn_pytest("--pdb %s" % p1)
+        child.expect("captured stdout")
+        child.expect("get rekt")
         child.expect("captured stderr")
         child.expect("get rekt")
-        child.expect("(Pdb)")
+        child.expect("traceback")
+        child.expect("def test_1")
+        child.expect("Pdb")
         child.sendeof()
         rest = child.read().decode("utf8")
-        assert "1 failed" in rest
+        assert "Exit: Quitting debugger" in rest
+        assert "= 1 failed in" in rest
+        assert "def test_1" not in rest
         assert "get rekt" not in rest
         self.flush(child)
 
@@ -246,7 +232,7 @@ class TestPDB(object):
         """
         )
         child = testdir.spawn_pytest("--pdb %s" % p1)
-        child.expect("(Pdb)")
+        child.expect("Pdb")
         output = child.before.decode("utf8")
         child.sendeof()
         assert "captured stdout" not in output
@@ -263,11 +249,13 @@ class TestPDB(object):
                 assert False
         """
         )
-        child = testdir.spawn_pytest("--show-capture=%s --pdb %s" % (showcapture, p1))
+        child = testdir.spawn_pytest(
+            "--show-capture={} --pdb {}".format(showcapture, p1)
+        )
         if showcapture in ("all", "log"):
             child.expect("captured log")
             child.expect("get rekt")
-        child.expect("(Pdb)")
+        child.expect("Pdb")
         child.sendeof()
         rest = child.read().decode("utf8")
         assert "1 failed" in rest
@@ -282,13 +270,11 @@ class TestPDB(object):
                 assert False
         """
         )
-        child = testdir.spawn_pytest(
-            "--show-capture=all --pdb " "-p no:logging %s" % p1
-        )
+        child = testdir.spawn_pytest("--show-capture=all --pdb -p no:logging %s" % p1)
         child.expect("get rekt")
         output = child.before.decode("utf8")
         assert "captured log" not in output
-        child.expect("(Pdb)")
+        child.expect("Pdb")
         child.sendeof()
         rest = child.read().decode("utf8")
         assert "1 failed" in rest
@@ -307,7 +293,7 @@ class TestPDB(object):
         child = testdir.spawn_pytest("--pdb %s" % p1)
         child.expect(".*def test_1")
         child.expect(".*pytest.raises.*globalfunc")
-        child.expect("(Pdb)")
+        child.expect("Pdb")
         child.sendline("globalfunc")
         child.expect(".*function")
         child.sendeof()
@@ -323,8 +309,8 @@ class TestPDB(object):
         )
         child = testdir.spawn_pytest("--pdb %s" % p1)
         # child.expect(".*import pytest.*")
-        child.expect("(Pdb)")
-        child.sendeof()
+        child.expect("Pdb")
+        child.sendline("c")
         child.expect("1 error")
         self.flush(child)
 
@@ -337,8 +323,20 @@ class TestPDB(object):
         )
         p1 = testdir.makepyfile("def test_func(): pass")
         child = testdir.spawn_pytest("--pdb %s" % p1)
-        # child.expect(".*import pytest.*")
-        child.expect("(Pdb)")
+        child.expect("Pdb")
+
+        # INTERNALERROR is only displayed once via terminal reporter.
+        assert (
+            len(
+                [
+                    x
+                    for x in child.before.decode().splitlines()
+                    if x.startswith("INTERNALERROR> Traceback")
+                ]
+            )
+            == 1
+        )
+
         child.sendeof()
         self.flush(child)
 
@@ -348,16 +346,41 @@ class TestPDB(object):
             import pytest
             def test_1():
                 i = 0
-                print ("hello17")
+                print("hello17")
                 pytest.set_trace()
-                x = 3
+                i == 1
+                assert 0
         """
         )
         child = testdir.spawn_pytest(str(p1))
-        child.expect("test_1")
-        child.expect("x = 3")
-        child.expect("(Pdb)")
-        child.sendeof()
+        child.expect(r"test_1\(\)")
+        child.expect("i == 1")
+        child.expect("Pdb")
+        child.sendline("c")
+        rest = child.read().decode("utf-8")
+        assert "AssertionError" in rest
+        assert "1 failed" in rest
+        assert "def test_1" in rest
+        assert "hello17" in rest  # out is captured
+        self.flush(child)
+
+    def test_pdb_set_trace_kwargs(self, testdir):
+        p1 = testdir.makepyfile(
+            """
+            import pytest
+            def test_1():
+                i = 0
+                print("hello17")
+                pytest.set_trace(header="== my_header ==")
+                x = 3
+                assert 0
+        """
+        )
+        child = testdir.spawn_pytest(str(p1))
+        child.expect("== my_header ==")
+        assert "PDB set_trace" not in child.before.decode()
+        child.expect("Pdb")
+        child.sendline("c")
         rest = child.read().decode("utf-8")
         assert "1 failed" in rest
         assert "def test_1" in rest
@@ -374,11 +397,12 @@ class TestPDB(object):
         )
         child = testdir.spawn_pytest(str(p1))
         child.expect("test_1")
-        child.expect("(Pdb)")
-        child.sendeof()
+        child.expect("Pdb")
+        child.sendline("q")
         rest = child.read().decode("utf8")
-        assert "1 failed" in rest
+        assert "no tests ran" in rest
         assert "reading from stdin while output" not in rest
+        assert "BdbQuit" not in rest
         self.flush(child)
 
     def test_pdb_and_capsys(self, testdir):
@@ -386,7 +410,7 @@ class TestPDB(object):
             """
             import pytest
             def test_1(capsys):
-                print ("hello1")
+                print("hello1")
                 pytest.set_trace()
         """
         )
@@ -398,6 +422,24 @@ class TestPDB(object):
         child.read()
         self.flush(child)
 
+    def test_pdb_with_caplog_on_pdb_invocation(self, testdir):
+        p1 = testdir.makepyfile(
+            """
+            def test_1(capsys, caplog):
+                import logging
+                logging.getLogger(__name__).warning("some_warning")
+                assert 0
+        """
+        )
+        child = testdir.spawn_pytest("--pdb %s" % str(p1))
+        child.send("caplog.record_tuples\n")
+        child.expect_exact(
+            "[('test_pdb_with_caplog_on_pdb_invocation', 30, 'some_warning')]"
+        )
+        child.sendeof()
+        child.read()
+        self.flush(child)
+
     def test_set_trace_capturing_afterwards(self, testdir):
         p1 = testdir.makepyfile(
             """
@@ -405,7 +447,7 @@ class TestPDB(object):
             def test_1():
                 pdb.set_trace()
             def test_2():
-                print ("hello")
+                print("hello")
                 assert 0
         """
         )
@@ -419,7 +461,7 @@ class TestPDB(object):
         child.read()
         self.flush(child)
 
-    def test_pdb_interaction_doctest(self, testdir):
+    def test_pdb_interaction_doctest(self, testdir, monkeypatch):
         p1 = testdir.makepyfile(
             """
             import pytest
@@ -431,10 +473,14 @@ class TestPDB(object):
         """
         )
         child = testdir.spawn_pytest("--doctest-modules --pdb %s" % p1)
-        child.expect("(Pdb)")
-        child.sendline("i")
-        child.expect("0")
-        child.expect("(Pdb)")
+        child.expect("Pdb")
+
+        assert "UNEXPECTED EXCEPTION: AssertionError()" in child.before.decode("utf8")
+
+        child.sendline("'i=%i.' % i")
+        child.expect("Pdb")
+        assert "\r\n'i=0.'\r\n" in child.before.decode("utf8")
+
         child.sendeof()
         rest = child.read().decode("utf8")
         assert "1 failed" in rest
@@ -446,28 +492,220 @@ class TestPDB(object):
             import pytest
             def test_1():
                 i = 0
-                print ("hello17")
+                print("hello17")
                 pytest.set_trace()
                 x = 3
-                print ("hello18")
+                print("hello18")
                 pytest.set_trace()
                 x = 4
+                assert 0
         """
         )
         child = testdir.spawn_pytest(str(p1))
+        child.expect(r"PDB set_trace \(IO-capturing turned off\)")
         child.expect("test_1")
         child.expect("x = 3")
-        child.expect("(Pdb)")
+        child.expect("Pdb")
         child.sendline("c")
+        child.expect(r"PDB continue \(IO-capturing resumed\)")
+        child.expect(r"PDB set_trace \(IO-capturing turned off\)")
         child.expect("x = 4")
-        child.sendeof()
+        child.expect("Pdb")
+        child.sendline("c")
+        child.expect("_ test_1 _")
+        child.expect("def test_1")
         rest = child.read().decode("utf8")
-        assert "1 failed" in rest
-        assert "def test_1" in rest
+        assert "Captured stdout call" in rest
         assert "hello17" in rest  # out is captured
         assert "hello18" in rest  # out is captured
+        assert "1 failed" in rest
         self.flush(child)
 
+    def test_pdb_with_injected_do_debug(self, testdir):
+        """Simulates pdbpp, which injects Pdb into do_debug, and uses
+        self.__class__ in do_continue.
+        """
+        p1 = testdir.makepyfile(
+            mytest="""
+            import pdb
+            import pytest
+
+            count_continue = 0
+
+            class CustomPdb(pdb.Pdb, object):
+                def do_debug(self, arg):
+                    import sys
+                    import types
+
+                    if sys.version_info < (3, ):
+                        do_debug_func = pdb.Pdb.do_debug.im_func
+                    else:
+                        do_debug_func = pdb.Pdb.do_debug
+
+                    newglobals = do_debug_func.__globals__.copy()
+                    newglobals['Pdb'] = self.__class__
+                    orig_do_debug = types.FunctionType(
+                        do_debug_func.__code__, newglobals,
+                        do_debug_func.__name__, do_debug_func.__defaults__,
+                    )
+                    return orig_do_debug(self, arg)
+                do_debug.__doc__ = pdb.Pdb.do_debug.__doc__
+
+                def do_continue(self, *args, **kwargs):
+                    global count_continue
+                    count_continue += 1
+                    return super(CustomPdb, self).do_continue(*args, **kwargs)
+
+            def foo():
+                print("print_from_foo")
+
+            def test_1():
+                i = 0
+                print("hello17")
+                pytest.set_trace()
+                x = 3
+                print("hello18")
+
+                assert count_continue == 2, "unexpected_failure: %d != 2" % count_continue
+                pytest.fail("expected_failure")
+        """
+        )
+        child = testdir.spawn_pytest("--pdbcls=mytest:CustomPdb %s" % str(p1))
+        child.expect(r"PDB set_trace \(IO-capturing turned off\)")
+        child.expect(r"\n\(Pdb")
+        child.sendline("debug foo()")
+        child.expect("ENTERING RECURSIVE DEBUGGER")
+        child.expect(r"\n\(\(Pdb")
+        child.sendline("c")
+        child.expect("LEAVING RECURSIVE DEBUGGER")
+        assert b"PDB continue" not in child.before
+        # No extra newline.
+        assert child.before.endswith(b"c\r\nprint_from_foo\r\n")
+
+        # set_debug should not raise outcomes.Exit, if used recrursively.
+        child.sendline("debug 42")
+        child.sendline("q")
+        child.expect("LEAVING RECURSIVE DEBUGGER")
+        assert b"ENTERING RECURSIVE DEBUGGER" in child.before
+        assert b"Quitting debugger" not in child.before
+
+        child.sendline("c")
+        child.expect(r"PDB continue \(IO-capturing resumed\)")
+        rest = child.read().decode("utf8")
+        assert "hello17" in rest  # out is captured
+        assert "hello18" in rest  # out is captured
+        assert "1 failed" in rest
+        assert "Failed: expected_failure" in rest
+        assert "AssertionError: unexpected_failure" not in rest
+        self.flush(child)
+
+    def test_pdb_without_capture(self, testdir):
+        p1 = testdir.makepyfile(
+            """
+            import pytest
+            def test_1():
+                pytest.set_trace()
+        """
+        )
+        child = testdir.spawn_pytest("-s %s" % p1)
+        child.expect(r">>> PDB set_trace >>>")
+        child.expect("Pdb")
+        child.sendline("c")
+        child.expect(r">>> PDB continue >>>")
+        child.expect("1 passed")
+        self.flush(child)
+
+    @pytest.mark.parametrize("capture_arg", ("", "-s", "-p no:capture"))
+    def test_pdb_continue_with_recursive_debug(self, capture_arg, testdir):
+        """Full coverage for do_debug without capturing.
+
+        This is very similar to test_pdb_interaction_continue_recursive in general,
+        but mocks out ``pdb.set_trace`` for providing more coverage.
+        """
+        p1 = testdir.makepyfile(
+            """
+            try:
+                input = raw_input
+            except NameError:
+                pass
+
+            def set_trace():
+                __import__('pdb').set_trace()
+
+            def test_1(monkeypatch):
+                import _pytest.debugging
+
+                class pytestPDBTest(_pytest.debugging.pytestPDB):
+                    @classmethod
+                    def set_trace(cls, *args, **kwargs):
+                        # Init PytestPdbWrapper to handle capturing.
+                        _pdb = cls._init_pdb("set_trace", *args, **kwargs)
+
+                        # Mock out pdb.Pdb.do_continue.
+                        import pdb
+                        pdb.Pdb.do_continue = lambda self, arg: None
+
+                        print("===" + " SET_TRACE ===")
+                        assert input() == "debug set_trace()"
+
+                        # Simulate PytestPdbWrapper.do_debug
+                        cls._recursive_debug += 1
+                        print("ENTERING RECURSIVE DEBUGGER")
+                        print("===" + " SET_TRACE_2 ===")
+
+                        assert input() == "c"
+                        _pdb.do_continue("")
+                        print("===" + " SET_TRACE_3 ===")
+
+                        # Simulate PytestPdbWrapper.do_debug
+                        print("LEAVING RECURSIVE DEBUGGER")
+                        cls._recursive_debug -= 1
+
+                        print("===" + " SET_TRACE_4 ===")
+                        assert input() == "c"
+                        _pdb.do_continue("")
+
+                    def do_continue(self, arg):
+                        print("=== do_continue")
+
+                monkeypatch.setattr(_pytest.debugging, "pytestPDB", pytestPDBTest)
+
+                import pdb
+                monkeypatch.setattr(pdb, "set_trace", pytestPDBTest.set_trace)
+
+                set_trace()
+        """
+        )
+        child = testdir.spawn_pytest("--tb=short %s %s" % (p1, capture_arg))
+        child.expect("=== SET_TRACE ===")
+        before = child.before.decode("utf8")
+        if not capture_arg:
+            assert ">>> PDB set_trace (IO-capturing turned off) >>>" in before
+        else:
+            assert ">>> PDB set_trace >>>" in before
+        child.sendline("debug set_trace()")
+        child.expect("=== SET_TRACE_2 ===")
+        before = child.before.decode("utf8")
+        assert "\r\nENTERING RECURSIVE DEBUGGER\r\n" in before
+        child.sendline("c")
+        child.expect("=== SET_TRACE_3 ===")
+
+        # No continue message with recursive debugging.
+        before = child.before.decode("utf8")
+        assert ">>> PDB continue " not in before
+
+        child.sendline("c")
+        child.expect("=== SET_TRACE_4 ===")
+        before = child.before.decode("utf8")
+        assert "\r\nLEAVING RECURSIVE DEBUGGER\r\n" in before
+        child.sendline("c")
+        rest = child.read().decode("utf8")
+        if not capture_arg:
+            assert "> PDB continue (IO-capturing resumed) >" in rest
+        else:
+            assert "> PDB continue >" in rest
+        assert "1 passed in" in rest
+
     def test_pdb_used_outside_test(self, testdir):
         p1 = testdir.makepyfile(
             """
@@ -476,8 +714,9 @@ class TestPDB(object):
             x = 5
         """
         )
-        child = testdir.spawn("%s %s" % (sys.executable, p1))
+        child = testdir.spawn("{} {}".format(sys.executable, p1))
         child.expect("x = 5")
+        child.expect("Pdb")
         child.sendeof()
         self.flush(child)
 
@@ -494,37 +733,69 @@ class TestPDB(object):
         )
         child = testdir.spawn_pytest(str(p1))
         child.expect("x = 5")
+        child.expect("Pdb")
         child.sendeof()
         self.flush(child)
 
     def test_pdb_collection_failure_is_shown(self, testdir):
         p1 = testdir.makepyfile("xxx")
         result = testdir.runpytest_subprocess("--pdb", p1)
-        result.stdout.fnmatch_lines(["*NameError*xxx*", "*1 error*"])
+        result.stdout.fnmatch_lines(
+            ["E   NameError: *xxx*", "*! *Exit: Quitting debugger !*"]  # due to EOF
+        )
 
-    def test_enter_pdb_hook_is_called(self, testdir):
+    @pytest.mark.parametrize("post_mortem", (False, True))
+    def test_enter_leave_pdb_hooks_are_called(self, post_mortem, testdir):
         testdir.makeconftest(
             """
-            def pytest_enter_pdb(config):
-                assert config.testing_verification == 'configured'
-                print 'enter_pdb_hook'
+            mypdb = None
 
             def pytest_configure(config):
                 config.testing_verification = 'configured'
+
+            def pytest_enter_pdb(config, pdb):
+                assert config.testing_verification == 'configured'
+                print('enter_pdb_hook')
+
+                global mypdb
+                mypdb = pdb
+                mypdb.set_attribute = "bar"
+
+            def pytest_leave_pdb(config, pdb):
+                assert config.testing_verification == 'configured'
+                print('leave_pdb_hook')
+
+                global mypdb
+                assert mypdb is pdb
+                assert mypdb.set_attribute == "bar"
         """
         )
         p1 = testdir.makepyfile(
             """
             import pytest
 
-            def test_foo():
+            def test_set_trace():
                 pytest.set_trace()
+                assert 0
+
+            def test_post_mortem():
+                assert 0
         """
         )
-        child = testdir.spawn_pytest(str(p1))
+        if post_mortem:
+            child = testdir.spawn_pytest(str(p1) + " --pdb -s -k test_post_mortem")
+        else:
+            child = testdir.spawn_pytest(str(p1) + " -k test_set_trace")
         child.expect("enter_pdb_hook")
-        child.send("c\n")
-        child.sendeof()
+        child.sendline("c")
+        if post_mortem:
+            child.expect(r"PDB continue")
+        else:
+            child.expect(r"PDB continue \(IO-capturing resumed\)")
+            child.expect("Captured stdout call")
+        rest = child.read().decode("utf8")
+        assert "leave_pdb_hook" in rest
+        assert "1 failed" in rest
         self.flush(child)
 
     def test_pdb_custom_cls(self, testdir, custom_pdb_calls):
@@ -533,18 +804,40 @@ class TestPDB(object):
         result.stdout.fnmatch_lines(["*NameError*xxx*", "*1 error*"])
         assert custom_pdb_calls == ["init", "reset", "interaction"]
 
+    def test_pdb_custom_cls_invalid(self, testdir):
+        result = testdir.runpytest_inprocess("--pdbcls=invalid")
+        result.stderr.fnmatch_lines(
+            [
+                "*: error: argument --pdbcls: 'invalid' is not in the format 'modname:classname'"
+            ]
+        )
+
+    def test_pdb_validate_usepdb_cls(self, testdir):
+        assert _validate_usepdb_cls("os.path:dirname.__name__") == (
+            "os.path",
+            "dirname.__name__",
+        )
+
+        assert _validate_usepdb_cls("pdb:DoesNotExist") == ("pdb", "DoesNotExist")
+
     def test_pdb_custom_cls_without_pdb(self, testdir, custom_pdb_calls):
         p1 = testdir.makepyfile("""xxx """)
         result = testdir.runpytest_inprocess("--pdbcls=_pytest:_CustomPdb", p1)
         result.stdout.fnmatch_lines(["*NameError*xxx*", "*1 error*"])
         assert custom_pdb_calls == []
 
-    def test_pdb_custom_cls_with_settrace(self, testdir, monkeypatch):
+    def test_pdb_custom_cls_with_set_trace(self, testdir, monkeypatch):
         testdir.makepyfile(
             custom_pdb="""
             class CustomPdb(object):
+                def __init__(self, *args, **kwargs):
+                    skip = kwargs.pop("skip")
+                    assert skip == ["foo.*"]
+                    print("__init__")
+                    super(CustomPdb, self).__init__(*args, **kwargs)
+
                 def set_trace(*args, **kwargs):
-                    print 'custom set_trace>'
+                    print('custom set_trace>')
          """
         )
         p1 = testdir.makepyfile(
@@ -552,18 +845,18 @@ class TestPDB(object):
             import pytest
 
             def test_foo():
-                pytest.set_trace()
+                pytest.set_trace(skip=['foo.*'])
         """
         )
         monkeypatch.setenv("PYTHONPATH", str(testdir.tmpdir))
         child = testdir.spawn_pytest("--pdbcls=custom_pdb:CustomPdb %s" % str(p1))
 
+        child.expect("__init__")
         child.expect("custom set_trace>")
         self.flush(child)
 
 
 class TestDebuggingBreakpoints(object):
-
     def test_supports_breakpoint_module_global(self):
         """
         Test that supports breakpoint global marks on Python 3.7+ and not on
@@ -674,10 +967,10 @@ class TestDebuggingBreakpoints(object):
         )
         child = testdir.spawn_pytest(str(p1))
         child.expect("test_1")
-        child.expect("(Pdb)")
-        child.sendeof()
+        child.expect("Pdb")
+        child.sendline("quit")
         rest = child.read().decode("utf8")
-        assert "1 failed" in rest
+        assert "Quitting debugger" in rest
         assert "reading from stdin while output" not in rest
         TestPDB.flush(child)
 
@@ -690,13 +983,255 @@ class TestDebuggingBreakpoints(object):
             import pdb
             def test_1():
                 pdb.set_trace()
+                assert 0
         """
         )
         child = testdir.spawn_pytest(str(p1))
         child.expect("test_1")
-        child.expect("(Pdb)")
-        child.sendeof()
+        child.expect("Pdb")
+        child.sendline("c")
         rest = child.read().decode("utf8")
         assert "1 failed" in rest
         assert "reading from stdin while output" not in rest
         TestPDB.flush(child)
+
+
+class TestTraceOption:
+    def test_trace_sets_breakpoint(self, testdir):
+        p1 = testdir.makepyfile(
+            """
+            def test_1():
+                assert True
+
+            def test_2():
+                pass
+
+            def test_3():
+                pass
+            """
+        )
+        child = testdir.spawn_pytest("--trace " + str(p1))
+        child.expect("test_1")
+        child.expect("Pdb")
+        child.sendline("c")
+        child.expect("test_2")
+        child.expect("Pdb")
+        child.sendline("c")
+        child.expect("test_3")
+        child.expect("Pdb")
+        child.sendline("q")
+        child.expect_exact("Exit: Quitting debugger")
+        rest = child.read().decode("utf8")
+        assert "2 passed in" in rest
+        assert "reading from stdin while output" not in rest
+        # Only printed once - not on stderr.
+        assert "Exit: Quitting debugger" not in child.before.decode("utf8")
+        TestPDB.flush(child)
+
+
+def test_trace_after_runpytest(testdir):
+    """Test that debugging's pytest_configure is re-entrant."""
+    p1 = testdir.makepyfile(
+        """
+        from _pytest.debugging import pytestPDB
+
+        def test_outer(testdir):
+            assert len(pytestPDB._saved) == 1
+
+            testdir.makepyfile(
+                \"""
+                from _pytest.debugging import pytestPDB
+
+                def test_inner():
+                    assert len(pytestPDB._saved) == 2
+                    print()
+                    print("test_inner_" + "end")
+                \"""
+            )
+
+            result = testdir.runpytest("-s", "-k", "test_inner")
+            assert result.ret == 0
+
+            assert len(pytestPDB._saved) == 1
+    """
+    )
+    result = testdir.runpytest_subprocess("-s", "-p", "pytester", str(p1))
+    result.stdout.fnmatch_lines(["test_inner_end"])
+    assert result.ret == 0
+
+
+def test_quit_with_swallowed_SystemExit(testdir):
+    """Test that debugging's pytest_configure is re-entrant."""
+    p1 = testdir.makepyfile(
+        """
+        def call_pdb_set_trace():
+            __import__('pdb').set_trace()
+
+
+        def test_1():
+            try:
+                call_pdb_set_trace()
+            except SystemExit:
+                pass
+
+
+        def test_2():
+            pass
+    """
+    )
+    child = testdir.spawn_pytest(str(p1))
+    child.expect("Pdb")
+    child.sendline("q")
+    child.expect_exact("Exit: Quitting debugger")
+    rest = child.read().decode("utf8")
+    assert "no tests ran" in rest
+    TestPDB.flush(child)
+
+
+@pytest.mark.parametrize("fixture", ("capfd", "capsys"))
+def test_pdb_suspends_fixture_capturing(testdir, fixture):
+    """Using "-s" with pytest should suspend/resume fixture capturing."""
+    p1 = testdir.makepyfile(
+        """
+        def test_inner({fixture}):
+            import sys
+
+            print("out_inner_before")
+            sys.stderr.write("err_inner_before\\n")
+
+            __import__("pdb").set_trace()
+
+            print("out_inner_after")
+            sys.stderr.write("err_inner_after\\n")
+
+            out, err = {fixture}.readouterr()
+            assert out =="out_inner_before\\nout_inner_after\\n"
+            assert err =="err_inner_before\\nerr_inner_after\\n"
+        """.format(
+            fixture=fixture
+        )
+    )
+
+    child = testdir.spawn_pytest(str(p1) + " -s")
+
+    child.expect("Pdb")
+    before = child.before.decode("utf8")
+    assert (
+        "> PDB set_trace (IO-capturing turned off for fixture %s) >" % (fixture)
+        in before
+    )
+
+    # Test that capturing is really suspended.
+    child.sendline("p 40 + 2")
+    child.expect("Pdb")
+    assert "\r\n42\r\n" in child.before.decode("utf8")
+
+    child.sendline("c")
+    rest = child.read().decode("utf8")
+    assert "out_inner" not in rest
+    assert "err_inner" not in rest
+
+    TestPDB.flush(child)
+    assert child.exitstatus == 0
+    assert "= 1 passed in " in rest
+    assert "> PDB continue (IO-capturing resumed for fixture %s) >" % (fixture) in rest
+
+
+def test_pdbcls_via_local_module(testdir):
+    """It should be imported in pytest_configure or later only."""
+    p1 = testdir.makepyfile(
+        """
+        def test():
+            print("before_set_trace")
+            __import__("pdb").set_trace()
+        """,
+        mypdb="""
+        class Wrapped:
+            class MyPdb:
+                def set_trace(self, *args):
+                    print("set_trace_called", args)
+
+                def runcall(self, *args, **kwds):
+                    print("runcall_called", args, kwds)
+                    assert "func" in kwds
+        """,
+    )
+    result = testdir.runpytest(
+        str(p1), "--pdbcls=really.invalid:Value", syspathinsert=True
+    )
+    result.stdout.fnmatch_lines(
+        [
+            "*= FAILURES =*",
+            "E * --pdbcls: could not import 'really.invalid:Value': No module named *really*",
+        ]
+    )
+    assert result.ret == 1
+
+    result = testdir.runpytest(
+        str(p1), "--pdbcls=mypdb:Wrapped.MyPdb", syspathinsert=True
+    )
+    assert result.ret == 0
+    result.stdout.fnmatch_lines(["*set_trace_called*", "* 1 passed in *"])
+
+    # Ensure that it also works with --trace.
+    result = testdir.runpytest(
+        str(p1), "--pdbcls=mypdb:Wrapped.MyPdb", "--trace", syspathinsert=True
+    )
+    assert result.ret == 0
+    result.stdout.fnmatch_lines(["*runcall_called*", "* 1 passed in *"])
+
+
+def test_raises_bdbquit_with_eoferror(testdir):
+    """It is not guaranteed that DontReadFromInput's read is called."""
+    if six.PY2:
+        builtin_module = "__builtin__"
+        input_func = "raw_input"
+    else:
+        builtin_module = "builtins"
+        input_func = "input"
+    p1 = testdir.makepyfile(
+        """
+        def input_without_read(*args, **kwargs):
+            raise EOFError()
+
+        def test(monkeypatch):
+            import {builtin_module}
+            monkeypatch.setattr({builtin_module}, {input_func!r}, input_without_read)
+            __import__('pdb').set_trace()
+        """.format(
+            builtin_module=builtin_module, input_func=input_func
+        )
+    )
+    result = testdir.runpytest(str(p1))
+    result.stdout.fnmatch_lines(["E *BdbQuit", "*= 1 failed in*"])
+    assert result.ret == 1
+
+
+def test_pdb_wrapper_class_is_reused(testdir):
+    p1 = testdir.makepyfile(
+        """
+        def test():
+            __import__("pdb").set_trace()
+            __import__("pdb").set_trace()
+
+            import mypdb
+            instances = mypdb.instances
+            assert len(instances) == 2
+            assert instances[0].__class__ is instances[1].__class__
+        """,
+        mypdb="""
+        instances = []
+
+        class MyPdb:
+            def __init__(self, *args, **kwargs):
+                instances.append(self)
+
+            def set_trace(self, *args):
+                print("set_trace_called", args)
+        """,
+    )
+    result = testdir.runpytest(str(p1), "--pdbcls=mypdb:MyPdb", syspathinsert=True)
+    assert result.ret == 0
+    result.stdout.fnmatch_lines(
+        ["*set_trace_called*", "*set_trace_called*", "* 1 passed in *"]
+    )
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_pluginmanager.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_pluginmanager.py
index 22cea4207c6..23655164343 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_pluginmanager.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_pluginmanager.py
@@ -1,13 +1,17 @@
-# encoding: UTF-8
-from __future__ import absolute_import, division, print_function
-import pytest
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import os
-import re
 import sys
 import types
 
-from _pytest.config import get_config, PytestPluginManager
-from _pytest.main import EXIT_NOTESTSCOLLECTED, Session
+import pytest
+from _pytest.config import PytestPluginManager
+from _pytest.config.exceptions import UsageError
+from _pytest.main import EXIT_NOTESTSCOLLECTED
+from _pytest.main import Session
 
 
 @pytest.fixture
@@ -16,8 +20,7 @@ def pytestpm():
 
 
 class TestPytestPluginInteractions(object):
-
-    def test_addhooks_conftestplugin(self, testdir):
+    def test_addhooks_conftestplugin(self, testdir, _config_for_test):
         testdir.makepyfile(
             newhooks="""
             def pytest_myhook(xyz):
@@ -26,15 +29,14 @@ class TestPytestPluginInteractions(object):
         )
         conf = testdir.makeconftest(
             """
-            import sys ; sys.path.insert(0, '.')
             import newhooks
             def pytest_addhooks(pluginmanager):
-                pluginmanager.addhooks(newhooks)
+                pluginmanager.add_hookspecs(newhooks)
             def pytest_myhook(xyz):
                 return xyz + 1
         """
         )
-        config = get_config()
+        config = _config_for_test
         pm = config.pluginmanager
         pm.hook.pytest_addhooks.call_historic(
             kwargs=dict(pluginmanager=config.pluginmanager)
@@ -49,43 +51,13 @@ class TestPytestPluginInteractions(object):
             """
             import sys
             def pytest_addhooks(pluginmanager):
-                pluginmanager.addhooks(sys)
+                pluginmanager.add_hookspecs(sys)
         """
         )
         res = testdir.runpytest()
         assert res.ret != 0
         res.stderr.fnmatch_lines(["*did not find*sys*"])
 
-    def test_namespace_early_from_import(self, testdir):
-        p = testdir.makepyfile(
-            """
-            from pytest import Item
-            from pytest import Item as Item2
-            assert Item is Item2
-        """
-        )
-        result = testdir.runpython(p)
-        assert result.ret == 0
-
-    def test_do_ext_namespace(self, testdir):
-        testdir.makeconftest(
-            """
-            def pytest_namespace():
-                return {'hello': 'world'}
-        """
-        )
-        p = testdir.makepyfile(
-            """
-            from pytest import hello
-            import pytest
-            def test_hello():
-                assert hello == "world"
-                assert 'hello' in pytest.__all__
-        """
-        )
-        reprec = testdir.inline_run(p)
-        reprec.assertoutcome(passed=1)
-
     def test_do_option_postinitialize(self, testdir):
         config = testdir.parseconfigure()
         assert not hasattr(config.option, "test123")
@@ -104,7 +76,6 @@ class TestPytestPluginInteractions(object):
         values = []
 
         class A(object):
-
             def pytest_configure(self, config):
                 values.append(self)
 
@@ -120,17 +91,15 @@ class TestPytestPluginInteractions(object):
         config.pluginmanager.register(A())
         assert len(values) == 2
 
-    def test_hook_tracing(self):
-        pytestpm = get_config().pluginmanager  # fully initialized with plugins
+    def test_hook_tracing(self, _config_for_test):
+        pytestpm = _config_for_test.pluginmanager  # fully initialized with plugins
         saveindent = []
 
         class api1(object):
-
             def pytest_plugin_registered(self):
                 saveindent.append(pytestpm.trace.root.indent)
 
         class api2(object):
-
             def pytest_plugin_registered(self):
                 saveindent.append(pytestpm.trace.root.indent)
                 raise ValueError()
@@ -171,36 +140,6 @@ class TestPytestPluginInteractions(object):
         ihook_b = session.gethookproxy(testdir.tmpdir.join("tests"))
         assert ihook_a is not ihook_b
 
-    def test_warn_on_deprecated_addhooks(self, pytestpm):
-        warnings = []
-
-        class get_warnings(object):
-
-            def pytest_logwarning(self, code, fslocation, message, nodeid):
-                warnings.append(message)
-
-        class Plugin(object):
-
-            def pytest_testhook():
-                pass
-
-        pytestpm.register(get_warnings())
-        before = list(warnings)
-        pytestpm.addhooks(Plugin())
-        assert len(warnings) == len(before) + 1
-        assert "deprecated" in warnings[-1]
-
-
-def test_namespace_has_default_and_env_plugins(testdir):
-    p = testdir.makepyfile(
-        """
-        import pytest
-        pytest.mark
-    """
-    )
-    result = testdir.runpython(p)
-    assert result.ret == 0
-
 
 def test_default_markers(testdir):
     result = testdir.runpytest("--markers")
@@ -216,7 +155,7 @@ def test_importplugin_error_message(testdir, pytestpm):
     testdir.syspathinsert(testdir.tmpdir)
     testdir.makepyfile(
         qwe="""
-        # encoding: UTF-8
+        # -*- coding: utf-8 -*-
         def test_traceback():
             raise ImportError(u'Not possible to import: ☺')
         test_traceback()
@@ -225,14 +164,13 @@ def test_importplugin_error_message(testdir, pytestpm):
     with pytest.raises(ImportError) as excinfo:
         pytestpm.import_plugin("qwe")
 
-    expected_message = '.*Error importing plugin "qwe": Not possible to import: .'
-    expected_traceback = ".*in test_traceback"
-    assert re.match(expected_message, str(excinfo.value))
-    assert re.match(expected_traceback, str(excinfo.traceback[-1]))
+    assert str(excinfo.value).endswith(
+        'Error importing plugin "qwe": Not possible to import: ☺'
+    )
+    assert "in test_traceback" in str(excinfo.traceback[-1])
 
 
 class TestPytestPluginManager(object):
-
     def test_register_imported_modules(self):
         pm = PytestPluginManager()
         mod = types.ModuleType("x.y.pytest_hello")
@@ -240,7 +178,7 @@ class TestPytestPluginManager(object):
         assert pm.is_registered(mod)
         values = pm.get_plugins()
         assert mod in values
-        pytest.raises(ValueError, "pm.register(mod)")
+        pytest.raises(ValueError, pm.register, mod)
         pytest.raises(ValueError, lambda: pm.register(mod))
         # assert not pm.is_registered(mod2)
         assert pm.get_plugins() == values
@@ -263,14 +201,13 @@ class TestPytestPluginManager(object):
         assert pytestpm.get_plugin("pytest_p1").__name__ == "pytest_p1"
         assert pytestpm.get_plugin("pytest_p2").__name__ == "pytest_p2"
 
-    def test_consider_module_import_module(self, testdir):
-        pytestpm = get_config().pluginmanager
+    def test_consider_module_import_module(self, testdir, _config_for_test):
+        pytestpm = _config_for_test.pluginmanager
         mod = types.ModuleType("x")
         mod.pytest_plugins = "pytest_a"
         aplugin = testdir.makepyfile(pytest_a="#")
         reprec = testdir.make_hook_recorder(pytestpm)
-        # syspath.prepend(aplugin.dirpath())
-        sys.path.insert(0, str(aplugin.dirpath()))
+        testdir.syspathinsert(aplugin.dirpath())
         pytestpm.consider_module(mod)
         call = reprec.getcall(pytestpm.hook.pytest_plugin_registered.name)
         assert call.plugin.__name__ == "pytest_a"
@@ -285,11 +222,12 @@ class TestPytestPluginManager(object):
         with pytest.raises(ImportError):
             pytestpm.consider_env()
 
+    @pytest.mark.filterwarnings("always")
     def test_plugin_skip(self, testdir, monkeypatch):
         p = testdir.makepyfile(
             skipping1="""
             import pytest
-            pytest.skip("hello")
+            pytest.skip("hello", allow_module_level=True)
         """
         )
         p.copy(p.dirpath("skipping2.py"))
@@ -329,8 +267,8 @@ class TestPytestPluginManager(object):
         result.stdout.fnmatch_lines(["*1 passed*"])
 
     def test_import_plugin_importname(self, testdir, pytestpm):
-        pytest.raises(ImportError, 'pytestpm.import_plugin("qweqwex.y")')
-        pytest.raises(ImportError, 'pytestpm.import_plugin("pytest_qweqwx.y")')
+        pytest.raises(ImportError, pytestpm.import_plugin, "qweqwex.y")
+        pytest.raises(ImportError, pytestpm.import_plugin, "pytest_qweqwx.y")
 
         testdir.syspathinsert()
         pluginname = "pytest_hello"
@@ -346,8 +284,8 @@ class TestPytestPluginManager(object):
         assert plugin2 is plugin1
 
     def test_import_plugin_dotted_name(self, testdir, pytestpm):
-        pytest.raises(ImportError, 'pytestpm.import_plugin("qweqwex.y")')
-        pytest.raises(ImportError, 'pytestpm.import_plugin("pytest_qweqwex.y")')
+        pytest.raises(ImportError, pytestpm.import_plugin, "qweqwex.y")
+        pytest.raises(ImportError, pytestpm.import_plugin, "pytest_qweqwex.y")
 
         testdir.syspathinsert()
         testdir.mkpydir("pkg").join("plug.py").write("x=3")
@@ -363,12 +301,23 @@ class TestPytestPluginManager(object):
 
 
 class TestPytestPluginManagerBootstrapming(object):
-
     def test_preparse_args(self, pytestpm):
         pytest.raises(
             ImportError, lambda: pytestpm.consider_preparse(["xyz", "-p", "hello123"])
         )
 
+        # Handles -p without space (#3532).
+        with pytest.raises(ImportError) as excinfo:
+            pytestpm.consider_preparse(["-phello123"])
+        assert '"hello123"' in excinfo.value.args[0]
+        pytestpm.consider_preparse(["-pno:hello123"])
+
+        # Handles -p without following arg (when used without argparse).
+        pytestpm.consider_preparse(["-p"])
+
+        with pytest.raises(UsageError, match="^plugin main cannot be disabled$"):
+            pytestpm.consider_preparse(["-p", "no:main"])
+
     def test_plugin_prevent_register(self, pytestpm):
         pytestpm.consider_preparse(["xyz", "-p", "no:abc"])
         l1 = pytestpm.get_plugins()
@@ -384,3 +333,28 @@ class TestPytestPluginManagerBootstrapming(object):
         pytestpm.consider_preparse(["xyz", "-p", "no:abc"])
         l2 = pytestpm.get_plugins()
         assert 42 not in l2
+
+    def test_plugin_prevent_register_stepwise_on_cacheprovider_unregister(
+        self, pytestpm
+    ):
+        """ From PR #4304 : The only way to unregister a module is documented at
+        the end of https://docs.pytest.org/en/latest/plugins.html.
+
+        When unregister cacheprovider, then unregister stepwise too
+        """
+        pytestpm.register(42, name="cacheprovider")
+        pytestpm.register(43, name="stepwise")
+        l1 = pytestpm.get_plugins()
+        assert 42 in l1
+        assert 43 in l1
+        pytestpm.consider_preparse(["xyz", "-p", "no:cacheprovider"])
+        l2 = pytestpm.get_plugins()
+        assert 42 not in l2
+        assert 43 not in l2
+
+    def test_blocked_plugin_can_be_used(self, pytestpm):
+        pytestpm.consider_preparse(["xyz", "-p", "no:abc", "-p", "abc"])
+
+        assert pytestpm.has_plugin("abc")
+        assert not pytestpm.is_blocked("abc")
+        assert not pytestpm.is_blocked("pytest_abc")
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_pytester.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_pytester.py
index b74c0b7f70c..f7cc0936cce 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_pytester.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_pytester.py
@@ -1,14 +1,26 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import os
-import py.path
-import pytest
+import subprocess
 import sys
+import time
+
+import py.path
+
 import _pytest.pytester as pytester
-from _pytest.pytester import HookRecorder
-from _pytest.pytester import CwdSnapshot, SysModulesSnapshot, SysPathsSnapshot
+import pytest
 from _pytest.config import PytestPluginManager
-from _pytest.main import EXIT_OK, EXIT_TESTSFAILED
+from _pytest.main import EXIT_NOTESTSCOLLECTED
+from _pytest.main import EXIT_OK
+from _pytest.main import EXIT_TESTSFAILED
+from _pytest.pytester import CwdSnapshot
+from _pytest.pytester import HookRecorder
+from _pytest.pytester import LineMatcher
+from _pytest.pytester import SysModulesSnapshot
+from _pytest.pytester import SysPathsSnapshot
 
 
 def test_make_hook_recorder(testdir):
@@ -61,7 +73,7 @@ def test_make_hook_recorder(testdir):
     recorder.unregister()
     recorder.clear()
     recorder.hook.pytest_runtest_logreport(report=rep)
-    pytest.raises(ValueError, "recorder.getfailures()")
+    pytest.raises(ValueError, recorder.getfailures)
 
 
 def test_parseconfig(testdir):
@@ -83,10 +95,70 @@ def test_testdir_runs_with_plugin(testdir):
     result.assert_outcomes(passed=1)
 
 
+def test_runresult_assertion_on_xfail(testdir):
+    testdir.makepyfile(
+        """
+        import pytest
+
+        pytest_plugins = "pytester"
+
+        @pytest.mark.xfail
+        def test_potato():
+            assert False
+    """
+    )
+    result = testdir.runpytest()
+    result.assert_outcomes(xfailed=1)
+    assert result.ret == 0
+
+
+def test_runresult_assertion_on_xpassed(testdir):
+    testdir.makepyfile(
+        """
+        import pytest
+
+        pytest_plugins = "pytester"
+
+        @pytest.mark.xfail
+        def test_potato():
+            assert True
+    """
+    )
+    result = testdir.runpytest()
+    result.assert_outcomes(xpassed=1)
+    assert result.ret == 0
+
+
+def test_runresult_repr():
+    from _pytest.pytester import RunResult
+
+    assert (
+        repr(
+            RunResult(ret="ret", outlines=[""], errlines=["some", "errors"], duration=1)
+        )
+        == "<RunResult ret='ret' len(stdout.lines)=1 len(stderr.lines)=2 duration=1.00s>"
+    )
+
+
+def test_xpassed_with_strict_is_considered_a_failure(testdir):
+    testdir.makepyfile(
+        """
+        import pytest
+
+        pytest_plugins = "pytester"
+
+        @pytest.mark.xfail(strict=True)
+        def test_potato():
+            assert True
+    """
+    )
+    result = testdir.runpytest()
+    result.assert_outcomes(failed=1)
+    assert result.ret != 0
+
+
 def make_holder():
-
     class apiclass(object):
-
         def pytest_xyz(self, arg):
             "x"
 
@@ -109,13 +181,13 @@ def make_holder():
 @pytest.mark.parametrize("holder", make_holder())
 def test_hookrecorder_basic(holder):
     pm = PytestPluginManager()
-    pm.addhooks(holder)
+    pm.add_hookspecs(holder)
     rec = HookRecorder(pm)
     pm.hook.pytest_xyz(arg=123)
     call = rec.popcall("pytest_xyz")
     assert call.arg == 123
     assert call._name == "pytest_xyz"
-    pytest.raises(pytest.fail.Exception, "rec.popcall('abc')")
+    pytest.raises(pytest.fail.Exception, rec.popcall, "abc")
     pm.hook.pytest_xyz_noarg()
     call = rec.popcall("pytest_xyz_noarg")
     assert call._name == "pytest_xyz_noarg"
@@ -127,7 +199,7 @@ def test_makepyfile_unicode(testdir):
         unichr(65)
     except NameError:
         unichr = chr
-    testdir.makepyfile(unichr(0xfffd))
+    testdir.makepyfile(unichr(0xFFFD))
 
 
 def test_makepyfile_utf8(testdir):
@@ -143,7 +215,6 @@ def test_makepyfile_utf8(testdir):
 
 
 class TestInlineRunModulesCleanup(object):
-
     def test_inline_run_test_module_not_cleaned_up(self, testdir):
         test_mod = testdir.makepyfile("def test_foo(): assert True")
         result = testdir.inline_run(str(test_mod))
@@ -154,7 +225,6 @@ class TestInlineRunModulesCleanup(object):
         assert result2.ret == EXIT_TESTSFAILED
 
     def spy_factory(self):
-
         class SysModulesSnapshotSpy(object):
             instances = []
 
@@ -175,8 +245,8 @@ class TestInlineRunModulesCleanup(object):
     ):
         spy_factory = self.spy_factory()
         monkeypatch.setattr(pytester, "SysModulesSnapshot", spy_factory)
-        original = dict(sys.modules)
         testdir.syspathinsert()
+        original = dict(sys.modules)
         testdir.makepyfile(import1="# you son of a silly person")
         testdir.makepyfile(import2="# my hovercraft is full of eels")
         test_mod = testdir.makepyfile(
@@ -219,64 +289,11 @@ class TestInlineRunModulesCleanup(object):
         assert imported.data == 42
 
 
-def test_inline_run_clean_sys_paths(testdir):
-
-    def test_sys_path_change_cleanup(self, testdir):
-        test_path1 = testdir.tmpdir.join("boink1").strpath
-        test_path2 = testdir.tmpdir.join("boink2").strpath
-        test_path3 = testdir.tmpdir.join("boink3").strpath
-        sys.path.append(test_path1)
-        sys.meta_path.append(test_path1)
-        original_path = list(sys.path)
-        original_meta_path = list(sys.meta_path)
-        test_mod = testdir.makepyfile(
-            """
-            import sys
-            sys.path.append({:test_path2})
-            sys.meta_path.append({:test_path2})
-            def test_foo():
-                sys.path.append({:test_path3})
-                sys.meta_path.append({:test_path3})""".format(
-                locals()
-            )
-        )
-        testdir.inline_run(str(test_mod))
-        assert sys.path == original_path
-        assert sys.meta_path == original_meta_path
-
-    def spy_factory(self):
-
-        class SysPathsSnapshotSpy(object):
-            instances = []
-
-            def __init__(self):
-                SysPathsSnapshotSpy.instances.append(self)
-                self._spy_restore_count = 0
-                self.__snapshot = SysPathsSnapshot()
-
-            def restore(self):
-                self._spy_restore_count += 1
-                return self.__snapshot.restore()
-
-        return SysPathsSnapshotSpy
-
-    def test_inline_run_taking_and_restoring_a_sys_paths_snapshot(
-        self, testdir, monkeypatch
-    ):
-        spy_factory = self.spy_factory()
-        monkeypatch.setattr(pytester, "SysPathsSnapshot", spy_factory)
-        test_mod = testdir.makepyfile("def test_foo(): pass")
-        testdir.inline_run(str(test_mod))
-        assert len(spy_factory.instances) == 1
-        spy = spy_factory.instances[0]
-        assert spy._spy_restore_count == 1
-
-
 def test_assert_outcomes_after_pytest_error(testdir):
     testdir.makepyfile("def test_foo(): assert True")
 
     result = testdir.runpytest("--unexpected-argument")
-    with pytest.raises(ValueError, message="Pytest terminal report not found"):
+    with pytest.raises(ValueError, match="Pytest terminal report not found"):
         result.assert_outcomes(passed=0)
 
 
@@ -370,9 +387,7 @@ class TestSysPathsSnapshot(object):
         original = list(sys_path)
         original_other = list(getattr(sys, other_path_type))
         snapshot = SysPathsSnapshot()
-        transformation = {
-            "source": (0, 1, 2, 3, 4, 5), "target": (6, 2, 9, 7, 5, 8)
-        }  # noqa: E201
+        transformation = {"source": (0, 1, 2, 3, 4, 5), "target": (6, 2, 9, 7, 5, 8)}
         assert sys_path == [self.path(x) for x in transformation["source"]]
         sys_path[1] = self.path(6)
         sys_path[3] = self.path(7)
@@ -399,3 +414,174 @@ class TestSysPathsSnapshot(object):
         assert getattr(sys, path_type) == original_data
         assert getattr(sys, other_path_type) is original_other
         assert getattr(sys, other_path_type) == original_other_data
+
+
+def test_testdir_subprocess(testdir):
+    testfile = testdir.makepyfile("def test_one(): pass")
+    assert testdir.runpytest_subprocess(testfile).ret == 0
+
+
+def test_unicode_args(testdir):
+    result = testdir.runpytest("-k", u"💩")
+    assert result.ret == EXIT_NOTESTSCOLLECTED
+
+
+def test_testdir_run_no_timeout(testdir):
+    testfile = testdir.makepyfile("def test_no_timeout(): pass")
+    assert testdir.runpytest_subprocess(testfile).ret == EXIT_OK
+
+
+def test_testdir_run_with_timeout(testdir):
+    testfile = testdir.makepyfile("def test_no_timeout(): pass")
+
+    timeout = 120
+
+    start = time.time()
+    result = testdir.runpytest_subprocess(testfile, timeout=timeout)
+    end = time.time()
+    duration = end - start
+
+    assert result.ret == EXIT_OK
+    assert duration < timeout
+
+
+def test_testdir_run_timeout_expires(testdir):
+    testfile = testdir.makepyfile(
+        """
+        import time
+
+        def test_timeout():
+            time.sleep(10)"""
+    )
+    with pytest.raises(testdir.TimeoutExpired):
+        testdir.runpytest_subprocess(testfile, timeout=1)
+
+
+def test_linematcher_with_nonlist():
+    """Test LineMatcher with regard to passing in a set (accidentally)."""
+    lm = LineMatcher([])
+
+    with pytest.raises(AssertionError):
+        lm.fnmatch_lines(set())
+    with pytest.raises(AssertionError):
+        lm.fnmatch_lines({})
+    lm.fnmatch_lines([])
+    lm.fnmatch_lines(())
+
+    assert lm._getlines({}) == {}
+    assert lm._getlines(set()) == set()
+
+
+def test_pytester_addopts(request, monkeypatch):
+    monkeypatch.setenv("PYTEST_ADDOPTS", "--orig-unused")
+
+    testdir = request.getfixturevalue("testdir")
+
+    try:
+        assert "PYTEST_ADDOPTS" not in os.environ
+    finally:
+        testdir.finalize()
+
+    assert os.environ["PYTEST_ADDOPTS"] == "--orig-unused"
+
+
+def test_run_stdin(testdir):
+    with pytest.raises(testdir.TimeoutExpired):
+        testdir.run(
+            sys.executable,
+            "-c",
+            "import sys, time; time.sleep(1); print(sys.stdin.read())",
+            stdin=subprocess.PIPE,
+            timeout=0.1,
+        )
+
+    with pytest.raises(testdir.TimeoutExpired):
+        result = testdir.run(
+            sys.executable,
+            "-c",
+            "import sys, time; time.sleep(1); print(sys.stdin.read())",
+            stdin=b"input\n2ndline",
+            timeout=0.1,
+        )
+
+    result = testdir.run(
+        sys.executable,
+        "-c",
+        "import sys; print(sys.stdin.read())",
+        stdin=b"input\n2ndline",
+    )
+    assert result.stdout.lines == ["input", "2ndline"]
+    assert result.stderr.str() == ""
+    assert result.ret == 0
+
+
+def test_popen_stdin_pipe(testdir):
+    proc = testdir.popen(
+        [sys.executable, "-c", "import sys; print(sys.stdin.read())"],
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        stdin=subprocess.PIPE,
+    )
+    stdin = b"input\n2ndline"
+    stdout, stderr = proc.communicate(input=stdin)
+    assert stdout.decode("utf8").splitlines() == ["input", "2ndline"]
+    assert stderr == b""
+    assert proc.returncode == 0
+
+
+def test_popen_stdin_bytes(testdir):
+    proc = testdir.popen(
+        [sys.executable, "-c", "import sys; print(sys.stdin.read())"],
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        stdin=b"input\n2ndline",
+    )
+    stdout, stderr = proc.communicate()
+    assert stdout.decode("utf8").splitlines() == ["input", "2ndline"]
+    assert stderr == b""
+    assert proc.returncode == 0
+
+
+def test_popen_default_stdin_stderr_and_stdin_None(testdir):
+    # stdout, stderr default to pipes,
+    # stdin can be None to not close the pipe, avoiding
+    # "ValueError: flush of closed file" with `communicate()`.
+    p1 = testdir.makepyfile(
+        """
+        import sys
+        print(sys.stdin.read())  # empty
+        print('stdout')
+        sys.stderr.write('stderr')
+        """
+    )
+    proc = testdir.popen([sys.executable, str(p1)], stdin=None)
+    stdout, stderr = proc.communicate(b"ignored")
+    assert stdout.splitlines() == [b"", b"stdout"]
+    assert stderr.splitlines() == [b"stderr"]
+    assert proc.returncode == 0
+
+
+def test_spawn_uses_tmphome(testdir):
+    import os
+
+    tmphome = str(testdir.tmpdir)
+
+    # Does use HOME only during run.
+    assert os.environ.get("HOME") != tmphome
+
+    testdir._env_run_update["CUSTOMENV"] = "42"
+
+    p1 = testdir.makepyfile(
+        """
+        import os
+
+        def test():
+            assert os.environ["HOME"] == {tmphome!r}
+            assert os.environ["CUSTOMENV"] == "42"
+        """.format(
+            tmphome=tmphome
+        )
+    )
+    child = testdir.spawn_pytest(str(p1))
+    out = child.read()
+    assert child.wait() == 0, out.decode("utf8")
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_recwarn.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_recwarn.py
index a8e2fb80378..d652219df3e 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_recwarn.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_recwarn.py
@@ -1,13 +1,24 @@
-from __future__ import absolute_import, division, print_function
-import warnings
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import re
+import warnings
 
 import pytest
 from _pytest.recwarn import WarningsRecorder
+from _pytest.warning_types import PytestDeprecationWarning
+
+
+def test_recwarn_stacklevel(recwarn):
+    warnings.warn("hello")
+    warn = recwarn.pop()
+    assert warn.filename == __file__
 
 
 def test_recwarn_functional(testdir):
-    reprec = testdir.inline_runsource(
+    testdir.makepyfile(
         """
         import warnings
         def test_method(recwarn):
@@ -16,12 +27,11 @@ def test_recwarn_functional(testdir):
             assert isinstance(warn.message, UserWarning)
     """
     )
-    res = reprec.countoutcomes()
-    assert tuple(res) == (1, 0, 0), res
+    reprec = testdir.inline_run()
+    reprec.assertoutcome(passed=1)
 
 
 class TestWarningsRecorderChecker(object):
-
     def test_recording(self):
         rec = WarningsRecorder()
         with rec:
@@ -36,7 +46,13 @@ class TestWarningsRecorderChecker(object):
             rec.clear()
             assert len(rec.list) == 0
             assert values is rec.list
-            pytest.raises(AssertionError, "rec.pop()")
+            pytest.raises(AssertionError, rec.pop)
+
+    def test_warn_stacklevel(self):
+        """#4243"""
+        rec = WarningsRecorder()
+        with rec:
+            warnings.warn("test", DeprecationWarning, 2)
 
     def test_typechecking(self):
         from _pytest.recwarn import WarningsChecker
@@ -77,9 +93,8 @@ class TestDeprecatedCall(object):
             )
 
     def test_deprecated_call_raises(self):
-        with pytest.raises(AssertionError) as excinfo:
+        with pytest.raises(pytest.fail.Exception, match="No warnings of type"):
             pytest.deprecated_call(self.dep, 3, 5)
-        assert "Did not produce" in str(excinfo)
 
     def test_deprecated_call(self):
         pytest.deprecated_call(self.dep, 0, 5)
@@ -101,7 +116,7 @@ class TestDeprecatedCall(object):
         assert warn_explicit is warnings.warn_explicit
 
     def test_deprecated_explicit_call_raises(self):
-        with pytest.raises(AssertionError):
+        with pytest.raises(pytest.fail.Exception):
             pytest.deprecated_call(self.dep_explicit, 3)
 
     def test_deprecated_explicit_call(self):
@@ -117,8 +132,8 @@ class TestDeprecatedCall(object):
         def f():
             pass
 
-        msg = "Did not produce DeprecationWarning or PendingDeprecationWarning"
-        with pytest.raises(AssertionError, match=msg):
+        msg = "No warnings of type (.*DeprecationWarning.*, .*PendingDeprecationWarning.*)"
+        with pytest.raises(pytest.fail.Exception, match=msg):
             if mode == "call":
                 pytest.deprecated_call(f)
             else:
@@ -180,23 +195,38 @@ class TestDeprecatedCall(object):
             def f():
                 warnings.warn(warning("hi"))
 
-            with pytest.raises(AssertionError):
+            with pytest.raises(pytest.fail.Exception):
                 pytest.deprecated_call(f)
-            with pytest.raises(AssertionError):
+            with pytest.raises(pytest.fail.Exception):
                 with pytest.deprecated_call():
                     f()
 
+    def test_deprecated_call_supports_match(self):
+        with pytest.deprecated_call(match=r"must be \d+$"):
+            warnings.warn("value must be 42", DeprecationWarning)
+
+        with pytest.raises(pytest.fail.Exception):
+            with pytest.deprecated_call(match=r"must be \d+$"):
+                warnings.warn("this is not here", DeprecationWarning)
+
 
 class TestWarns(object):
-
     def test_strings(self):
         # different messages, b/c Python suppresses multiple identical warnings
         source1 = "warnings.warn('w1', RuntimeWarning)"
         source2 = "warnings.warn('w2', RuntimeWarning)"
         source3 = "warnings.warn('w3', RuntimeWarning)"
-        pytest.warns(RuntimeWarning, source1)
-        pytest.raises(pytest.fail.Exception, lambda: pytest.warns(UserWarning, source2))
-        pytest.warns(RuntimeWarning, source3)
+        with pytest.warns(PytestDeprecationWarning) as warninfo:  # yo dawg
+            pytest.warns(RuntimeWarning, source1)
+            pytest.raises(
+                pytest.fail.Exception, lambda: pytest.warns(UserWarning, source2)
+            )
+            pytest.warns(RuntimeWarning, source3)
+        assert len(warninfo) == 3
+        for w in warninfo:
+            assert w.filename == __file__
+            (msg,) = w.message.args
+            assert msg.startswith("warns(..., 'code(as_a_string)') is deprecated")
 
     def test_function(self):
         pytest.warns(
@@ -345,3 +375,13 @@ class TestWarns(object):
             with pytest.warns(UserWarning, match=r"aaa"):
                 warnings.warn("bbbbbbbbbb", UserWarning)
                 warnings.warn("cccccccccc", UserWarning)
+
+    @pytest.mark.filterwarnings("ignore")
+    def test_can_capture_previously_warned(self):
+        def f():
+            warnings.warn(UserWarning("ohai"))
+            return 10
+
+        assert f() == 10
+        assert pytest.warns(UserWarning, f) == 10
+        assert pytest.warns(UserWarning, f) == 10
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_reports.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_reports.py
new file mode 100644
index 00000000000..5c6851e49bd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_reports.py
@@ -0,0 +1,314 @@
+# -*- coding: utf-8 -*-
+import pytest
+from _pytest.pathlib import Path
+from _pytest.reports import CollectReport
+from _pytest.reports import TestReport
+
+
+class TestReportSerialization(object):
+    def test_xdist_longrepr_to_str_issue_241(self, testdir):
+        """
+        Regarding issue pytest-xdist#241
+
+        This test came originally from test_remote.py in xdist (ca03269).
+        """
+        testdir.makepyfile(
+            """
+            def test_a(): assert False
+            def test_b(): pass
+        """
+        )
+        reprec = testdir.inline_run()
+        reports = reprec.getreports("pytest_runtest_logreport")
+        assert len(reports) == 6
+        test_a_call = reports[1]
+        assert test_a_call.when == "call"
+        assert test_a_call.outcome == "failed"
+        assert test_a_call._to_json()["longrepr"]["reprtraceback"]["style"] == "long"
+        test_b_call = reports[4]
+        assert test_b_call.when == "call"
+        assert test_b_call.outcome == "passed"
+        assert test_b_call._to_json()["longrepr"] is None
+
+    def test_xdist_report_longrepr_reprcrash_130(self, testdir):
+        """Regarding issue pytest-xdist#130
+
+        This test came originally from test_remote.py in xdist (ca03269).
+        """
+        reprec = testdir.inline_runsource(
+            """
+                    def test_fail():
+                        assert False, 'Expected Message'
+                """
+        )
+        reports = reprec.getreports("pytest_runtest_logreport")
+        assert len(reports) == 3
+        rep = reports[1]
+        added_section = ("Failure Metadata", str("metadata metadata"), "*")
+        rep.longrepr.sections.append(added_section)
+        d = rep._to_json()
+        a = TestReport._from_json(d)
+        # Check assembled == rep
+        assert a.__dict__.keys() == rep.__dict__.keys()
+        for key in rep.__dict__.keys():
+            if key != "longrepr":
+                assert getattr(a, key) == getattr(rep, key)
+        assert rep.longrepr.reprcrash.lineno == a.longrepr.reprcrash.lineno
+        assert rep.longrepr.reprcrash.message == a.longrepr.reprcrash.message
+        assert rep.longrepr.reprcrash.path == a.longrepr.reprcrash.path
+        assert rep.longrepr.reprtraceback.entrysep == a.longrepr.reprtraceback.entrysep
+        assert (
+            rep.longrepr.reprtraceback.extraline == a.longrepr.reprtraceback.extraline
+        )
+        assert rep.longrepr.reprtraceback.style == a.longrepr.reprtraceback.style
+        assert rep.longrepr.sections == a.longrepr.sections
+        # Missing section attribute PR171
+        assert added_section in a.longrepr.sections
+
+    def test_reprentries_serialization_170(self, testdir):
+        """Regarding issue pytest-xdist#170
+
+        This test came originally from test_remote.py in xdist (ca03269).
+        """
+        from _pytest._code.code import ReprEntry
+
+        reprec = testdir.inline_runsource(
+            """
+                            def test_repr_entry():
+                                x = 0
+                                assert x
+                        """,
+            "--showlocals",
+        )
+        reports = reprec.getreports("pytest_runtest_logreport")
+        assert len(reports) == 3
+        rep = reports[1]
+        d = rep._to_json()
+        a = TestReport._from_json(d)
+
+        rep_entries = rep.longrepr.reprtraceback.reprentries
+        a_entries = a.longrepr.reprtraceback.reprentries
+        for i in range(len(a_entries)):
+            assert isinstance(rep_entries[i], ReprEntry)
+            assert rep_entries[i].lines == a_entries[i].lines
+            assert rep_entries[i].reprfileloc.lineno == a_entries[i].reprfileloc.lineno
+            assert (
+                rep_entries[i].reprfileloc.message == a_entries[i].reprfileloc.message
+            )
+            assert rep_entries[i].reprfileloc.path == a_entries[i].reprfileloc.path
+            assert rep_entries[i].reprfuncargs.args == a_entries[i].reprfuncargs.args
+            assert rep_entries[i].reprlocals.lines == a_entries[i].reprlocals.lines
+            assert rep_entries[i].style == a_entries[i].style
+
+    def test_reprentries_serialization_196(self, testdir):
+        """Regarding issue pytest-xdist#196
+
+        This test came originally from test_remote.py in xdist (ca03269).
+        """
+        from _pytest._code.code import ReprEntryNative
+
+        reprec = testdir.inline_runsource(
+            """
+                            def test_repr_entry_native():
+                                x = 0
+                                assert x
+                        """,
+            "--tb=native",
+        )
+        reports = reprec.getreports("pytest_runtest_logreport")
+        assert len(reports) == 3
+        rep = reports[1]
+        d = rep._to_json()
+        a = TestReport._from_json(d)
+
+        rep_entries = rep.longrepr.reprtraceback.reprentries
+        a_entries = a.longrepr.reprtraceback.reprentries
+        for i in range(len(a_entries)):
+            assert isinstance(rep_entries[i], ReprEntryNative)
+            assert rep_entries[i].lines == a_entries[i].lines
+
+    def test_itemreport_outcomes(self, testdir):
+        """
+        This test came originally from test_remote.py in xdist (ca03269).
+        """
+        reprec = testdir.inline_runsource(
+            """
+            import py
+            def test_pass(): pass
+            def test_fail(): 0/0
+            @py.test.mark.skipif("True")
+            def test_skip(): pass
+            def test_skip_imperative():
+                py.test.skip("hello")
+            @py.test.mark.xfail("True")
+            def test_xfail(): 0/0
+            def test_xfail_imperative():
+                py.test.xfail("hello")
+        """
+        )
+        reports = reprec.getreports("pytest_runtest_logreport")
+        assert len(reports) == 17  # with setup/teardown "passed" reports
+        for rep in reports:
+            d = rep._to_json()
+            newrep = TestReport._from_json(d)
+            assert newrep.passed == rep.passed
+            assert newrep.failed == rep.failed
+            assert newrep.skipped == rep.skipped
+            if newrep.skipped and not hasattr(newrep, "wasxfail"):
+                assert len(newrep.longrepr) == 3
+            assert newrep.outcome == rep.outcome
+            assert newrep.when == rep.when
+            assert newrep.keywords == rep.keywords
+            if rep.failed:
+                assert newrep.longreprtext == rep.longreprtext
+
+    def test_collectreport_passed(self, testdir):
+        """This test came originally from test_remote.py in xdist (ca03269)."""
+        reprec = testdir.inline_runsource("def test_func(): pass")
+        reports = reprec.getreports("pytest_collectreport")
+        for rep in reports:
+            d = rep._to_json()
+            newrep = CollectReport._from_json(d)
+            assert newrep.passed == rep.passed
+            assert newrep.failed == rep.failed
+            assert newrep.skipped == rep.skipped
+
+    def test_collectreport_fail(self, testdir):
+        """This test came originally from test_remote.py in xdist (ca03269)."""
+        reprec = testdir.inline_runsource("qwe abc")
+        reports = reprec.getreports("pytest_collectreport")
+        assert reports
+        for rep in reports:
+            d = rep._to_json()
+            newrep = CollectReport._from_json(d)
+            assert newrep.passed == rep.passed
+            assert newrep.failed == rep.failed
+            assert newrep.skipped == rep.skipped
+            if rep.failed:
+                assert newrep.longrepr == str(rep.longrepr)
+
+    def test_extended_report_deserialization(self, testdir):
+        """This test came originally from test_remote.py in xdist (ca03269)."""
+        reprec = testdir.inline_runsource("qwe abc")
+        reports = reprec.getreports("pytest_collectreport")
+        assert reports
+        for rep in reports:
+            rep.extra = True
+            d = rep._to_json()
+            newrep = CollectReport._from_json(d)
+            assert newrep.extra
+            assert newrep.passed == rep.passed
+            assert newrep.failed == rep.failed
+            assert newrep.skipped == rep.skipped
+            if rep.failed:
+                assert newrep.longrepr == str(rep.longrepr)
+
+    def test_paths_support(self, testdir):
+        """Report attributes which are py.path or pathlib objects should become strings."""
+        testdir.makepyfile(
+            """
+            def test_a():
+                assert False
+        """
+        )
+        reprec = testdir.inline_run()
+        reports = reprec.getreports("pytest_runtest_logreport")
+        assert len(reports) == 3
+        test_a_call = reports[1]
+        test_a_call.path1 = testdir.tmpdir
+        test_a_call.path2 = Path(testdir.tmpdir)
+        data = test_a_call._to_json()
+        assert data["path1"] == str(testdir.tmpdir)
+        assert data["path2"] == str(testdir.tmpdir)
+
+    def test_unserialization_failure(self, testdir):
+        """Check handling of failure during unserialization of report types."""
+        testdir.makepyfile(
+            """
+            def test_a():
+                assert False
+        """
+        )
+        reprec = testdir.inline_run()
+        reports = reprec.getreports("pytest_runtest_logreport")
+        assert len(reports) == 3
+        test_a_call = reports[1]
+        data = test_a_call._to_json()
+        entry = data["longrepr"]["reprtraceback"]["reprentries"][0]
+        assert entry["type"] == "ReprEntry"
+
+        entry["type"] = "Unknown"
+        with pytest.raises(
+            RuntimeError, match="INTERNALERROR: Unknown entry type returned: Unknown"
+        ):
+            TestReport._from_json(data)
+
+
+class TestHooks:
+    """Test that the hooks are working correctly for plugins"""
+
+    def test_test_report(self, testdir, pytestconfig):
+        testdir.makepyfile(
+            """
+            def test_a(): assert False
+            def test_b(): pass
+        """
+        )
+        reprec = testdir.inline_run()
+        reports = reprec.getreports("pytest_runtest_logreport")
+        assert len(reports) == 6
+        for rep in reports:
+            data = pytestconfig.hook.pytest_report_to_serializable(
+                config=pytestconfig, report=rep
+            )
+            assert data["_report_type"] == "TestReport"
+            new_rep = pytestconfig.hook.pytest_report_from_serializable(
+                config=pytestconfig, data=data
+            )
+            assert new_rep.nodeid == rep.nodeid
+            assert new_rep.when == rep.when
+            assert new_rep.outcome == rep.outcome
+
+    def test_collect_report(self, testdir, pytestconfig):
+        testdir.makepyfile(
+            """
+            def test_a(): assert False
+            def test_b(): pass
+        """
+        )
+        reprec = testdir.inline_run()
+        reports = reprec.getreports("pytest_collectreport")
+        assert len(reports) == 2
+        for rep in reports:
+            data = pytestconfig.hook.pytest_report_to_serializable(
+                config=pytestconfig, report=rep
+            )
+            assert data["_report_type"] == "CollectReport"
+            new_rep = pytestconfig.hook.pytest_report_from_serializable(
+                config=pytestconfig, data=data
+            )
+            assert new_rep.nodeid == rep.nodeid
+            assert new_rep.when == "collect"
+            assert new_rep.outcome == rep.outcome
+
+    @pytest.mark.parametrize(
+        "hook_name", ["pytest_runtest_logreport", "pytest_collectreport"]
+    )
+    def test_invalid_report_types(self, testdir, pytestconfig, hook_name):
+        testdir.makepyfile(
+            """
+            def test_a(): pass
+            """
+        )
+        reprec = testdir.inline_run()
+        reports = reprec.getreports(hook_name)
+        assert reports
+        rep = reports[0]
+        data = pytestconfig.hook.pytest_report_to_serializable(
+            config=pytestconfig, report=rep
+        )
+        data["_report_type"] = "Unknown"
+        with pytest.raises(AssertionError):
+            _ = pytestconfig.hook.pytest_report_from_serializable(
+                config=pytestconfig, data=data
+            )
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_resultlog.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_resultlog.py
index 173384ffb30..1ef49d5e2d9 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_resultlog.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_resultlog.py
@@ -1,41 +1,19 @@
-from __future__ import absolute_import, division, print_function
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import os
 
-import _pytest._code
 import py
+
+import _pytest._code
 import pytest
-from _pytest.nodes import Node, Item, FSCollector
-from _pytest.resultlog import (
-    generic_path,
-    ResultLog,
-    pytest_configure,
-    pytest_unconfigure,
-)
+from _pytest.resultlog import pytest_configure
+from _pytest.resultlog import pytest_unconfigure
+from _pytest.resultlog import ResultLog
 
-
-def test_generic_path(testdir):
-    from _pytest.main import Session
-
-    config = testdir.parseconfig()
-    session = Session(config)
-    p1 = Node("a", config=config, session=session, nodeid="a")
-    # assert p1.fspath is None
-    p2 = Node("B", parent=p1)
-    p3 = Node("()", parent=p2)
-    item = Item("c", parent=p3)
-
-    res = generic_path(item)
-    assert res == "a.B().c"
-
-    p0 = FSCollector("proj/test", config=config, session=session)
-    p1 = FSCollector("proj/test/a", parent=p0)
-    p2 = Node("B", parent=p1)
-    p3 = Node("()", parent=p2)
-    p4 = Node("c", parent=p3)
-    item = Item("[1]", parent=p4)
-
-    res = generic_path(item)
-    assert res == "test/a:B().c[1]"
+pytestmark = pytest.mark.filterwarnings("ignore:--result-log is deprecated")
 
 
 def test_write_log_entry():
@@ -144,7 +122,7 @@ class TestWithFunctionIntegration(object):
         try:
             raise ValueError
         except ValueError:
-            excinfo = _pytest._code.ExceptionInfo()
+            excinfo = _pytest._code.ExceptionInfo.from_current()
         reslog = ResultLog(None, py.io.TextIO())
         reslog.pytest_internalerror(excinfo.getrepr(style=style))
         entry = reslog.logfile.getvalue()
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_runner.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_runner.py
index f5430a90da5..6906efb910c 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_runner.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_runner.py
@@ -1,18 +1,24 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
-import _pytest._code
 import inspect
 import os
-import py
-import pytest
 import sys
 import types
-from _pytest import runner, main, outcomes
+
+import py
+
+import _pytest._code
+import pytest
+from _pytest import main
+from _pytest import outcomes
+from _pytest import reports
+from _pytest import runner
 
 
 class TestSetupState(object):
-
     def test_setup(self, testdir):
         ss = runner.SetupState()
         item = testdir.getitem("def test_func(): pass")
@@ -101,7 +107,6 @@ class TestSetupState(object):
 
 
 class BaseFunctionalTests(object):
-
     def test_passfunction(self, testdir):
         reports = testdir.runitem(
             """
@@ -253,10 +258,10 @@ class BaseFunctionalTests(object):
         """
         )
         reps = rec.getcalls("pytest_runtest_logstart pytest_runtest_logfinish")
-        assert (
-            [x._name for x in reps]
-            == ["pytest_runtest_logstart", "pytest_runtest_logfinish"]
-        )
+        assert [x._name for x in reps] == [
+            "pytest_runtest_logstart",
+            "pytest_runtest_logfinish",
+        ]
         for rep in reps:
             assert rep.nodeid == "test_logstart_logfinish_hooks.py::test_func"
             assert rep.location == ("test_logstart_logfinish_hooks.py", 1, "test_func")
@@ -395,9 +400,7 @@ class BaseFunctionalTests(object):
 
 
 class TestExecutionNonForked(BaseFunctionalTests):
-
     def getrunner(self):
-
         def f(item):
             return runner.runtestprotocol(item, log=False)
 
@@ -439,7 +442,6 @@ class TestExecutionForked(BaseFunctionalTests):
 
 
 class TestSessionReports(object):
-
     def test_collect_result(self, testdir):
         col = testdir.getmodulecol(
             """
@@ -463,12 +465,7 @@ class TestSessionReports(object):
         assert res[1].name == "TestClass"
 
 
-reporttypes = [
-    runner.BaseReport,
-    runner.TestReport,
-    runner.TeardownErrorReport,
-    runner.CollectReport,
-]
+reporttypes = [reports.BaseReport, reports.TestReport, reports.CollectReport]
 
 
 @pytest.mark.parametrize(
@@ -485,13 +482,16 @@ def test_report_extra_parameters(reporttype):
 
 
 def test_callinfo():
-    ci = runner.CallInfo(lambda: 0, "123")
+    ci = runner.CallInfo.from_call(lambda: 0, "123")
     assert ci.when == "123"
     assert ci.result == 0
     assert "result" in repr(ci)
-    ci = runner.CallInfo(lambda: 0 / 0, "123")
+    assert repr(ci) == "<CallInfo when='123' result: 0>"
+
+    ci = runner.CallInfo.from_call(lambda: 0 / 0, "123")
     assert ci.when == "123"
     assert not hasattr(ci, "result")
+    assert repr(ci) == "<CallInfo when='123' exception: division by zero>"
     assert ci.excinfo
     assert "exc" in repr(ci)
 
@@ -546,20 +546,16 @@ def test_outcomeexception_passes_except_Exception():
 
 
 def test_pytest_exit():
-    try:
+    with pytest.raises(pytest.exit.Exception) as excinfo:
         pytest.exit("hello")
-    except pytest.exit.Exception:
-        excinfo = _pytest._code.ExceptionInfo()
-        assert excinfo.errisinstance(KeyboardInterrupt)
+    assert excinfo.errisinstance(pytest.exit.Exception)
 
 
 def test_pytest_fail():
-    try:
+    with pytest.raises(pytest.fail.Exception) as excinfo:
         pytest.fail("hello")
-    except pytest.fail.Exception:
-        excinfo = _pytest._code.ExceptionInfo()
-        s = excinfo.exconly(tryshort=True)
-        assert s.startswith("Failed")
+    s = excinfo.exconly(tryshort=True)
+    assert s.startswith("Failed")
 
 
 def test_pytest_exit_msg(testdir):
@@ -575,7 +571,43 @@ def test_pytest_exit_msg(testdir):
     result.stderr.fnmatch_lines(["Exit: oh noes"])
 
 
-def test_pytest_fail_notrace(testdir):
+def test_pytest_exit_returncode(testdir):
+    testdir.makepyfile(
+        """
+        import pytest
+        def test_foo():
+            pytest.exit("some exit msg", 99)
+    """
+    )
+    result = testdir.runpytest()
+    result.stdout.fnmatch_lines(["*! *Exit: some exit msg !*"])
+    # Assert no output on stderr, except for unreliable ResourceWarnings.
+    # (https://github.com/pytest-dev/pytest/issues/5088)
+    assert [
+        x
+        for x in result.stderr.lines
+        if not x.startswith("Exception ignored in:")
+        and not x.startswith("ResourceWarning")
+    ] == [""]
+    assert result.ret == 99
+
+    # It prints to stderr also in case of exit during pytest_sessionstart.
+    testdir.makeconftest(
+        """
+        import pytest
+
+        def pytest_sessionstart():
+            pytest.exit("during_sessionstart", 98)
+        """
+    )
+    result = testdir.runpytest()
+    result.stdout.fnmatch_lines(["*! *Exit: during_sessionstart !*"])
+    assert result.stderr.lines == ["Exit: during_sessionstart", ""]
+    assert result.ret == 98
+
+
+def test_pytest_fail_notrace_runtest(testdir):
+    """Test pytest.fail(..., pytrace=False) does not show tracebacks during test run."""
     testdir.makepyfile(
         """
         import pytest
@@ -590,6 +622,21 @@ def test_pytest_fail_notrace(testdir):
     assert "def teardown_function" not in result.stdout.str()
 
 
+def test_pytest_fail_notrace_collection(testdir):
+    """Test pytest.fail(..., pytrace=False) does not show tracebacks during collection."""
+    testdir.makepyfile(
+        """
+        import pytest
+        def some_internal_function():
+            pytest.fail("hello", pytrace=False)
+        some_internal_function()
+    """
+    )
+    result = testdir.runpytest()
+    result.stdout.fnmatch_lines(["hello"])
+    assert "def some_internal_function()" not in result.stdout.str()
+
+
 @pytest.mark.parametrize("str_prefix", ["u", ""])
 def test_pytest_fail_notrace_non_ascii(testdir, str_prefix):
     """Fix pytest.fail with pytrace=False with non-ascii characters (#1178).
@@ -598,7 +645,7 @@ def test_pytest_fail_notrace_non_ascii(testdir, str_prefix):
     """
     testdir.makepyfile(
         u"""
-        # coding: utf-8
+        # -*- coding: utf-8 -*-
         import pytest
 
         def test_hello():
@@ -616,7 +663,7 @@ def test_pytest_fail_notrace_non_ascii(testdir, str_prefix):
 
 def test_pytest_no_tests_collected_exit_status(testdir):
     result = testdir.runpytest()
-    result.stdout.fnmatch_lines("*collected 0 items*")
+    result.stdout.fnmatch_lines(["*collected 0 items*"])
     assert result.ret == main.EXIT_NOTESTSCOLLECTED
 
     testdir.makepyfile(
@@ -626,13 +673,13 @@ def test_pytest_no_tests_collected_exit_status(testdir):
     """
     )
     result = testdir.runpytest()
-    result.stdout.fnmatch_lines("*collected 1 item*")
-    result.stdout.fnmatch_lines("*1 passed*")
+    result.stdout.fnmatch_lines(["*collected 1 item*"])
+    result.stdout.fnmatch_lines(["*1 passed*"])
     assert result.ret == main.EXIT_OK
 
     result = testdir.runpytest("-k nonmatch")
-    result.stdout.fnmatch_lines("*collected 1 item*")
-    result.stdout.fnmatch_lines("*1 deselected*")
+    result.stdout.fnmatch_lines(["*collected 1 item*"])
+    result.stdout.fnmatch_lines(["*1 deselected*"])
     assert result.ret == main.EXIT_NOTESTSCOLLECTED
 
 
@@ -640,7 +687,7 @@ def test_exception_printing_skip():
     try:
         pytest.skip("hello")
     except pytest.skip.Exception:
-        excinfo = _pytest._code.ExceptionInfo()
+        excinfo = _pytest._code.ExceptionInfo.from_current()
         s = excinfo.exconly(tryshort=True)
         assert s.startswith("Skipped")
 
@@ -661,21 +708,17 @@ def test_importorskip(monkeypatch):
         # check that importorskip reports the actual call
         # in this test the test_runner.py file
         assert path.purebasename == "test_runner"
-        pytest.raises(SyntaxError, "pytest.importorskip('x y z')")
-        pytest.raises(SyntaxError, "pytest.importorskip('x=y')")
+        pytest.raises(SyntaxError, pytest.importorskip, "x y z")
+        pytest.raises(SyntaxError, pytest.importorskip, "x=y")
         mod = types.ModuleType("hello123")
         mod.__version__ = "1.3"
         monkeypatch.setitem(sys.modules, "hello123", mod)
-        pytest.raises(
-            pytest.skip.Exception,
-            """
+        with pytest.raises(pytest.skip.Exception):
             pytest.importorskip("hello123", minversion="1.3.1")
-        """,
-        )
         mod2 = pytest.importorskip("hello123", minversion="1.3")
         assert mod2 == mod
     except pytest.skip.Exception:
-        print(_pytest._code.ExceptionInfo())
+        print(_pytest._code.ExceptionInfo.from_current())
         pytest.fail("spurious skip")
 
 
@@ -691,13 +734,10 @@ def test_importorskip_dev_module(monkeypatch):
         monkeypatch.setitem(sys.modules, "mockmodule", mod)
         mod2 = pytest.importorskip("mockmodule", minversion="0.12.0")
         assert mod2 == mod
-        pytest.raises(
-            pytest.skip.Exception,
-            """
-            pytest.importorskip('mockmodule1', minversion='0.14.0')""",
-        )
+        with pytest.raises(pytest.skip.Exception):
+            pytest.importorskip("mockmodule1", minversion="0.14.0")
     except pytest.skip.Exception:
-        print(_pytest._code.ExceptionInfo())
+        print(_pytest._code.ExceptionInfo.from_current())
         pytest.fail("spurious skip")
 
 
@@ -716,6 +756,22 @@ def test_importorskip_module_level(testdir):
     result.stdout.fnmatch_lines(["*collected 0 items / 1 skipped*"])
 
 
+def test_importorskip_custom_reason(testdir):
+    """make sure custom reasons are used"""
+    testdir.makepyfile(
+        """
+        import pytest
+        foobarbaz = pytest.importorskip("foobarbaz2", reason="just because")
+
+        def test_foo():
+            pass
+    """
+    )
+    result = testdir.runpytest("-ra")
+    result.stdout.fnmatch_lines(["*just because*"])
+    result.stdout.fnmatch_lines(["*collected 0 items / 1 skipped*"])
+
+
 def test_pytest_cmdline_main(testdir):
     p = testdir.makepyfile(
         """
@@ -869,14 +925,11 @@ def test_current_test_env_var(testdir, monkeypatch):
     result = testdir.runpytest_inprocess()
     assert result.ret == 0
     test_id = "test_current_test_env_var.py::test"
-    assert (
-        pytest_current_test_vars
-        == [
-            ("setup", test_id + " (setup)"),
-            ("call", test_id + " (call)"),
-            ("teardown", test_id + " (teardown)"),
-        ]
-    )
+    assert pytest_current_test_vars == [
+        ("setup", test_id + " (setup)"),
+        ("call", test_id + " (call)"),
+        ("teardown", test_id + " (teardown)"),
+    ]
     assert "PYTEST_CURRENT_TEST" not in os.environ
 
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_runner_xunit.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_runner_xunit.py
index 8316aafbf56..5be7297f6c5 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_runner_xunit.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_runner_xunit.py
@@ -1,8 +1,12 @@
+# -*- coding: utf-8 -*-
 """
  test correct setup/teardowns at
  module, class, and instance level
 """
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import pytest
 
 
@@ -166,62 +170,6 @@ def test_method_setup_failure_no_teardown(testdir):
     reprec.assertoutcome(failed=1, passed=1)
 
 
-def test_method_generator_setup(testdir):
-    reprec = testdir.inline_runsource(
-        """
-        class TestSetupTeardownOnInstance(object):
-            def setup_class(cls):
-                cls.classsetup = True
-
-            def setup_method(self, method):
-                self.methsetup = method
-
-            def test_generate(self):
-                assert self.classsetup
-                assert self.methsetup == self.test_generate
-                yield self.generated, 5
-                yield self.generated, 2
-
-            def generated(self, value):
-                assert self.classsetup
-                assert self.methsetup == self.test_generate
-                assert value == 5
-    """
-    )
-    reprec.assertoutcome(passed=1, failed=1)
-
-
-def test_func_generator_setup(testdir):
-    reprec = testdir.inline_runsource(
-        """
-        import sys
-
-        def setup_module(mod):
-            print ("setup_module")
-            mod.x = []
-
-        def setup_function(fun):
-            print ("setup_function")
-            x.append(1)
-
-        def teardown_function(fun):
-            print ("teardown_function")
-            x.pop()
-
-        def test_one():
-            assert x == [1]
-            def check():
-                print ("check")
-                sys.stderr.write("e\\n")
-                assert x == [1]
-            yield check
-            assert x == [1]
-    """
-    )
-    rep = reprec.matchreport("test_one", names="pytest_runtest_logreport")
-    assert rep.passed
-
-
 def test_method_setup_uses_fresh_instances(testdir):
     reprec = testdir.inline_runsource(
         """
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_session.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_session.py
index 4a594009bab..9acad5deafd 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_session.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_session.py
@@ -1,12 +1,13 @@
-from __future__ import absolute_import, division, print_function
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import pytest
-
 from _pytest.main import EXIT_NOTESTSCOLLECTED
 
 
 class SessionTests(object):
-
     def test_basic_testitem_events(self, testdir):
         tfile = testdir.makepyfile(
             """
@@ -68,21 +69,7 @@ class SessionTests(object):
         passed, skipped, failed = reprec.listoutcomes()
         assert len(failed) == 1
         out = failed[0].longrepr.reprcrash.message
-        if not out.find("DID NOT RAISE") != -1:
-            print(out)
-            pytest.fail("incorrect raises() output")
-
-    def test_generator_yields_None(self, testdir):
-        reprec = testdir.inline_runsource(
-            """
-            def test_1():
-                yield None
-        """
-        )
-        failures = reprec.getfailedcollections()
-        out = failures[0].longrepr.reprcrash.message
-        i = out.find("TypeError")
-        assert i != -1
+        assert "DID NOT RAISE" in out
 
     def test_syntax_error_module(self, testdir):
         reprec = testdir.inline_runsource("this is really not python")
@@ -128,7 +115,8 @@ class SessionTests(object):
             class TestBrokenClass(object):
                 def test_explicit_bad_repr(self):
                     t = BrokenRepr1()
-                    pytest.raises(Exception, 'repr(t)')
+                    with pytest.raises(Exception, match="I'm a broken repr"):
+                        repr(t)
 
                 def test_implicit_bad_repr1(self):
                     t = BrokenRepr1()
@@ -138,14 +126,38 @@ class SessionTests(object):
         )
         reprec = testdir.inline_run(p)
         passed, skipped, failed = reprec.listoutcomes()
-        assert len(failed) == 1
+        assert (len(passed), len(skipped), len(failed)) == (1, 0, 1)
         out = failed[0].longrepr.reprcrash.message
         assert (
             out.find(
                 """[Exception("Ha Ha fooled you, I'm a broken repr().") raised in repr()]"""
             )
             != -1
-        )  # '
+        )
+
+    def test_broken_repr_with_showlocals_verbose(self, testdir):
+        p = testdir.makepyfile(
+            """
+            class ObjWithErrorInRepr:
+                def __repr__(self):
+                    raise NotImplementedError
+
+            def test_repr_error():
+                x = ObjWithErrorInRepr()
+                assert x == "value"
+        """
+        )
+        reprec = testdir.inline_run("--showlocals", "-vv", p)
+        passed, skipped, failed = reprec.listoutcomes()
+        assert (len(passed), len(skipped), len(failed)) == (0, 0, 1)
+        entries = failed[0].longrepr.reprtraceback.reprentries
+        assert len(entries) == 1
+        repr_locals = entries[0].reprlocals
+        assert repr_locals.lines
+        assert len(repr_locals.lines) == 1
+        assert repr_locals.lines[0].startswith(
+            'x          = <[NotImplementedError("") raised in repr()] ObjWithErrorInRepr'
+        )
 
     def test_skip_file_by_conftest(self, testdir):
         testdir.makepyfile(
@@ -160,7 +172,7 @@ class SessionTests(object):
         )
         try:
             reprec = testdir.inline_run(testdir.tmpdir)
-        except pytest.skip.Exception:
+        except pytest.skip.Exception:  # pragma: no cover
             pytest.fail("wrong skipped caught")
         reports = reprec.getreports("pytest_collectreport")
         assert len(reports) == 1
@@ -168,7 +180,6 @@ class SessionTests(object):
 
 
 class TestNewSession(SessionTests):
-
     def test_order_of_execution(self, testdir):
         reprec = testdir.inline_runsource(
             """
@@ -194,7 +205,6 @@ class TestNewSession(SessionTests):
         passed, skipped, failed = reprec.countoutcomes()
         assert failed == skipped == 0
         assert passed == 7
-        # also test listnames() here ...
 
     def test_collect_only_with_various_situations(self, testdir):
         p = testdir.makepyfile(
@@ -220,7 +230,7 @@ class TestNewSession(SessionTests):
         started = reprec.getcalls("pytest_collectstart")
         finished = reprec.getreports("pytest_collectreport")
         assert len(started) == len(finished)
-        assert len(started) == 7  # XXX extra TopCollector
+        assert len(started) == 8
         colfail = [x for x in finished if x.failed]
         assert len(colfail) == 1
 
@@ -242,12 +252,8 @@ class TestNewSession(SessionTests):
 
 
 def test_plugin_specify(testdir):
-    pytest.raises(
-        ImportError,
-        """
-            testdir.parseconfig("-p", "nqweotexistent")
-    """,
-    )
+    with pytest.raises(ImportError):
+        testdir.parseconfig("-p", "nqweotexistent")
     # pytest.raises(ImportError,
     #    "config.do_configure(config)"
     # )
@@ -271,20 +277,45 @@ def test_exclude(testdir):
     result.stdout.fnmatch_lines(["*1 passed*"])
 
 
+def test_exclude_glob(testdir):
+    hellodir = testdir.mkdir("hello")
+    hellodir.join("test_hello.py").write("x y syntaxerror")
+    hello2dir = testdir.mkdir("hello2")
+    hello2dir.join("test_hello2.py").write("x y syntaxerror")
+    hello3dir = testdir.mkdir("hallo3")
+    hello3dir.join("test_hello3.py").write("x y syntaxerror")
+    subdir = testdir.mkdir("sub")
+    subdir.join("test_hello4.py").write("x y syntaxerror")
+    testdir.makepyfile(test_ok="def test_pass(): pass")
+    result = testdir.runpytest("--ignore-glob=*h[ea]llo*")
+    assert result.ret == 0
+    result.stdout.fnmatch_lines(["*1 passed*"])
+
+
 def test_deselect(testdir):
     testdir.makepyfile(
         test_a="""
         import pytest
+
         def test_a1(): pass
+
         @pytest.mark.parametrize('b', range(3))
         def test_a2(b): pass
+
+        class TestClass:
+            def test_c1(self): pass
+
+            def test_c2(self): pass
     """
     )
     result = testdir.runpytest(
-        "-v", "--deselect=test_a.py::test_a2[1]", "--deselect=test_a.py::test_a2[2]"
+        "-v",
+        "--deselect=test_a.py::test_a2[1]",
+        "--deselect=test_a.py::test_a2[2]",
+        "--deselect=test_a.py::TestClass::test_c1",
     )
     assert result.ret == 0
-    result.stdout.fnmatch_lines(["*2 passed, 2 deselected*"])
+    result.stdout.fnmatch_lines(["*3 passed, 3 deselected*"])
     for line in result.stdout.lines:
         assert not line.startswith(("test_a.py::test_a2[1]", "test_a.py::test_a2[2]"))
 
@@ -324,7 +355,11 @@ def test_rootdir_option_arg(testdir, monkeypatch, path):
 
     result = testdir.runpytest("--rootdir={}".format(path))
     result.stdout.fnmatch_lines(
-        ["*rootdir: {}/root, inifile:*".format(testdir.tmpdir), "*1 passed*"]
+        [
+            "*rootdir: {}/root".format(testdir.tmpdir),
+            "root/test_rootdir_option_arg.py *",
+            "*1 passed*",
+        ]
     )
 
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_skipping.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_skipping.py
index 5d970e2fea0..7834971125a 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_skipping.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_skipping.py
@@ -1,13 +1,17 @@
-from __future__ import absolute_import, division, print_function
-import pytest
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import sys
 
-from _pytest.skipping import MarkEvaluator, folded_skips, pytest_runtest_setup
+import pytest
 from _pytest.runner import runtestprotocol
+from _pytest.skipping import MarkEvaluator
+from _pytest.skipping import pytest_runtest_setup
 
 
 class TestEvaluator(object):
-
     def test_no_marker(self, testdir):
         item = testdir.getitem("def test_func(): pass")
         evalskipif = MarkEvaluator(item, "skipif")
@@ -126,10 +130,13 @@ class TestEvaluator(object):
         )
         ev = MarkEvaluator(item, "skipif")
         exc = pytest.raises(pytest.fail.Exception, ev.istrue)
-        assert """Failed: you need to specify reason=STRING when using booleans as conditions.""" in exc.value.msg
+        assert (
+            """Failed: you need to specify reason=STRING when using booleans as conditions."""
+            in exc.value.msg
+        )
 
     def test_skipif_class(self, testdir):
-        item, = testdir.getitems(
+        (item,) = testdir.getitems(
             """
             import pytest
             class TestClass(object):
@@ -146,7 +153,6 @@ class TestEvaluator(object):
 
 
 class TestXFail(object):
-
     @pytest.mark.parametrize("strict", [True, False])
     def test_xfail_simple(self, testdir, strict):
         item = testdir.getitem(
@@ -325,7 +331,7 @@ class TestXFail(object):
         result = testdir.runpytest(p, "-rx")
         result.stdout.fnmatch_lines(["*XFAIL*test_this*", "*reason:*hello*"])
         result = testdir.runpytest(p, "--runxfail")
-        result.stdout.fnmatch_lines("*1 pass*")
+        result.stdout.fnmatch_lines(["*1 pass*"])
 
     def test_xfail_imperative_in_setup_function(self, testdir):
         p = testdir.makepyfile(
@@ -471,7 +477,7 @@ class TestXFail(object):
             % strict
         )
         result = testdir.runpytest(p, "-rxX")
-        result.stdout.fnmatch_lines("*1 passed*")
+        result.stdout.fnmatch_lines(["*1 passed*"])
         assert result.ret == 0
 
     @pytest.mark.parametrize("strict", [True, False])
@@ -487,7 +493,7 @@ class TestXFail(object):
             % strict
         )
         result = testdir.runpytest(p, "-rxX")
-        result.stdout.fnmatch_lines("*1 passed*")
+        result.stdout.fnmatch_lines(["*1 passed*"])
         assert result.ret == 0
 
     @pytest.mark.parametrize("strict_val", ["true", "false"])
@@ -509,12 +515,11 @@ class TestXFail(object):
         )
         result = testdir.runpytest(p, "-rxX")
         strict = strict_val == "true"
-        result.stdout.fnmatch_lines("*1 failed*" if strict else "*1 xpassed*")
+        result.stdout.fnmatch_lines(["*1 failed*" if strict else "*1 xpassed*"])
         assert result.ret == (1 if strict else 0)
 
 
 class TestXFailwithSetupTeardown(object):
-
     def test_failing_setup_issue9(self, testdir):
         testdir.makepyfile(
             """
@@ -547,7 +552,6 @@ class TestXFailwithSetupTeardown(object):
 
 
 class TestSkip(object):
-
     def test_skip_class(self, testdir):
         testdir.makepyfile(
             """
@@ -645,7 +649,6 @@ class TestSkip(object):
 
 
 class TestSkipif(object):
-
     def test_skipif_conditional(self, testdir):
         item = testdir.getitem(
             """
@@ -746,39 +749,6 @@ def test_skipif_class(testdir):
     result.stdout.fnmatch_lines(["*2 skipped*"])
 
 
-def test_skip_reasons_folding():
-    path = "xyz"
-    lineno = 3
-    message = "justso"
-    longrepr = (path, lineno, message)
-
-    class X(object):
-        pass
-
-    ev1 = X()
-    ev1.when = "execute"
-    ev1.skipped = True
-    ev1.longrepr = longrepr
-
-    ev2 = X()
-    ev2.when = "execute"
-    ev2.longrepr = longrepr
-    ev2.skipped = True
-
-    # ev3 might be a collection report
-    ev3 = X()
-    ev3.longrepr = longrepr
-    ev3.skipped = True
-
-    values = folded_skips([ev1, ev2, ev3])
-    assert len(values) == 1
-    num, fspath, lineno, reason = values[0]
-    assert num == 3
-    assert fspath == path
-    assert lineno == lineno
-    assert reason == message
-
-
 def test_skipped_reasons_functional(testdir):
     testdir.makepyfile(
         test_one="""
@@ -872,11 +842,22 @@ def test_reportchars_all(testdir):
             pass
         def test_4():
             pytest.skip("four")
+        @pytest.fixture
+        def fail():
+            assert 0
+        def test_5(fail):
+            pass
     """
     )
     result = testdir.runpytest("-ra")
     result.stdout.fnmatch_lines(
-        ["FAIL*test_1*", "SKIP*four*", "XFAIL*test_2*", "XPASS*test_3*"]
+        [
+            "SKIP*four*",
+            "XFAIL*test_2*",
+            "XPASS*test_3*",
+            "ERROR*test_5*",
+            "FAIL*test_1*",
+        ]
     )
 
 
@@ -895,7 +876,6 @@ def test_reportchars_all_error(testdir):
     result.stdout.fnmatch_lines(["ERROR*test_foo*"])
 
 
-@pytest.mark.xfail("hasattr(sys, 'pypy_version_info')")
 def test_errors_in_xfail_skip_expressions(testdir):
     testdir.makepyfile(
         """
@@ -916,6 +896,10 @@ def test_errors_in_xfail_skip_expressions(testdir):
     if sys.platform.startswith("java"):
         # XXX report this to java
         markline = "*" + markline[8:]
+    elif hasattr(sys, "pypy_version_info") and sys.pypy_version_info < (6,):
+        markline = markline[5:]
+    elif sys.version_info >= (3, 8) or hasattr(sys, "pypy_version_info"):
+        markline = markline[4:]
     result.stdout.fnmatch_lines(
         [
             "*ERROR*test_nameerror*",
@@ -1023,7 +1007,6 @@ def test_imperativeskip_on_xfail_test(testdir):
 
 
 class TestBooleanCondition(object):
-
     def test_skipif(self, testdir):
         testdir.makepyfile(
             """
@@ -1113,7 +1096,9 @@ def test_module_level_skip_error(testdir):
     """
     )
     result = testdir.runpytest()
-    result.stdout.fnmatch_lines("*Using pytest.skip outside of a test is not allowed*")
+    result.stdout.fnmatch_lines(
+        ["*Using pytest.skip outside of a test is not allowed*"]
+    )
 
 
 def test_module_level_skip_with_allow_module_level(testdir):
@@ -1130,7 +1115,7 @@ def test_module_level_skip_with_allow_module_level(testdir):
     """
     )
     result = testdir.runpytest("-rxs")
-    result.stdout.fnmatch_lines("*SKIP*skip_module_level")
+    result.stdout.fnmatch_lines(["*SKIP*skip_module_level"])
 
 
 def test_invalid_skip_keyword_parameter(testdir):
@@ -1147,7 +1132,7 @@ def test_invalid_skip_keyword_parameter(testdir):
     """
     )
     result = testdir.runpytest()
-    result.stdout.fnmatch_lines("*TypeError:*['unknown']*")
+    result.stdout.fnmatch_lines(["*TypeError:*['unknown']*"])
 
 
 def test_mark_xfail_item(testdir):
@@ -1189,6 +1174,14 @@ def test_summary_list_after_errors(testdir):
         [
             "=* FAILURES *=",
             "*= short test summary info =*",
-            "FAIL test_summary_list_after_errors.py::test_fail",
+            "FAILED test_summary_list_after_errors.py::test_fail - assert 0",
         ]
     )
+
+
+def test_importorskip():
+    with pytest.raises(
+        pytest.skip.Exception,
+        match="^could not import 'doesnotexist': No module named .*",
+    ):
+        pytest.importorskip("doesnotexist")
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_stepwise.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_stepwise.py
new file mode 100644
index 00000000000..d8d11917ade
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_stepwise.py
@@ -0,0 +1,224 @@
+# -*- coding: utf-8 -*-
+import sys
+
+import pytest
+
+
+@pytest.fixture
+def stepwise_testdir(testdir):
+    # Rather than having to modify our testfile between tests, we introduce
+    # a flag for wether or not the second test should fail.
+    testdir.makeconftest(
+        """
+def pytest_addoption(parser):
+    group = parser.getgroup('general')
+    group.addoption('--fail', action='store_true', dest='fail')
+    group.addoption('--fail-last', action='store_true', dest='fail_last')
+"""
+    )
+
+    # Create a simple test suite.
+    testdir.makepyfile(
+        test_a="""
+def test_success_before_fail():
+    assert 1
+
+def test_fail_on_flag(request):
+    assert not request.config.getvalue('fail')
+
+def test_success_after_fail():
+    assert 1
+
+def test_fail_last_on_flag(request):
+    assert not request.config.getvalue('fail_last')
+
+def test_success_after_last_fail():
+    assert 1
+"""
+    )
+
+    testdir.makepyfile(
+        test_b="""
+def test_success():
+    assert 1
+"""
+    )
+
+    # customize cache directory so we don't use the tox's cache directory, which makes tests in this module flaky
+    testdir.makeini(
+        """
+        [pytest]
+        cache_dir = .cache
+    """
+    )
+
+    return testdir
+
+
+@pytest.fixture
+def error_testdir(testdir):
+    testdir.makepyfile(
+        test_a="""
+def test_error(nonexisting_fixture):
+    assert 1
+
+def test_success_after_fail():
+    assert 1
+"""
+    )
+
+    return testdir
+
+
+@pytest.fixture
+def broken_testdir(testdir):
+    testdir.makepyfile(
+        working_testfile="def test_proper(): assert 1", broken_testfile="foobar"
+    )
+    return testdir
+
+
+def test_run_without_stepwise(stepwise_testdir):
+    result = stepwise_testdir.runpytest("-v", "--strict-markers", "--fail")
+
+    result.stdout.fnmatch_lines(["*test_success_before_fail PASSED*"])
+    result.stdout.fnmatch_lines(["*test_fail_on_flag FAILED*"])
+    result.stdout.fnmatch_lines(["*test_success_after_fail PASSED*"])
+
+
+def test_fail_and_continue_with_stepwise(stepwise_testdir):
+    # Run the tests with a failing second test.
+    result = stepwise_testdir.runpytest(
+        "-v", "--strict-markers", "--stepwise", "--fail"
+    )
+    assert not result.stderr.str()
+
+    stdout = result.stdout.str()
+    # Make sure we stop after first failing test.
+    assert "test_success_before_fail PASSED" in stdout
+    assert "test_fail_on_flag FAILED" in stdout
+    assert "test_success_after_fail" not in stdout
+
+    # "Fix" the test that failed in the last run and run it again.
+    result = stepwise_testdir.runpytest("-v", "--strict-markers", "--stepwise")
+    assert not result.stderr.str()
+
+    stdout = result.stdout.str()
+    # Make sure the latest failing test runs and then continues.
+    assert "test_success_before_fail" not in stdout
+    assert "test_fail_on_flag PASSED" in stdout
+    assert "test_success_after_fail PASSED" in stdout
+
+
+def test_run_with_skip_option(stepwise_testdir):
+    result = stepwise_testdir.runpytest(
+        "-v",
+        "--strict-markers",
+        "--stepwise",
+        "--stepwise-skip",
+        "--fail",
+        "--fail-last",
+    )
+    assert not result.stderr.str()
+
+    stdout = result.stdout.str()
+    # Make sure first fail is ignore and second fail stops the test run.
+    assert "test_fail_on_flag FAILED" in stdout
+    assert "test_success_after_fail PASSED" in stdout
+    assert "test_fail_last_on_flag FAILED" in stdout
+    assert "test_success_after_last_fail" not in stdout
+
+
+def test_fail_on_errors(error_testdir):
+    result = error_testdir.runpytest("-v", "--strict-markers", "--stepwise")
+
+    assert not result.stderr.str()
+    stdout = result.stdout.str()
+
+    assert "test_error ERROR" in stdout
+    assert "test_success_after_fail" not in stdout
+
+
+def test_change_testfile(stepwise_testdir):
+    result = stepwise_testdir.runpytest(
+        "-v", "--strict-markers", "--stepwise", "--fail", "test_a.py"
+    )
+    assert not result.stderr.str()
+
+    stdout = result.stdout.str()
+    assert "test_fail_on_flag FAILED" in stdout
+
+    # Make sure the second test run starts from the beginning, since the
+    # test to continue from does not exist in testfile_b.
+    result = stepwise_testdir.runpytest(
+        "-v", "--strict-markers", "--stepwise", "test_b.py"
+    )
+    assert not result.stderr.str()
+
+    stdout = result.stdout.str()
+    assert "test_success PASSED" in stdout
+
+
+@pytest.mark.parametrize("broken_first", [True, False])
+def test_stop_on_collection_errors(broken_testdir, broken_first):
+    """Stop during collection errors. Broken test first or broken test last
+    actually surfaced a bug (#5444), so we test both situations."""
+    files = ["working_testfile.py", "broken_testfile.py"]
+    if broken_first:
+        files.reverse()
+    result = broken_testdir.runpytest("-v", "--strict-markers", "--stepwise", *files)
+    result.stdout.fnmatch_lines("*errors during collection*")
+
+
+def test_xfail_handling(testdir):
+    """Ensure normal xfail is ignored, and strict xfail interrupts the session in sw mode
+
+    (#5547)
+    """
+    contents = """
+        import pytest
+        def test_a(): pass
+
+        @pytest.mark.xfail(strict={strict})
+        def test_b(): assert {assert_value}
+
+        def test_c(): pass
+        def test_d(): pass
+    """
+    testdir.makepyfile(contents.format(assert_value="0", strict="False"))
+    result = testdir.runpytest("--sw", "-v")
+    result.stdout.fnmatch_lines(
+        [
+            "*::test_a PASSED *",
+            "*::test_b XFAIL *",
+            "*::test_c PASSED *",
+            "*::test_d PASSED *",
+            "* 3 passed, 1 xfailed in *",
+        ]
+    )
+
+    testdir.makepyfile(contents.format(assert_value="1", strict="True"))
+    result = testdir.runpytest("--sw", "-v")
+    result.stdout.fnmatch_lines(
+        [
+            "*::test_a PASSED *",
+            "*::test_b FAILED *",
+            "* Interrupted*",
+            "* 1 failed, 1 passed in *",
+        ]
+    )
+
+    # because we are writing to the same file, mtime might not be affected enough to
+    # invalidate the cache, making this next run flaky
+    if not sys.dont_write_bytecode:
+        testdir.tmpdir.join("__pycache__").remove()
+    testdir.makepyfile(contents.format(assert_value="0", strict="True"))
+    result = testdir.runpytest("--sw", "-v")
+    result.stdout.fnmatch_lines(
+        [
+            "*::test_b XFAIL *",
+            "*::test_c PASSED *",
+            "*::test_d PASSED *",
+            "* 2 passed, 1 deselected, 1 xfailed in *",
+        ]
+    )
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_terminal.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_terminal.py
index 8f08ad34fa1..752c894ca93 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_terminal.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_terminal.py
@@ -1,33 +1,41 @@
+# -*- coding: utf-8 -*-
 """
 terminal reporting of the full testing process.
 """
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import collections
+import os
 import sys
+import textwrap
 
 import pluggy
-import _pytest._code
 import py
+
 import pytest
 from _pytest.main import EXIT_NOTESTSCOLLECTED
-from _pytest.terminal import TerminalReporter, repr_pythonversion, getreportopt
-from _pytest.terminal import build_summary_stats_line, _plugin_nameversions
-
+from _pytest.reports import BaseReport
+from _pytest.terminal import _folded_skips
+from _pytest.terminal import _get_line_with_reprcrash_message
+from _pytest.terminal import _plugin_nameversions
+from _pytest.terminal import build_summary_stats_line
+from _pytest.terminal import getreportopt
+from _pytest.terminal import TerminalReporter
 
 DistInfo = collections.namedtuple("DistInfo", ["project_name", "version"])
 
 
 class Option(object):
-
-    def __init__(self, verbose=False, fulltrace=False):
-        self.verbose = verbose
+    def __init__(self, verbosity=0, fulltrace=False):
+        self.verbosity = verbosity
         self.fulltrace = fulltrace
 
     @property
     def args(self):
         values = []
-        if self.verbose:
-            values.append("-v")
+        values.append("--verbosity=%d" % self.verbosity)
         if self.fulltrace:
             values.append("--fulltrace")
         return values
@@ -35,9 +43,9 @@ class Option(object):
 
 @pytest.fixture(
     params=[
-        Option(verbose=False),
-        Option(verbose=True),
-        Option(verbose=-1),
+        Option(verbosity=0),
+        Option(verbosity=1),
+        Option(verbosity=-1),
         Option(fulltrace=True),
     ],
     ids=["default", "verbose", "quiet", "fulltrace"],
@@ -68,7 +76,6 @@ def test_plugin_nameversion(input, expected):
 
 
 class TestTerminal(object):
-
     def test_pass_skip_fail(self, testdir, option):
         testdir.makepyfile(
             """
@@ -82,7 +89,7 @@ class TestTerminal(object):
         """
         )
         result = testdir.runpytest(*option.args)
-        if option.verbose:
+        if option.verbosity > 0:
             result.stdout.fnmatch_lines(
                 [
                     "*test_pass_skip_fail.py::test_ok PASS*",
@@ -90,8 +97,10 @@ class TestTerminal(object):
                     "*test_pass_skip_fail.py::test_func FAIL*",
                 ]
             )
-        else:
+        elif option.verbosity == 0:
             result.stdout.fnmatch_lines(["*test_pass_skip_fail.py .sF*"])
+        else:
+            result.stdout.fnmatch_lines([".sF*"])
         result.stdout.fnmatch_lines(
             ["    def test_func():", ">       assert 0", "E       assert 0"]
         )
@@ -99,7 +108,8 @@ class TestTerminal(object):
     def test_internalerror(self, testdir, linecomp):
         modcol = testdir.getmodulecol("def test_one(): pass")
         rep = TerminalReporter(modcol.config, file=linecomp.stringio)
-        excinfo = pytest.raises(ValueError, "raise ValueError('hello')")
+        with pytest.raises(ValueError) as excinfo:
+            raise ValueError("hello")
         rep.pytest_internalerror(excinfo.getrepr())
         linecomp.assert_contains_lines(["INTERNALERROR> *ValueError*hello*"])
 
@@ -136,6 +146,31 @@ class TestTerminal(object):
         child.sendeof()
         child.kill(15)
 
+    def test_report_collect_after_half_a_second(self, testdir):
+        """Test for "collecting" being updated after 0.5s"""
+
+        testdir.makepyfile(
+            **{
+                "test1.py": """
+                import _pytest.terminal
+
+                _pytest.terminal.REPORT_COLLECTING_RESOLUTION = 0
+
+                def test_1():
+                    pass
+                    """,
+                "test2.py": "def test_2(): pass",
+            }
+        )
+
+        child = testdir.spawn_pytest("-v test1.py test2.py")
+        child.expect(r"collecting \.\.\.")
+        child.expect(r"collecting 1 item")
+        child.expect(r"collecting 2 items")
+        child.expect(r"collected 2 items")
+        rest = child.read().decode("utf8")
+        assert "2 passed in" in rest
+
     def test_itemreport_subclasses_show_subclassed_file(self, testdir):
         testdir.makepyfile(
             test_p1="""
@@ -155,7 +190,7 @@ class TestTerminal(object):
         )
         result = testdir.runpytest(p2)
         result.stdout.fnmatch_lines(["*test_p2.py .*", "*1 passed*"])
-        result = testdir.runpytest("-v", p2)
+        result = testdir.runpytest("-vv", p2)
         result.stdout.fnmatch_lines(
             ["*test_p2.py::TestMore::test_p1* <- *test_p1.py*PASSED*"]
         )
@@ -163,15 +198,15 @@ class TestTerminal(object):
     def test_itemreport_directclasses_not_shown_as_subclasses(self, testdir):
         a = testdir.mkpydir("a123")
         a.join("test_hello123.py").write(
-            _pytest._code.Source(
+            textwrap.dedent(
+                """\
+                class TestClass(object):
+                    def test_method(self):
+                        pass
                 """
-            class TestClass(object):
-                def test_method(self):
-                    pass
-        """
             )
         )
-        result = testdir.runpytest("-v")
+        result = testdir.runpytest("-vv")
         assert result.ret == 0
         result.stdout.fnmatch_lines(["*a123/test_hello123.py*PASS*"])
         assert " <- " not in result.stdout.str()
@@ -248,7 +283,6 @@ class TestTerminal(object):
 
 
 class TestCollectonly(object):
-
     def test_collectonly_basic(self, testdir):
         testdir.makepyfile(
             """
@@ -258,7 +292,7 @@ class TestCollectonly(object):
         )
         result = testdir.runpytest("--collect-only")
         result.stdout.fnmatch_lines(
-            ["<Module 'test_collectonly_basic.py'>", "  <Function 'test_func'>"]
+            ["<Module test_collectonly_basic.py>", "  <Function test_func>"]
         )
 
     def test_collectonly_skipped_module(self, testdir):
@@ -271,6 +305,18 @@ class TestCollectonly(object):
         result = testdir.runpytest("--collect-only", "-rs")
         result.stdout.fnmatch_lines(["*ERROR collecting*"])
 
+    def test_collectonly_display_test_description(self, testdir):
+        testdir.makepyfile(
+            """
+            def test_with_description():
+                \""" This test has a description.
+                \"""
+                assert True
+        """
+        )
+        result = testdir.runpytest("--collect-only", "--verbose")
+        result.stdout.fnmatch_lines(["    This test has a description."])
+
     def test_collectonly_failed_module(self, testdir):
         testdir.makepyfile("""raise ValueError(0)""")
         result = testdir.runpytest("--collect-only")
@@ -302,11 +348,10 @@ class TestCollectonly(object):
         assert result.ret == 0
         result.stdout.fnmatch_lines(
             [
-                "*<Module '*.py'>",
-                "* <Function 'test_func1'*>",
-                "* <Class 'TestClass'>",
-                # "*  <Instance '()'>",
-                "*   <Function 'test_method'*>",
+                "*<Module *.py>",
+                "* <Function test_func1>",
+                "* <Class TestClass>",
+                "*   <Function test_method>",
             ]
         )
 
@@ -315,13 +360,13 @@ class TestCollectonly(object):
         result = testdir.runpytest("--collect-only", p)
         assert result.ret == 2
         result.stdout.fnmatch_lines(
-            _pytest._code.Source(
+            textwrap.dedent(
+                """\
+                *ERROR*
+                *ImportError*
+                *No module named *Errlk*
+                *1 error*
                 """
-            *ERROR*
-            *ImportError*
-            *No module named *Errlk*
-            *1 error*
-        """
             ).strip()
         )
 
@@ -345,23 +390,12 @@ class TestCollectonly(object):
         result.stdout.fnmatch_lines(["*test_fun.py: 1*"])
 
 
-def test_repr_python_version(monkeypatch):
-    try:
-        monkeypatch.setattr(sys, "version_info", (2, 5, 1, "final", 0))
-        assert repr_pythonversion() == "2.5.1-final-0"
-        sys.version_info = x = (2, 3)
-        assert repr_pythonversion() == str(x)
-    finally:
-        monkeypatch.undo()  # do this early as pytest can get confused
-
-
 class TestFixtureReporting(object):
-
     def test_setup_fixture_error(self, testdir):
         testdir.makepyfile(
             """
             def setup_function(function):
-                print ("setup func")
+                print("setup func")
                 assert 0
             def test_nada():
                 pass
@@ -385,7 +419,7 @@ class TestFixtureReporting(object):
             def test_nada():
                 pass
             def teardown_function(function):
-                print ("teardown func")
+                print("teardown func")
                 assert 0
         """
         )
@@ -408,7 +442,7 @@ class TestFixtureReporting(object):
                 assert 0, "failingfunc"
 
             def teardown_function(function):
-                print ("teardown func")
+                print("teardown func")
                 assert False
         """
         )
@@ -432,13 +466,13 @@ class TestFixtureReporting(object):
         testdir.makepyfile(
             """
             def setup_function(function):
-                print ("setup func")
+                print("setup func")
 
             def test_fail():
                 assert 0, "failingfunc"
 
             def teardown_function(function):
-                print ("teardown func")
+                print("teardown func")
         """
         )
         result = testdir.runpytest()
@@ -457,7 +491,6 @@ class TestFixtureReporting(object):
 
 
 class TestTerminalFunctional(object):
-
     def test_deselected(self, testdir):
         testpath = testdir.makepyfile(
             """
@@ -471,13 +504,44 @@ class TestTerminalFunctional(object):
         )
         result = testdir.runpytest("-k", "test_two:", testpath)
         result.stdout.fnmatch_lines(
-            ["collected 3 items / 1 deselected", "*test_deselected.py ..*"]
+            ["collected 3 items / 1 deselected / 2 selected", "*test_deselected.py ..*"]
+        )
+        assert result.ret == 0
+
+    def test_deselected_with_hookwrapper(self, testdir):
+        testpath = testdir.makeconftest(
+            """
+            import pytest
+
+            @pytest.hookimpl(hookwrapper=True)
+            def pytest_collection_modifyitems(config, items):
+                yield
+                deselected = items.pop()
+                config.hook.pytest_deselected(items=[deselected])
+            """
+        )
+        testpath = testdir.makepyfile(
+            """
+                def test_one():
+                    pass
+                def test_two():
+                    pass
+                def test_three():
+                    pass
+           """
+        )
+        result = testdir.runpytest(testpath)
+        result.stdout.fnmatch_lines(
+            [
+                "collected 3 items / 1 deselected / 2 selected",
+                "*= 2 passed, 1 deselected in*",
+            ]
         )
         assert result.ret == 0
 
     def test_show_deselected_items_using_markexpr_before_test_execution(self, testdir):
         testdir.makepyfile(
-            """
+            test_show_deselected="""
             import pytest
 
             @pytest.mark.foo
@@ -495,8 +559,8 @@ class TestTerminalFunctional(object):
         result = testdir.runpytest("-m", "not foo")
         result.stdout.fnmatch_lines(
             [
-                "collected 3 items / 1 deselected",
-                "*test_show_des*.py ..*",
+                "collected 3 items / 1 deselected / 2 selected",
+                "*test_show_deselected.py ..*",
                 "*= 2 passed, 1 deselected in * =*",
             ]
         )
@@ -537,7 +601,7 @@ class TestTerminalFunctional(object):
         result.stdout.fnmatch_lines(["test_passes.py ..*", "* 2 pass*"])
         assert result.ret == 0
 
-    def test_header_trailer_info(self, testdir):
+    def test_header_trailer_info(self, testdir, request):
         testdir.makepyfile(
             """
             def test_passes():
@@ -561,9 +625,38 @@ class TestTerminalFunctional(object):
                 "=* 1 passed*in *.[0-9][0-9] seconds *=",
             ]
         )
-        if pytest.config.pluginmanager.list_plugin_distinfo():
+        if request.config.pluginmanager.list_plugin_distinfo():
             result.stdout.fnmatch_lines(["plugins: *"])
 
+    def test_header(self, testdir, request):
+        testdir.tmpdir.join("tests").ensure_dir()
+        testdir.tmpdir.join("gui").ensure_dir()
+
+        # no ini file
+        result = testdir.runpytest()
+        result.stdout.fnmatch_lines(["rootdir: *test_header0"])
+
+        # with inifile
+        testdir.makeini("""[pytest]""")
+        result = testdir.runpytest()
+        result.stdout.fnmatch_lines(["rootdir: *test_header0, inifile: tox.ini"])
+
+        # with testpaths option, and not passing anything in the command-line
+        testdir.makeini(
+            """
+            [pytest]
+            testpaths = tests gui
+        """
+        )
+        result = testdir.runpytest()
+        result.stdout.fnmatch_lines(
+            ["rootdir: *test_header0, inifile: tox.ini, testpaths: tests, gui"]
+        )
+
+        # with testpaths option, passing directory in command-line: do not show testpaths then
+        result = testdir.runpytest("tests")
+        result.stdout.fnmatch_lines(["rootdir: *test_header0, inifile: tox.ini"])
+
     def test_showlocals(self, testdir):
         p1 = testdir.makepyfile(
             """
@@ -582,8 +675,9 @@ class TestTerminalFunctional(object):
             ]
         )
 
-    def test_verbose_reporting(self, testdir, pytestconfig):
-        p1 = testdir.makepyfile(
+    @pytest.fixture
+    def verbose_testfile(self, testdir):
+        return testdir.makepyfile(
             """
             import pytest
             def test_fail():
@@ -599,22 +693,31 @@ class TestTerminalFunctional(object):
                 yield check, 0
         """
         )
-        result = testdir.runpytest(p1, "-v")
+
+    def test_verbose_reporting(self, verbose_testfile, testdir, pytestconfig):
+        result = testdir.runpytest(
+            verbose_testfile, "-v", "-Walways::pytest.PytestWarning"
+        )
         result.stdout.fnmatch_lines(
             [
                 "*test_verbose_reporting.py::test_fail *FAIL*",
                 "*test_verbose_reporting.py::test_pass *PASS*",
                 "*test_verbose_reporting.py::TestClass::test_skip *SKIP*",
-                "*test_verbose_reporting.py::test_gen*0* *FAIL*",
+                "*test_verbose_reporting.py::test_gen *XFAIL*",
             ]
         )
         assert result.ret == 1
 
+    def test_verbose_reporting_xdist(self, verbose_testfile, testdir, pytestconfig):
         if not pytestconfig.pluginmanager.get_plugin("xdist"):
             pytest.skip("xdist plugin not installed")
 
-        result = testdir.runpytest(p1, "-v", "-n 1")
-        result.stdout.fnmatch_lines(["*FAIL*test_verbose_reporting.py::test_fail*"])
+        result = testdir.runpytest(
+            verbose_testfile, "-v", "-n 1", "-Walways::pytest.PytestWarning"
+        )
+        result.stdout.fnmatch_lines(
+            ["*FAIL*test_verbose_reporting_xdist.py::test_fail*"]
+        )
         assert result.ret == 1
 
     def test_quiet_reporting(self, testdir):
@@ -635,7 +738,10 @@ class TestTerminalFunctional(object):
         assert "===" not in s
         assert "passed" not in s
 
-    def test_report_collectionfinish_hook(self, testdir):
+    @pytest.mark.parametrize(
+        "params", [(), ("--collect-only",)], ids=["no-params", "collect-only"]
+    )
+    def test_report_collectionfinish_hook(self, testdir, params):
         testdir.makeconftest(
             """
             def pytest_report_collectionfinish(config, startdir, items):
@@ -650,16 +756,51 @@ class TestTerminalFunctional(object):
                 pass
         """
         )
-        result = testdir.runpytest()
+        result = testdir.runpytest(*params)
         result.stdout.fnmatch_lines(["collected 3 items", "hello from hook: 3 items"])
 
+    def test_summary_f_alias(self, testdir):
+        """Test that 'f' and 'F' report chars are aliases and don't show up twice in the summary (#6334)"""
+        testdir.makepyfile(
+            """
+            def test():
+                assert False
+            """
+        )
+        result = testdir.runpytest("-rfF")
+        expected = "FAILED test_summary_f_alias.py::test - assert False"
+        result.stdout.fnmatch_lines([expected])
+        assert result.stdout.lines.count(expected) == 1
 
-def test_fail_extra_reporting(testdir):
-    testdir.makepyfile("def test_this(): assert 0")
+    def test_summary_s_alias(self, testdir):
+        """Test that 's' and 'S' report chars are aliases and don't show up twice in the summary"""
+        testdir.makepyfile(
+            """
+            import pytest
+
+            @pytest.mark.skip
+            def test():
+                pass
+            """
+        )
+        result = testdir.runpytest("-rsS")
+        expected = "SKIPPED [1] test_summary_s_alias.py:3: unconditional skip"
+        result.stdout.fnmatch_lines([expected])
+        assert result.stdout.lines.count(expected) == 1
+
+
+def test_fail_extra_reporting(testdir, monkeypatch):
+    monkeypatch.setenv("COLUMNS", "80")
+    testdir.makepyfile("def test_this(): assert 0, 'this_failed' * 100")
     result = testdir.runpytest()
     assert "short test summary" not in result.stdout.str()
     result = testdir.runpytest("-rf")
-    result.stdout.fnmatch_lines(["*test summary*", "FAIL*test_fail_extra_reporting*"])
+    result.stdout.fnmatch_lines(
+        [
+            "*test summary*",
+            "FAILED test_fail_extra_reporting.py::test_this - AssertionError: this_failedt...",
+        ]
+    )
 
 
 def test_fail_reporting_on_pass(testdir):
@@ -685,14 +826,30 @@ def test_pass_reporting_on_fail(testdir):
 def test_pass_output_reporting(testdir):
     testdir.makepyfile(
         """
-        def test_pass_output():
+        def test_pass_has_output():
             print("Four score and seven years ago...")
+        def test_pass_no_output():
+            pass
     """
     )
     result = testdir.runpytest()
-    assert "Four score and seven years ago..." not in result.stdout.str()
-    result = testdir.runpytest("-rP")
-    result.stdout.fnmatch_lines(["Four score and seven years ago..."])
+    s = result.stdout.str()
+    assert "test_pass_has_output" not in s
+    assert "Four score and seven years ago..." not in s
+    assert "test_pass_no_output" not in s
+    result = testdir.runpytest("-rPp")
+    result.stdout.fnmatch_lines(
+        [
+            "*= PASSES =*",
+            "*_ test_pass_has_output _*",
+            "*- Captured stdout call -*",
+            "Four score and seven years ago...",
+            "*= short test summary info =*",
+            "PASSED test_pass_output_reporting.py::test_pass_has_output",
+            "PASSED test_pass_output_reporting.py::test_pass_no_output",
+            "*= 2 passed in *",
+        ]
+    )
 
 
 def test_color_yes(testdir):
@@ -735,9 +892,7 @@ def test_color_yes_collection_on_non_atty(testdir, verbose):
 
 
 def test_getreportopt():
-
     class Config(object):
-
         class Option(object):
             reportchars = ""
             disable_warnings = True
@@ -752,14 +907,23 @@ def test_getreportopt():
     config.option.reportchars = "sfxw"
     assert getreportopt(config) == "sfx"
 
-    config.option.reportchars = "sfx"
+    # Now with --disable-warnings.
     config.option.disable_warnings = False
+    config.option.reportchars = "a"
+    assert getreportopt(config) == "sxXwEf"  # NOTE: "w" included!
+
+    config.option.reportchars = "sfx"
     assert getreportopt(config) == "sfxw"
 
     config.option.reportchars = "sfxw"
-    config.option.disable_warnings = False
     assert getreportopt(config) == "sfxw"
 
+    config.option.reportchars = "a"
+    assert getreportopt(config) == "sxXwEf"  # NOTE: "w" included!
+
+    config.option.reportchars = "A"
+    assert getreportopt(config) == "PpsxXwEf"
+
 
 def test_terminalreporter_reportopt_addopts(testdir):
     testdir.makeini("[pytest]\naddopts=-rs")
@@ -845,7 +1009,7 @@ class TestGenericReporting(object):
             def g():
                 raise IndexError
             def test_func():
-                print (6*7)
+                print(6*7)
                 g()  # --calling--
         """
         )
@@ -854,9 +1018,9 @@ class TestGenericReporting(object):
             result = testdir.runpytest("--tb=%s" % tbopt)
             s = result.stdout.str()
             if tbopt == "long":
-                assert "print (6*7)" in s
+                assert "print(6*7)" in s
             else:
-                assert "print (6*7)" not in s
+                assert "print(6*7)" not in s
             if tbopt != "no":
                 assert "--calling--" in s
                 assert "IndexError" in s
@@ -872,7 +1036,7 @@ class TestGenericReporting(object):
             def g():
                 raise IndexError
             def test_func1():
-                print (6*7)
+                print(6*7)
                 g()  # --calling--
             def test_func2():
                 assert 0, "hello"
@@ -955,6 +1119,46 @@ def pytest_report_header(config, startdir):
         assert "!This is stderr!" not in stdout
         assert "!This is a warning log msg!" not in stdout
 
+    def test_show_capture_with_teardown_logs(self, testdir):
+        """Ensure that the capturing of teardown logs honor --show-capture setting"""
+        testdir.makepyfile(
+            """
+            import logging
+            import sys
+            import pytest
+
+            @pytest.fixture(scope="function", autouse="True")
+            def hook_each_test(request):
+                yield
+                sys.stdout.write("!stdout!")
+                sys.stderr.write("!stderr!")
+                logging.warning("!log!")
+
+            def test_func():
+                assert False
+        """
+        )
+
+        result = testdir.runpytest("--show-capture=stdout", "--tb=short").stdout.str()
+        assert "!stdout!" in result
+        assert "!stderr!" not in result
+        assert "!log!" not in result
+
+        result = testdir.runpytest("--show-capture=stderr", "--tb=short").stdout.str()
+        assert "!stdout!" not in result
+        assert "!stderr!" in result
+        assert "!log!" not in result
+
+        result = testdir.runpytest("--show-capture=log", "--tb=short").stdout.str()
+        assert "!stdout!" not in result
+        assert "!stderr!" not in result
+        assert "!log!" in result
+
+        result = testdir.runpytest("--show-capture=no", "--tb=short").stdout.str()
+        assert "!stdout!" not in result
+        assert "!stderr!" not in result
+        assert "!log!" not in result
+
 
 @pytest.mark.xfail("not hasattr(os, 'dup')")
 def test_fdopen_kept_alive_issue124(testdir):
@@ -1013,22 +1217,66 @@ def test_terminal_summary(testdir):
     )
 
 
+@pytest.mark.filterwarnings("default")
 def test_terminal_summary_warnings_are_displayed(testdir):
     """Test that warnings emitted during pytest_terminal_summary are displayed.
     (#1305).
     """
     testdir.makeconftest(
         """
+        import warnings
         def pytest_terminal_summary(terminalreporter):
-            config = terminalreporter.config
-            config.warn('C1', 'internal warning')
+            warnings.warn(UserWarning('internal warning'))
     """
     )
-    result = testdir.runpytest("-rw")
+    testdir.makepyfile(
+        """
+        def test_failure():
+            import warnings
+            warnings.warn("warning_from_" + "test")
+            assert 0
+    """
+    )
+    result = testdir.runpytest("-ra")
     result.stdout.fnmatch_lines(
-        ["<undetermined location>", "*internal warning", "*== 1 warnings in *"]
+        [
+            "*= warnings summary =*",
+            "*warning_from_test*",
+            "*= short test summary info =*",
+            "*= warnings summary (final) =*",
+            "*conftest.py:3:*internal warning",
+            "*== 1 failed, 2 warnings in *",
+        ]
     )
     assert "None" not in result.stdout.str()
+    stdout = result.stdout.str()
+    assert stdout.count("warning_from_test") == 1
+    assert stdout.count("=== warnings summary ") == 2
+
+
+@pytest.mark.filterwarnings("default")
+def test_terminal_summary_warnings_header_once(testdir):
+    testdir.makepyfile(
+        """
+        def test_failure():
+            import warnings
+            warnings.warn("warning_from_" + "test")
+            assert 0
+    """
+    )
+    result = testdir.runpytest("-ra")
+    result.stdout.fnmatch_lines(
+        [
+            "*= warnings summary =*",
+            "*warning_from_test*",
+            "*= short test summary info =*",
+            "*== 1 failed, 1 warnings in *",
+        ]
+    )
+    assert "None" not in result.stdout.str()
+    stdout = result.stdout.str()
+    assert stdout.count("warning_from_test") == 1
+    assert stdout.count("=== warnings summary ") == 1
 
 
 @pytest.mark.parametrize(
@@ -1085,24 +1333,74 @@ def test_terminal_summary_warnings_are_displayed(testdir):
 )
 def test_summary_stats(exp_line, exp_color, stats_arg):
     print("Based on stats: %s" % stats_arg)
-    print('Expect summary: "%s"; with color "%s"' % (exp_line, exp_color))
+    print('Expect summary: "{}"; with color "{}"'.format(exp_line, exp_color))
     (line, color) = build_summary_stats_line(stats_arg)
-    print('Actually got:   "%s"; with color "%s"' % (line, color))
+    print('Actually got:   "{}"; with color "{}"'.format(line, color))
     assert line == exp_line
     assert color == exp_color
 
 
-def test_no_trailing_whitespace_after_inifile_word(testdir):
-    result = testdir.runpytest("")
-    assert "inifile:\n" in result.stdout.str()
+def test_skip_counting_towards_summary():
+    class DummyReport(BaseReport):
+        count_towards_summary = True
 
-    testdir.makeini("[pytest]")
-    result = testdir.runpytest("")
-    assert "inifile: tox.ini\n" in result.stdout.str()
+    r1 = DummyReport()
+    r2 = DummyReport()
+    res = build_summary_stats_line({"failed": (r1, r2)})
+    assert res == ("2 failed", "red")
+
+    r1.count_towards_summary = False
+    res = build_summary_stats_line({"failed": (r1, r2)})
+    assert res == ("1 failed", "red")
 
 
-class TestProgress(object):
+class TestClassicOutputStyle(object):
+    """Ensure classic output style works as expected (#3883)"""
 
+    @pytest.fixture
+    def test_files(self, testdir):
+        testdir.makepyfile(
+            **{
+                "test_one.py": "def test_one(): pass",
+                "test_two.py": "def test_two(): assert 0",
+                "sub/test_three.py": """
+                    def test_three_1(): pass
+                    def test_three_2(): assert 0
+                    def test_three_3(): pass
+                """,
+            }
+        )
+
+    def test_normal_verbosity(self, testdir, test_files):
+        result = testdir.runpytest("-o", "console_output_style=classic")
+        result.stdout.fnmatch_lines(
+            [
+                "test_one.py .",
+                "test_two.py F",
+                "sub{}test_three.py .F.".format(os.sep),
+                "*2 failed, 3 passed in*",
+            ]
+        )
+
+    def test_verbose(self, testdir, test_files):
+        result = testdir.runpytest("-o", "console_output_style=classic", "-v")
+        result.stdout.fnmatch_lines(
+            [
+                "test_one.py::test_one PASSED",
+                "test_two.py::test_two FAILED",
+                "sub{}test_three.py::test_three_1 PASSED".format(os.sep),
+                "sub{}test_three.py::test_three_2 FAILED".format(os.sep),
+                "sub{}test_three.py::test_three_3 PASSED".format(os.sep),
+                "*2 failed, 3 passed in*",
+            ]
+        )
+
+    def test_quiet(self, testdir, test_files):
+        result = testdir.runpytest("-o", "console_output_style=classic", "-q")
+        result.stdout.fnmatch_lines([".F.F.", "*2 failed, 3 passed in*"])
+
+
+class TestProgressOutputStyle(object):
     @pytest.fixture
     def many_tests_files(self, testdir):
         testdir.makepyfile(
@@ -1151,6 +1449,22 @@ class TestProgress(object):
             ]
         )
 
+    def test_count(self, many_tests_files, testdir):
+        testdir.makeini(
+            """
+            [pytest]
+            console_output_style = count
+        """
+        )
+        output = testdir.runpytest()
+        output.stdout.re_match_lines(
+            [
+                r"test_bar.py \.{10} \s+ \[10/20\]",
+                r"test_foo.py \.{5} \s+ \[15/20\]",
+                r"test_foobar.py \.{5} \s+ \[20/20\]",
+            ]
+        )
+
     def test_verbose(self, many_tests_files, testdir):
         output = testdir.runpytest("-v")
         output.stdout.re_match_lines(
@@ -1161,13 +1475,43 @@ class TestProgress(object):
             ]
         )
 
-    def test_xdist_normal(self, many_tests_files, testdir):
+    def test_verbose_count(self, many_tests_files, testdir):
+        testdir.makeini(
+            """
+            [pytest]
+            console_output_style = count
+        """
+        )
+        output = testdir.runpytest("-v")
+        output.stdout.re_match_lines(
+            [
+                r"test_bar.py::test_bar\[0\] PASSED \s+ \[ 1/20\]",
+                r"test_foo.py::test_foo\[4\] PASSED \s+ \[15/20\]",
+                r"test_foobar.py::test_foobar\[4\] PASSED \s+ \[20/20\]",
+            ]
+        )
+
+    def test_xdist_normal(self, many_tests_files, testdir, monkeypatch):
         pytest.importorskip("xdist")
+        monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", raising=False)
         output = testdir.runpytest("-n2")
         output.stdout.re_match_lines([r"\.{20} \s+ \[100%\]"])
 
-    def test_xdist_verbose(self, many_tests_files, testdir):
+    def test_xdist_normal_count(self, many_tests_files, testdir, monkeypatch):
         pytest.importorskip("xdist")
+        monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", raising=False)
+        testdir.makeini(
+            """
+            [pytest]
+            console_output_style = count
+        """
+        )
+        output = testdir.runpytest("-n2")
+        output.stdout.re_match_lines([r"\.{20} \s+ \[20/20\]"])
+
+    def test_xdist_verbose(self, many_tests_files, testdir, monkeypatch):
+        pytest.importorskip("xdist")
+        monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", raising=False)
         output = testdir.runpytest("-n2", "-v")
         output.stdout.re_match_lines_random(
             [
@@ -1236,12 +1580,16 @@ class TestProgressWithTeardown(object):
         testdir.makepyfile(
             """
             def test_foo(fail_teardown):
-                assert False
+                assert 0
         """
         )
-        output = testdir.runpytest()
+        output = testdir.runpytest("-rfE")
         output.stdout.re_match_lines(
-            [r"test_teardown_with_test_also_failing.py FE\s+\[100%\]"]
+            [
+                r"test_teardown_with_test_also_failing.py FE\s+\[100%\]",
+                "FAILED test_teardown_with_test_also_failing.py::test_foo - assert 0",
+                "ERROR test_teardown_with_test_also_failing.py::test_foo - assert False",
+            ]
         )
 
     def test_teardown_many(self, testdir, many_files):
@@ -1261,7 +1609,111 @@ class TestProgressWithTeardown(object):
             ]
         )
 
-    def test_xdist_normal(self, many_files, testdir):
+    def test_xdist_normal(self, many_files, testdir, monkeypatch):
         pytest.importorskip("xdist")
+        monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", raising=False)
         output = testdir.runpytest("-n2")
         output.stdout.re_match_lines([r"[\.E]{40} \s+ \[100%\]"])
+
+
+def test_skip_reasons_folding():
+    path = "xyz"
+    lineno = 3
+    message = "justso"
+    longrepr = (path, lineno, message)
+
+    class X(object):
+        pass
+
+    ev1 = X()
+    ev1.when = "execute"
+    ev1.skipped = True
+    ev1.longrepr = longrepr
+
+    ev2 = X()
+    ev2.when = "execute"
+    ev2.longrepr = longrepr
+    ev2.skipped = True
+
+    # ev3 might be a collection report
+    ev3 = X()
+    ev3.when = "collect"
+    ev3.longrepr = longrepr
+    ev3.skipped = True
+
+    values = _folded_skips([ev1, ev2, ev3])
+    assert len(values) == 1
+    num, fspath, lineno, reason = values[0]
+    assert num == 3
+    assert fspath == path
+    assert lineno == lineno
+    assert reason == message
+
+
+def test_line_with_reprcrash(monkeypatch):
+    import _pytest.terminal
+    from wcwidth import wcswidth
+
+    mocked_verbose_word = "FAILED"
+
+    mocked_pos = "some::nodeid"
+
+    def mock_get_pos(*args):
+        return mocked_pos
+
+    monkeypatch.setattr(_pytest.terminal, "_get_pos", mock_get_pos)
+
+    class config(object):
+        pass
+
+    class rep(object):
+        def _get_verbose_word(self, *args):
+            return mocked_verbose_word
+
+        class longrepr:
+            class reprcrash:
+                pass
+
+    def check(msg, width, expected):
+        __tracebackhide__ = True
+        if msg:
+            rep.longrepr.reprcrash.message = msg
+        actual = _get_line_with_reprcrash_message(config, rep(), width)
+
+        assert actual == expected
+        if actual != "%s %s" % (mocked_verbose_word, mocked_pos):
+            assert len(actual) <= width
+            assert wcswidth(actual) <= width
+
+    # AttributeError with message
+    check(None, 80, "FAILED some::nodeid")
+
+    check("msg", 80, "FAILED some::nodeid - msg")
+    check("msg", 3, "FAILED some::nodeid")
+
+    check("msg", 24, "FAILED some::nodeid")
+    check("msg", 25, "FAILED some::nodeid - msg")
+
+    check("some longer msg", 24, "FAILED some::nodeid")
+    check("some longer msg", 25, "FAILED some::nodeid - ...")
+    check("some longer msg", 26, "FAILED some::nodeid - s...")
+
+    check("some\nmessage", 25, "FAILED some::nodeid - ...")
+    check("some\nmessage", 26, "FAILED some::nodeid - some")
+    check("some\nmessage", 80, "FAILED some::nodeid - some")
+
+    # Test unicode safety.
+    check(u"😄😄😄😄😄\n2nd line", 25, u"FAILED some::nodeid - ...")
+    check(u"😄😄😄😄😄\n2nd line", 26, u"FAILED some::nodeid - ...")
+    check(u"😄😄😄😄😄\n2nd line", 27, u"FAILED some::nodeid - 😄...")
+    check(u"😄😄😄😄😄\n2nd line", 28, u"FAILED some::nodeid - 😄...")
+    check(u"😄😄😄😄😄\n2nd line", 29, u"FAILED some::nodeid - 😄😄...")
+
+    # NOTE: constructed, not sure if this is supported.
+    # It would fail if not using u"" in Python 2 for mocked_pos.
+    mocked_pos = u"nodeid::😄::withunicode"
+    check(u"😄😄😄😄😄\n2nd line", 29, u"FAILED nodeid::😄::withunicode")
+    check(u"😄😄😄😄😄\n2nd line", 40, u"FAILED nodeid::😄::withunicode - 😄😄...")
+    check(u"😄😄😄😄😄\n2nd line", 41, u"FAILED nodeid::😄::withunicode - 😄😄...")
+    check(u"😄😄😄😄😄\n2nd line", 42, u"FAILED nodeid::😄::withunicode - 😄😄😄...")
+    check(u"😄😄😄😄😄\n2nd line", 80, u"FAILED nodeid::😄::withunicode - 😄😄😄😄😄")
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_tmpdir.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_tmpdir.py
index 33624909495..7622342b1d7 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_tmpdir.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_tmpdir.py
@@ -1,37 +1,26 @@
-from __future__ import absolute_import, division, print_function
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import errno
+import os
+import stat
 import sys
-import py
+
+import attr
+import six
+
 import pytest
-
-from _pytest.tmpdir import tmpdir
+from _pytest import pathlib
+from _pytest.pathlib import Path
+from _pytest.warnings import SHOW_PYTEST_WARNINGS_ARG
 
 
-def test_funcarg(testdir):
-    testdir.makepyfile(
-        """
-            def pytest_generate_tests(metafunc):
-                metafunc.addcall(id='a')
-                metafunc.addcall(id='b')
-            def test_func(tmpdir): pass
-    """
-    )
-    from _pytest.tmpdir import TempdirFactory
-
-    reprec = testdir.inline_run()
-    calls = reprec.getcalls("pytest_runtest_setup")
-    item = calls[0].item
-    config = item.config
-    tmpdirhandler = TempdirFactory(config)
-    item._initrequest()
-    p = tmpdir(item._request, tmpdirhandler)
-    assert p.check()
-    bn = p.basename.strip("0123456789")
-    assert bn.endswith("test_func_a_")
-    item.name = "qwe/\\abc"
-    p = tmpdir(item._request, tmpdirhandler)
-    assert p.check()
-    bn = p.basename.strip("0123456789")
-    assert bn == "qwe__abc"
+def test_tmpdir_fixture(testdir):
+    p = testdir.copy_example("tmpdir/tmpdir_fixture.py")
+    results = testdir.runpytest(p)
+    results.stdout.fnmatch_lines(["*1 passed*"])
 
 
 def test_ensuretemp(recwarn):
@@ -41,14 +30,30 @@ def test_ensuretemp(recwarn):
     assert d1.check(dir=1)
 
 
+@attr.s
+class FakeConfig(object):
+    basetemp = attr.ib()
+    trace = attr.ib(default=None)
+
+    @property
+    def trace(self):
+        return self
+
+    def get(self, key):
+        return lambda *k: None
+
+    @property
+    def option(self):
+        return self
+
+
 class TestTempdirHandler(object):
+    def test_mktemp(self, tmp_path):
 
-    def test_mktemp(self, testdir):
-        from _pytest.tmpdir import TempdirFactory
+        from _pytest.tmpdir import TempdirFactory, TempPathFactory
 
-        config = testdir.parseconfig()
-        config.option.basetemp = testdir.mkdir("hello")
-        t = TempdirFactory(config)
+        config = FakeConfig(tmp_path)
+        t = TempdirFactory(TempPathFactory.from_config(config))
         tmp = t.mktemp("world")
         assert tmp.relto(t.getbasetemp()) == "world0"
         tmp = t.mktemp("this")
@@ -57,9 +62,17 @@ class TestTempdirHandler(object):
         assert tmp2.relto(t.getbasetemp()).startswith("this")
         assert tmp2 != tmp
 
+    def test_tmppath_relative_basetemp_absolute(self, tmp_path, monkeypatch):
+        """#4425"""
+        from _pytest.tmpdir import TempPathFactory
+
+        monkeypatch.chdir(tmp_path)
+        config = FakeConfig("hello")
+        t = TempPathFactory.from_config(config)
+        assert t.getbasetemp().resolve() == (tmp_path / "hello").resolve()
+
 
 class TestConfigTmpdir(object):
-
     def test_getbasetemp_custom_removes_old(self, testdir):
         mytemp = testdir.tmpdir.join("xyz")
         p = testdir.makepyfile(
@@ -86,15 +99,11 @@ def test_basetemp(testdir):
             pytest.ensuretemp("hello")
     """
     )
-    result = testdir.runpytest(p, "--basetemp=%s" % mytemp)
+    result = testdir.runpytest(p, "--basetemp=%s" % mytemp, SHOW_PYTEST_WARNINGS_ARG)
     assert result.ret == 0
     assert mytemp.join("hello").check()
 
 
-@pytest.mark.skipif(
-    not hasattr(py.path.local, "mksymlinkto"),
-    reason="symlink not available on this platform",
-)
 def test_tmpdir_always_is_realpath(testdir):
     # the reason why tmpdir should be a realpath is that
     # when you cd to it and do "os.getcwd()" you will anyway
@@ -104,7 +113,7 @@ def test_tmpdir_always_is_realpath(testdir):
     # os.environ["PWD"]
     realtemp = testdir.tmpdir.mkdir("myrealtemp")
     linktemp = testdir.tmpdir.join("symlinktemp")
-    linktemp.mksymlinkto(realtemp)
+    attempt_symlink_to(linktemp, str(realtemp))
     p = testdir.makepyfile(
         """
         def test_1(tmpdir):
@@ -116,6 +125,22 @@ def test_tmpdir_always_is_realpath(testdir):
     assert not result.ret
 
 
+def test_tmp_path_always_is_realpath(testdir, monkeypatch):
+    # for reasoning see: test_tmpdir_always_is_realpath test-case
+    realtemp = testdir.tmpdir.mkdir("myrealtemp")
+    linktemp = testdir.tmpdir.join("symlinktemp")
+    attempt_symlink_to(linktemp, str(realtemp))
+    monkeypatch.setenv("PYTEST_DEBUG_TEMPROOT", str(linktemp))
+    testdir.makepyfile(
+        """
+        def test_1(tmp_path):
+            assert tmp_path.resolve() == tmp_path
+    """
+    )
+    reprec = testdir.inline_run()
+    reprec.assertoutcome(passed=1)
+
+
 def test_tmpdir_too_long_on_parametrization(testdir):
     testdir.makepyfile(
         """
@@ -137,7 +162,7 @@ def test_tmpdir_factory(testdir):
         def session_dir(tmpdir_factory):
             return tmpdir_factory.mktemp('data', numbered=False)
         def test_some(session_dir):
-            session_dir.isdir()
+            assert session_dir.isdir()
     """
     )
     reprec = testdir.inline_run()
@@ -210,3 +235,219 @@ def test_get_user(monkeypatch):
     monkeypatch.delenv("USER", raising=False)
     monkeypatch.delenv("USERNAME", raising=False)
     assert get_user() is None
+
+
+class TestNumberedDir(object):
+    PREFIX = "fun-"
+
+    def test_make(self, tmp_path):
+        from _pytest.pathlib import make_numbered_dir
+
+        for i in range(10):
+            d = make_numbered_dir(root=tmp_path, prefix=self.PREFIX)
+            assert d.name.startswith(self.PREFIX)
+            assert d.name.endswith(str(i))
+
+        symlink = tmp_path.joinpath(self.PREFIX + "current")
+        if symlink.exists():
+            # unix
+            assert symlink.is_symlink()
+            assert symlink.resolve() == d.resolve()
+
+    def test_cleanup_lock_create(self, tmp_path):
+        d = tmp_path.joinpath("test")
+        d.mkdir()
+        from _pytest.pathlib import create_cleanup_lock
+
+        lockfile = create_cleanup_lock(d)
+        with pytest.raises(EnvironmentError, match="cannot create lockfile in .*"):
+            create_cleanup_lock(d)
+
+        lockfile.unlink()
+
+    def test_lock_register_cleanup_removal(self, tmp_path):
+        from _pytest.pathlib import create_cleanup_lock, register_cleanup_lock_removal
+
+        lock = create_cleanup_lock(tmp_path)
+
+        registry = []
+        register_cleanup_lock_removal(lock, register=registry.append)
+
+        (cleanup_func,) = registry
+
+        assert lock.is_file()
+
+        cleanup_func(original_pid="intentionally_different")
+
+        assert lock.is_file()
+
+        cleanup_func()
+
+        assert not lock.exists()
+
+        cleanup_func()
+
+        assert not lock.exists()
+
+    def _do_cleanup(self, tmp_path):
+        self.test_make(tmp_path)
+        from _pytest.pathlib import cleanup_numbered_dir
+
+        cleanup_numbered_dir(
+            root=tmp_path,
+            prefix=self.PREFIX,
+            keep=2,
+            consider_lock_dead_if_created_before=0,
+        )
+
+    def test_cleanup_keep(self, tmp_path):
+        self._do_cleanup(tmp_path)
+        a, b = (x for x in tmp_path.iterdir() if not x.is_symlink())
+        print(a, b)
+
+    def test_cleanup_locked(self, tmp_path):
+
+        from _pytest import pathlib
+
+        p = pathlib.make_numbered_dir(root=tmp_path, prefix=self.PREFIX)
+
+        pathlib.create_cleanup_lock(p)
+
+        assert not pathlib.ensure_deletable(
+            p, consider_lock_dead_if_created_before=p.stat().st_mtime - 1
+        )
+        assert pathlib.ensure_deletable(
+            p, consider_lock_dead_if_created_before=p.stat().st_mtime + 1
+        )
+
+    def test_cleanup_ignores_symlink(self, tmp_path):
+        the_symlink = tmp_path / (self.PREFIX + "current")
+        attempt_symlink_to(the_symlink, tmp_path / (self.PREFIX + "5"))
+        self._do_cleanup(tmp_path)
+
+    def test_removal_accepts_lock(self, tmp_path):
+        folder = pathlib.make_numbered_dir(root=tmp_path, prefix=self.PREFIX)
+        pathlib.create_cleanup_lock(folder)
+        pathlib.maybe_delete_a_numbered_dir(folder)
+        assert folder.is_dir()
+
+
+class TestRmRf:
+    def test_rm_rf(self, tmp_path):
+        from _pytest.pathlib import rm_rf
+
+        adir = tmp_path / "adir"
+        adir.mkdir()
+        rm_rf(adir)
+
+        assert not adir.exists()
+
+        adir.mkdir()
+        afile = adir / "afile"
+        afile.write_bytes(b"aa")
+
+        rm_rf(adir)
+        assert not adir.exists()
+
+    def test_rm_rf_with_read_only_file(self, tmp_path):
+        """Ensure rm_rf can remove directories with read-only files in them (#5524)"""
+        from _pytest.pathlib import rm_rf
+
+        fn = tmp_path / "dir/foo.txt"
+        fn.parent.mkdir()
+
+        fn.touch()
+
+        self.chmod_r(fn)
+
+        rm_rf(fn.parent)
+
+        assert not fn.parent.is_dir()
+
+    def chmod_r(self, path):
+        mode = os.stat(str(path)).st_mode
+        os.chmod(str(path), mode & ~stat.S_IWRITE)
+
+    def test_rm_rf_with_read_only_directory(self, tmp_path):
+        """Ensure rm_rf can remove read-only directories (#5524)"""
+        from _pytest.pathlib import rm_rf
+
+        adir = tmp_path / "dir"
+        adir.mkdir()
+
+        (adir / "foo.txt").touch()
+        self.chmod_r(adir)
+
+        rm_rf(adir)
+
+        assert not adir.is_dir()
+
+    def test_on_rm_rf_error(self, tmp_path):
+        from _pytest.pathlib import on_rm_rf_error
+
+        adir = tmp_path / "dir"
+        adir.mkdir()
+
+        fn = adir / "foo.txt"
+        fn.touch()
+        self.chmod_r(fn)
+
+        # unknown exception
+        with pytest.warns(pytest.PytestWarning):
+            exc_info = (None, RuntimeError(), None)
+            on_rm_rf_error(os.unlink, str(fn), exc_info, start_path=tmp_path)
+            assert fn.is_file()
+
+        # we ignore FileNotFoundError
+        file_not_found = OSError()
+        file_not_found.errno = errno.ENOENT
+        exc_info = (None, file_not_found, None)
+        assert not on_rm_rf_error(None, str(fn), exc_info, start_path=tmp_path)
+
+        permission_error = OSError()
+        permission_error.errno = errno.EACCES
+        # unknown function
+        with pytest.warns(pytest.PytestWarning):
+            exc_info = (None, permission_error, None)
+            on_rm_rf_error(None, str(fn), exc_info, start_path=tmp_path)
+            assert fn.is_file()
+
+        exc_info = (None, permission_error, None)
+        on_rm_rf_error(os.unlink, str(fn), exc_info, start_path=tmp_path)
+        assert not fn.is_file()
+
+
+def attempt_symlink_to(path, to_path):
+    """Try to make a symlink from "path" to "to_path", skipping in case this platform
+    does not support it or we don't have sufficient privileges (common on Windows)."""
+    if sys.platform.startswith("win") and six.PY2:
+        pytest.skip("pathlib for some reason cannot make symlinks on Python 2")
+    try:
+        Path(path).symlink_to(Path(to_path))
+    except OSError:
+        pytest.skip("could not create symbolic link")
+
+
+def test_tmpdir_equals_tmp_path(tmpdir, tmp_path):
+    assert Path(tmpdir) == tmp_path
+
+
+def test_basetemp_with_read_only_files(testdir):
+    """Integration test for #5524"""
+    testdir.makepyfile(
+        """
+        import os
+        import stat
+
+        def test(tmp_path):
+            fn = tmp_path / 'foo.txt'
+            fn.write_text(u'hello')
+            mode = os.stat(str(fn)).st_mode
+            os.chmod(str(fn), mode & ~stat.S_IREAD)
+    """
+    )
+    result = testdir.runpytest("--basetemp=tmp")
+    assert result.ret == 0
+    # running a second time and ensure we don't crash
+    result = testdir.runpytest("--basetemp=tmp")
+    assert result.ret == 0
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_unittest.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_unittest.py
index 65ffdb97538..6b721d1c0ce 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_unittest.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_unittest.py
@@ -1,8 +1,13 @@
-from __future__ import absolute_import, division, print_function
-from _pytest.main import EXIT_NOTESTSCOLLECTED
-import pytest
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import gc
 
+import pytest
+from _pytest.main import EXIT_NOTESTSCOLLECTED
+
 
 def test_simple_unittest(testdir):
     testpath = testdir.makepyfile(
@@ -139,6 +144,29 @@ def test_new_instances(testdir):
     reprec.assertoutcome(passed=2)
 
 
+def test_function_item_obj_is_instance(testdir):
+    """item.obj should be a bound method on unittest.TestCase function items (#5390)."""
+    testdir.makeconftest(
+        """
+        def pytest_runtest_makereport(item, call):
+            if call.when == 'call':
+                class_ = item.parent.obj
+                assert isinstance(item.obj.__self__, class_)
+    """
+    )
+    testdir.makepyfile(
+        """
+        import unittest
+
+        class Test(unittest.TestCase):
+            def test_foo(self):
+                pass
+    """
+    )
+    result = testdir.runpytest_inprocess()
+    result.stdout.fnmatch_lines(["* 1 passed in*"])
+
+
 def test_teardown(testdir):
     testpath = testdir.makepyfile(
         """
@@ -240,7 +268,7 @@ def test_setup_failure_is_shown(testdir):
             def setUp(self):
                 assert 0, "down1"
             def test_method(self):
-                print ("never42")
+                print("never42")
                 xyz
     """
     )
@@ -360,7 +388,7 @@ def test_testcase_custom_exception_info(testdir, type):
 
 
 def test_testcase_totally_incompatible_exception_info(testdir):
-    item, = testdir.getitems(
+    (item,) = testdir.getitems(
         """
         from unittest import TestCase
         class MyTestCase(TestCase):
@@ -389,7 +417,6 @@ def test_module_level_pytestmark(testdir):
 
 
 class TestTrialUnittest(object):
-
     def setup_class(cls):
         cls.ut = pytest.importorskip("twisted.trial.unittest")
         # on windows trial uses a socket for a reactor and apparently doesn't close it properly
@@ -607,14 +634,14 @@ def test_djangolike_testcase(testdir):
         class DjangoLikeTestCase(TestCase):
 
             def setUp(self):
-                print ("setUp()")
+                print("setUp()")
 
             def test_presetup_has_been_run(self):
-                print ("test_thing()")
+                print("test_thing()")
                 self.assertTrue(hasattr(self, 'was_presetup'))
 
             def tearDown(self):
-                print ("tearDown()")
+                print("tearDown()")
 
             def __call__(self, result=None):
                 try:
@@ -636,11 +663,11 @@ def test_djangolike_testcase(testdir):
                     return
 
             def _pre_setup(self):
-                print ("_pre_setup()")
+                print("_pre_setup()")
                 self.was_presetup = True
 
             def _post_teardown(self):
-                print ("_post_teardown()")
+                print("_post_teardown()")
     """
     )
     result = testdir.runpytest("-s")
@@ -791,7 +818,7 @@ def test_unittest_setup_interaction(testdir, fix_type, stmt):
         )
     )
     result = testdir.runpytest()
-    result.stdout.fnmatch_lines("*3 passed*")
+    result.stdout.fnmatch_lines(["*3 passed*"])
 
 
 def test_non_unittest_no_setupclass_support(testdir):
@@ -927,11 +954,11 @@ def test_class_method_containing_test_issue1558(testdir):
     reprec.assertoutcome(passed=1)
 
 
-@pytest.mark.issue(3498)
 @pytest.mark.parametrize(
     "base", ["six.moves.builtins.object", "unittest.TestCase", "unittest2.TestCase"]
 )
 def test_usefixtures_marker_on_unittest(base, testdir):
+    """#3498"""
     module = base.rsplit(".", 1)[0]
     pytest.importorskip(module)
     testdir.makepyfile(
@@ -990,3 +1017,51 @@ def test_usefixtures_marker_on_unittest(base, testdir):
 
     result = testdir.runpytest("-s")
     result.assert_outcomes(passed=2)
+
+
+def test_testcase_handles_init_exceptions(testdir):
+    """
+    Regression test to make sure exceptions in the __init__ method are bubbled up correctly.
+    See https://github.com/pytest-dev/pytest/issues/3788
+    """
+    testdir.makepyfile(
+        """
+        from unittest import TestCase
+        import pytest
+        class MyTestCase(TestCase):
+            def __init__(self, *args, **kwargs):
+                raise Exception("should raise this exception")
+            def test_hello(self):
+                pass
+    """
+    )
+    result = testdir.runpytest()
+    assert "should raise this exception" in result.stdout.str()
+    assert "ERROR at teardown of MyTestCase.test_hello" not in result.stdout.str()
+
+
+def test_error_message_with_parametrized_fixtures(testdir):
+    testdir.copy_example("unittest/test_parametrized_fixture_error_message.py")
+    result = testdir.runpytest()
+    result.stdout.fnmatch_lines(
+        [
+            "*test_two does not support fixtures*",
+            "*TestSomethingElse::test_two",
+            "*Function type: TestCaseFunction",
+        ]
+    )
+
+
+@pytest.mark.parametrize(
+    "test_name, expected_outcome",
+    [
+        ("test_setup_skip.py", "1 skipped"),
+        ("test_setup_skip_class.py", "1 skipped"),
+        ("test_setup_skip_module.py", "1 error"),
+    ],
+)
+def test_setup_inheritance_skipping(testdir, test_name, expected_outcome):
+    """Issue #4700"""
+    testdir.copy_example("unittest/{}".format(test_name))
+    result = testdir.runpytest()
+    result.stdout.fnmatch_lines(["* {} in *".format(expected_outcome)])
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_warnings.py b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_warnings.py
index c5bea052a47..65f57e024f3 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_warnings.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_warnings.py
@@ -1,11 +1,13 @@
-# -*- coding: utf8 -*-
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 import sys
+import warnings
+
+import six
 
 import pytest
 
-
 WARNINGS_SUMMARY_HEADER = "warnings summary"
 
 
@@ -37,17 +39,16 @@ def pyfile_with_warnings(testdir, request):
     )
 
 
-@pytest.mark.filterwarnings("always")
+@pytest.mark.filterwarnings("default")
 def test_normal_flow(testdir, pyfile_with_warnings):
     """
-    Check that the warnings section is displayed, containing test node ids followed by
-    all warnings generated by that test node.
+    Check that the warnings section is displayed.
     """
     result = testdir.runpytest()
     result.stdout.fnmatch_lines(
         [
             "*== %s ==*" % WARNINGS_SUMMARY_HEADER,
-            "*test_normal_flow.py::test_func",
+            "test_normal_flow.py::test_func",
             "*normal_flow_module.py:3: UserWarning: user warning",
             '*  warnings.warn(UserWarning("user warning"))',
             "*normal_flow_module.py:4: RuntimeWarning: runtime warning",
@@ -55,7 +56,6 @@ def test_normal_flow(testdir, pyfile_with_warnings):
             "* 1 passed, 2 warnings*",
         ]
     )
-    assert result.stdout.str().count("test_normal_flow.py::test_func") == 1
 
 
 @pytest.mark.filterwarnings("always")
@@ -95,10 +95,12 @@ def test_as_errors(testdir, pyfile_with_warnings, method):
         testdir.makeini(
             """
             [pytest]
-            filterwarnings= error
+            filterwarnings=error
             """
         )
-    result = testdir.runpytest(*args)
+    # Use a subprocess, since changing logging level affects other threads
+    # (xdist).
+    result = testdir.runpytest_subprocess(*args)
     result.stdout.fnmatch_lines(
         [
             "E       UserWarning: user warning",
@@ -131,7 +133,7 @@ def test_ignore(testdir, pyfile_with_warnings, method):
 def test_unicode(testdir, pyfile_with_warnings):
     testdir.makepyfile(
         """
-        # -*- coding: utf8 -*-
+        # -*- coding: utf-8 -*-
         import warnings
         import pytest
 
@@ -160,14 +162,13 @@ def test_unicode(testdir, pyfile_with_warnings):
     reason="warnings message is broken as it is not str instance",
 )
 def test_py2_unicode(testdir, pyfile_with_warnings):
-    if (
-        getattr(sys, "pypy_version_info", ())[:2] == (5, 9)
-        and sys.platform.startswith("win")
+    if getattr(sys, "pypy_version_info", ())[:2] == (5, 9) and sys.platform.startswith(
+        "win"
     ):
         pytest.xfail("fails with unicode error on PyPy2 5.9 and Windows (#2905)")
     testdir.makepyfile(
         """
-        # -*- coding: utf8 -*-
+        # -*- coding: utf-8 -*-
         import warnings
         import pytest
 
@@ -288,3 +289,427 @@ def test_non_string_warning_argument(testdir):
     )
     result = testdir.runpytest("-W", "always")
     result.stdout.fnmatch_lines(["*= 1 passed, 1 warnings in *"])
+
+
+def test_filterwarnings_mark_registration(testdir):
+    """Ensure filterwarnings mark is registered"""
+    testdir.makepyfile(
+        """
+        import pytest
+
+        @pytest.mark.filterwarnings('error')
+        def test_func():
+            pass
+    """
+    )
+    result = testdir.runpytest("--strict-markers")
+    assert result.ret == 0
+
+
+@pytest.mark.filterwarnings("always")
+def test_warning_captured_hook(testdir):
+    testdir.makeconftest(
+        """
+        from _pytest.warnings import _issue_warning_captured
+        def pytest_configure(config):
+            _issue_warning_captured(UserWarning("config warning"), config.hook, stacklevel=2)
+    """
+    )
+    testdir.makepyfile(
+        """
+        import pytest, warnings
+
+        warnings.warn(UserWarning("collect warning"))
+
+        @pytest.fixture
+        def fix():
+            warnings.warn(UserWarning("setup warning"))
+            yield 1
+            warnings.warn(UserWarning("teardown warning"))
+
+        def test_func(fix):
+            warnings.warn(UserWarning("call warning"))
+            assert fix == 1
+        """
+    )
+
+    collected = []
+
+    class WarningCollector:
+        def pytest_warning_captured(self, warning_message, when, item):
+            imge_name = item.name if item is not None else ""
+            collected.append((str(warning_message.message), when, imge_name))
+
+    result = testdir.runpytest(plugins=[WarningCollector()])
+    result.stdout.fnmatch_lines(["*1 passed*"])
+
+    expected = [
+        ("config warning", "config", ""),
+        ("collect warning", "collect", ""),
+        ("setup warning", "runtest", "test_func"),
+        ("call warning", "runtest", "test_func"),
+        ("teardown warning", "runtest", "test_func"),
+    ]
+    assert collected == expected
+
+
+@pytest.mark.filterwarnings("always")
+def test_collection_warnings(testdir):
+    """
+    Check that we also capture warnings issued during test collection (#3251).
+    """
+    testdir.makepyfile(
+        """
+        import warnings
+
+        warnings.warn(UserWarning("collection warning"))
+
+        def test_foo():
+            pass
+    """
+    )
+    result = testdir.runpytest()
+    result.stdout.fnmatch_lines(
+        [
+            "*== %s ==*" % WARNINGS_SUMMARY_HEADER,
+            "  *collection_warnings.py:3: UserWarning: collection warning",
+            '    warnings.warn(UserWarning("collection warning"))',
+            "* 1 passed, 1 warnings*",
+        ]
+    )
+
+
+@pytest.mark.filterwarnings("always")
+def test_mark_regex_escape(testdir):
+    """@pytest.mark.filterwarnings should not try to escape regex characters (#3936)"""
+    testdir.makepyfile(
+        r"""
+        import pytest, warnings
+
+        @pytest.mark.filterwarnings(r"ignore:some \(warning\)")
+        def test_foo():
+            warnings.warn(UserWarning("some (warning)"))
+    """
+    )
+    result = testdir.runpytest()
+    assert WARNINGS_SUMMARY_HEADER not in result.stdout.str()
+
+
+@pytest.mark.filterwarnings("default")
+@pytest.mark.parametrize("ignore_pytest_warnings", ["no", "ini", "cmdline"])
+def test_hide_pytest_internal_warnings(testdir, ignore_pytest_warnings):
+    """Make sure we can ignore internal pytest warnings using a warnings filter."""
+    testdir.makepyfile(
+        """
+        import pytest
+        import warnings
+
+        warnings.warn(pytest.PytestWarning("some internal warning"))
+
+        def test_bar():
+            pass
+    """
+    )
+    if ignore_pytest_warnings == "ini":
+        testdir.makeini(
+            """
+            [pytest]
+            filterwarnings = ignore::pytest.PytestWarning
+        """
+        )
+    args = (
+        ["-W", "ignore::pytest.PytestWarning"]
+        if ignore_pytest_warnings == "cmdline"
+        else []
+    )
+    result = testdir.runpytest(*args)
+    if ignore_pytest_warnings != "no":
+        assert WARNINGS_SUMMARY_HEADER not in result.stdout.str()
+    else:
+        result.stdout.fnmatch_lines(
+            [
+                "*== %s ==*" % WARNINGS_SUMMARY_HEADER,
+                "*test_hide_pytest_internal_warnings.py:4: PytestWarning: some internal warning",
+                "* 1 passed, 1 warnings *",
+            ]
+        )
+
+
+@pytest.mark.parametrize("ignore_on_cmdline", [True, False])
+def test_option_precedence_cmdline_over_ini(testdir, ignore_on_cmdline):
+    """filters defined in the command-line should take precedence over filters in ini files (#3946)."""
+    testdir.makeini(
+        """
+        [pytest]
+        filterwarnings = error
+    """
+    )
+    testdir.makepyfile(
+        """
+        import warnings
+        def test():
+            warnings.warn(UserWarning('hello'))
+    """
+    )
+    args = ["-W", "ignore"] if ignore_on_cmdline else []
+    result = testdir.runpytest(*args)
+    if ignore_on_cmdline:
+        result.stdout.fnmatch_lines(["* 1 passed in*"])
+    else:
+        result.stdout.fnmatch_lines(["* 1 failed in*"])
+
+
+def test_option_precedence_mark(testdir):
+    """Filters defined by marks should always take precedence (#3946)."""
+    testdir.makeini(
+        """
+        [pytest]
+        filterwarnings = ignore
+    """
+    )
+    testdir.makepyfile(
+        """
+        import pytest, warnings
+        @pytest.mark.filterwarnings('error')
+        def test():
+            warnings.warn(UserWarning('hello'))
+    """
+    )
+    result = testdir.runpytest("-W", "ignore")
+    result.stdout.fnmatch_lines(["* 1 failed in*"])
+
+
+class TestDeprecationWarningsByDefault:
+    """
+    Note: all pytest runs are executed in a subprocess so we don't inherit warning filters
+    from pytest's own test suite
+    """
+
+    def create_file(self, testdir, mark=""):
+        testdir.makepyfile(
+            """
+            import pytest, warnings
+
+            warnings.warn(DeprecationWarning("collection"))
+
+            {mark}
+            def test_foo():
+                warnings.warn(PendingDeprecationWarning("test run"))
+        """.format(
+                mark=mark
+            )
+        )
+
+    @pytest.mark.parametrize("customize_filters", [True, False])
+    def test_shown_by_default(self, testdir, customize_filters):
+        """Show deprecation warnings by default, even if user has customized the warnings filters (#4013)."""
+        self.create_file(testdir)
+        if customize_filters:
+            testdir.makeini(
+                """
+                [pytest]
+                filterwarnings =
+                    once::UserWarning
+            """
+            )
+        result = testdir.runpytest_subprocess()
+        result.stdout.fnmatch_lines(
+            [
+                "*== %s ==*" % WARNINGS_SUMMARY_HEADER,
+                "*test_shown_by_default.py:3: DeprecationWarning: collection",
+                "*test_shown_by_default.py:7: PendingDeprecationWarning: test run",
+                "* 1 passed, 2 warnings*",
+            ]
+        )
+
+    def test_hidden_by_ini(self, testdir):
+        self.create_file(testdir)
+        testdir.makeini(
+            """
+            [pytest]
+            filterwarnings =
+                ignore::DeprecationWarning
+                ignore::PendingDeprecationWarning
+        """
+        )
+        result = testdir.runpytest_subprocess()
+        assert WARNINGS_SUMMARY_HEADER not in result.stdout.str()
+
+    def test_hidden_by_mark(self, testdir):
+        """Should hide the deprecation warning from the function, but the warning during collection should
+        be displayed normally.
+        """
+        self.create_file(
+            testdir,
+            mark='@pytest.mark.filterwarnings("ignore::PendingDeprecationWarning")',
+        )
+        result = testdir.runpytest_subprocess()
+        result.stdout.fnmatch_lines(
+            [
+                "*== %s ==*" % WARNINGS_SUMMARY_HEADER,
+                "*test_hidden_by_mark.py:3: DeprecationWarning: collection",
+                "* 1 passed, 1 warnings*",
+            ]
+        )
+
+    def test_hidden_by_cmdline(self, testdir):
+        self.create_file(testdir)
+        result = testdir.runpytest_subprocess(
+            "-W",
+            "ignore::DeprecationWarning",
+            "-W",
+            "ignore::PendingDeprecationWarning",
+        )
+        assert WARNINGS_SUMMARY_HEADER not in result.stdout.str()
+
+    def test_hidden_by_system(self, testdir, monkeypatch):
+        self.create_file(testdir)
+        monkeypatch.setenv(str("PYTHONWARNINGS"), str("once::UserWarning"))
+        result = testdir.runpytest_subprocess()
+        assert WARNINGS_SUMMARY_HEADER not in result.stdout.str()
+
+
+@pytest.mark.skipif(not six.PY2, reason="Python 2 only issue")
+def test_infinite_loop_warning_against_unicode_usage_py2(testdir):
+    """
+    We need to be careful when raising the warning about unicode usage with "warnings.warn"
+    because it might be overwritten by users and this itself causes another warning (#3691).
+    """
+    testdir.makepyfile(
+        """
+        # -*- coding: utf-8 -*-
+        from __future__ import unicode_literals
+        import warnings
+        import pytest
+
+        def _custom_showwarning(message, *a, **b):
+            return "WARNING: {}".format(message)
+
+        warnings.formatwarning = _custom_showwarning
+
+        @pytest.mark.filterwarnings("default")
+        def test_custom_warning_formatter():
+            warnings.warn("¥")
+    """
+    )
+    result = testdir.runpytest_subprocess()
+    result.stdout.fnmatch_lines(["*1 passed, * warnings in*"])
+
+
+@pytest.mark.parametrize("change_default", [None, "ini", "cmdline"])
+def test_removed_in_pytest4_warning_as_error(testdir, change_default):
+    testdir.makepyfile(
+        """
+        import warnings, pytest
+        def test():
+            warnings.warn(pytest.RemovedInPytest4Warning("some warning"))
+    """
+    )
+    if change_default == "ini":
+        testdir.makeini(
+            """
+            [pytest]
+            filterwarnings =
+                ignore::pytest.RemovedInPytest4Warning
+        """
+        )
+
+    args = (
+        ("-Wignore::pytest.RemovedInPytest4Warning",)
+        if change_default == "cmdline"
+        else ()
+    )
+    result = testdir.runpytest(*args)
+    if change_default is None:
+        result.stdout.fnmatch_lines(["* 1 failed in *"])
+    else:
+        assert change_default in ("ini", "cmdline")
+        result.stdout.fnmatch_lines(["* 1 passed in *"])
+
+
+class TestAssertionWarnings:
+    @staticmethod
+    def assert_result_warns(result, msg):
+        result.stdout.fnmatch_lines(["*PytestAssertRewriteWarning: %s*" % msg])
+
+    def test_tuple_warning(self, testdir):
+        testdir.makepyfile(
+            """
+            def test_foo():
+                assert (1,2)
+            """
+        )
+        result = testdir.runpytest()
+        self.assert_result_warns(
+            result, "assertion is always true, perhaps remove parentheses?"
+        )
+
+    @staticmethod
+    def create_file(testdir, return_none):
+        testdir.makepyfile(
+            """
+            def foo(return_none):
+                if return_none:
+                    return None
+                else:
+                    return False
+
+            def test_foo():
+                assert foo({return_none})
+            """.format(
+                return_none=return_none
+            )
+        )
+
+    def test_none_function_warns(self, testdir):
+        self.create_file(testdir, True)
+        result = testdir.runpytest()
+        self.assert_result_warns(
+            result, 'asserting the value None, please use "assert is None"'
+        )
+
+    def test_assert_is_none_no_warn(self, testdir):
+        testdir.makepyfile(
+            """
+            def foo():
+                return None
+
+            def test_foo():
+                assert foo() is None
+            """
+        )
+        result = testdir.runpytest()
+        result.stdout.fnmatch_lines(["*1 passed in*"])
+
+    def test_false_function_no_warn(self, testdir):
+        self.create_file(testdir, False)
+        result = testdir.runpytest()
+        result.stdout.fnmatch_lines(["*1 failed in*"])
+
+
+def test_warnings_checker_twice():
+    """Issue #4617"""
+    expectation = pytest.warns(UserWarning)
+    with expectation:
+        warnings.warn("Message A", UserWarning)
+    with expectation:
+        warnings.warn("Message B", UserWarning)
+
+
+@pytest.mark.filterwarnings("always")
+def test_group_warnings_by_message(testdir):
+    testdir.copy_example("warnings/test_group_warnings_by_message.py")
+    result = testdir.runpytest()
+    result.stdout.fnmatch_lines(
+        [
+            "test_group_warnings_by_message.py::test_foo[0]",
+            "test_group_warnings_by_message.py::test_foo[1]",
+            "test_group_warnings_by_message.py::test_foo[2]",
+            "test_group_warnings_by_message.py::test_foo[3]",
+            "test_group_warnings_by_message.py::test_foo[4]",
+            "test_group_warnings_by_message.py::test_bar",
+        ]
+    )
+    warning_code = 'warnings.warn(UserWarning("foo"))'
+    assert warning_code in result.stdout.str()
+    assert result.stdout.str().count(warning_code) == 1
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/tox.ini b/tests/wpt/web-platform-tests/tools/third_party/pytest/tox.ini
index cb3846d5422..f75a0610482 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pytest/tox.ini
+++ b/tests/wpt/web-platform-tests/tools/third_party/pytest/tox.ini
@@ -1,5 +1,6 @@
 [tox]
-minversion = 2.0
+isolated_build = True
+minversion = 3.5.3
 distshare = {homedir}/.tox/distshare
 # make sure to update environment list in travis.yml and appveyor.yml
 envlist =
@@ -9,193 +10,162 @@ envlist =
     py35
     py36
     py37
+    py38
+    py39
     pypy
-    {py27,py36}-{pexpect,xdist,trial,numpy,pluggymaster}
-    py27-nobyte
+    pypy3
+    {py27,py37}-{pexpect,xdist,twisted,numpy,pluggymaster}
+    py27-nobyte-xdist
     doctesting
-    py36-freeze
+    py37-freeze
     docs
 
 [testenv]
-commands = pytest --lsof -ra {posargs:testing}
-passenv = USER USERNAME
+commands =
+    {env:_PYTEST_TOX_COVERAGE_RUN:} pytest {posargs:{env:_PYTEST_TOX_DEFAULT_POSARGS:}}
+    coverage: coverage combine
+    coverage: coverage report
+passenv = USER USERNAME COVERAGE_* TRAVIS PYTEST_ADDOPTS
+setenv =
+    _PYTEST_TOX_DEFAULT_POSARGS={env:_PYTEST_TOX_POSARGS_LSOF:} {env:_PYTEST_TOX_POSARGS_PEXPECT:} {env:_PYTEST_TOX_POSARGS_TWISTED:} {env:_PYTEST_TOX_POSARGS_XDIST:}
+
+    # Configuration to run with coverage similar to Travis/Appveyor, e.g.
+    # "tox -e py37-coverage".
+    coverage: _PYTEST_TOX_COVERAGE_RUN=coverage run -m
+    coverage: _PYTEST_TOX_EXTRA_DEP=coverage-enable-subprocess
+    coverage: COVERAGE_FILE={toxinidir}/.coverage
+    coverage: COVERAGE_PROCESS_START={toxinidir}/.coveragerc
+
+    nobyte: PYTHONDONTWRITEBYTECODE=1
+
+    lsof: _PYTEST_TOX_POSARGS_LSOF=--lsof
+
+    pexpect: _PYTEST_TOX_PLATFORM=linux|darwin
+    pexpect: _PYTEST_TOX_POSARGS_PEXPECT=-m uses_pexpect
+
+    twisted: _PYTEST_TOX_POSARGS_TWISTED=testing/test_unittest.py
+
+    xdist: _PYTEST_TOX_POSARGS_XDIST=-n auto
+extras = testing
 deps =
-    hypothesis>=3.56
-    nose
-    mock
-    requests
+    numpy: numpy
+    pexpect: pexpect
+    pluggymaster: git+https://github.com/pytest-dev/pluggy.git@master
+    twisted: twisted
+    twisted: unittest2
+    xdist: pytest-xdist>=1.13
+    {env:_PYTEST_TOX_EXTRA_DEP:}
+platform = {env:_PYTEST_TOX_PLATFORM:.*}
 
 [testenv:py27-subprocess]
-changedir = .
 deps =
     pytest-xdist>=1.13
-    mock
+    py27: mock
     nose
 commands =
-    pytest -n3 -ra --runpytest=subprocess {posargs:testing}
+    pytest -n auto --runpytest=subprocess {posargs}
 
 
 [testenv:linting]
-skipsdist = True
-usedevelop = True
-basepython = python3.6
-deps = pre-commit
+skip_install = True
+basepython = python3
+deps = pre-commit>=1.11.0
 commands = pre-commit run --all-files --show-diff-on-failure
 
-[testenv:py27-xdist]
-deps =
-    pytest-xdist>=1.13
-    mock
-    nose
-    hypothesis>=3.56
-changedir=testing
-commands =
-    pytest -n8 -ra {posargs:.}
-
-[testenv:py36-xdist]
-deps = {[testenv:py27-xdist]deps}
-commands = {[testenv:py27-xdist]commands}
-
-[testenv:py27-pexpect]
-changedir = testing
-platform = linux|darwin
-deps = pexpect
-commands =
-    pytest -ra test_pdb.py test_terminal.py test_unittest.py
-
-[testenv:py36-pexpect]
-changedir = {[testenv:py27-pexpect]changedir}
-platform = {[testenv:py27-pexpect]platform}
-deps = {[testenv:py27-pexpect]deps}
-commands = {[testenv:py27-pexpect]commands}
-
-[testenv:py27-nobyte]
-deps =
-    pytest-xdist>=1.13
-    hypothesis>=3.56
-    mock
-distribute = true
-changedir=testing
-setenv =
-    PYTHONDONTWRITEBYTECODE=1
-commands =
-    pytest -n3 -ra {posargs:.}
-
-[testenv:py27-trial]
-deps = twisted
-commands =
-    pytest -ra {posargs:testing/test_unittest.py}
-
-[testenv:py36-trial]
-deps = {[testenv:py27-trial]deps}
-commands = {[testenv:py27-trial]commands}
-
-[testenv:py27-numpy]
-deps = numpy
-commands=
-  pytest -ra {posargs:testing/python/approx.py}
-
-[testenv:py36-numpy]
-deps = {[testenv:py27-numpy]deps}
-commands = {[testenv:py27-numpy]commands}
-
-[testenv:py27-pluggymaster]
-setenv=
-    _PYTEST_SETUP_SKIP_PLUGGY_DEP=1
-deps =
-    {[testenv]deps}
-    git+https://github.com/pytest-dev/pluggy.git@master
-
-[testenv:py36-pluggymaster]
-setenv = {[testenv:py27-pluggymaster]setenv}
-deps = {[testenv:py27-pluggymaster]deps}
-
 [testenv:docs]
-skipsdist = True
+basepython = python3
 usedevelop = True
 changedir = doc/en
-deps =
-    attrs
-    more-itertools
-    PyYAML
-    sphinx
-    sphinxcontrib-trio
+deps = -r{toxinidir}/doc/en/requirements.txt
 
 commands =
     sphinx-build -W -b html . _build
 
 [testenv:doctesting]
-basepython = python
-usedevelop = True
+basepython = python3
 skipsdist = True
-# ensure the given pyargs can't mean anything else
-changedir = doc/
 deps =
+    {[testenv]deps}
     PyYAML
 commands =
-    pytest -ra en
-    pytest --doctest-modules --pyargs _pytest
+    {env:_PYTEST_TOX_COVERAGE_RUN:} pytest doc/en
+    {env:_PYTEST_TOX_COVERAGE_RUN:} pytest --doctest-modules --pyargs _pytest
 
 [testenv:regen]
 changedir = doc/en
 skipsdist = True
-basepython = python3.5
+basepython = python3
 deps =
     sphinx
     PyYAML
     regendoc>=0.6.1
+    dataclasses
 whitelist_externals =
     rm
     make
 commands =
+    # don't show hypothesis plugin info in docs, see #4602
+    pip uninstall hypothesis -y
     rm -rf /tmp/doc-exec*
+    rm -rf {envdir}/.pytest_cache
     make regen
 
-[testenv:fix-lint]
-skipsdist = True
-usedevelop = True
-deps =
-    autopep8
-commands =
-    autopep8 --in-place -r --max-line-length=120 --exclude=test_source_multiline_block.py _pytest testing setup.py pytest.py
-
 [testenv:jython]
 changedir = testing
 commands =
-    {envpython} {envbindir}/py.test-jython -ra {posargs}
+    {envpython} {envbindir}/py.test-jython {posargs}
 
-[testenv:py36-freeze]
+[testenv:py37-freeze]
 changedir = testing/freeze
-deps = pyinstaller
+# Disable PEP 517 with pip, which does not work with PyInstaller currently.
+deps =
+    pyinstaller
+    setuptools < 45.0.0
 commands =
     {envpython} create_executable.py
     {envpython} tox_run.py
 
-
-[testenv:coveralls]
-passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH COVERALLS_REPO_TOKEN
+[testenv:release]
+decription = do a release, required posarg of the version number
+basepython = python3
 usedevelop = True
-changedir = .
+passenv = *
 deps =
-    {[testenv]deps}
-    coveralls
-commands =
-    coverage run --source=_pytest -m pytest testing
-    coverage report -m
-    coveralls
+    colorama
+    gitpython
+    pre-commit>=1.11.0
+    towncrier
+    wheel
+commands = python scripts/release.py {posargs}
+
+[testenv:publish_gh_release_notes]
+description = create GitHub release after deployment
+basepython = python3
+usedevelop = True
+passenv = GH_RELEASE_NOTES_TOKEN TRAVIS_TAG TRAVIS_REPO_SLUG
+deps =
+    github3.py
+    pypandoc
+commands = python scripts/publish_gh_release_notes.py
+
 
 [pytest]
 minversion = 2.0
-plugins = pytester
-addopts = -ra -p pytester --ignore=testing/cx_freeze
-rsyncdirs = tox.ini pytest.py _pytest testing
+addopts = -ra -p pytester --strict-markers
+rsyncdirs = tox.ini doc src testing
 python_files = test_*.py *_test.py testing/*/*.py
 python_classes = Test Acceptance
 python_functions = test
-norecursedirs = .tox ja .hg cx_freeze_source
+# NOTE: "doc" is not included here, but gets tested explicitly via "doctesting".
+testpaths = testing
+norecursedirs = testing/example_scripts
 xfail_strict=true
 filterwarnings =
     error
+    ignore:yield tests are deprecated, and scheduled to be removed in pytest 4.0:pytest.RemovedInPytest4Warning
+    ignore:Metafunc.addcall is deprecated and scheduled to be removed in pytest 4.0:pytest.RemovedInPytest4Warning
+    ignore::pytest.RemovedInPytest4Warning
+    ignore:Module already imported so cannot be rewritten:pytest.PytestWarning
     # produced by path.local
     ignore:bad escape.*:DeprecationWarning:re
     # produced by path.readlines
@@ -204,9 +174,30 @@ filterwarnings =
     ignore:.*type argument to addoption.*:DeprecationWarning
     # produced by python >=3.5 on execnet (pytest-xdist)
     ignore:.*inspect.getargspec.*deprecated, use inspect.signature.*:DeprecationWarning
-    # ignore warning about package resolution using __spec__ or __package__
-    # should be a temporary solution, see #3061 for discussion
-    ignore:.*can't resolve package from __spec__ or __package__.*:ImportWarning
+    # pytest's own futurewarnings
+    ignore::pytest.PytestExperimentalApiWarning
+    # Do not cause SyntaxError for invalid escape sequences in py37.
+    default:invalid escape sequence:DeprecationWarning
+    # ignore use of unregistered marks, because we use many to test the implementation
+    ignore::_pytest.warning_types.PytestUnknownMarkWarning
+pytester_example_dir = testing/example_scripts
+markers =
+    # dummy markers for testing
+    foo
+    bar
+    baz
+    # conftest.py reorders tests moving slow ones to the end of the list
+    slow
+    # experimental mark for all tests using pexpect
+    uses_pexpect
 
 [flake8]
 max-line-length = 120
+ignore = E203,W503
+
+[isort]
+; This config mimics what reorder-python-imports does.
+force_single_line = 1
+known_localfolder = pytest,_pytest
+known_third_party = test_source,test_excinfo
+force_alphabetical_sort_within_sections = 1
diff --git a/tests/wpt/web-platform-tests/tools/tox.ini b/tests/wpt/web-platform-tests/tools/tox.ini
index 1a94ec34021..c72d728239a 100644
--- a/tests/wpt/web-platform-tests/tools/tox.ini
+++ b/tests/wpt/web-platform-tests/tools/tox.ini
@@ -5,7 +5,8 @@ skip_missing_interpreters = False
 
 [testenv]
 deps =
-  pytest
+  # Same as tools/third_party/pytest, also the last version that supports Python 2
+  pytest==4.6.11
   pytest-cov
   # mock no longer supports Python 2 since v4
   mock==3.*
diff --git a/tests/wpt/web-platform-tests/tools/wave/tox.ini b/tests/wpt/web-platform-tests/tools/wave/tox.ini
index 8e3e26e135b..2feec8d1a4a 100644
--- a/tests/wpt/web-platform-tests/tools/wave/tox.ini
+++ b/tests/wpt/web-platform-tests/tools/wave/tox.ini
@@ -5,7 +5,8 @@ skip_missing_interpreters = False
 
 [testenv]
 deps =
-  pytest
+  # Same as tools/third_party/pytest, also the last version that supports Python 2
+  pytest==4.6.11
   pytest-cov
   hypothesis
   mock
diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/test_wpt.py b/tests/wpt/web-platform-tests/tools/wpt/tests/test_wpt.py
index 69a649a3d2d..ee338a33f83 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/tests/test_wpt.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/tests/test_wpt.py
@@ -184,8 +184,6 @@ def test_run_zero_tests():
 
 @pytest.mark.slow
 @pytest.mark.remote_network
-@pytest.mark.skipif(sys.version_info >= (3, 8) and sys.platform == 'darwin',
-                    reason="multiprocessing test hangs in Python 3.8 on macOS (#24880)")
 def test_run_failing_test():
     """Failing tests should be reported with a non-zero exit status unless the
     `--no-fail-on-unexpected` option has been specified."""
@@ -208,8 +206,6 @@ def test_run_failing_test():
 
 @pytest.mark.slow
 @pytest.mark.remote_network
-@pytest.mark.skipif(sys.version_info >= (3, 8) and sys.platform == 'darwin',
-                    reason="multiprocessing test hangs in Python 3.8 on macOS (#24880)")
 def test_run_verify_unstable(temp_test):
     """Unstable tests should be reported with a non-zero exit status. Stable
     tests should be reported with a zero exit status."""
diff --git a/tests/wpt/web-platform-tests/tools/wpt/tox.ini b/tests/wpt/web-platform-tests/tools/wpt/tox.ini
index 50717135539..03f4ab5aba0 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/tox.ini
+++ b/tests/wpt/web-platform-tests/tools/wpt/tox.ini
@@ -5,7 +5,8 @@ skip_missing_interpreters = False
 
 [testenv]
 deps =
-  pytest
+  # Same as tools/third_party/pytest, also the last version that supports Python 2
+  pytest==4.6.11
   pytest-cov
   hypothesis
   # mock no longer supports Python 2 since v4
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/tox.ini b/tests/wpt/web-platform-tests/tools/wptrunner/tox.ini
index 798f64a3e42..b39b5eb7e95 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/tox.ini
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/tox.ini
@@ -7,7 +7,8 @@ skip_missing_interpreters = False
 
 [testenv]
 deps =
-     pytest>=2.9
+     # Same as tools/third_party/pytest, also the last version that supports Python 2
+     pytest==4.6.11
      pytest-cov
      pytest-xdist
      # mock no longer supports Python 2 since v4
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_stash.py b/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_stash.py
index 0b960c1e9f8..1c4c9ad933a 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_stash.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_stash.py
@@ -1,4 +1,3 @@
-import sys
 import unittest
 import uuid
 
@@ -10,8 +9,6 @@ from wptserve.stash import StashServer
 from .base import TestUsingServer
 
 
-@pytest.mark.skipif(sys.version_info >= (3, 8) and sys.platform == 'darwin',
-                    reason="multiprocessing test hangs in Python 3.8 on macOS (#24880)")
 class TestResponseSetCookie(TestUsingServer):
     def run(self, result=None):
         with StashServer(None, authkey=str(uuid.uuid4())):
diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.keyboard.html b/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.keyboard.html
index 9d679d708e7..472dd96ddb8 100644
--- a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.keyboard.html
+++ b/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.keyboard.html
@@ -64,4 +64,4 @@
         <div>Test result: </div>
         <div id='testresult'>FAIL</div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/urlpattern/resources/urlpatterntestdata.json b/tests/wpt/web-platform-tests/urlpattern/resources/urlpatterntestdata.json
index 66038e03d23..5a1a3ec01eb 100644
--- a/tests/wpt/web-platform-tests/urlpattern/resources/urlpatterntestdata.json
+++ b/tests/wpt/web-platform-tests/urlpattern/resources/urlpatterntestdata.json
@@ -607,5 +607,235 @@
     "pattern": { "pathname": "/foo{/bar}*" },
     "input": { "pathname": "/foo/" },
     "expected": null
+  },
+  {
+    "pattern": { "protocol": "(café)" },
+    "error": true
+  },
+  {
+    "pattern": { "username": "(café)" },
+    "error": true
+  },
+  {
+    "pattern": { "password": "(café)" },
+    "error": true
+  },
+  {
+    "pattern": { "hostname": "(café)" },
+    "error": true
+  },
+  {
+    "pattern": { "pathname": "(café)" },
+    "error": true
+  },
+  {
+    "pattern": { "search": "(café)" },
+    "error": true
+  },
+  {
+    "pattern": { "hash": "(café)" },
+    "error": true
+  },
+  {
+    "pattern": { "protocol": "(.*)" },
+    "input": { "protocol" : "café" },
+    "expected": null
+  },
+  {
+    "pattern": { "protocol": "(.*)" },
+    "input": { "protocol": "cafe" },
+    "expected": {
+      "input": { "protocol": "cafe" },
+      "protocol": { "input": "cafe", "groups": { "0": "cafe" }}
+    }
+  },
+  {
+    "pattern": { "username": "caf%C3%A9" },
+    "input": { "username" : "café" },
+    "expected": {
+      "input": { "username" : "café" },
+      "username": { "input": "caf%C3%A9", "groups": {}}
+    }
+  },
+  {
+    "pattern": { "username": "caf%c3%a9" },
+    "input": { "username" : "café" },
+    "expected": null
+  },
+  {
+    "pattern": { "password": "caf%C3%A9" },
+    "input": { "password" : "café" },
+    "expected": {
+      "input": { "password" : "café" },
+      "password": { "input": "caf%C3%A9", "groups": {}}
+    }
+  },
+  {
+    "pattern": { "password": "caf%c3%a9" },
+    "input": { "password" : "café" },
+    "expected": null
+  },
+  {
+    "pattern": { "hostname": "xn--caf-dma.com" },
+    "input": { "hostname" : "café.com" },
+    "expected": {
+      "input": { "hostname" : "café.com" },
+      "hostname": { "input": "xn--caf-dma.com", "groups": {}}
+    }
+  },
+  {
+    "pattern": { "hostname": "cafe%7C.com" },
+    "input": { "hostname" : "cafe|.com" },
+    "expected": {
+      "input": { "hostname" : "cafe|.com" },
+      "hostname": { "input": "cafe%7C.com", "groups": {}}
+    }
+  },
+  {
+    "pattern": { "hostname": "cafe%7c.com" },
+    "input": { "hostname" : "cafe|.com" },
+    "expected": null
+  },
+  {
+    "pattern": { "hostname": "(.*)" },
+    "input": { "hostname" : "cafe^.com" },
+    "expected": null
+  },
+  {
+    "pattern": { "port": "" },
+    "input": { "protocol": "http", "port": "80" },
+    "expected": {
+      "input": { "protocol": "http", "port": "80" },
+      "protocol": { "input": "http", "groups": { "0": "http" }},
+      "port": { "input": "", "groups": {}}
+    }
+  },
+  {
+    "pattern": { "port": "80" },
+    "input": { "port": "80" },
+    "expected": {
+      "input": { "port": "80" },
+      "port": { "input": "80", "groups": {}}
+    }
+  },
+  {
+    "pattern": { "port": "(.*)" },
+    "input": { "port": "invalid80" },
+    "expected": null
+  },
+  {
+    "pattern": { "pathname": "/foo/bar" },
+    "input": { "pathname": "/foo/./bar" },
+    "expected": {
+      "input": { "pathname": "/foo/./bar" },
+      "pathname": { "input": "/foo/bar", "groups": {}}
+    }
+  },
+  {
+    "pattern": { "pathname": "/foo/baz" },
+    "input": { "pathname": "/foo/bar/../baz" },
+    "expected": {
+      "input": { "pathname": "/foo/bar/../baz" },
+      "pathname": { "input": "/foo/baz", "groups": {}}
+    }
+  },
+  {
+    "pattern": { "pathname": "/caf%C3%A9" },
+    "input": { "pathname": "/café" },
+    "expected": {
+      "input": { "pathname": "/café" },
+      "pathname": { "input": "/caf%C3%A9", "groups": {}}
+    }
+  },
+  {
+    "pattern": { "pathname": "/caf%c3%a9" },
+    "input": { "pathname": "/café" },
+    "expected": null
+  },
+  {
+    "pattern": { "pathname": "/foo/bar" },
+    "input": { "pathname": "foo/bar" },
+    "expected": null
+  },
+  {
+    "pattern": { "pathname": "/foo/bar" },
+    "input": { "pathname": "foo/bar", "baseURL": "https://example.com" },
+    "expected": {
+      "input": { "pathname": "foo/bar", "baseURL": "https://example.com" },
+      "protocol": { "input": "https", "groups": { "0": "https" }},
+      "hostname": { "input": "example.com", "groups": { "0": "example.com" }},
+      "pathname": { "input": "/foo/bar", "groups": {}}
+    }
+  },
+  {
+    "pattern": { "pathname": "foo/bar" },
+    "input": "https://example.com/foo/bar",
+    "expected": null
+  },
+  {
+    "pattern": { "pathname": "foo/bar", "baseURL": "https://example.com" },
+    "input": "https://example.com/foo/bar",
+    "expected": {
+      "input": "https://example.com/foo/bar",
+      "exactly_empty_components": [ "username", "password", "port" ],
+      "protocol": { "input": "https", "groups": {}},
+      "hostname": { "input": "example.com", "groups": {}},
+      "pathname": { "input": "/foo/bar", "groups": {}}
+    }
+  },
+  {
+    "pattern": { "pathname": ":name.html", "baseURL": "https://example.com" },
+    "input": "https://example.com/foo.html",
+    "expected": {
+      "input": "https://example.com/foo.html",
+      "exactly_empty_components": [ "username", "password", "port" ],
+      "protocol": { "input": "https", "groups": {}},
+      "hostname": { "input": "example.com", "groups": {}},
+      "pathname": { "input": "/foo.html", "groups": { "name": "foo" }}
+    }
+  },
+  {
+    "pattern": { "search": "q=caf%C3%A9" },
+    "input": { "search": "q=café" },
+    "expected": {
+      "input": { "search": "q=café" },
+      "search": { "input": "q=caf%C3%A9", "groups": {}}
+    }
+  },
+  {
+    "pattern": { "search": "q=caf%c3%a9" },
+    "input": { "search": "q=café" },
+    "expected": null
+  },
+  {
+    "pattern": { "hash": "caf%C3%A9" },
+    "input": { "hash": "café" },
+    "expected": {
+      "input": { "hash": "café" },
+      "hash": { "input": "caf%C3%A9", "groups": {}}
+    }
+  },
+  {
+    "pattern": { "hash": "caf%c3%a9" },
+    "input": { "hash": "café" },
+    "expected": null
+  },
+  {
+    "pattern": { "protocol": "about", "pathname": "(blank|sourcedoc)" },
+    "input": "about:blank",
+    "expected": {
+      "input": "about:blank",
+      "protocol": { "input": "about", "groups": {}},
+      "pathname": { "input": "blank", "groups": { "0": "blank" }}
+    }
+  },
+  {
+    "pattern": { "protocol": "data", "pathname": ":number([0-9]+)" },
+    "input": "data:8675309",
+    "expected": {
+      "input": "data:8675309",
+      "protocol": { "input": "data", "groups": {}},
+      "pathname": { "input": "8675309", "groups": { "number": "8675309" }}
+    }
   }
 ]
diff --git a/tests/wpt/web-platform-tests/urlpattern/urlpattern.https.any.js b/tests/wpt/web-platform-tests/urlpattern/urlpattern.https.any.js
index 27b03d0ff03..3d47f57f118 100644
--- a/tests/wpt/web-platform-tests/urlpattern/urlpattern.https.any.js
+++ b/tests/wpt/web-platform-tests/urlpattern/urlpattern.https.any.js
@@ -3,6 +3,12 @@
 function runTests(data) {
   for (let entry of data) {
     test(function() {
+      if (entry.error) {
+        assert_throws_js(TypeError, _ => new URLPattern(entry.pattern),
+                         'URLPattern() constructor');
+        return;
+      }
+
       const pattern = new URLPattern(entry.pattern);
 
       // First, validate the test() method by converting the expected result to
@@ -50,12 +56,7 @@ function runTests(data) {
         // where the pattern has a default wildcard or empty string pattern
         // for a component and the input is essentially empty.
         if (!expected_obj) {
-          // We must treat pathname specially since it always has at least one
-          // slash.
-          if (component === 'pathname')
-            expected_obj = { input: '/', groups: {} };
-          else
-            expected_obj = { input: '', groups: {} };
+          expected_obj = { input: '', groups: {} };
 
           // Next, we must treat default wildcards differently than empty string
           // patterns.  The wildcard results in a capture group, but the empty
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures.py b/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures.py
index 78a8a981e35..888c42b1f72 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures.py
@@ -10,7 +10,7 @@ from six import string_types
 from six.moves.urllib.parse import urlunsplit
 
 from tests.support import defaults
-from tests.support.helpers import cleanup_session
+from tests.support.helpers import cleanup_session, deep_update
 from tests.support.inline import build_inline
 from tests.support.http_request import HTTPRequest
 from tests.support.sync import Poll
@@ -124,7 +124,7 @@ def session(capabilities, configuration, request):
     # Update configuration capabilities with custom ones from the
     # capabilities fixture, which can be set by tests
     caps = copy.deepcopy(configuration["capabilities"])
-    caps.update(capabilities)
+    deep_update(caps, capabilities)
     caps = {"alwaysMatch": caps}
 
     # If there is a session with different capabilities active, end it now
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/helpers.py b/tests/wpt/web-platform-tests/webdriver/tests/support/helpers.py
index f857083b477..a1082caf58c 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/support/helpers.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/support/helpers.py
@@ -1,8 +1,11 @@
 from __future__ import print_function
 
+import collections
 import math
 import sys
 
+from six import iteritems
+
 import webdriver
 
 from tests.support import defaults
@@ -106,6 +109,20 @@ def clear_all_cookies(session):
     session.transport.send("DELETE", "session/%s/cookie" % session.session_id)
 
 
+def deep_update(source, overrides):
+    """
+    Update a nested dictionary or similar mapping.
+    Modify ``source`` in place.
+    """
+    for key, value in iteritems(overrides):
+        if isinstance(value, collections.Mapping) and value:
+            returned = deep_update(source.get(key, {}), value)
+            source[key] = returned
+        else:
+            source[key] = overrides[key]
+    return source
+
+
 def document_dimensions(session):
     return tuple(session.execute_script("""
         let rect = document.documentElement.getBoundingClientRect();
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/merge_dictionaries.py b/tests/wpt/web-platform-tests/webdriver/tests/support/merge_dictionaries.py
index cf06c9b433c..c13ab904e40 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/support/merge_dictionaries.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/support/merge_dictionaries.py
@@ -1,9 +1,4 @@
-def iteritems(d):
-    """Create a key-value iterator for the given dict in both Python 2.x and
-    Python 3.x environments"""
-    if hasattr(d, "iteritems"):
-        return d.iteritems()
-    return d.items()
+from six import iteritems
 
 def merge_dictionaries(first, second):
     """Given two dictionaries, create a third that defines all specified
diff --git a/tests/wpt/web-platform-tests/webxr/webGLCanvasContext_create_xrcompatible.https.html b/tests/wpt/web-platform-tests/webxr/webGLCanvasContext_create_xrcompatible.https.html
index e3e83a50eee..3cdbce99ccd 100644
--- a/tests/wpt/web-platform-tests/webxr/webGLCanvasContext_create_xrcompatible.https.html
+++ b/tests/wpt/web-platform-tests/webxr/webGLCanvasContext_create_xrcompatible.https.html
@@ -17,28 +17,28 @@
     xr_promise_test("Creating a webgl2 context with no device",
       testNoDevice, null, 'webgl2');
 
+    function testOffscreenCanvas(canvas, glContextType) {
+      let gl = canvas.getContext('webgl');
+
+      return gl.makeXRCompatible().then(() => {
+        assert_true(gl.getContextAttributes().xrCompatible);
+      });
+    }
+
     function testXrCompatible(t, gl) {
-      let offscreenGl = null;
-      let offscreenGl2 = null;
       return navigator.xr.test.simulateDeviceConnection(TRACKED_IMMERSIVE_DEVICE)
         .then( (controller) => {
           return gl.makeXRCompatible();
         }).then( () => {
           assert_true(gl.getContextAttributes().xrCompatible);
 
-          // Check that an offscreen webgl context behaves no different.
-          let offscreenCanvas = document.createElement('canvas');
-          offscreenGl = offscreenCanvas.getContext('webgl');
-          return offscreenGl.makeXRCompatible();
+          return testOffscreenCanvas(document.createElement('canvas'), 'webgl');
         }).then( () => {
-          assert_true(offscreenGl.getContextAttributes().xrCompatible);
-
-          // Check that an offscreen webgl2 context behaves no different.
-          let offscreenCanvas = document.createElement('canvas');
-          offscreenGl2 = offscreenCanvas.getContext('webgl2');
-          return offscreenGl2.makeXRCompatible();
-      }).then( () => {
-          assert_true(offscreenGl2.getContextAttributes().xrCompatible);
+          return testOffscreenCanvas(document.createElement('canvas'), 'webgl2');
+        }).then( () => {
+          return testOffscreenCanvas(new OffscreenCanvas(1, 1), 'webgl');
+        }).then( () => {
+          return testOffscreenCanvas(new OffscreenCanvas(1, 1), 'webgl2');
       });
     }