floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged in dangra/pytest (pull request #132) 

no need for im_func and it does not exists in python3
This commit is contained in:
holger krekel 2014-03-28 14:46:34 +01:00
parent a65380941d 0cb9d26d83
commit 47379d4a79
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_pytest/unittest.py
View File

@ -154,7 +154,7 @@ def pytest_runtest_protocol(item, __multicall__):
if isinstance(item, TestCaseFunction): if isinstance(item, TestCaseFunction):
if 'twisted.trial.unittest' in sys.modules: if 'twisted.trial.unittest' in sys.modules:
ut = sys.modules['twisted.python.failure'] ut = sys.modules['twisted.python.failure']
Failure__init__ = ut.Failure.__init__.im_func Failure__init__ = ut.Failure.__init__
check_testcase_implements_trial_reporter() check_testcase_implements_trial_reporter()
def excstore(self, exc_value=None, exc_type=None, exc_tb=None, def excstore(self, exc_value=None, exc_type=None, exc_tb=None,
captureVars=None): captureVars=None):

14
tox.ini
View File

@ -1,6 +1,6 @@
[tox] [tox]
distshare={homedir}/.tox/distshare distshare={homedir}/.tox/distshare
envlist=flakes,py26,py27,pypy,py27-pexpect,py33-pexpect,py27-nobyte,py32,py33,py27-xdist,py33-xdist,trial envlist=flakes,py26,py27,pypy,py27-pexpect,py33-pexpect,py27-nobyte,py32,py33,py27-xdist,py33-xdist,py27-trial,py33-trial
[testenv] [testenv]
changedir=testing changedir=testing
@ -61,12 +61,22 @@ commands=
py.test -n3 -rfsxX \ py.test -n3 -rfsxX \
--junitxml={envlogdir}/junit-{envname}.xml {posargs:testing} --junitxml={envlogdir}/junit-{envname}.xml {posargs:testing}
[testenv:trial] [testenv:py27-trial]
changedir=. changedir=.
basepython=python2.7
deps=twisted deps=twisted
commands= commands=
py.test -rsxf \ py.test -rsxf \
--junitxml={envlogdir}/junit-{envname}.xml {posargs:testing/test_unittest.py} --junitxml={envlogdir}/junit-{envname}.xml {posargs:testing/test_unittest.py}
[testenv:py33-trial]
changedir=.
basepython=python3.3
deps={[testenv:py27-trial]deps}
commands=
py.test -rsxf \
--junitxml={envlogdir}/junit-{envname}.xml {posargs:testing/test_unittest.py}
[testenv:doctest] [testenv:doctest]
changedir=. changedir=.
commands=py.test --doctest-modules _pytest commands=py.test --doctest-modules _pytest