Skip to content

erp5
erp5
Commit 038ac81c authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

Improve display of failed Zelenium tests 

See merge request nexedi/erp5!1796
parents 30405447 d1fb21fe
Pipeline #29528 failed with stage
    Hide whitespace changes
    Inline Side-by-side
    Showing with 16 additions and 343 deletions
    bt5/erp5_test_result/SkinTemplateItem/portal_skins/erp5_test_result/TestResultLine_view.xml
    View file @ 038ac81c
    ...@@ -96,7 +96,6 @@ ...@@ -96,7 +96,6 @@
    <string>my_duration</string> <string>my_duration</string>
    <string>my_parent_int_index</string> <string>my_parent_int_index</string>
    <string>my_source_title</string> <string>my_source_title</string>
    <string>your_hide_expected_failure</string>
    </list> </list>
    </value> </value>
    </item> </item>
    ......
    bt5/erp5_test_result/SkinTemplateItem/portal_skins/erp5_test_result/TestResultLine_view/your_hide_expected_failure.xml deleted 100644 → 0
    View file @ 30405447
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="EditorField" module="Products.ERP5Form.EditorField"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>id</string> </key>
    <value> <string>your_hide_expected_failure</string> </value>
    </item>
    <item>
    <key> <string>message_values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>external_validator_failed</string> </key>
    <value> <string>The input failed the external validator.</string> </value>
    </item>
    <item>
    <key> <string>line_too_long</string> </key>
    <value> <string>A line was too long.</string> </value>
    </item>
    <item>
    <key> <string>required_not_found</string> </key>
    <value> <string>Input is required but no input given.</string> </value>
    </item>
    <item>
    <key> <string>too_long</string> </key>
    <value> <string>You entered too many characters.</string> </value>
    </item>
    <item>
    <key> <string>too_many_lines</string> </key>
    <value> <string>You entered too many lines.</string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>overrides</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>alternate_name</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>css_class</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>default</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>editable</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>enabled</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>external_validator</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>extra</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>height</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>hidden</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>max_length</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>max_linelength</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>max_lines</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>required</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>text_editor</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>unicode</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>whitespace_preserve</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>width</string> </key>
    <value> <string></string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>tales</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>alternate_name</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>css_class</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>default</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>editable</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>enabled</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>external_validator</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>extra</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>height</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>hidden</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>max_length</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>max_linelength</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>max_lines</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>required</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>text_editor</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>unicode</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>whitespace_preserve</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>width</string> </key>
    <value> <string></string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>alternate_name</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>css_class</string> </key>
    <value> <string>hide_expected_failure_controller</string> </value>
    </item>
    <item>
    <key> <string>default</string> </key>
    <value> <string encoding="cdata"><![CDATA[
    <script>\n
    $(document).ready(function () {\n
    var buttons = $(\'<button>Show</button><button>Hide</button>\');\n
    buttons.click(\n
    function(event) {\n
    $(\'tr.status_failed:first-child\').parent().each(function(idx, elem){\n
    var e = $(elem); txt = e.text();\n
    if (txt.indexOf(\'expected\') != -1) {\n
    e.parent().parent().parent().toggle();\n
    }\n
    });\n
    buttons.toggle();\n
    event.preventDefault();\n
    });\n
    \n
    $(".input > div.hide_expected_failure_controller").append(buttons);\n
    \n
    // Start with expected failures hidden\n
    buttons.first().hide().click();\n
    });\n
    </script>
    ]]></string> </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>editable</string> </key>
    <value> <int>0</int> </value>
    </item>
    <item>
    <key> <string>enabled</string> </key>
    <value> <int>1</int> </value>
    </item>
    <item>
    <key> <string>external_validator</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>extra</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>height</string> </key>
    <value> <int>5</int> </value>
    </item>
    <item>
    <key> <string>hidden</string> </key>
    <value> <int>0</int> </value>
    </item>
    <item>
    <key> <string>max_length</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>max_linelength</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>max_lines</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>required</string> </key>
    <value> <int>0</int> </value>
    </item>
    <item>
    <key> <string>text_editor</string> </key>
    <value> <string>text_area</string> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string>Expected Failures</string> </value>
    </item>
    <item>
    <key> <string>unicode</string> </key>
    <value> <int>0</int> </value>
    </item>
    <item>
    <key> <string>whitespace_preserve</string> </key>
    <value> <int>0</int> </value>
    </item>
    <item>
    <key> <string>width</string> </key>
    <value> <int>40</int> </value>
    </item>
    </dictionary>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="TALESMethod" module="Products.Formulator.TALESField"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_text</string> </key>
    <value> <string>python: here.getProperty(\'html_test_result\')</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    product/ERP5Type/tests/ERP5TypeFunctionalTestCase.py
    View file @ 038ac81c
    ...@@ -44,7 +44,7 @@ from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase ...@@ -44,7 +44,7 @@ from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
    from Products.ERP5Type.tests.runUnitTest import log_directory from Products.ERP5Type.tests.runUnitTest import log_directory
    from Products.ERP5Type.Utils import stopProcess, PR_SET_PDEATHSIG from Products.ERP5Type.Utils import stopProcess, PR_SET_PDEATHSIG
    from lxml import etree from lxml import etree
    from lxml.html import builder as E from lxml.html.builder import E
    import certifi import certifi
    import urllib3 import urllib3
    from selenium import webdriver from selenium import webdriver
    ...@@ -360,8 +360,8 @@ class FunctionalTestRunner: ...@@ -360,8 +360,8 @@ class FunctionalTestRunner:
    iframe = etree.fromstring( iframe = etree.fromstring(
    browser.execute_script( browser.execute_script(
    "return document.getElementById('testSuiteFrame').contentDocument.querySelector('html').innerHTML" "return document.getElementById('testSuiteFrame').contentDocument.querySelector('html').innerHTML"
    ).encode('UTF-8'), ),
    html_parser html_parser
    ) )
    return iframe return iframe
    ...@@ -383,26 +383,31 @@ class FunctionalTestRunner: ...@@ -383,26 +383,31 @@ class FunctionalTestRunner:
    test_table = tr[1].xpath('.//table')[0] test_table = tr[1].xpath('.//table')[0]
    status = tr.attrib.get('class') status = tr.attrib.get('class')
    if 'status_failed' in status: if 'status_failed' in status:
    # XXX replace status_failed classes by an inline style supported by gadget_html_viewer
    for test_tr in test_table.xpath('.//tr[contains(@class, "status_failed")]'):
    test_tr.set('style', 'background-color: red;')
    details_attribute_dict = {}
    if etree.tostring(test_table).find("expected failure") != -1: if etree.tostring(test_table).find("expected failure") != -1:
    expected_failure_amount += 1 expected_failure_amount += 1
    else: else:
    failure_amount += 1 failure_amount += 1
    error_title_list.append(test_name) error_title_list.append(test_name)
    detail_element = E.DIV() details_attribute_dict['open'] = 'true'
    detail_element.append(E.DIV(E.P(test_name), E.BR, test_table)) detail_element = E.div()
    detail_element.append(E.details(E.summary(test_name), test_table, **details_attribute_dict))
    detail += etree.tostring(detail_element) detail += etree.tostring(detail_element)
    tr_count += 1 tr_count += 1
    sucess_amount = tr_count - 1 - failure_amount - expected_failure_amount success_amount = tr_count - 1 - failure_amount - expected_failure_amount
    if detail: if detail:
    detail = '''<html> detail = '''<html>
    <head> <body>
    <style type="text/css">tr.status_failed { background-color:red };</style> <h3>Failed Zelenium Test Details</h3>
    </head> %s
    <body>%s</body> </body>
    </html>''' % detail </html>''' % detail
    # When return fix output for handle unicode issues. # When return fix output for handle unicode issues.
    return detail, sucess_amount, failure_amount, expected_failure_amount, \ return detail, success_amount, failure_amount, expected_failure_amount, \
    error_title_list error_title_list
    ......
    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
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7