Compare commits

..

63 Commits

Author SHA1 Message Date
Bruno Oliveira
6fc02bb04a Release 1.26.1 2019-01-28 18:07:36 -02:00
Bruno Oliveira
c5f65b39ec Do not implement pytest_logwarning in pytest versions where it is deprecated
Fix #406
2019-01-28 18:05:41 -02:00
Bruno Oliveira
f00f9ecf58 Merge pull request #403 from BoboTiG/fix-resource-leaks
Fix ResourceWarning: unclosed file in setup.py
2019-01-15 08:22:08 -02:00
Ronny Pfannschmidt
48b7014530 Merge pull request #401 from nicoddemus/mainargv-docs
Add docs for sys.argv access from workers
2019-01-15 06:16:41 +01:00
Bruno Oliveira
1dec9dc246 ReprEntry objects no longer have the localssep attribute
The attribute was not used anywhere and has been removed in
pytest-dev/pytest#4615
2019-01-14 21:59:05 -02:00
Mickaël Schoentgen
f6ecaa9b7f Fix ResourceWarning: unclosed file in setup.py
Also uniformize the usage of the 'with' context manager.

Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr>
2019-01-14 22:59:36 +01:00
Bruno Oliveira
1276df4cfa Add docs for sys.argv access from workers 2019-01-11 21:59:33 -02:00
Bruno Oliveira
ccdb36a477 Merge pull request #400 from nicoddemus/release-1.26.0
Release 1.26.0
2019-01-11 21:14:46 -02:00
Bruno Oliveira
45ddc221ef Release 1.26.0 2019-01-11 15:19:37 -02:00
Bruno Oliveira
c3dbd05bd1 Merge pull request #379 from aadamson/warning-details-dumps-check
Check that we can serialize the warning detail attr
2019-01-11 15:17:02 -02:00
Bruno Oliveira
b9423d894c Fix linting 2019-01-10 19:19:34 -02:00
Alex Adamson
242c009866 Remove trailing whitespace 2019-01-10 15:50:25 -05:00
Alex Adamson
0ee219dc48 Address comments 2019-01-10 15:45:48 -05:00
Bruno Oliveira
76075f5de1 Merge pull request #397 from nicoddemus/do-not-change-pythonpath
Do not change PYTHONPATH or sys.path on workers
2019-01-09 18:40:02 -02:00
Bruno Oliveira
f8d51aab57 Do not change PYTHONPATH or sys.path on local workers
Fix #376
2019-01-09 11:14:35 -02:00
Alex Adamson
ac2bf10fe2 Disable unserialized arguments check for py2 2019-01-08 15:17:03 -05:00
Alex Adamson
fa85371c73 Add test for #379 2019-01-08 15:17:03 -05:00
Alex Adamson
d55fab3aa7 Add changelog entry 2019-01-08 15:17:03 -05:00
Alex Adamson
4632df37a6 Check that we can serialize the warning detail attr 2019-01-08 15:17:03 -05:00
Bruno Oliveira
ca94bda1b7 Merge pull request #396 from nicoddemus/fix-4.1.0-tests
Skip config.warn tests in pytest 4.1
2019-01-08 17:18:13 -02:00
Bruno Oliveira
261d4189f0 Skip config.warn tests in pytest 4.1 2019-01-08 10:57:14 -02:00
Bruno Oliveira
f283dddf36 Merge pull request #392 from nicoddemus/release-1.25.0
Release 1.25.0
2018-12-13 11:09:27 -02:00
Bruno Oliveira
6d74bab518 Merge remote-tracking branch 'upstream/master' into release-1.25.0 2018-12-12 22:28:53 -02:00
Daniel Hahler
c306287a4e Merge pull request #393 from nicoddemus/fix-master
Fix test_remote_usage_prog which started to break with pytest@features
2018-12-12 23:15:45 +01:00
Bruno Oliveira
2b65800738 Fix test_remote_usage_prog which started to break with pytest@features 2018-12-12 18:25:04 -02:00
Bruno Oliveira
86bf3cb8b3 Release 1.25.0 2018-12-12 15:24:02 -02:00
Bruno Oliveira
95aaaec6c5 Merge pull request #388 from blueyed/pass-mainargv
Pass and use original sys.argv to/with workers
2018-12-12 15:21:56 -02:00
Bruno Oliveira
33d5441258 Merge pull request #390 from nicoddemus/pytest-logwarning
Prepare for the removal of pytest_logwarning in pytest 4.1
2018-12-12 08:59:21 -02:00
Bruno Oliveira
b5c09f8e84 Add CHANGELOG 2018-12-11 18:49:40 -02:00
Bruno Oliveira
a30124e858 Prepare for the removal of pytest_logwarning in pytest 4.1 2018-12-11 18:46:30 -02:00
Bruno Oliveira
c5d8635294 Merge pull request #375 from ethanhs/silencenodes
Don't show node setup when running quiet
2018-12-11 18:08:42 -02:00
Bruno Oliveira
5f0abe3cb8 Merge remote-tracking branch 'upstream/master' into ethanhs/silencenodes 2018-12-11 14:35:25 -02:00
Bruno Oliveira
3332c99e1e Improve verbosity test 2018-12-11 14:35:16 -02:00
Bruno Oliveira
3329bbbae2 Merge pull request #389 from nicoddemus/excinfo-fix-384
Fix ExceptionInfo usage for pytest 4.1
2018-12-11 14:23:21 -02:00
Bruno Oliveira
dd63d0b667 Merge pull request #386 from blueyed/minor
minor: fix error message and wrongly joined/blackified strings
2018-12-11 12:21:56 -02:00
Bruno Oliveira
dd6eac12a4 Fix ExceptionInfo usage for pytest 4.1
Fix #384
2018-12-11 12:19:34 -02:00
Daniel Hahler
a70dace69c Pass and use original sys.argv to/with workers
This gets used e.g. by argparse for the "prog" part.

