Compare commits

..

27 Commits
1.8 ... 1.9

Author SHA1 Message Date
holger krekel
b88b23e358 some test fixes and configure tox-testing against pytest==2.3.5 and pytest>=2.4.2 2013-10-04 10:34:24 +02:00
holger krekel
a9aca9a3ae fix pytest issue347: slaves running on top of Python3.2
will set PYTHONDONTWRITEYBTECODE to 1 to avoid import concurrency
bugs.
2013-09-05 18:52:59 +02:00
holger krekel
45dd5975f0 Merged in dimazest/pytest-xdist/collection_diff_reporting (pull request #3)
Give more context when nodes collected different tests.
2013-09-05 16:23:12 +02:00
Dmitrijs Milajevs
fa96143aeb Cleanup 2013-09-05 15:30:37 +02:00
Dmitrijs Milajevs
9a50d9de17 Give more context when nodes collected different tests. 2013-09-05 15:24:27 +02:00
holger krekel
f144ef88e3 fix pytest issue41: re-run tests on all file changes, not just
randomly select ones like .py/.c.
2013-09-05 14:21:43 +02:00
holger krekel
013b2fc6bb streamline tox.ini 2013-09-05 14:21:28 +02:00
holger krekel
df66687eae bump version 2013-04-30 17:08:06 +02:00
holger krekel
75c125e04e Merged in jjh/pytest-xdist/catch-import-errors (pull request #2)
Patch for issue #180
2013-04-30 17:07:09 +02:00
Jonathan Hunt
26016aefd1 Use the error longrepr rather than the file path to check
for duplicate errors.
2013-04-28 16:14:52 -07:00
Jonathan Hunt
6c1587a157 Added an additional test for import errors in --tx mode. 2013-04-28 16:06:41 -07:00
Jonathan Hunt
10c9c34c75 Passing tests, avoiding duplicate errors. 2013-04-25 18:20:40 -07:00
Jonathan Hunt
46b94c1c81 Report ImportErrors in distributed mode. 2013-04-25 18:04:24 -07:00
Jonathan Hunt
6038ec21ca Added test to catch import failure in distributed mode. 2013-04-25 17:45:42 -07:00
holger krekel
0be3d4b077 fix py3 issue 2013-04-02 10:48:26 +02:00
holger krekel
34eec1ef17 - changed LICENSE to MIT
- attribute Jeremy's change
2013-04-02 10:33:36 +02:00
holger krekel
c44fe4e234 merge again 2013-04-02 10:30:52 +02:00
holger krekel
a771352f01 merge 2013-04-02 10:29:51 +02:00
holger krekel
6369c8c7ce Merged in jerith/pytest-xdist/dedupe-failures (pull request #1)
Avoid collecting duplicate failures when using --looponfail.
2013-04-02 10:29:21 +02:00
Jeremy Thurgood
587d1501a7 Avoid collecting duplicate failures when using --looponfail. 2013-03-27 17:34:58 +02:00
holger krekel
53c4025774 add boxed example 2012-11-20 13:26:29 +01:00
holger krekel
8ed3788992 mention that --boxed is not available on windows 2012-09-27 15:09:55 +02:00
holger krekel
60f035bcae improve README to cover --boxed option and contain some more links 2012-08-04 09:54:51 +02:00
holger krekel
d766c0777a add a note where to find the issue tracker 2012-04-30 18:31:13 -06:00
holger krekel
b235db879c merge 2012-01-22 06:14:22 +01:00
Ronny Pfannschmidt
663cd81117 add a test to check deserialization of nonstandard test report attributes 2012-01-20 19:53:41 +01:00
holger krekel
f56c316645 Added tag 1.8 for changeset 1d27987c2675 2011-12-16 11:59:21 +00:00
17 changed files with 365 additions and 67 deletions

View File

@@ -11,3 +11,5 @@ cd44a941c833c098e4899fe3d42a96703754d0d5 1.5
20875fed94e7f3dff50bdf762df91153b15ceca6 1.7
29c38e195526f5f0fdd651fb51f59d6efaaafbb0 1.7
0d1c00018008433956aa7d93007bab6ea7de96e4 1.8
0d1c00018008433956aa7d93007bab6ea7de96e4 1.8
1d27987c267577899350a25ba5828d55d87083ad 1.8

View File

@@ -1,3 +1,18 @@
1.9
-------------------------
- changed LICENSE to MIT
- fix duplicate reported test ids with --looponfailing
(thanks Jeremy Thurgood)
- fix pytest issue41: re-run tests on all file changes, not just
randomly select ones like .py/.c.
- fix pytest issue347: slaves running on top of Python3.2
will set PYTHONDONTWRITEYBTECODE to 1 to avoid import concurrency
bugs.
1.8
-------------------------

28
LICENSE
View File

@@ -1,13 +1,19 @@
The execnet package is released under the provisions of the Gnu Public
License (GPL), version 2 or later.
See http://www.fsf.org/licensing/licenses/ for more information.
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.
This package also contains some minor parts which
which are useable under the MIT license.
If you have questions and/or want to use parts of
the code under a different license than the GPL
please contact me.
holger krekel, January 2010, holger at merlinux eu

View File

@@ -2,5 +2,6 @@ include CHANGELOG
include LICENSE
include README.txt
include setup.py
include tox.ini
graft testing
prune .hg

View File

@@ -4,16 +4,19 @@ xdist: pytest distributed testing plugin
The `pytest-xdist`_ plugin extends py.test with some unique
test execution modes:
* Looponfail: run your tests repeatedly in a subprocess. After each run py.test
waits until a file in your project changes and then re-runs the previously
failing tests. This is repeated until all tests pass after which again
a full run is performed.
* multiprocess Load-balancing: if you have multiple CPUs or hosts you can use
* test run parallelization_: if you have multiple CPUs or hosts you can use
those for a combined test run. This allows to speed up
development or to use special resources of remote machines.
development or to use special resources of `remote machines`_.
* Multi-Platform coverage: you can specify different Python interpreters
* ``--boxed``: (not available on Windows) run each test in a boxed_
subprocess to survive ``SEGFAULTS`` or otherwise dying processes
* ``--looponfail``: run your tests repeatedly in a subprocess. After each run
py.test waits until a file in your project changes and then re-runs
the previously failing tests. This is repeated until all tests pass
after which again a full run is performed.
* `Multi-Platform`_ coverage: you can specify different Python interpreters
or different platforms and run tests in parallel on all of them.
Before running tests remotely, ``py.test`` efficiently "rsyncs" your
@@ -41,6 +44,8 @@ a checkout of the `pytest-xdist repository`_ ::
Usage examples
---------------------
.. _parallelization:
Speed up test runs by sending tests to multiple CPUs
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -55,20 +60,42 @@ a lot of IO this can lead to considerable speed ups.
Running tests in a Python subprocess
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
To instantiate a python2.4 sub process and send tests to it, you may type::
To instantiate a python2.5 sub process and send tests to it, you may type::
py.test -d --tx popen//python=python2.4
py.test -d --tx popen//python=python2.5
This will start a subprocess which is run with the "python2.4"
This will start a subprocess which is run with the "python2.5"
Python interpreter, found in your system binary lookup path.
If you prefix the --tx option value like this::
--tx 3*popen//python=python2.4
--tx 3*popen//python=python2.5
then three subprocesses would be created and tests
will be load-balanced across these three processes.
.. _boxed:
Running tests in a boxed subprocess
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
If you have tests involving C or C++ libraries you might have to deal
with tests crashing the process. For this case you max use the boxing
options::
py.test --boxed
which will run each test in a subprocess and will report if a test
crashed the process. You can also combine this option with
running multiple processes to speed up the test run and use your CPU cores::
py.test -n3 --boxed
this would run 3 testing subprocesses in parallel which each
create new boxed subprocesses for each test.
.. _`remote machines`:
Sending tests to remote SSH accounts
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -111,6 +138,8 @@ new socket host with something like this::
.. _`atonce`:
.. _`Multi-Platform`:
Running tests on many platforms at once
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -168,3 +197,9 @@ where the configuration file was found.
.. _`pytest-xdist repository`: http://bitbucket.org/hpk42/pytest-xdist
.. _`pytest`: http://pytest.org
Issue and Bug Tracker
------------------------
Please use the pytest issue tracker for bugs in this plugin, see https://bitbucket.org/hpk42/pytest/issues .

62
example/boxed.txt Normal file
View File

@@ -0,0 +1,62 @@
If your testing involves C or C++ libraries you might have to deal
with crashing processes. The xdist-plugin provides the ``--boxed`` option
to run each test in a controled subprocess. Here is a basic example::
# content of test_module.py
import pytest
import os
import time
# run test function 50 times with different argument
@pytest.mark.parametrize("arg", range(50))
def test_func(arg):
time.sleep(0.05) # each tests takes a while
if arg % 19 == 0:
os.kill(os.getpid(), 15)
If you run this with::
$ py.test --boxed
=========================== test session starts ============================
platform linux2 -- Python 2.7.3 -- pytest-2.3.0.dev8
plugins: xdist, bugzilla, cache, oejskit, cli, pep8, cov
collecting ... collected 50 items
test_module.py f..................f..................f...........
================================= FAILURES =================================
_______________________________ test_func[0] _______________________________
/home/hpk/tmp/doc-exec-420/test_module.py:6: running the test CRASHED with signal 15
______________________________ test_func[19] _______________________________
/home/hpk/tmp/doc-exec-420/test_module.py:6: running the test CRASHED with signal 15
______________________________ test_func[38] _______________________________
/home/hpk/tmp/doc-exec-420/test_module.py:6: running the test CRASHED with signal 15
=================== 3 failed, 47 passed in 3.41 seconds ====================
You'll see that a couple of tests are reported as crashing, indicated
by lower-case ``f`` and the respective failure summary. You can also use
the xdist-provided parallelization feature to speed up your testing::
$ py.test --boxed -n3
=========================== test session starts ============================
platform linux2 -- Python 2.7.3 -- pytest-2.3.0.dev8
plugins: xdist, bugzilla, cache, oejskit, cli, pep8, cov
gw0 I / gw1 I / gw2 I
gw0 [50] / gw1 [50] / gw2 [50]
scheduling tests via LoadScheduling
..f...............f..................f............
================================= FAILURES =================================
_______________________________ test_func[0] _______________________________
[gw0] linux2 -- Python 2.7.3 /home/hpk/venv/1/bin/python
/home/hpk/tmp/doc-exec-420/test_module.py:6: running the test CRASHED with signal 15
______________________________ test_func[19] _______________________________
[gw2] linux2 -- Python 2.7.3 /home/hpk/venv/1/bin/python
/home/hpk/tmp/doc-exec-420/test_module.py:6: running the test CRASHED with signal 15
______________________________ test_func[38] _______________________________
[gw2] linux2 -- Python 2.7.3 /home/hpk/venv/1/bin/python
/home/hpk/tmp/doc-exec-420/test_module.py:6: running the test CRASHED with signal 15
=================== 3 failed, 47 passed in 2.03 seconds ====================

View File

@@ -2,22 +2,22 @@ from setuptools import setup
setup(
name="pytest-xdist",
version='1.8',
version='1.9',
description='py.test xdist plugin for distributed testing and loop-on-failing modes',
long_description=open('README.txt').read(),
license='GPLv2 or later',
license='MIT',
author='holger krekel and contributors',
author_email='py-dev@codespeak.net,holger@merlinux.eu',
author_email='pytest-dev@python.org,holger@merlinux.eu',
url='http://bitbucket.org/hpk42/pytest-xdist',
platforms=['linux', 'osx', 'win32'],
packages = ['xdist'],
entry_points = {'pytest11': ['xdist = xdist.plugin'],},
zip_safe=False,
install_requires = ['execnet>=1.0.8', 'pytest>=2.2.1'],
install_requires = ['execnet>=1.1', 'pytest>=2.3.5'],
classifiers=[
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
'License :: OSI Approved :: GNU General Public License (GPL)',
'License :: OSI Approved :: MIT License',
'Operating System :: POSIX',
'Operating System :: Microsoft :: Windows',
'Operating System :: MacOS :: MacOS X',

View File

@@ -24,6 +24,30 @@ class TestDistribution:
"*1 failed*",
])
def test_n1_import_error(self, testdir):
p1 = testdir.makepyfile("""
import __import_of_missing_module
def test_import():
pass
""")
result = testdir.runpytest(p1, "-n1")
assert result.ret == 1
result.stdout.fnmatch_lines([
"E ImportError: *__import_of_missing_module*",
])
def test_n2_import_error(self, testdir):
"""Check that we don't report the same import error multiple times
in distributed mode."""
p1 = testdir.makepyfile("""
import __import_of_missing_module
def test_import():
pass
""")
result1 = testdir.runpytest(p1, "-n2")
result2 = testdir.runpytest(p1, "-n1")
assert len(result1.stdout.lines) == len(result2.stdout.lines)
def test_n1_skip(self, testdir):
p1 = testdir.makepyfile("""
def test_skip():
@@ -36,6 +60,18 @@ class TestDistribution:
"*1 skipped*",
])
def test_manytests_to_one_import_error(self, testdir):
p1 = testdir.makepyfile("""
import __import_of_missing_module
def test_import():
pass
""")
result = testdir.runpytest(p1, '--tx=popen', '--tx=popen')
assert result.ret == 1
result.stdout.fnmatch_lines([
"E ImportError: *__import_of_missing_module*",
])
def test_manytests_to_one_popen(self, testdir):
p1 = testdir.makepyfile("""
import py

View File

@@ -1,4 +1,9 @@
from xdist.dsession import DSession, LoadScheduling, EachScheduling
from xdist.dsession import (
DSession,
LoadScheduling,
EachScheduling,
report_collection_diff,
)
from _pytest import main as outcome
import py
import execnet
@@ -12,9 +17,16 @@ def run(item, node, excinfo=None):
rep.node = node
return rep
class MockGateway:
_count = 0
def __init__(self):
self.id = str(self._count)
self._count += 1
class MockNode:
def __init__(self):
self.sent = []
self.gateway = MockGateway()
def send_runtest(self, nodeid):
self.sent.append(nodeid)
@@ -165,3 +177,35 @@ class TestDistReporter:
linecomp.assert_contains_lines([
"[X1,X2] rsyncing: hello",
])
def test_report_collection_diff_equal():
"""Test reporting of equal collections."""
from_collection = to_collection = ['aaa', 'bbb', 'ccc']
assert report_collection_diff(from_collection, to_collection, 1, 2)
def test_report_collection_diff_different():
"""Test reporting of different collections."""
from_collection = ['aaa', 'bbb', 'ccc', 'YYY']
to_collection = ['aZa', 'bbb', 'XXX', 'ccc']
error_message = (
'Different tests were collected between 1 and 2. The difference is:\n'
'--- 1\n'
'\n'
'+++ 2\n'
'\n'
'@@ -1,4 +1,4 @@\n'
'\n'
'-aaa\n'
'+aZa\n'
' bbb\n'
'+XXX\n'
' ccc\n'
'-YYY'
)
try:
report_collection_diff(from_collection, to_collection, 1, 2)
except AssertionError as e:
assert py.builtin._totext(e) == error_message

View File

@@ -64,11 +64,11 @@ class TestStatRecorder:
pycfile = hello + "c"
pycfile.ensure()
changed = sd.check()
assert not changed
assert changed
hello.write("world")
changed = sd.check()
assert not pycfile.check()
assert changed
def test_waitonchange(self, tmpdir, monkeypatch):
tmp = tmpdir
@@ -206,6 +206,24 @@ class TestLooponFailing:
remotecontrol.loop_once()
assert len(remotecontrol.failures) == 1
def test_looponfail_multiple_errors(self, testdir, monkeypatch):
modcol = testdir.getmodulecol("""
def test_one():
assert 0
""")
remotecontrol = RemoteControl(modcol.config)
orig_runsession = remotecontrol.runsession
def runsession_dups():
# twisted.trial test cases may report multiple errors.
failures, reports, collection_failed = orig_runsession()
print (failures)
return failures * 2, reports, collection_failed
monkeypatch.setattr(remotecontrol, 'runsession', runsession_dups)
remotecontrol.loop_once()
assert len(remotecontrol.failures) == 1
class TestFunctional:
def test_fail_to_ok(self, testdir):

View File

@@ -88,7 +88,7 @@ class TestReportSerialization:
assert newrep.passed == rep.passed
assert newrep.failed == rep.failed
assert newrep.skipped == rep.skipped
if newrep.skipped and 'xfail' not in newrep.keywords:
if newrep.skipped and not hasattr(newrep, "wasxfail"):
assert len(newrep.longrepr) == 3
assert newrep.outcome == rep.outcome
assert newrep.when == rep.when
@@ -121,6 +121,23 @@ class TestReportSerialization:
if rep.failed:
assert newrep.longrepr == str(rep.longrepr)
def test_extended_report_deserialization(self, testdir):
reprec = testdir.inline_runsource("qwe abc")
reports = reprec.getreports("pytest_collectreport")
assert reports
for rep in reports:
rep.extra = True
d = serialize_report(rep)
check_marshallable(d)
newrep = unserialize_report("collectreport", 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)
class TestSlaveInteractor:
def test_basic_collect_and_runtests(self, slave):
p = slave.testdir.makepyfile("""

View File

@@ -15,12 +15,14 @@ def pytest_funcarg__config(request):
config = testdir.parseconfig()
return config
class pytest_funcarg__mysetup:
def __init__(self, request):
temp = request.getfuncargvalue("tmpdir")
self.source = temp.mkdir("source")
self.dest = temp.mkdir("dest")
request.getfuncargvalue("_pytest")
def pytest_funcarg__mysetup(request):
class mysetup:
def __init__(self, request):
temp = request.getfuncargvalue("tmpdir")
self.source = temp.mkdir("source")
self.dest = temp.mkdir("dest")
request.getfuncargvalue("_pytest")
return mysetup(request)
class TestNodeManagerPopen:
def test_popen_no_default_chdir(self, config):
@@ -97,11 +99,13 @@ class TestNodeManagerPopen:
call = hookrecorder.popcall("pytest_xdist_rsyncfinish")
class TestHRSync:
class pytest_funcarg__mysetup:
def __init__(self, request):
tmp = request.getfuncargvalue('tmpdir')
self.source = tmp.mkdir("source")
self.dest = tmp.mkdir("dest")
def pytest_funcarg__mysetup(self, request):
class mysetup:
def __init__(self, request):
tmp = request.getfuncargvalue('tmpdir')
self.source = tmp.mkdir("source")
self.dest = tmp.mkdir("dest")
return mysetup(request)
def test_hrsync_filter(self, mysetup):
source, dest = mysetup.source, mysetup.dest

28
tox.ini
View File

@@ -1,23 +1,25 @@
[tox]
envlist=py26,py31,py27,py25,py24
indexserver=
testrun = http://pypi.testrun.org
pypi = http://pypi.python.org/simple
envlist=py26,py32,py33,py27,py26,py26-old,py33-old
[testenv]
changedir=testing
deps=:testrun:pytest>=2.2.0.dev2
deps=pytest>=2.4.2
commands= py.test --junitxml={envlogdir}/junit-{envname}.xml []
#[testenv:py31]
#deps=:pypi:pytest # XXX needed because ClueRelease/pip broken
#[testenv:py32]
#deps=:pypi:pytest # XXX needed because ClueRelease/pip broken
[testenv:py26]
[testenv:py27]
deps=
:testrun:pytest
:pypi:pexpect
pytest>=2.4.2
pexpect
[testenv:py26-old]
deps=
pytest==2.3.5
pexpect
[testenv:py33-old]
basepython = python3.3
deps=
pytest==2.3.5
[pytest]
addopts = -rsfxX

View File

@@ -1,2 +1,2 @@
#
__version__ = '1.8'
__version__ = '1.9'

View File

@@ -1,8 +1,14 @@
import pytest, py
import sys
import difflib
import pytest
import py
from xdist.slavemanage import NodeManager
queue = py.builtin._tryimport('queue', 'Queue')
class EachScheduling:
def __init__(self, numnodes, log=None):
@@ -127,15 +133,21 @@ class LoadScheduling:
assert not hasattr(self, 'item2nodes')
self.item2nodes = {}
# XXX allow nodes to have different collections
col = list(self.node2collection.values())[0]
first_node, col = list(self.node2collection.items())[0]
for node, collection in self.node2collection.items():
assert collection == col
report_collection_diff(
col,
collection,
first_node.gateway.id,
node.gateway.id,
)
self.pending = col
if not col:
return
available = list(self.node2pending.items())
num_available = self.numnodes
max_one_round = num_available * self.ITEM_CHUNKSIZE -1
max_one_round = num_available * self.ITEM_CHUNKSIZE - 1
for i, item in enumerate(self.pending):
nodeindex = i % num_available
node, pending = available[nodeindex]
@@ -144,7 +156,35 @@ class LoadScheduling:
pending.append(item)
if i >= max_one_round:
break
del self.pending[:i+1]
del self.pending[:i + 1]
def report_collection_diff(from_collection, to_collection, from_id, to_id):
"""Report the collected test difference between two nodes.
:returns: True if collections are equal.
:raises: AssertionError with a detailed error message describing the
difference between the collections.
"""
if from_collection == to_collection:
return True
diff = difflib.unified_diff(
from_collection,
to_collection,
fromfile=from_id,
tofile=to_id,
)
error_message = py.builtin._totext(
'Different tests were collected between {from_id} and {to_id}. '
'The difference is:\n'
'{diff}'
).format(from_id=from_id, to_id=to_id, diff='\n'.join(diff))
msg = "\n".join([x.rstrip() for x in error_message.split("\n")])
raise AssertionError(msg)
class Interrupted(KeyboardInterrupt):
""" signals an immediate interruption. """
@@ -159,6 +199,7 @@ class DSession:
self.countfailures = 0
self.maxfail = config.getvalue("maxfail")
self.queue = queue.Queue()
self._failed_collection_errors = {}
try:
self.terminal = config.pluginmanager.getplugin("terminalreporter")
except KeyError:
@@ -285,9 +326,16 @@ class DSession:
self._handlefailures(rep)
def slave_collectreport(self, node, rep):
#self.report_line("collectreport %s: %s" %(rep.id, rep.status))
#rep.node = node
self._handlefailures(rep)
if rep.failed:
self._failed_slave_collectreport(node, rep)
def _failed_slave_collectreport(self, node, rep):
# Check we haven't already seen this report (from
# another slave).
if rep.longrepr not in self._failed_collection_errors:
self._failed_collection_errors[rep.longrepr] = True
self.config.hook.pytest_collectreport(report=rep)
self._handlefailures(rep)
def _handlefailures(self, rep):
if rep.failed:

View File

@@ -89,7 +89,11 @@ class RemoteControl(object):
if collection_failed:
reports = ["Collection failed, keeping previous failure set"]
else:
self.failures = failures
uniq_failures = []
for failure in failures:
if failure not in uniq_failures:
uniq_failures.append(failure)
self.failures = uniq_failures
def repr_pytest_looponfailinfo(failreports, rootdirs):
tr = py.io.TerminalWriter()
@@ -184,7 +188,7 @@ class StatRecorder:
self.check() # snapshot state
def fil(self, p):
return p.ext in ('.py', '.txt', '.c', '.h')
return True # we are sensitive to all file changes since 1.9
def rec(self, p):
return p.check(dotfile=0)

View File

@@ -125,6 +125,10 @@ def remote_initconfig(option_dict, args):
if __name__ == '__channelexec__':
# python3.2 is not concurrent import safe, so let's play it safe
# https://bitbucket.org/hpk42/pytest/issue/347/pytest-xdist-and-python-32
if sys.version_info[:2] == (3,2):
os.environ["PYTHONDONTWRITEBYTECODE"] = "1"
slaveinput,args,option_dict = channel.receive()
importpath = os.getcwd()
sys.path.insert(0, importpath) # XXX only for remote situations