p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some fixes after the merge 

--HG--
branch : trunk
This commit is contained in:
holger krekel 2010-10-02 20:49:24 +02:00
parent 63bb9efd29
commit a6003ac332
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -3,6 +3,8 @@ Changes between 1.3.4 and 1.4.0.dev0
================================================== ==================================================
- introduce (customizable) assertion failure representations (Floris Bruynooghe) - introduce (customizable) assertion failure representations (Floris Bruynooghe)
- nose-plugin: pass through type-signature failures in setup/teardown
functions instead of not calling them (Ed Singleton)
- major refactoring of internal collection handling - major refactoring of internal collection handling
- majorly reduce py.test core code, shift function/python testing to own plugin - majorly reduce py.test core code, shift function/python testing to own plugin
- fix issue88 (finding custom test nodes from command line arg) - fix issue88 (finding custom test nodes from command line arg)

4
testing/plugin/test_pytest_nose.py
View File

@ -1,6 +1,7 @@
import py import py
py.test.importorskip("nose")
def setup_module(mod):
mod.nose = py.test.importorskip("nose")
def test_nose_setup(testdir): def test_nose_setup(testdir):
p = testdir.makepyfile(""" p = testdir.makepyfile("""
@ -99,6 +100,7 @@ def test_nose_setup_func_failure_2(testdir):
def test_nose_setup_partial(testdir): def test_nose_setup_partial(testdir):
py.test.importorskip("functools")
p = testdir.makepyfile(""" p = testdir.makepyfile("""
from functools import partial from functools import partial

1
tox.ini
View File

@ -12,6 +12,7 @@ commands=
py.test -rfsxX --junitxml={envlogdir}/junit-{envname}.xml [] py.test -rfsxX --junitxml={envlogdir}/junit-{envname}.xml []
deps= deps=
pexpect pexpect
nose
[testenv:py27] [testenv:py27]
basepython=python2.7 basepython=python2.7
[testenv:py27-xdist] [testenv:py27-xdist]