refactor code to read expected failures from functional test results

product/ERP5Type/tests/ERP5TypeTestSuite.py

@@ -192,7 +192,8 @@ class ERP5TypeTestSuite(TestSuite):
     """, re.DOTALL | re.VERBOSE)
 
   FTEST_PASS_FAIL_RE = re.compile(
-    '.*Functional Tests (?P<total>\d+) Tests, (?P<failures>\d+) Failures')
+    ".*Functional Tests (?P<total>\d+) Tests, (?P<failures>\d+) " + \
+        "Failures(\,\ (?P<expected_failure>\d+) Expected failures|)")
 
   def setup(self):
     instance_home = self.instance and 'unit_test.%u' % self.instance \

tests/__init__.py

@@ -109,6 +109,7 @@ class ERP5UserInterface(_ERP5):
       group_dict = search.groupdict()
       status_dict['failure_count'] = int(group_dict['failures'])
       status_dict['test_count'] = int(group_dict['total'])
+      status_dict['expected_failure'] = int(group_dict['expected_failure'])
 
     return status_dict