diff --git a/product/ERP5/bin/run_test_suite b/product/ERP5/bin/run_test_suite index e1dc5105cdcf350c1e3fe89e893b3006890e6809..7289ce747887436c286d20fda102ec5ff5695edc 100755 --- a/product/ERP5/bin/run_test_suite +++ b/product/ERP5/bin/run_test_suite @@ -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), - skip_count=int(groupdict['skips'] or 0) - +int(groupdict['expected_failures'] or 0) - +int(groupdict['unexpected_successes'] 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)) return status_dict diff --git a/product/ERP5Type/tests/ERP5TypeTestSuite.py b/product/ERP5Type/tests/ERP5TypeTestSuite.py index ab44e14df0a55a66b295ee0408bcba7e9f516479..5bc9c3e13bde42fa249b475e8ee9aa6cd42b4526 100644 --- a/product/ERP5Type/tests/ERP5TypeTestSuite.py +++ b/product/ERP5Type/tests/ERP5TypeTestSuite.py @@ -233,11 +233,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), - skip_count=int(groupdict['skips'] or 0) - +int(groupdict['expected_failures'] or 0) - +int(groupdict['unexpected_successes'] 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)) return status_dict class ProjectTestSuite(ERP5TypeTestSuite): diff --git a/product/ERP5Type/tests/backportUnittest.py b/product/ERP5Type/tests/backportUnittest.py index 95b99343e82657b047c94c6111c73750eaa5f5e2..db8a5bf65c40b565ad6a7fcaab9aec55f068a835 100644 --- a/product/ERP5Type/tests/backportUnittest.py +++ b/product/ERP5Type/tests/backportUnittest.py @@ -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: