Use the nose skip plugin to actually properly skip tests.

gsnedders · gsnedders · commit c66d41e4e729 · 2014-11-24T00:47:39.000Z
diff --git a/html5lib/tests/support.py b/html5lib/tests/support.py
@@ -6,6 +6,8 @@
 import glob
 import xml.sax.handler
 
+from nose.plugins.skip import SkipTest
+
 base_path = os.path.split(__file__)[0]
 
 test_dir = os.path.join(base_path, 'testdata')
@@ -182,6 +184,8 @@ def xfail(test):
     def t(*args, **kwargs):
         try:
             test(*args)
+        except SkipTest:
+            raise
         except:
             return
         else:
diff --git a/html5lib/tests/test_encoding.py b/html5lib/tests/test_encoding.py
@@ -8,6 +8,8 @@
 except AttributeError:
     unittest.TestCase.assertEqual = unittest.TestCase.assertEquals
 
+from nose.plugins.skip import SkipTest
+
 from .support import get_data_files, TestData, test_dir, errorMessage
 from html5lib import HTMLParser, inputstream
 
@@ -41,7 +43,7 @@ def runPreScanEncodingTest(data, encoding):
 
     # Very crude way to ignore irrelevant tests
     if len(data) > stream.numBytesMeta:
-        return
+        raise SkipTest()
 
     assert encoding == stream.charEncoding[0], errorMessage(data, encoding, stream.charEncoding[0])
 
diff --git a/html5lib/tests/test_parser.py b/html5lib/tests/test_parser.py
@@ -8,6 +8,8 @@
 
 warnings.simplefilter("error")
 
+from nose.plugins.skip import SkipTest
+
 from .support import get_data_files
 from .support import TestData, convert, convertExpected, treeTypes
 from .support import xfail
@@ -30,7 +32,7 @@ def runParserTest(innerHTML, input, expected, errors, treeClass,
                   namespaceHTMLElements, scriptingDisabled):
     if scriptingDisabled:
         # We don't support the scripting disabled case!
-        return
+        raise SkipTest()
 
     with warnings.catch_warnings(record=True) as caughtWarnings:
         warnings.simplefilter("always")
@@ -51,7 +53,7 @@ def runParserTest(innerHTML, input, expected, errors, treeClass,
                      if not issubclass(x.category, constants.DataLossWarning)]
     assert len(otherWarnings) == 0, [(x.category, x.message) for x in otherWarnings]
     if len(caughtWarnings):
-        return
+        raise SkipTest()
 
     output = convertTreeDump(p.tree.testSerializer(document))
 
diff --git a/html5lib/tests/test_treewalkers.py b/html5lib/tests/test_treewalkers.py
@@ -11,6 +11,8 @@
 except AttributeError:
     unittest.TestCase.assertEqual = unittest.TestCase.assertEquals
 
+from nose.plugins.skip import SkipTest
+
 from .support import get_data_files, TestData, convertExpected, xfail
 
 from html5lib import html5parser, treewalkers, treebuilders, constants
@@ -253,7 +255,7 @@ def test_all_tokens(self):
 def runTreewalkerTest(innerHTML, input, expected, errors, treeClass, scriptingDisabled):
     if scriptingDisabled:
         # We don't support the scripting disabled case!
-        return
+        raise SkipTest()
 
     warnings.resetwarnings()
     warnings.simplefilter("error")
@@ -265,7 +267,7 @@ def runTreewalkerTest(innerHTML, input, expected, errors, treeClass, scriptingDi
             document = p.parse(input)
     except constants.DataLossWarning:
         # Ignore testcases we know we don't pass
-        return
+        raise SkipTest()
 
     document = treeClass.get("adapter", lambda x: x)(document)
     try:
@@ -282,7 +284,7 @@ def runTreewalkerTest(innerHTML, input, expected, errors, treeClass, scriptingDi
                 "", "Diff:", diff,
         ])
     except NotImplementedError:
-        pass  # Amnesty for those that confess...
+        raise SkipTest() # Amnesty for those that confess...
 
 
 @xfail
