IQ.Lvbs/pytest-xdist
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
holger krekel
2013-04-02 10:29:51 +02:00
parent 53c4025774
commit a771352f01
4 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@@ -2,7 +2,7 @@ from setuptools import setup
setup( setup(
name="pytest-xdist", name="pytest-xdist",
version='1.8', version='1.9dev1',
description='py.test xdist plugin for distributed testing and loop-on-failing modes', description='py.test xdist plugin for distributed testing and loop-on-failing modes',
long_description=open('README.txt').read(), long_description=open('README.txt').read(),
license='GPLv2 or later', license='GPLv2 or later',

2
testing/test_remote.py
View File

@@ -88,7 +88,7 @@ class TestReportSerialization:
assert newrep.passed == rep.passed assert newrep.passed == rep.passed
assert newrep.failed == rep.failed assert newrep.failed == rep.failed
assert newrep.skipped == rep.skipped 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 len(newrep.longrepr) == 3
assert newrep.outcome == rep.outcome assert newrep.outcome == rep.outcome
assert newrep.when == rep.when assert newrep.when == rep.when

8
testing/test_slavemanage.py
View File

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

2
xdist/__init__.py
View File

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