summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2011-04-25 23:08:53 +0200
committerJelmer Vernooij <jelmer@samba.org>2011-04-25 23:08:53 +0200
commit7ce9deb0fe988b194c577b778b722f079a272d74 (patch)
tree367d4343dfef6f37ce37aba61477e0ff2e80e4c8 /python
parent137f492db934863d0352e46aa00486b8f8d7c806 (diff)
downloadsubunit-git-7ce9deb0fe988b194c577b778b722f079a272d74.tar.gz
Split out method that checks for expected failures into a separate method.
Diffstat (limited to 'python')
-rw-r--r--python/subunit/test_results.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/python/subunit/test_results.py b/python/subunit/test_results.py
index a3ad928..fe5b8d1 100644
--- a/python/subunit/test_results.py
+++ b/python/subunit/test_results.py
@@ -339,7 +339,7 @@ class TestResultFilter(TestResultDecorator):
def addError(self, test, err=None, details=None):
if (self.filter_predicate(test, 'error', err, details)):
- if test.id() in self._fixup_expected_failures:
+ if self._failure_expected(test):
self._buffered_calls.append(
('addExpectedFailure', [test, err], {'details': details}))
else:
@@ -350,7 +350,7 @@ class TestResultFilter(TestResultDecorator):
def addFailure(self, test, err=None, details=None):
if (self.filter_predicate(test, 'failure', err, details)):
- if test.id() in self._fixup_expected_failures:
+ if self._failure_expected(test):
self._buffered_calls.append(
('addExpectedFailure', [test, err], {'details': details}))
else:
@@ -368,7 +368,7 @@ class TestResultFilter(TestResultDecorator):
def addSuccess(self, test, details=None):
if (self.filter_predicate(test, 'success', None, details)):
- if test.id() in self._fixup_expected_failures:
+ if self._failure_expected(test):
self._buffered_calls.append(
('addUnexpectedSuccess', [test], {'details': details}))
else:
@@ -391,6 +391,9 @@ class TestResultFilter(TestResultDecorator):
def _filtered(self):
self._current_test_filtered = True
+ def _failure_expected(self, test):
+ return (test.id() in self._fixup_expected_failures)
+
def startTest(self, test):
"""Start a test.