Skip to content

Commit

Permalink
Bug 1680099 [wpt PR 26704] - Upgrade pytest to 4.6.11 along with its …
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
Hexcles authored and moz-wptsync-bot committed Dec 21, 2020
1 parent b7d40bf commit c6e4bde
Show file tree
Hide file tree
Showing 519 changed files with 45,546 additions and 11,635 deletions.
6 changes: 5 additions & 1 deletion testing/web-platform/tests/tools/localpaths.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
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"))
Expand All @@ -22,6 +24,8 @@
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"))

Expand Down
3 changes: 0 additions & 3 deletions testing/web-platform/tests/tools/serve/test_functional.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import Queue as queue # noqa: N813
except ImportError:
import queue
import sys
import tempfile
import threading

Expand Down Expand Up @@ -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

Expand Down
19 changes: 19 additions & 0 deletions testing/web-platform/tests/tools/third_party/funcsigs/.gitignore
Original file line number Diff line number Diff line change
@@ -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/
Original file line number Diff line number Diff line change
Expand Up @@ -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: [email protected]
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading

0 comments on commit c6e4bde

Please sign in to comment.