We could explicitly pass it through and/or set it on
config._parser.prog, but that is a bit tedious just for this use case,
and it looks like "simulating" the main prog here appears to not be that
bad of a hack after all.
2018-12-11 06:41:18 +01:00
Daniel Hahler
6a21a5aa81 minor: fix error message and wrongly joined/blackified strings 2018-12-05 19:46:14 +01:00
Ethan Smith
49c09117ed Fix lint 2018-11-29 00:55:33 -08:00
Ethan Smith
566480fdd3 Add test and silence completely 2018-11-29 00:25:30 -08:00
Ronny Pfannschmidt
5ecbf25450 Merge pull request #380 from nicoddemus/fix-master
Skip test which needs pytest_namespace(), removed recently
2018-11-22 07:11:19 +01:00
Ronny Pfannschmidt
646eb868ab Merge pull request #378 from tzickel/geventfix
fix a bug with gevent monkeypatch
2018-11-22 07:09:38 +01:00
Bruno Oliveira
50b27d2735 Skip test which needs pytest_namespace(), removed recently 2018-11-21 19:57:24 -02:00
tzickel
16db6eddd7 fix a bug with gevent monkeypatch 2018-11-21 18:59:28 +02:00
Ronny Pfannschmidt
f2061875e1 Merge pull request #377 from nicoddemus/pytest-4-fix
Update test that used deprecated cached_setup function
2018-11-16 19:35:04 +01:00
Bruno Oliveira
c4b365b082 Update test that used deprecated cached_setup function 2018-11-16 12:50:15 -02:00
Ethan Smith
5465d936f7 Add newline 2018-11-12 14:05:07 -08:00
Ethan Smith
b819657dac Add changelog entry 2018-11-12 13:37:10 -08:00
Ethan Smith
d8c6c22989 Don't show node setup when running quiet 2018-11-12 13:31:19 -08:00
Bruno Oliveira
1efec5a153 Merge pull request #372 from nicoddemus/drop-old-pytest
Drop support to old pytest versions and test with python 3.7
2018-11-11 12:15:34 -02:00
Bruno Oliveira
f9a13fe53b Drop support to old pytest versions and test with python 3.7 2018-11-11 11:27:30 -02:00
Bruno Oliveira
74a5e0ca03 Merge pull request #371 from nicoddemus/skip-module-370
Fix handling of skipped modules with pytest.skip at module level
2018-11-10 19:19:50 -02:00
Bruno Oliveira
3292e0ede0 Fix handling of skipped modules with pytest.skip at module level
Fix #332
2018-11-10 18:20:13 -02:00
Bruno Oliveira
d40d47acd9 Merge pull request #369 from nicoddemus/release-1.21.1
Release 1.21.1
2018-11-10 11:51:32 -02:00
Bruno Oliveira
3579bfce7d Release 1.21.1 2018-11-09 14:29:21 -02:00
Ronny Pfannschmidt
365499eeaf Merge pull request #368 from nicoddemus/rename-filescope-file
Rename filescope to loadfile
2018-11-09 17:20:35 +01:00
Ronny Pfannschmidt
a518bd4e2a Merge pull request #362 from nicoddemus/serialize-fail-349
Handle warnings with unserializable arguments
2018-11-09 17:17:59 +01:00
Bruno Oliveira
d84ae73775 Rename filescope to loadfile
This makes it consistent with the option (--dist=loadfile) and the other
scheduling file (loadscope.py)
2018-11-09 13:00:40 -02:00
Bruno Oliveira
673fe9bd67 Create 'baseline' stage for fast-failure of builds, similar to pytest 2018-10-30 09:44:13 -03:00
Bruno Oliveira
9217b80fb1 Update CI to test against latest pytest release 2018-10-30 09:44:13 -03:00
Bruno Oliveira
b151e56fbd Handle unserializable warning arguments
Fix #349
2018-10-30 09:44:13 -03:00
Bruno Oliveira
70688b7986 Refactor warning acceptance tests into a class 2018-10-29 18:38:01 -03:00
Bruno Oliveira
adc385253c Merge pull request #357 from nicoddemus/release-1.24.0
Release 1.24.0
2018-10-29 18:23:37 -03:00
17 changed files with 414 additions and 169 deletions

View File

@@ -11,36 +11,36 @@ notifications:
email: email:
- pytest-commit@python.org - pytest-commit@python.org
python: install:
- '2.7' - pip install -U pip
- '3.4' - pip install tox setuptools_scm
- '3.5'
- '3.6'
env:
- TOXENV=py-pytest30
- TOXENV=py-pytest31
- TOXENV=py-pytest32
- TOXENV=py-pytest33
- TOXENV=py-pytest36
- TOXENV=py-pytest38
install: pip install tox setuptools_scm
script: tox script: tox
stages: stages:
- linting - baseline
- test - test
- name: deploy - name: deploy
if: repo = pytest-dev/pytest-xdist AND tag IS present if: repo = pytest-dev/pytest-xdist AND tag IS present
jobs: jobs:
include: include:
- stage: linting - stage: baseline
python: '3.6' python: '3.6'
script: env: TOXENV=linting
- tox -e linting - python: '3.6'
env: TOXENV=py36-pytestlatest
- python: '2.7'
env: TOXENV=py27-pytestlatest
- stage: test - stage: test
# python x env above are already included into this stage python: "3.4"
env: TOXENV=py34-pytestlatest
- python: "3.5"
env: TOXENV=py35-pytestlatest
- python: "3.7"
env: TOXENV=py37-pytestlatest
sudo: required
dist: xenial
- python: "2.7" - python: "2.7"
env: TOXENV=py27-pytestmaster env: TOXENV=py27-pytestmaster
- python: "2.7" - python: "2.7"

