Commit 7f719af7 authored by Rafael Monnerat's avatar Rafael Monnerat

revert previous change and apply appropriate fix.

parent 1f4677ca
...@@ -284,7 +284,7 @@ class FunctionalTestRunner: ...@@ -284,7 +284,7 @@ class FunctionalTestRunner:
xvfb.quit() xvfb.quit()
def processResult(self): def processResult(self):
file_content = self.getStatus() file_content = self.getStatus().encode("utf-8", "replace")
sucess_amount = TEST_PASS_RE.search(file_content).group(1) sucess_amount = TEST_PASS_RE.search(file_content).group(1)
failure_amount = TEST_FAILURE_RE.search(file_content).group(1) failure_amount = TEST_FAILURE_RE.search(file_content).group(1)
error_title_list = [re.compile('\s+').sub(' ', x).strip() error_title_list = [re.compile('\s+').sub(' ', x).strip()
...@@ -306,9 +306,7 @@ class FunctionalTestRunner: ...@@ -306,9 +306,7 @@ class FunctionalTestRunner:
</html>''' % detail </html>''' % detail
# When return fix output for handle unicode issues. # When return fix output for handle unicode issues.
return unicode(detail, "utf-8", "replace"), int(sucess_amount),\ return detail, int(sucess_amount), int(failure_amount), error_title_list
int(failure_amount),\
[unicode(i, "utf-8", "replace") for i in error_title_list]
class ERP5TypeFunctionalTestCase(ERP5TypeTestCase): class ERP5TypeFunctionalTestCase(ERP5TypeTestCase):
run_only = "" run_only = ""
......
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