From a6003ac3323b233665d2a65c77a275e14a5c4cda Mon Sep 17 00:00:00 2001 From: holger krekel Date: Sat, 2 Oct 2010 20:49:24 +0200 Subject: [PATCH] some fixes after the merge --HG-- branch : trunk --- CHANGELOG | 2 ++ testing/plugin/test_pytest_nose.py | 4 +++- tox.ini | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index cbd47878f..60f3145f0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,8 @@ Changes between 1.3.4 and 1.4.0.dev0 ================================================== - 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 - majorly reduce py.test core code, shift function/python testing to own plugin - fix issue88 (finding custom test nodes from command line arg) diff --git a/testing/plugin/test_pytest_nose.py b/testing/plugin/test_pytest_nose.py index 3b049471e..2554d29b1 100644 --- a/testing/plugin/test_pytest_nose.py +++ b/testing/plugin/test_pytest_nose.py @@ -1,6 +1,7 @@ import py -py.test.importorskip("nose") +def setup_module(mod): + mod.nose = py.test.importorskip("nose") def test_nose_setup(testdir): p = testdir.makepyfile(""" @@ -99,6 +100,7 @@ def test_nose_setup_func_failure_2(testdir): def test_nose_setup_partial(testdir): + py.test.importorskip("functools") p = testdir.makepyfile(""" from functools import partial diff --git a/tox.ini b/tox.ini index 770e998d9..78fcc1340 100644 --- a/tox.ini +++ b/tox.ini @@ -12,6 +12,7 @@ commands= py.test -rfsxX --junitxml={envlogdir}/junit-{envname}.xml [] deps= pexpect + nose [testenv:py27] basepython=python2.7 [testenv:py27-xdist]