1 new commit in pytest-xdist:
https://bitbucket.org/hpk42/pytest-xdist/changeset/017a73903b6f/ changeset: 017a73903b6f user: hpk42 date: 2011-11-08 18:54:26 summary: adapt to pytest-2.2.0.dev2 affected #: 8 files diff -r 52e15109500c7b43b244961b6060198207fb998f -r 017a73903b6f50f3ad201be5c8b7465111e5026c CHANGELOG --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +1.7 +------------------------- + +- fix incompatibilities with pytest-2.2.0 + 1.6 ------------------------- diff -r 52e15109500c7b43b244961b6060198207fb998f -r 017a73903b6f50f3ad201be5c8b7465111e5026c setup.py --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name="pytest-xdist", - version='1.6', + version='1.7.dev1', 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>2.0.2'], + install_requires = ['execnet>=1.0.8', 'pytest>=2.2.0.dev2'], classifiers=[ 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', @@ -27,4 +27,4 @@ 'Programming Language :: Python', 'Programming Language :: Python :: 3', ], -) \ No newline at end of file +) diff -r 52e15109500c7b43b244961b6060198207fb998f -r 017a73903b6f50f3ad201be5c8b7465111e5026c testing/test_boxed.py --- a/testing/test_boxed.py +++ b/testing/test_boxed.py @@ -16,13 +16,13 @@ class TestOptionEffects: def test_boxed_option_default(self, testdir): tmpdir = testdir.tmpdir.ensure("subdir", dir=1) - config = testdir.reparseconfig() + config = testdir.parseconfig() assert not config.option.boxed py.test.importorskip("execnet") - config = testdir.reparseconfig(['-d', tmpdir]) + config = testdir.parseconfig('-d', tmpdir) assert not config.option.boxed def test_is_not_boxed_by_default(self, testdir): - config = testdir.reparseconfig([testdir.tmpdir]) + config = testdir.parseconfig(testdir.tmpdir) assert not config.option.boxed diff -r 52e15109500c7b43b244961b6060198207fb998f -r 017a73903b6f50f3ad201be5c8b7465111e5026c testing/test_remote.py --- a/testing/test_remote.py +++ b/testing/test_remote.py @@ -80,7 +80,7 @@ py.test.xfail("hello") """) reports = reprec.getreports("pytest_runtest_logreport") - assert len(reports) == 6 + assert len(reports) == 17 # with setup/teardown "passed" reports for rep in reports: d = serialize_report(rep) check_marshallable(d) @@ -138,6 +138,7 @@ ids = ev.kwargs['ids'] assert len(ids) == 1 slave.sendcommand("runtests", ids=ids) + ev = slave.popevent("testreport") # setup ev = slave.popevent("testreport") assert ev.name == "testreport" rep = unserialize_report(ev.name, ev.kwargs['data']) @@ -194,15 +195,12 @@ ids = ev.kwargs['ids'] assert len(ids) == 2 slave.sendcommand("runtests_all", ) - ev = slave.popevent("testreport") - assert ev.name == "testreport" - rep = unserialize_report(ev.name, ev.kwargs['data']) - assert rep.nodeid.endswith("::test_func") - ev = slave.popevent("testreport") - assert ev.name == "testreport" - rep = unserialize_report(ev.name, ev.kwargs['data']) - assert rep.nodeid.endswith("::test_func2") - assert rep.passed + for func in "::test_func", "::test_func2": + for i in range(3): # setup/call/teardown + ev = slave.popevent("testreport") + assert ev.name == "testreport" + rep = unserialize_report(ev.name, ev.kwargs['data']) + assert rep.nodeid.endswith(func) slave.sendcommand("shutdown") ev = slave.popevent("slavefinished") assert 'slaveoutput' in ev.kwargs diff -r 52e15109500c7b43b244961b6060198207fb998f -r 017a73903b6f50f3ad201be5c8b7465111e5026c testing/test_slavemanage.py --- a/testing/test_slavemanage.py +++ b/testing/test_slavemanage.py @@ -135,7 +135,7 @@ @py.test.mark.xfail def test_rsync_roots_no_roots(self, testdir, mysetup): mysetup.source.ensure("dir1", "file1").write("hello") - config = testdir.reparseconfig([source]) + config = testdir.parseconfig(source) nodemanager = NodeManager(config, ["popen//chdir=%s" % mysetup.dest]) #assert nodemanager.config.topdir == source == config.topdir nodemanager.makegateways() @@ -179,7 +179,7 @@ [pytest] rsyncdirs=dir1/dir2 """)) - config = testdir.reparseconfig([source]) + config = testdir.parseconfig(source) nodemanager = NodeManager(config, ["popen//chdir=%s" % dest]) nodemanager.makegateways() nodemanager.rsync_roots() @@ -198,7 +198,7 @@ rsyncdirs = dir1 dir5 rsyncignore = dir1/dir2 dir5/dir6 """)) - config = testdir.reparseconfig([source]) + config = testdir.parseconfig(source) nodemanager = NodeManager(config, ["popen//chdir=%s" % dest]) nodemanager.makegateways() nodemanager.rsync_roots() @@ -212,7 +212,7 @@ specs = ["popen"] * 3 source.join("conftest.py").write("rsyncdirs = ['a']") source.ensure('a', dir=1) - config = testdir.reparseconfig([source]) + config = testdir.parseconfig(source) nodemanager = NodeManager(config, specs) nodemanager.makegateways() nodemanager.rsync_roots() diff -r 52e15109500c7b43b244961b6060198207fb998f -r 017a73903b6f50f3ad201be5c8b7465111e5026c tox.ini --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,7 @@ [testenv] changedir=testing -deps=:testrun:pytest +deps=:testrun:pytest>=2.2.0.dev2 commands= py.test --junitxml={envlogdir}/junit-{envname}.xml [] [testenv:py31] diff -r 52e15109500c7b43b244961b6060198207fb998f -r 017a73903b6f50f3ad201be5c8b7465111e5026c xdist/__init__.py --- a/xdist/__init__.py +++ b/xdist/__init__.py @@ -1,2 +1,2 @@ # -__version__ = '1.6' +__version__ = '1.7.dev1' diff -r 52e15109500c7b43b244961b6060198207fb998f -r 017a73903b6f50f3ad201be5c8b7465111e5026c xdist/dsession.py --- a/xdist/dsession.py +++ b/xdist/dsession.py @@ -271,7 +271,7 @@ self.terminal.write_line("") self.terminal.write_line("scheduling tests via %s" %( self.sched.__class__.__name__)) - + self.sched.init_distribute() def slave_logstart(self, node, nodeid, location): @@ -279,8 +279,9 @@ nodeid=nodeid, location=location) def slave_testreport(self, node, rep): - if rep.when in ("setup", "call"): - self.sched.remove_item(node, rep.nodeid) + if not (rep.passed and rep.when != "call"): + if rep.when in ("setup", "call"): + self.sched.remove_item(node, rep.nodeid) #self.report_line("testreport %s: %s" %(rep.id, rep.status)) rep.node = node self.config.hook.pytest_runtest_logreport(report=rep) 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
