Add XFAIL support. As with Skip, there is no python object representation of the skip, because there is no standard for reporting them.

1 files changed, 20 insertions, 1 deletions

diff --git a/python/subunit/__init__.py b/python/subunit/__init__.py
index 4c7cf57..b2d1ad8 100644
--- a/python/subunit/__init__.py
+++ b/python/subunit/__init__.py
@@ -50,6 +50,7 @@ class TestProtocolServer(object):
     READING_FAILURE = 2
     READING_ERROR = 3
     READING_SKIP = 4
+    READING_XFAIL = 5
 
     def __init__(self, client, stream=sys.stdout):
         """Create a TestProtocol server instance.
@@ -81,6 +82,20 @@ class TestProtocolServer(object):
         else:
             self.stdOutLineReceived(line)
 
+    def _addExpectedFail(self, offset, line):
+        if (self.state == TestProtocolServer.TEST_STARTED and
+            self.current_test_description == line[offset:-1]):
+            self.state = TestProtocolServer.OUTSIDE_TEST
+            self.current_test_description = None
+            self.client.addSuccess(self._current_test)
+            self.client.stopTest(self._current_test)
+        elif (self.state == TestProtocolServer.TEST_STARTED and
+            self.current_test_description + " [" == line[offset:-1]):
+            self.state = TestProtocolServer.READING_XFAIL
+            self._message = ""
+        else:
+            self.stdOutLineReceived(line)
+
     def _addFailure(self, offset, line):
         if (self.state == TestProtocolServer.TEST_STARTED and
             self.current_test_description == line[offset:-1]):
@@ -136,7 +151,9 @@ class TestProtocolServer(object):
             self.client.addError(self._current_test,
                                  RemoteError(self._message))
             self.client.stopTest(self._current_test)
-        elif self.state == TestProtocolServer.READING_SKIP:
+        elif self.state in (
+            TestProtocolServer.READING_SKIP,
+            TestProtocolServer.READING_XFAIL):
             self._succeedTest()
         else:
             self.stdOutLineReceived(line)
@@ -164,6 +181,8 @@ class TestProtocolServer(object):
                     self._addSkip(offset, line)
                 elif cmd in ('success', 'successful'):
                     self._addSuccess(offset, line)
+                elif cmd == 'xfail':
+                    self._addExpectedFail(offset, line)
                 else:
                     self.stdOutLineReceived(line)
             else: