some fixes after the merge

--HG--
branch : trunk

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)

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
 

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]