1 new changeset in pytest-xdist:
http://bitbucket.org/hpk42/pytest-xdist/changeset/90734eb951b5/
changeset: r100:90734eb951b5
user: hpk42
date: 2011-03-16 17:59:14
summary: fix issue34
affected #: 7 files (749 bytes)
--- a/CHANGELOG Tue Dec 07 12:47:36 2010 +0100
+++ b/CHANGELOG Wed Mar 16 17:59:14 2011 +0100
@@ -1,3 +1,10 @@
+1.6 (dev)
+-------------------------
+
+- terser collection reporting
+
+- fix issue34 - distributed testing with -p plugin now works correctly
+
1.5
-------------------------
--- a/setup.py Tue Dec 07 12:47:36 2010 +0100
+++ b/setup.py Wed Mar 16 17:59:14 2011 +0100
@@ -2,7 +2,7 @@
setup(
name="pytest-xdist",
- version='1.6.dev2',
+ version='1.6.dev3',
description='py.test xdist plugin for distributed testing and
loop-on-failing modes',
long_description=open('README.txt').read(),
license='GPLv2 or later',
@@ -13,7 +13,7 @@
packages = ['xdist'],
entry_points = {'pytest11': ['xdist = xdist.plugin'],},
zip_safe=False,
- install_requires = ['execnet>=1.0.8', 'pytest>1.9.9'],
+ install_requires = ['execnet>=1.0.8', 'pytest>2.0.2'],
classifiers=[
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
--- a/testing/acceptance_test.py Tue Dec 07 12:47:36 2010 +0100
+++ b/testing/acceptance_test.py Wed Mar 16 17:59:14 2011 +0100
@@ -407,5 +407,18 @@
"*1 skipped*"
])
-
-
+def test_issue34_pluginloading_in_subprocess(testdir):
+ testdir.tmpdir.join("plugin123.py").write(py.code.Source("""
+ def pytest_namespace():
+ return {'sample_variable': 'testing'}
+ """))
+ testdir.makepyfile("""
+ import pytest
+ def test_hello():
+ assert pytest.sample_variable == "testing"
+ """)
+ result = testdir.runpytest("-n1", "-p", "plugin123")
+ assert result.ret == 0
+ result.stdout.fnmatch_lines([
+ "*1 passed*",
+ ])
--- a/testing/test_remote.py Tue Dec 07 12:47:36 2010 +0100
+++ b/testing/test_remote.py Wed Mar 16 17:59:14 2011 +0100
@@ -62,7 +62,7 @@
config1 = testdir.parseconfig()
config2 = remote_initconfig(config1.option.__dict__, config1.args)
assert config2.option.__dict__ == config1.option.__dict__
- assert config2.pluginmanager.getplugin("terminal") == None
+ assert config2.pluginmanager.getplugin("terminal") in (-1, None)
class TestReportSerialization:
def test_itemreport_outcomes(self, testdir):
--- a/xdist/__init__.py Tue Dec 07 12:47:36 2010 +0100
+++ b/xdist/__init__.py Wed Mar 16 17:59:14 2011 +0100
@@ -1,2 +1,2 @@
#
-__version__ = '1.6.dev2'
+__version__ = '1.6.dev3'
--- a/xdist/looponfail.py Tue Dec 07 12:47:36 2010 +0100
+++ b/xdist/looponfail.py Wed Mar 16 17:59:14 2011 +0100
@@ -120,9 +120,7 @@
#fullwidth, hasmarkup = channel.receive()
from _pytest.config import Config
- config = Config()
- config.option.__dict__.update(option_dict)
- config._preparse(list(args))
+ config = Config.fromdictargs(option_dict, list(args))
config.args = args
from xdist.looponfail import SlaveFailSession
SlaveFailSession(config, channel).main()
--- a/xdist/remote.py Tue Dec 07 12:47:36 2010 +0100
+++ b/xdist/remote.py Wed Mar 16 17:59:14 2011 +0100
@@ -109,10 +109,8 @@
def remote_initconfig(option_dict, args):
from _pytest.config import Config
- config = Config()
- config.pluginmanager.unregister(name="terminal")
- config._preparse(args, addopts=False)
- config.option.__dict__.update(option_dict)
+ option_dict['plugins'].append("no:terminal")
+ config = Config.fromdictargs(option_dict, args)
config.option.looponfail = False
config.option.usepdb = False
config.option.dist = "no"
Repository URL: https://bitbucket.org/hpk42/pytest-xdist/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
py-svn mailing list
py-svn@codespeak.net
http://codespeak.net/mailman/listinfo/py-svn
