Commit edb4be56 authored by Julien Muchembled's avatar Julien Muchembled

Mark test as FAILED in case of "unexpected success"

This reapplies commit ddcb5001,
now that we have no more unexpected success.
parent d27e5c3a
No related merge requests found
......@@ -332,11 +332,12 @@ class ERP5TypeTestSuite(TestSuite):
search = self.STATUS_RE.search(test_log)
if search:
groupdict = search.groupdict()
status_dict.update(error_count=int(groupdict['errors'] or 0),
failure_count=int(groupdict['failures'] or 0),
status_dict.update(
error_count=int(groupdict['errors'] or 0),
failure_count=int(groupdict['failures'] or 0)
+int(groupdict['unexpected_successes'] or 0),
skip_count=int(groupdict['skips'] or 0)
+int(groupdict['expected_failures'] or 0)
+int(groupdict['unexpected_successes'] or 0))
+int(groupdict['expected_failures'] or 0))
return status_dict
......
......@@ -234,11 +234,12 @@ class ERP5TypeTestSuite(TestSuite):
search = self.STATUS_RE.search(test_log)
if search:
groupdict = search.groupdict()
status_dict.update(error_count=int(groupdict['errors'] or 0),
failure_count=int(groupdict['failures'] or 0),
status_dict.update(
error_count=int(groupdict['errors'] or 0),
failure_count=int(groupdict['failures'] or 0)
+int(groupdict['unexpected_successes'] or 0),
skip_count=int(groupdict['skips'] or 0)
+int(groupdict['expected_failures'] or 0)
+int(groupdict['unexpected_successes'] or 0))
+int(groupdict['expected_failures'] or 0))
return status_dict
class ProjectTestSuite(ERP5TypeTestSuite):
......
......@@ -207,6 +207,10 @@ class _TextTestResult(unittest._TextTestResult, TestResult):
unittest._TextTestResult.__init__(self, stream, descriptions, verbosity)
TestResult.__init__(self)
def wasSuccessful(self):
"Tells whether or not this result was a success"
return not (self.failures or self.errors or self.unexpectedSuccesses)
def addSkip(self, test, reason):
super(_TextTestResult, self).addSkip(test, reason)
if self.showAll:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment