Skip to content

erp5
erp5
Commit 30066147 authored by Jérome Perrin's avatar Jérome Perrin
1 Browse files
Options

test_result: Rewrite TestResultLine_viewResultHistory 

so that test result line does not need to be indexable
parent 2a5f469b
Hide whitespace changes
Inline Side-by-side
Showing with 147 additions and 13 deletions
bt5/erp5_test_result/SkinTemplateItem/portal_skins/erp5_test_result/TestResultLine_countResultHistoryList.xml 0 → 100644
View file @ 30066147
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>"""Count all previous test result line for the same test, same\n
test suite, but for older revisions.\n
"""\n
\n
test_result = context.getParentValue()\n
query_params = {\'portal_type\': \'Test Result\',\n
\'title\': dict(query=test_result.getTitle(), key=\'ExactMatch\'),\n
\'simulation_state\': (\'stopped\', \'public_stopped\', \'failed\'),\n
}\n
return context.portal_catalog.countResults(**query_params)\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>**kw</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>TestResultLine_countResultHistoryList</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_test_result/SkinTemplateItem/portal_skins/erp5_test_result/TestResultLine_getResultHistoryList.xml
View file @ 30066147
...@@ -58,19 +58,41 @@ Note that creation_date is used, but it could be nicer to use\n ...@@ -58,19 +58,41 @@ Note that creation_date is used, but it could be nicer to use\n
the start date. However for now it is more convenient from a\n the start date. However for now it is more convenient from a\n
catalog point of view\n catalog point of view\n
"""\n """\n
\n
test_result = context.getParentValue()\n test_result = context.getParentValue()\n
\n
query_params = {\'creation_date\' : dict(query=context.getCreationDate(), range=\'ngt\'),\n query_params = {\'creation_date\' : dict(query=context.getCreationDate(), range=\'ngt\'),\n
\'portal_type\': context.getPortalType(),\n \'portal_type\': \'Test Result\',\n
\'title\': dict(query=context.getTitle(), key=\'ExactMatch\'),\n \'limit\': limit,\n
\'parent_title\': dict(query=test_result.getTitle(), key=\'ExactMatch\'),\n \'title\': dict(query=test_result.getTitle(), key=\'ExactMatch\'),\n
\'simulation_state\': \'stopped\',\n \'simulation_state\': (\'stopped\', \'public_stopped\', \'failed\'),\n
\'sort_on\': ((\'creation_date\', \'descending\'),),}\n \'sort_on\': ((\'creation_date\', \'descending\'),),}\n
return context.portal_catalog(**query_params)\n \n
result_list = []\n
expected_id = context.getId()\n
expected_title = context.getTitle()\n
for tr in context.portal_catalog(**query_params):\n
tr = tr.getObject()\n
# Optimisation: the test result line probably have the same id in the previous\n
# test result.\n
line = getattr(tr, expected_id, None)\n
if line is not None and line.getTitle() == expected_title \\\n
and line.getSimulationState() in (\'stopped\', \'public_stopped\', \'failed\'):\n
result_list.append(line)\n
else:\n
for line in tr.contentValues(portal_type=\'Test Result Line\'):\n
if line.getTitle() == context.getTitle() \\\n
and line.getSimulationState() in (\'stopped\', \'public_stopped\', \'failed\'):\n
result_list.append(line)\n
# next time, the test result line will likely have the same id as this one.\n
expected_id = line.getId()\n
\n
return result_list\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>**kw</string> </value> <value> <string>limit, **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
bt5/erp5_test_result/SkinTemplateItem/portal_skins/erp5_test_result/TestResultLine_viewResultHistory/listbox.xml
View file @ 30066147
...@@ -394,12 +394,18 @@ ...@@ -394,12 +394,18 @@
</item> </item>
<item> <item>
<key> <string>count_method</string> </key> <key> <string>count_method</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>default_display_style</string> </key>
<value> <string>table</string> </value>
</item>
<item> <item>
<key> <string>default_params</string> </key> <key> <string>default_params</string> </key>
<value> <value>
...@@ -410,6 +416,12 @@ ...@@ -410,6 +416,12 @@
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>display_style_list</string> </key>
<value>
<list/>
</value>
</item>
<item> <item>
<key> <string>domain_root_list</string> </key> <key> <string>domain_root_list</string> </key>
<value> <value>
...@@ -449,6 +461,10 @@ ...@@ -449,6 +461,10 @@
<list/> <list/>
</value> </value>
</item> </item>
<item>
<key> <string>global_search_column</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
...@@ -459,7 +475,7 @@ ...@@ -459,7 +475,7 @@
</item> </item>
<item> <item>
<key> <string>lines</string> </key> <key> <string>lines</string> </key>
<value> <int>20</int> </value> <value> <int>15</int> </value>
</item> </item>
<item> <item>
<key> <string>list_action</string> </key> <key> <string>list_action</string> </key>
...@@ -468,7 +484,7 @@ ...@@ -468,7 +484,7 @@
<item> <item>
<key> <string>list_method</string> </key> <key> <string>list_method</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -477,6 +493,10 @@ ...@@ -477,6 +493,10 @@
<list/> <list/>
</value> </value>
</item> </item>
<item>
<key> <string>page_navigation_template</string> </key>
<value> <string>ListBox_viewSliderPageNavigationRenderer</string> </value>
</item>
<item> <item>
<key> <string>page_template</string> </key> <key> <string>page_template</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -541,6 +561,12 @@ ...@@ -541,6 +561,12 @@
<key> <string>stat_method</string> </key> <key> <string>stat_method</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>style_columns</string> </key>
<value>
<list/>
</value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>listbox</string> </value> <value> <string>listbox</string> </value>
...@@ -565,10 +591,20 @@ ...@@ -565,10 +591,20 @@
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <global name="Method" module="Products.Formulator.MethodField"/>
<global name="Method" module="Products.Formulator.MethodField"/> </pickle>
<tuple/> <pickle>
</tuple> <dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>TestResultLine_countResultHistoryList</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="Method" module="Products.Formulator.MethodField"/>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
......
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