expectedFailure should be treated as a TODO.

.travis.yml

@@ -21,6 +21,7 @@ matrix:
       language: generic
       env: TOX_ENV=py27
       before_install:
+        - brew update
         - brew upgrade python
         - python3 -m venv venv
         - source venv/bin/activate

docs/releases.rst

@@ -1,6 +1,12 @@
 Releases
 ========
 
+Version 2.3, To Be Released
+---------------------------
+
+* `unittest.expectedFailure` now uses a TODO directive to better align
+  with the specification.
+
 Version 2.2, Released January 7, 2018
 -------------------------------------
 

tap/runner.py

@@ -50,12 +50,12 @@ def addExpectedFailure(self, test, err):
         diagnostics = formatter.format_exception(err)
         self.tracker.add_not_ok(
             self._cls_name(test), self._description(test),
-            _('(expected failure)'), diagnostics=diagnostics)
+            'TODO {}'.format(_('(expected failure)')), diagnostics=diagnostics)
 
     def addUnexpectedSuccess(self, test):
         super(TAPTestResult, self).addUnexpectedSuccess(test)
         self.tracker.add_ok(self._cls_name(test), self._description(test),
-                            _('(unexpected success)'))
+                            'TODO {}'.format(_('(unexpected success)')))
 
     def _cls_name(self, test):
         return test.__class__.__name__

tap/tests/test_result.py

@@ -62,11 +62,13 @@ def test_adds_expected_failure(self):
         result.addExpectedFailure(FakeTestCase(), exc)
         line = result.tracker._test_cases['FakeTestCase'][0]
         self.assertFalse(line.ok)
-        self.assertEqual(line.directive.text, _('(expected failure)'))
+        self.assertEqual(
+            line.directive.text, 'TODO {}'.format(_('(expected failure)')))
 
     def test_adds_unexpected_success(self):
         result = self._make_one()
         result.addUnexpectedSuccess(FakeTestCase())
         line = result.tracker._test_cases['FakeTestCase'][0]
         self.assertTrue(line.ok)
-        self.assertEqual(line.directive.text, _('(unexpected success)'))
+        self.assertEqual(
+            line.directive.text, 'TODO {}'.format(_('(unexpected success)')))