Skip to content

Commit c6e4bde

Browse files
Hexclesmoz-wptsync-bot
authored andcommitted
Bug 1680099 [wpt PR 26704] - Upgrade pytest to 4.6.11 along with its deps, a=testonly
Automatic update from web-platform-tests Squashed 'tools/third_party/funcsigs/' changes from db7f0afe3e..29e7a6ebb2 1b88d78a38 Release 1.0.2. a2602c812c Fix #21: setup_requires setuptools 17.1 3b0a393c27 Release 1.0.1. 6848ca897c Fixes #18: depend on ordereddict on old Pythons d967e51973 Version bump to 1.0.0. 9610297407 Merge pull request #17 from rbtcollins/mfield-varargs_class_method f2c0368f2e Deal with unbound methods like foo(*args). 3306968f41 Cleanup tests: e70929ceb2 Update README.rst fa0f64c06a Use the ordereddict pypi package when needed 7693e97193 Add .gitignore e7fb456d52 Merge pull request #6 from rbtcollins/github 43ee6b7b4e Fixup tox patch. 4e80d81554 Add tox.ini for tox 95ce8ebc49 README.rst: A few more tweaks 6cea81cced README.rst: Add detail to example d131c4af91 README.rst: compatability => compatibility 82d9c949d6 Avoid easy-install in travis. aa7288e532 Updates to fit into the new home. 32a9d3e37b Closes #14: Fix binding with self as a kwarg. git-subtree-dir: tools/third_party/funcsigs git-subtree-split: 29e7a6ebb21bf1c4dc9aca710d9fbfea08875849 -- Merge commit '483de5a5b4c8bf03949b95cf6f77ded784d9673e' as 'tools/third_party/funcsigs' git subtree pull --squash --prefix=tools/third_party/funcsigs https://github.com/testing-cabal/funcsigs.git 1.0.2 -- Merge commit 'b2e86ecc07141439c6af2b0808843e1e7e94b294' as 'tools/third_party/pathlib2' git subtree add --squash --prefix=tools/third_party/pathlib2 https://github.com/mcmtroffaes/pathlib2.git 2.3.5 -- Add pathlib2 to localpaths -- Merge commit '4ca1339ce4115d8e6806f8e4b6220eb6e215d6ce' as 'tools/third_party/pluggy' git subtree pull --squash --prefix=tools/third_party/pluggy https://github.com/pytest-dev/pluggy.git 0.13.1 -- Fix the path of pluggy -- Merge commit '8c0b23feb0fb44dc09a5c4496953286846b93dbd' as 'tools/third_party/importlib_metadata' git subtree add --squash --prefix=tools/third_party/importlib_metadata https://github.com/python/importlib_metadata.git v2.1.0 -- Add importlib_metadata to localpaths But only on Python<=3.8 (this package became a part of stdlib since 3.8) -- Merge commit '122a58fc25277dbce4dbb93c127aae206a3bce9d' as 'tools/third_party/packaging' git subtree add --squash --prefix tools/third_party/packaging https://github.com/pypa/packaging.git 20.7 -- Add packaging to localpaths -- rm tools/third_party/pytest for a clean subtree add -- Merge commit 'cc003ad772f702c6593b430f9f41ebc1c7180422' as 'tools/third_party/pytest' git subtree add --squash --prefix=tools/third_party/pytest https://github.com/pytest-dev/pytest.git 4.6.11 -- Pin pytest to 4.6.11 in tox.ini -- Revert "[tools] Disable some multiprocessing tests (#24892)" This reverts commit b2579d4e08a237fd1e38942ead6303495f3fbf07. Fixes #24880. -- wpt-commits: 483de5a5b4c8bf03949b95cf6f77ded784d9673e, 7371a197590f7c091725f1a10cd59d76803a730f, b4e2de6481bf60f1ced8f0cd15d036a16d33db32, 1e131cbf75c27b272423978bc7556607648e365f, bb2650ef0098cb40f670c905e1423a0a182d784d, cdcc1a21147b397392bfe9104688818548a036ed, 78ac8608268d9ad65dcc8851022f52471a3fe539, 41dd226cad2c4b7a12a4bf151c2ebe5164295a8c, 6a49e4c470d0e7a0ddf6e4e9f350d6f8223b301f, 36500575af7e635f6b6d1bc7c0da3a8d81e3338e, 3fcdf4a37d3c347c0b8bd9d18c4cf68c0042d1f3, 5d22f87fdd9419f707969619bd5ef9a8dc7a0a9e, 09436597e19c7f3fa1a5e58fefbd56ca7c5abba3, 6e0e1a0c369e4ae452eb334aa8b5078a78deb780 wpt-pr: 26704
1 parent b7d40bf commit c6e4bde

519 files changed

Lines changed: 45546 additions & 11635 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

testing/web-platform/tests/tools/localpaths.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
sys.path.insert(0, os.path.join(here, "third_party", "funcsigs"))
1212
sys.path.insert(0, os.path.join(here, "third_party", "html5lib"))
1313
sys.path.insert(0, os.path.join(here, "third_party", "more-itertools"))
14-
sys.path.insert(0, os.path.join(here, "third_party", "pluggy"))
14+
sys.path.insert(0, os.path.join(here, "third_party", "packaging"))
15+
sys.path.insert(0, os.path.join(here, "third_party", "pathlib2"))
16+
sys.path.insert(0, os.path.join(here, "third_party", "pluggy", "src"))
1517
sys.path.insert(0, os.path.join(here, "third_party", "py"))
1618
sys.path.insert(0, os.path.join(here, "third_party", "pytest"))
1719
sys.path.insert(0, os.path.join(here, "third_party", "pytest", "src"))
@@ -22,6 +24,8 @@
2224
sys.path.insert(0, os.path.join(here, "third_party", "hyperframe"))
2325
sys.path.insert(0, os.path.join(here, "third_party", "certifi"))
2426
sys.path.insert(0, os.path.join(here, "third_party", "hyper"))
27+
if sys.version_info < (3, 8):
28+
sys.path.insert(0, os.path.join(here, "third_party", "importlib_metadata"))
2529
sys.path.insert(0, os.path.join(here, "webdriver"))
2630
sys.path.insert(0, os.path.join(here, "wptrunner"))
2731

testing/web-platform/tests/tools/serve/test_functional.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import Queue as queue # noqa: N813
1010
except ImportError:
1111
import queue
12-
import sys
1312
import tempfile
1413
import threading
1514

@@ -46,8 +45,6 @@ def tempfile_name():
4645
os.remove(name)
4746

4847

49-
@pytest.mark.skipif(sys.version_info >= (3, 8) and sys.platform == 'darwin',
50-
reason="multiprocessing test hangs in Python 3.8 on macOS (#24880)")
5148
def test_subprocess_exit(server_subprocesses, tempfile_name):
5249
timeout = 30
5350

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
*~
2+
*.egg
3+
*.egg-info
4+
*.pyc
5+
*.pyo
6+
*.swp
7+
.DS_Store
8+
.coverage
9+
.tox/
10+
MANIFEST
11+
build/
12+
docs/.build/
13+
dist/
14+
env*/
15+
htmlcov/
16+
tmp/
17+
coverage.xml
18+
junit.xml
19+
.eggs/

testing/web-platform/tests/tools/third_party/funcsigs/.travis.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@ language: python
22
python:
33
- 2.6
44
- 2.7
5-
- 3.2
65
- 3.3
6+
- 3.4
7+
- 3.5
8+
- nightly
79
- pypy
10+
# - pypy3
811
install:
9-
- pip install -r requirements/development.txt -r requirements/production.txt
10-
- python setup.py install
12+
- pip install -U pip setuptools wheel
13+
- pip install -r requirements/development.txt .
1114
script:
1215
- coverage run setup.py test
1316
- coverage report --show-missing
1417
after_success:
1518
- coveralls
16-
notifications:
17-
email: aaron.iles+travis-ci@gmail.com

testing/web-platform/tests/tools/third_party/funcsigs/CHANGELOG

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
Changelog
22
---------
33

4+
0.5
5+
```
6+
7+
* Fix binding with self as a kwarg. (Robert Collins #14)
8+
49
0.4 (2013-12-20)
510
````````````````
611
* Fix unbound methods getting their first parameter curried

0 commit comments

Comments
 (0)