View File

@@ -1,3 +1,70 @@
pytest-xdist 1.26.1 (2019-01-28)
================================
Bug Fixes
---------
- `#406 <https://github.com/pytest-dev/pytest-xdist/issues/406>`_: Do not implement deprecated ``pytest_logwarning`` hook in pytest versions where it is deprecated.
pytest-xdist 1.26.0 (2019-01-11)
================================
Features
--------
- `#376 <https://github.com/pytest-dev/pytest-xdist/issues/376>`_: The current directory is no longer added ``sys.path`` for local workers, only for remote connections.
This behavior is surprising because it makes xdist runs and non-xdist runs to potentially behave differently.
Bug Fixes
---------
- `#379 <https://github.com/pytest-dev/pytest-xdist/issues/379>`_: Warning attributes are checked to make sure they can be dumped prior to
serializing the warning for submission to the master node.
pytest-xdist 1.25.0 (2018-12-12)
================================
Deprecations and Removals
-------------------------
- `#372 <https://github.com/pytest-dev/pytest-xdist/issues/372>`_: Pytest versions older than 3.6 are no longer supported.
Features
--------
- `#373 <https://github.com/pytest-dev/pytest-xdist/issues/373>`_: Node setup information is hidden when pytest is run in quiet mode to reduce noise on many-core machines.
- `#388 <https://github.com/pytest-dev/pytest-xdist/issues/388>`_: ``mainargv`` is made available in ``workerinput`` from the host's ``sys.argv``.
This can be used via ``request.config.workerinput["mainargv"]``.
Bug Fixes
---------
- `#332 <https://github.com/pytest-dev/pytest-xdist/issues/332>`_: Fix report of module-level skips (``pytest.skip(reason, allow_module_level=True)``).
- `#378 <https://github.com/pytest-dev/pytest-xdist/issues/378>`_: Fix support for gevent monkeypatching
- `#384 <https://github.com/pytest-dev/pytest-xdist/issues/384>`_: pytest 4.1 support: ``ExceptionInfo`` API changes.
- `#390 <https://github.com/pytest-dev/pytest-xdist/issues/390>`_: pytest 4.1 support: ``pytest_logwarning`` hook removed.
pytest-xdist 1.24.1 (2018-11-09)
================================
Bug Fixes
---------
- `#349 <https://github.com/pytest-dev/pytest-xdist/issues/349>`_: Correctly handle warnings created with arguments that can't be serialized during the transfer from workers to master node.
pytest-xdist 1.24.0 (2018-10-18) pytest-xdist 1.24.0 (2018-10-18)
================================ ================================

View File

@@ -223,6 +223,12 @@ defined:
The information about the worker_id in a test is stored in the ``TestReport`` as The information about the worker_id in a test is stored in the ``TestReport`` as
well, under the ``worker_id`` attribute. well, under the ``worker_id`` attribute.
Acessing ``sys.argv`` from the master node in workers
-----------------------------------------------------
To access the ``sys.argv`` passed to the command-line of the master node, use
``request.config.workerinput["mainargv"]``.
Specifying test exec environments in an ini file Specifying test exec environments in an ini file
------------------------------------------------ ------------------------------------------------

View File

@@ -1,22 +1,23 @@
environment: environment:
matrix: matrix:
# note: please use "tox --listenvs" to populate the build matrix - TOXENV: "py27-pytestlatest"
- TOXENV: "py27-pytest33" - TOXENV: "py34-pytestlatest"
- TOXENV: "py34-pytest33" - TOXENV: "py35-pytestlatest"
- TOXENV: "py35-pytest33" - TOXENV: "py36-pytestlatest"
- TOXENV: "py36-pytest33" - TOXENV: "py37-pytestlatest"
- TOXENV: "py36-pytest36" - TOXENV: "py27-pytestmaster"
- TOXENV: "py36-pytest38" - TOXENV: "py36-pytestmaster"
- TOXENV: "py27-pytest33-pexpect" - TOXENV: "py27-pytestfeatures"
- TOXENV: "py36-pytest33-pexpect" - TOXENV: "py36-pytestfeatures"
install: install:
- C:\Python36\python -m pip install -U tox setuptools_scm pip - C:\Python37\python -m pip install -U pip
- C:\Python37\python -m pip install -U tox setuptools_scm
build: false # Not a C# project, build stuff at the test step instead. build: false # Not a C# project, build stuff at the test step instead.
test_script: test_script:
- C:\Python36\python -m tox - C:\Python37\python -m tox
# We don't deploy anything on tags with AppVeyor, we use Travis instead, so we # We don't deploy anything on tags with AppVeyor, we use Travis instead, so we
# might as well save resources # might as well save resources

View File

