Fix test order when running with nose

James Graham · James Graham · commit 1acc7e7f32ab · 2011-07-24T19:26:04.000+02:00
--HG--
extra : transplant_source : %E8N%D9Z%09%F5%27%F1%BF%1CC%2C%9E%1EP%B38%8A%E4%C5
diff --git a/html5lib/tests/test_parser.py b/html5lib/tests/test_parser.py
@@ -7,7 +7,8 @@
 
 warnings.simplefilter("error")
 
-from support import html5lib_test_files, TestData, convert, convertExpected
+from support import html5lib_test_files as data_files
+from support import TestData, convert, convertExpected
 import html5lib
 from html5lib import html5parser, treebuilders, constants
 
@@ -113,23 +114,23 @@ def runParserTest(innerHTML, input, expected, errors, treeClass,
             assert len(p.errors) == len(errors), errorMsg2.encode("utf-8")
 
 def test_parser():
-    sys.stdout.write('Testing tree builders '+ " ".join(treeTypes.keys()) + "\n")
-
-    for treeName, treeCls in treeTypes.iteritems():
-        files = html5lib_test_files('tree-construction')
-        for filename in files:
-            testName = os.path.basename(filename).replace(".dat","")
-
-            tests = TestData(filename, "data")
+    sys.stderr.write('Testing tree builders '+ " ".join(treeTypes.keys()) + "\n")
+    files = data_files('tree-construction')
+    
+    for filename in files:
+        testName = os.path.basename(filename).replace(".dat","")
 
-            for index, test in enumerate(tests):
-                input, errors, innerHTML, expected = [test[key] for key in
+        tests = TestData(filename, "data")
+        
+        for index, test in enumerate(tests):
+            input, errors, innerHTML, expected = [test[key] for key in
                                                       'data', 'errors',
                                                       'document-fragment',
                                                       'document']
-                if errors:
-                    errors = errors.split("\n")
-                
+            if errors:
+                errors = errors.split("\n")
+
+            for treeName, treeCls in treeTypes.iteritems():
                 for namespaceHTMLElements in (True, False):
                     print input
                     yield (runParserTest, innerHTML, input, expected, errors, treeCls,
