From ffc3ec6be067481ca601cf3cf604a548c6279ea7 Mon Sep 17 00:00:00 2001 From: Jonathan Lange Date: Tue, 10 Apr 2012 13:59:31 +0100 Subject: Factor out the "fixup expected failures" thing so they look more like result transformers. --- python/subunit/test_results.py | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) (limited to 'python') diff --git a/python/subunit/test_results.py b/python/subunit/test_results.py index 32dff6a..7acd5ea 100644 --- a/python/subunit/test_results.py +++ b/python/subunit/test_results.py @@ -432,37 +432,24 @@ class TestResultFilter(_PredicateFilter): self._fixup_expected_failures = fixup_expected_failures def addError(self, test, err=None, details=None): - if (self.filter_predicate(test, 'error', err, details)): - if self._failure_expected(test): - self._buffered_calls.append( - ('addExpectedFailure', [test, err], {'details': details})) - else: - self._buffered_calls.append( - ('addError', [test, err], {'details': details})) + if self._failure_expected(test): + self.addExpectedFailure(test, err=err, details=details) else: - self._filtered() + super(TestResultFilter, self).addError( + test, err=err, details=details) def addFailure(self, test, err=None, details=None): - if (self.filter_predicate(test, 'failure', err, details)): - if self._failure_expected(test): - self._buffered_calls.append( - ('addExpectedFailure', [test, err], {'details': details})) - else: - self._buffered_calls.append( - ('addFailure', [test, err], {'details': details})) + if self._failure_expected(test): + self.addExpectedFailure(test, err=err, details=details) else: - self._filtered() + super(TestResultFilter, self).addFailure( + test, err=err, details=details) def addSuccess(self, test, details=None): - if (self.filter_predicate(test, 'success', None, details)): - if self._failure_expected(test): - self._buffered_calls.append( - ('addUnexpectedSuccess', [test], {'details': details})) - else: - self._buffered_calls.append( - ('addSuccess', [test], {'details': details})) + if self._failure_expected(test): + self.addUnexpectedSuccess(test, details=details) else: - self._filtered() + super(TestResultFilter, self).addSuccess(test, details=details) def _failure_expected(self, test): return (test.id() in self._fixup_expected_failures) -- cgit v1.2.1