@@ -1,14 +1,17 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
install_requires = ["execnet>=1.1", "pytest>=3.0.0", "pytest-forked", "six"] install_requires = ["execnet>=1.1", "pytest>=3.6.0", "pytest-forked", "six"]
with open("README.rst") as f:
long_description = f.read()
setup( setup(
name="pytest-xdist", name="pytest-xdist",
use_scm_version={"write_to": "xdist/_version.py"}, use_scm_version={"write_to": "xdist/_version.py"},
description="pytest xdist plugin for distributed testing" description="pytest xdist plugin for distributed testing"
" and loop-on-failing modes", " and loop-on-failing modes",
long_description=open("README.rst").read(), long_description=long_description,
license="MIT", license="MIT",
author="holger krekel and contributors", author="holger krekel and contributors",
author_email="pytest-dev@python.org,holger@merlinux.eu", author_email="pytest-dev@python.org,holger@merlinux.eu",
@@ -40,5 +43,6 @@ setup(
"Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
], ],
) )

View File

@@ -1,5 +1,6 @@
import os import os
import re import re
import sys
import textwrap import textwrap
import py import py
@@ -358,6 +359,30 @@ class TestDistEach:
class TestTerminalReporting: class TestTerminalReporting:
@pytest.mark.parametrize("verbosity", ["", "-q", "-v"])
def test_output_verbosity(self, testdir, verbosity):
testdir.makepyfile(
"""
def test_ok():
pass
"""
)
args = ["-n1"]
if verbosity:
args.append(verbosity)
result = testdir.runpytest(*args)
out = result.stdout.str()
if verbosity == "-v":
assert "scheduling tests" in out
assert "gw" in out
elif verbosity == "-q":
assert "scheduling tests" not in out
assert "gw" not in out
assert "bringing up nodes..." in out
else:
assert "scheduling tests" not in out
assert "gw" in out
def test_pass_skip_fail(self, testdir): def test_pass_skip_fail(self, testdir):
testdir.makepyfile( testdir.makepyfile(
""" """
@@ -400,64 +425,6 @@ class TestTerminalReporting:
] ]
) )
@pytest.mark.parametrize("n", ["-n0", "-n1"])
@pytest.mark.parametrize("warn_type", ["pytest", "builtin"])
def test_warnings(self, testdir, n, warn_type):
from pkg_resources import parse_version
if parse_version(pytest.__version__) < parse_version("3.1"):
pytest.skip("pytest warnings requires >= 3.1")
if warn_type == "builtin":
warn_code = """warnings.warn(UserWarning('this is a warning'))"""
elif warn_type == "pytest":
warn_code = """request.config.warn('', 'this is a warning',
fslocation=py.path.local())"""
else:
assert False
testdir.makepyfile(
"""
import warnings, py, pytest
@pytest.mark.filterwarnings('ignore:config.warn has been deprecated')
def test_func(request):
{warn_code}
""".format(
warn_code=warn_code
)
)
result = testdir.runpytest(n)
result.stdout.fnmatch_lines(["*this is a warning*", "*1 passed, 1 warnings*"])
@pytest.mark.parametrize("n", ["-n0", "-n1"])
def test_custom_subclass(self, testdir, n):
"""Check that warning subclasses that don't honor the args attribute don't break
pytest-xdist (#344)
"""
from pkg_resources import parse_version
if parse_version(pytest.__version__) < parse_version("3.1"):
pytest.skip("pytest warnings requires >= 3.1")
testdir.makepyfile(
"""
import warnings, py, pytest
class MyWarning(UserWarning):
def __init__(self, p1, p2):
self.p1 = p1
self.p2 = p2
self.args = ()
def test_func(request):
warnings.warn(MyWarning("foo", 1))
"""
)
testdir.syspathinsert()
result = testdir.runpytest(n)
result.stdout.fnmatch_lines(["*MyWarning*", "*1 passed, 1 warnings*"])
def test_logfinish_hook(self, testdir): def test_logfinish_hook(self, testdir):
"""Ensure the pytest_runtest_logfinish hook is being properly handled""" """Ensure the pytest_runtest_logfinish hook is being properly handled"""
from _pytest import hookspec from _pytest import hookspec
@@ -523,9 +490,8 @@ def test_session_hooks(testdir):
name = "worker" name = "worker"
else: else:
name = "master" name = "master"
f = open(name, "w") with open(name, "w") as f:
f.write("xy") f.write("xy")
f.close()
# let's fail on the worker # let's fail on the worker
if name == "worker": if name == "worker":
raise ValueError(42) raise ValueError(42)
@@ -575,16 +541,15 @@ def test_session_testscollected(testdir):
assert collected_file.read() == "collected = 3" assert collected_file.read() == "collected = 3"
def test_funcarg_teardown_failure(testdir): def test_fixture_teardown_failure(testdir):
p = testdir.makepyfile( p = testdir.makepyfile(
""" """
import pytest import pytest
@pytest.fixture @pytest.fixture(scope="module")
def myarg(request): def myarg(request):
def teardown(val): yield 42
raise ValueError(val) raise ValueError(42)
return request.cached_setup(setup=lambda: 42, teardown=teardown,
scope="module")
def test_hello(myarg): def test_hello(myarg):
pass pass
""" """
@@ -670,6 +635,11 @@ def test_skipping(testdir):
def test_issue34_pluginloading_in_subprocess(testdir): def test_issue34_pluginloading_in_subprocess(testdir):
import _pytest.hookspec
if not hasattr(_pytest.hookspec, "pytest_namespace"):
pytest.skip("this pytest version no longer supports pytest_namespace()")
testdir.tmpdir.join("plugin123.py").write( testdir.tmpdir.join("plugin123.py").write(
textwrap.dedent( textwrap.dedent(
""" """
@@ -765,6 +735,108 @@ def test_sub_plugins_disabled(testdir, plugin):
result.stdout.fnmatch_lines("*1 passed*") result.stdout.fnmatch_lines("*1 passed*")
class TestWarnings:
@pytest.mark.parametrize("n", ["-n0", "-n1"])
@pytest.mark.parametrize("warn_type", ["pytest", "builtin"])
def test_warnings(self, testdir, n, request, warn_type):
if warn_type == "builtin":
warn_code = """warnings.warn(UserWarning('this is a warning'))"""
elif warn_type == "pytest":
if not hasattr(request.config, "warn"):
pytest.skip("config.warn has been removed in pytest 4.1")
warn_code = """request.config.warn('', 'this is a warning',
fslocation=py.path.local())"""
else:
assert False
testdir.makepyfile(
"""
import warnings, py, pytest
@pytest.mark.filterwarnings('ignore:config.warn has been deprecated')
def test_func(request):
{warn_code}
""".format(
warn_code=warn_code
)
)
result = testdir.runpytest(n)
result.stdout.fnmatch_lines(["*this is a warning*", "*1 passed, 1 warnings*"])
@pytest.mark.parametrize("n", ["-n0", "-n1"])
def test_custom_subclass(self, testdir, n):
"""Check that warning subclasses that don't honor the args attribute don't break
pytest-xdist (#344)
"""
testdir.makepyfile(
"""
import warnings, py, pytest
class MyWarning(UserWarning):
def __init__(self, p1, p2):
self.p1 = p1
self.p2 = p2
self.args = ()
def test_func(request):
warnings.warn(MyWarning("foo", 1))
"""
)
testdir.syspathinsert()
result = testdir.runpytest(n)
result.stdout.fnmatch_lines(["*MyWarning*", "*1 passed, 1 warnings*"])
@pytest.mark.parametrize("n", ["-n0", "-n1"])
def test_unserializable_arguments(self, testdir, n):
"""Check that warnings with unserializable arguments are handled correctly (#349)."""
testdir.makepyfile(
"""
import warnings, pytest
def test_func(tmpdir):
fn = (tmpdir / 'foo.txt').ensure(file=1)
with fn.open('r') as f:
warnings.warn(UserWarning("foo", f))
"""
)
testdir.syspathinsert()
result = testdir.runpytest(n)
result.stdout.fnmatch_lines(["*UserWarning*foo.txt*", "*1 passed, 1 warnings*"])
@pytest.mark.parametrize("n", ["-n0", "-n1"])
def test_unserializable_warning_details(self, testdir, n):
"""Check that warnings with unserializable _WARNING_DETAILS are
handled correctly (#379).
"""
if sys.version_info[0] < 3:
# The issue is only present in Python 3 warnings
return
testdir.makepyfile(
"""
import warnings, pytest
import socket
import gc
def abuse_socket():
s = socket.socket()
del s
# Deliberately provoke a ResourceWarning for an unclosed socket.
# The socket itself will end up attached as a value in
# _WARNING_DETAIL. We need to test that it is not serialized
# (it can't be, so the test will fail if we try to).
@pytest.mark.filterwarnings('always')
def test_func(tmpdir):
abuse_socket()
gc.collect()
"""
)
testdir.syspathinsert()
result = testdir.runpytest(n)
result.stdout.fnmatch_lines(
["*ResourceWarning*unclosed*", "*1 passed, 1 warnings*"]
)
class TestNodeFailure: class TestNodeFailure:
def test_load_single(self, testdir): def test_load_single(self, testdir):
f = testdir.makepyfile( f = testdir.makepyfile(

View File

@@ -1,4 +1,7 @@
import py import py
import pytest
from pkg_resources import parse_version
from xdist.looponfail import RemoteControl from xdist.looponfail import RemoteControl
from xdist.looponfail import StatRecorder from xdist.looponfail import StatRecorder
@@ -214,7 +217,11 @@ class TestLooponFailing:
assert "test_one" not in remotecontrol.failures[0] assert "test_one" not in remotecontrol.failures[0]
assert "test_two" in remotecontrol.failures[0] assert "test_two" in remotecontrol.failures[0]
@py.test.mark.xfail(py.test.__version__ >= "3.1", reason="broken by pytest 3.1+") @pytest.mark.xfail(
parse_version(pytest.__version__) >= parse_version("3.1"),
reason="broken by pytest 3.1+",
strict=True,
)
def test_looponfail_removed_test(self, testdir): def test_looponfail_removed_test(self, testdir):
modcol = testdir.getmodulecol( modcol = testdir.getmodulecol(
""" """

View File

@@ -1,6 +1,8 @@
import py import py
import pprint import pprint
import pytest import pytest
import sys
from xdist.workermanage import WorkerController, unserialize_report from xdist.workermanage import WorkerController, unserialize_report
from xdist.remote import serialize_report from xdist.remote import serialize_report
import execnet import execnet
@@ -151,7 +153,6 @@ class TestReportSerialization:
for i in range(len(a_entries)): for i in range(len(a_entries)):
assert isinstance(rep_entries[i], ReprEntry) assert isinstance(rep_entries[i], ReprEntry)
assert rep_entries[i].lines == a_entries[i].lines assert rep_entries[i].lines == a_entries[i].lines
assert rep_entries[i].localssep == a_entries[i].localssep
assert rep_entries[i].reprfileloc.lineno == a_entries[i].reprfileloc.lineno assert rep_entries[i].reprfileloc.lineno == a_entries[i].reprfileloc.lineno
assert ( assert (
rep_entries[i].reprfileloc.message == a_entries[i].reprfileloc.message rep_entries[i].reprfileloc.message == a_entries[i].reprfileloc.message
@@ -292,14 +293,11 @@ class TestWorkerInteractor:
ev = worker.popevent("workerfinished") ev = worker.popevent("workerfinished")
assert "workeroutput" in ev.kwargs assert "workeroutput" in ev.kwargs
@pytest.mark.skipif(
pytest.__version__ >= "3.0", reason="skip at module level illegal in pytest 3.0"
)
def test_remote_collect_skip(self, worker): def test_remote_collect_skip(self, worker):
worker.testdir.makepyfile( worker.testdir.makepyfile(
""" """
import py import pytest
py.test.skip("hello") pytest.skip("hello", allow_module_level=True)
""" """
) )
worker.setup() worker.setup()
@@ -307,10 +305,9 @@ class TestWorkerInteractor:
assert not ev.kwargs assert not ev.kwargs
ev = worker.popevent() ev = worker.popevent()
assert ev.name == "collectreport" assert ev.name == "collectreport"
ev = worker.popevent()
assert ev.name == "collectreport"
rep = unserialize_report(ev.name, ev.kwargs["data"]) rep = unserialize_report(ev.name, ev.kwargs["data"])
assert rep.skipped assert rep.skipped
assert rep.longrepr[2] == "Skipped: hello"
ev = worker.popevent("collectionfinish") ev = worker.popevent("collectionfinish")
assert not ev.kwargs["ids"] assert not ev.kwargs["ids"]
@@ -400,3 +397,66 @@ def test_remote_env_vars(testdir):
) )
result = testdir.runpytest("-n2", "--max-worker-restart=0") result = testdir.runpytest("-n2", "--max-worker-restart=0")
assert result.ret == 0 assert result.ret == 0
def test_remote_inner_argv(testdir):
"""Test/document the behavior due to execnet using `python -c`."""
testdir.makepyfile(
"""
import sys
def test_argv():
assert sys.argv == ["-c"]
"""
)
result = testdir.runpytest("-n1")
assert result.ret == 0
def test_remote_mainargv(testdir):
outer_argv = sys.argv
testdir.makepyfile(
"""
def test_mainargv(request):
assert request.config.workerinput["mainargv"] == {!r}
""".format(
outer_argv
)
)
result = testdir.runpytest("-n1")
assert result.ret == 0
def test_remote_usage_prog(testdir, request):
if not hasattr(request.config._parser, "prog"):
pytest.skip("prog not available in config parser")
testdir.makeconftest(
"""
import pytest
config_parser = None
@pytest.fixture
def get_config_parser():
return config_parser
def pytest_configure(config):
global config_parser
config_parser = config._parser
"""
)
testdir.makepyfile(
"""
import sys
def test(get_config_parser, request):
get_config_parser._getparser().error("my_usage_error")
"""
)
result = testdir.runpytest_subprocess("-n1")
assert result.ret == 1
result.stdout.fnmatch_lines(
["usage: pytest.py *", "pytest.py: error: my_usage_error"]
)

22
tox.ini
View File

@@ -1,34 +1,18 @@
[tox] [tox]
# if you change the envlist, please update .travis.yml file as well
envlist= envlist=
linting linting
py{27,34,35,36}-pytest{30,31,32,33,36,38} py{27,34,35,36,37}-pytestlatest
py{27,36}-pytest36-pexpect
py{27,36}-pytest{master,features} py{27,36}-pytest{master,features}
[testenv] [testenv]
changedir=testing changedir=testing
passenv = USER USERNAME passenv = USER USERNAME
deps = deps =
pycmd pytestlatest: pytest
# to avoid .eggs
setuptools_scm
pytest30: pytest~=3.0.5
pytest31: pytest~=3.1.0
pytest32: pytest~=3.2.0
pytest33: pytest~=3.3.0
pytest36: pytest~=3.6.0
pytest38: pytest~=3.8.0
pytestmaster: git+https://github.com/pytest-dev/pytest.git@master pytestmaster: git+https://github.com/pytest-dev/pytest.git@master
pytestfeatures: git+https://github.com/pytest-dev/pytest.git@features pytestfeatures: git+https://github.com/pytest-dev/pytest.git@features
pexpect: pexpect
filelock filelock
platform=
pexpect: linux|darwin
commands= commands=
# always clean to avoid code unmarshal mismatch on old python/pytest
py.cleanup -aq
pytest {posargs} pytest {posargs}
[testenv:linting] [testenv:linting]
@@ -51,7 +35,7 @@ commands =
towncrier --version {posargs} --yes towncrier --version {posargs} --yes
[pytest] [pytest]
addopts = -rsfxX addopts = -ra
[flake8] [flake8]
max-line-length = 120 max-line-length = 120

View File

@@ -229,9 +229,10 @@ class DSession(object):
if self.terminal and not self.sched.has_pending: if self.terminal and not self.sched.has_pending:
self.trdist.ensure_show_status() self.trdist.ensure_show_status()
self.terminal.write_line("") self.terminal.write_line("")
self.terminal.write_line( if self.config.option.verbose > 0:
"scheduling tests via %s" % (self.sched.__class__.__name__) self.terminal.write_line(
) "scheduling tests via %s" % (self.sched.__class__.__name__)
)
self.sched.schedule() self.sched.schedule()
def worker_logstart(self, node, nodeid, location): def worker_logstart(self, node, nodeid, location):
@@ -259,10 +260,10 @@ class DSession(object):
def worker_collectreport(self, node, rep): def worker_collectreport(self, node, rep):
"""Emitted when a node calls the pytest_collectreport hook. """Emitted when a node calls the pytest_collectreport hook.
Because we only need the report when there's a failure, as optimization Because we only need the report when there's a failure/skip, as optimization
we only expect to receive failed reports from workers (#330). we only expect to receive failed/skipped reports from workers (#330).
""" """
assert rep.failed assert not rep.passed
self._failed_worker_collectreport(node, rep) self._failed_worker_collectreport(node, rep)
def worker_logwarning(self, message, code, nodeid, fslocation): def worker_logwarning(self, message, code, nodeid, fslocation):
@@ -344,8 +345,11 @@ class TerminalDistReporter(object):
self.rewrite(self.getstatus()) self.rewrite(self.getstatus())
def getstatus(self): def getstatus(self):
parts = ["%s %s" % (spec.id, self._status[spec.id]) for spec in self._specs] if self.config.option.verbose >= 0:
return " / ".join(parts) parts = ["%s %s" % (spec.id, self._status[spec.id]) for spec in self._specs]
return " / ".join(parts)
else:
return "bringing up nodes..."
def rewrite(self, line, newline=False): def rewrite(self, line, newline=False):
pline = line + " " * max(self._lastlen - len(line), 0) pline = line + " " * max(self._lastlen - len(line), 0)

View File

@@ -32,7 +32,7 @@ def pytest_cmdline_main(config):
if config.getoption("looponfail"): if config.getoption("looponfail"):
usepdb = config.getoption("usepdb") # a core option usepdb = config.getoption("usepdb") # a core option
if usepdb: if usepdb:
raise pytest.UsageError("--pdb incompatible with --looponfail.") raise pytest.UsageError("--pdb is incompatible with --looponfail.")
looponfail_main(config) looponfail_main(config)
return 2 # looponfail only can get stop with ctrl-C anyway return 2 # looponfail only can get stop with ctrl-C anyway

View File

@@ -126,12 +126,12 @@ def pytest_addoption(parser):
) )
parser.addini( parser.addini(
"rsyncdirs", "rsyncdirs",
"list of (relative) paths to be rsynced for" " remote distributed testing.", "list of (relative) paths to be rsynced for remote distributed testing.",
type="pathlist", type="pathlist",
) )
parser.addini( parser.addini(
"rsyncignore", "rsyncignore",
"list of (relative) glob-style paths to be ignored " "for rsyncing.", "list of (relative) glob-style paths to be ignored for rsyncing.",
type="pathlist", type="pathlist",
) )
parser.addini( parser.addini(

View File

@@ -12,6 +12,7 @@ import time
import _pytest.hookspec import _pytest.hookspec
import pytest import pytest
from execnet.gateway_base import dumps, DumpError
class WorkerInteractor(object): class WorkerInteractor(object):
@@ -109,19 +110,24 @@ class WorkerInteractor(object):
self.sendevent("testreport", data=data) self.sendevent("testreport", data=data)
def pytest_collectreport(self, report): def pytest_collectreport(self, report):
# master only needs reports that failed, as optimization send only them instead (#330) # send only reports that have not passed to master as optimization (#330)
if report.failed: if not report.passed:
data = serialize_report(report) data = serialize_report(report)
self.sendevent("collectreport", data=data) self.sendevent("collectreport", data=data)
def pytest_logwarning(self, message, code, nodeid, fslocation): # the pytest_logwarning hook was deprecated since pytest 4.0
self.sendevent( if hasattr(
"logwarning", _pytest.hookspec, "pytest_logwarning"
message=message, ) and not _pytest.hookspec.pytest_logwarning.pytest_spec.get("warn_on_impl"):
code=code,
nodeid=nodeid, def pytest_logwarning(self, message, code, nodeid, fslocation):
fslocation=str(fslocation), self.sendevent(
) "logwarning",
message=message,
code=code,
nodeid=nodeid,
fslocation=str(fslocation),
)
# the pytest_warning_captured hook was introduced in pytest 3.8 # the pytest_warning_captured hook was introduced in pytest 3.8
if hasattr(_pytest.hookspec, "pytest_warning_captured"): if hasattr(_pytest.hookspec, "pytest_warning_captured"):
@@ -181,8 +187,15 @@ def serialize_warning_message(warning_message):
if isinstance(warning_message.message, Warning): if isinstance(warning_message.message, Warning):
message_module = type(warning_message.message).__module__ message_module = type(warning_message.message).__module__
message_class_name = type(warning_message.message).__name__ message_class_name = type(warning_message.message).__name__
message_args = warning_message.message.args
message_str = str(warning_message.message) message_str = str(warning_message.message)
# check now if we can serialize the warning arguments (#349)
# if not, we will just use the exception message on the master node
try:
dumps(warning_message.message.args)
except DumpError:
message_args = None
else:
message_args = warning_message.message.args
else: else:
message_str = warning_message.message message_str = warning_message.message
message_module = None message_module = None
@@ -207,7 +220,15 @@ def serialize_warning_message(warning_message):
for attr_name in warning_message._WARNING_DETAILS: for attr_name in warning_message._WARNING_DETAILS:
if attr_name in ("message", "category"): if attr_name in ("message", "category"):
continue continue
result[attr_name] = getattr(warning_message, attr_name) attr = getattr(warning_message, attr_name)
# Check if we can serialize the warning detail, marking `None` otherwise
# Note that we need to define the attr (even as `None`) to allow deserializing
try:
dumps(attr)
except DumpError:
result[attr_name] = repr(attr)
else:
result[attr_name] = attr
return result return result
@@ -240,19 +261,23 @@ def remote_initconfig(option_dict, args):
if __name__ == "__channelexec__": if __name__ == "__channelexec__":
channel = channel # noqa
workerinput, args, option_dict = channel.receive()
importpath = os.getcwd()
sys.path.insert(0, importpath) # XXX only for remote situations
os.environ["PYTHONPATH"] = (
importpath + os.pathsep + os.environ.get("PYTHONPATH", "")
)
os.environ["PYTEST_XDIST_WORKER"] = workerinput["workerid"]
os.environ["PYTEST_XDIST_WORKER_COUNT"] = str(workerinput["workercount"])
# os.environ['PYTHONPATH'] = importpath
import py import py
channel = channel # noqa
workerinput, args, option_dict, change_sys_path = channel.receive()
if change_sys_path:
importpath = os.getcwd()
sys.path.insert(0, importpath)
os.environ["PYTHONPATH"] = (
importpath + os.pathsep + os.environ.get("PYTHONPATH", "")
)
os.environ["PYTEST_XDIST_WORKER"] = workerinput["workerid"]
os.environ["PYTEST_XDIST_WORKER_COUNT"] = str(workerinput["workercount"])
config = remote_initconfig(option_dict, args) config = remote_initconfig(option_dict, args)
config._parser.prog = os.path.basename(workerinput["mainargv"][0])
config.workerinput = workerinput config.workerinput = workerinput
config.workeroutput = {} config.workeroutput = {}
# TODO: deprecated name, backward compatibility only. Remove it in future # TODO: deprecated name, backward compatibility only. Remove it in future

View File

@@ -1,4 +1,4 @@
from xdist.scheduler.each import EachScheduling # noqa from xdist.scheduler.each import EachScheduling # noqa
from xdist.scheduler.load import LoadScheduling # noqa from xdist.scheduler.load import LoadScheduling # noqa
from xdist.scheduler.loadfile import LoadFileScheduling # noqa
from xdist.scheduler.loadscope import LoadScopeScheduling # noqa from xdist.scheduler.loadscope import LoadScopeScheduling # noqa
from xdist.scheduler.filescope import LoadFileScheduling # noqa

View File

@@ -1,4 +1,4 @@
from . import LoadScopeScheduling from .loadscope import LoadScopeScheduling
from py.log import Producer from py.log import Producer

View File

@@ -187,7 +187,7 @@ class LoadScopeScheduling(object):
break break
else: else:
raise RuntimeError( raise RuntimeError(
"Unable to identify crashitem on a workload with " "pending items" "Unable to identify crashitem on a workload with pending items"
) )
# Made uncompleted work unit available again # Made uncompleted work unit available again

View File

@@ -2,6 +2,7 @@ from __future__ import print_function
import fnmatch import fnmatch
import os import os
import re import re
import sys
import threading import threading
import py import py
@@ -213,6 +214,7 @@ class WorkerController(object):
"workercount": len(nodemanager.specs), "workercount": len(nodemanager.specs),
"slaveid": gateway.id, "slaveid": gateway.id,
"slavecount": len(nodemanager.specs), "slavecount": len(nodemanager.specs),
"mainargv": sys.argv,
} }
# TODO: deprecated name, backward compatibility only. Remove it in future # TODO: deprecated name, backward compatibility only. Remove it in future
self.slaveinput = self.workerinput self.slaveinput = self.workerinput
@@ -243,7 +245,9 @@ class WorkerController(object):
option_dict["basetemp"] = str(basetemp.join(name)) option_dict["basetemp"] = str(basetemp.join(name))
self.config.hook.pytest_configure_node(node=self) self.config.hook.pytest_configure_node(node=self)
self.channel = self.gateway.remote_exec(xdist.remote) self.channel = self.gateway.remote_exec(xdist.remote)
self.channel.send((self.workerinput, args, option_dict)) # change sys.path only for remote workers
change_sys_path = not self.gateway.spec.popen
self.channel.send((self.workerinput, args, option_dict, change_sys_path))
if self.putevent: if self.putevent:
self.channel.setcallback(self.process_from_remote, endmarker=self.ENDMARK) self.channel.setcallback(self.process_from_remote, endmarker=self.ENDMARK)
@@ -268,7 +272,7 @@ class WorkerController(object):
if not self._down: if not self._down:
try: try:
self.sendcommand("shutdown") self.sendcommand("shutdown")
except IOError: except (IOError, OSError):
pass pass
self._shutdown_sent = True self._shutdown_sent = True
@@ -345,7 +349,11 @@ class WorkerController(object):
except: # noqa except: # noqa
from _pytest._code import ExceptionInfo from _pytest._code import ExceptionInfo
excinfo = ExceptionInfo() # ExceptionInfo API changed in pytest 4.1
if hasattr(ExceptionInfo, "from_current"):
excinfo = ExceptionInfo.from_current()
else:
excinfo = ExceptionInfo()
print("!" * 20, excinfo) print("!" * 20, excinfo)
self.config.notify_exception(excinfo) self.config.notify_exception(excinfo)
self.shutdown() self.shutdown()
@@ -426,9 +434,16 @@ def unserialize_warning_message(data):
if data["message_module"]: if data["message_module"]:
mod = importlib.import_module(data["message_module"]) mod = importlib.import_module(data["message_module"])
cls = getattr(mod, data["message_class_name"]) cls = getattr(mod, data["message_class_name"])
try: message = None
message = cls(*data["message_args"]) if data["message_args"] is not None:
except TypeError: try:
message = cls(*data["message_args"])
except TypeError:
pass
if message is None:
# could not recreate the original warning instance;
# create a generic Warning instance with the original
# message at least
message_text = "{mod}.{cls}: {msg}".format( message_text = "{mod}.{cls}: {msg}".format(
mod=data["message_module"], mod=data["message_module"],
cls=data["message_class_name"], cls=data["message_class_name"],