Merge lp:~jelmer/subunit/tap2subunit-lc into lp:~subunit/subunit/trunk

[Jelmer Vernooij]

Handle lowercase skip/todo in tap output.

[Robert Collins (lifeless)]

 review: +1
 merge: approved

review: Approve

=== modified file 'python/subunit/__init__.py'
--- python/subunit/__init__.py	2010-01-16 04:33:40 +0000
+++ python/subunit/__init__.py	2010-04-11 18:25:27 +0000
@@ -913,7 +913,7 @@
                     subunit.write("]\n")
                 continue
         # not a plan line, or have seen one before
-        match = re.match("(ok|not ok)(?:\s+(\d+)?)?(?:\s+([^#]*[^#\s]+)\s*)?(?:\s+#\s+(TODO|SKIP)(?:\s+(.*))?)?\n", line)
+        match = re.match("(ok|not ok)(?:\s+(\d+)?)?(?:\s+([^#]*[^#\s]+)\s*)?(?:\s+#\s+(TODO|SKIP|skip|todo)(?:\s+(.*))?)?\n", line)
         if match:
             # new test, emit current one.
             _emit_test()
@@ -927,9 +927,9 @@
             else:
                 description = ' ' + description
             if directive is not None:
-                if directive == 'TODO':
+                if directive.upper() == 'TODO':
                     result = 'xfail'
-                elif directive == 'SKIP':
+                elif directive.upper() == 'SKIP':
                     result = 'skip'
                 if directive_comment is not None:
                     log.append(directive_comment)
 
=== modified file 'python/subunit/tests/test_tap2subunit.py'
--- python/subunit/tests/test_tap2subunit.py	2009-09-30 12:04:18 +0000
+++ python/subunit/tests/test_tap2subunit.py	2010-04-11 18:25:27 +0000
@@ -18,9 +18,7 @@
 
 import unittest
 from StringIO import StringIO
-import os
 import subunit
-import sys
 
 
 class TestTAP2SubUnit(unittest.TestCase):
@@ -125,6 +123,19 @@
             ],
             self.subunit.getvalue().splitlines())
 
+    def test_ok_skip_number_comment_lowercase(self):
+        self.tap.write("ok 1 # skip no samba environment available, skipping compilation\n")
+        self.tap.seek(0)
+        result = subunit.TAP2SubUnit(self.tap, self.subunit)
+        self.assertEqual(0, result)
+        self.assertEqual([
+            "test test 1",
+            "skip test 1 [", 
+            "no samba environment available, skipping compilation",
+            "]"
+            ],
+            self.subunit.getvalue().splitlines())
+
     def test_ok_number_description_SKIP_skip_comment(self):
         # A file
         # ok 1 foo  # SKIP Not done yet