sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-26 01:49:31 +03:00
Code Activity

subunit: Cope with lowercase test results in tap2subunit.

Browse Source 
Also submitted upstream.
This commit is contained in:
Jelmer Vernooij
2010-04-11 20:56:02 +02:00
parent 3a34b5f35e
commit 5d0694f994
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/subunit/python/subunit/__init__.py
View File

@ -913,7 +913,7 @@ def TAP2SubUnit(tap, subunit):
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 @@ def TAP2SubUnit(tap, subunit):
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)

15
lib/subunit/python/subunit/tests/test_tap2subunit.py
View File

@ -18,9 +18,7 @@
import unittest
from StringIO import StringIO
import os
import subunit
import sys
class TestTAP2SubUnit(unittest.TestCase):
@ -125,6 +123,19 @@ class TestTAP2SubUnit(unittest.TestCase):
],
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