Merge pull request #1395 from takluyver/xunit-kf

Make Xunit count KnownFailure tests as skipped, not failures.

IPython/testing/iptest.py

@@ -42,6 +42,8 b' import warnings'
 from IPython.testing import nosepatch
 # Now, proceed to import nose itself
 import nose.plugins.builtin
+from nose.plugins.xunit import Xunit
+from nose import SkipTest
 from nose.core import TestProgram
 
 # Our own imports
@@ -52,7 +54,7 b' from IPython.utils.sysinfo import sys_info'
 
 from IPython.testing import globalipapp
 from IPython.testing.plugin.ipdoctest import IPythonDoctest
-from IPython.external.decorators import KnownFailure
+from IPython.external.decorators import KnownFailure, knownfailureif
 
 pjoin = path.join
 
@@ -79,6 +81,23 b" warnings.filterwarnings('ignore', 'the sha module is deprecated',"
 warnings.filterwarnings('ignore', 'wxPython/wxWidgets release number mismatch',
                         UserWarning)
 
+# ------------------------------------------------------------------------------
+# Monkeypatch Xunit to count known failures as skipped.
+# ------------------------------------------------------------------------------
+def monkeypatch_xunit():
+    try:
+        knownfailureif(True)(lambda: None)()
+    except Exception as e:
+        KnownFailureTest = type(e)
+
+    def addError(self, test, err, capt=None):
+        if issubclass(err[0], KnownFailureTest):
+            err = (SkipTest,) + err[1:]
+        return self.orig_addError(test, err, capt)
+
+    Xunit.orig_addError = Xunit.addError
+    Xunit.addError = addError
+
 #-----------------------------------------------------------------------------
 # Logic for skipping doctests
 #-----------------------------------------------------------------------------
@@ -387,6 +406,9 b' def run_iptest():'
     `iptest all`.  It simply calls nose with appropriate command line flags
     and accepts all of the standard nose arguments.
     """
+    # Apply our monkeypatch to Xunit
+    if not hasattr(Xunit, 'orig_addError'):
+        monkeypatch_xunit()
 
     warnings.filterwarnings('ignore',
         'This will be removed soon.  Use IPython.testing.util instead')