Merge remote-tracking branch 'origin/zope4py2' into zope4py3

bt5/erp5_accounting_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_accounting_report_zuite/test_third_parties.zpt

@@ -17,8 +17,8 @@ Copy of unittest <a href="https://lab.nexedi.com/nexedi/erp5/blob/master/product
 
 <tr><td>open</td>
     <td>${base_url}/portal_caches/manage_clearAllCache</td><td></td></tr>
-<tr><td>assertElementPresent</td>
-    <td>//div[@class="system-msg" and contains(text(), "All cache factories cleared")]</td><td></td></tr>
+<tr><td>assertTextPresent</td>
+    <td>All cache factories cleared</td><td></td></tr>
 
 <tr><td>store</td><td tal:content="python: '{:0>#2d}'.format(now.day())"></td><td>day</td></tr>
 <tr><td>store</td><td tal:content="python: '{:0>#2d}'.format(now.month())"></td><td>month</td></tr>

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_label_field_zuite/testMultiCssClass.zpt

@@ -16,29 +16,19 @@
   <td>${base_url}/Foo_view/my_title/manage_main</td>
   <td></td>
 </tr>
-<tr>
-  <td>waitForElementPresent</td>
-  <td>name=field_css_class</td>
-  <td></td>
-</tr>
 <tr>
   <td>type</td>
   <td>name=field_css_class</td>
   <td>class1 class2 class3</td>
 </tr>
 <tr>
-  <td>waitForElementPresent</td>
-  <td>//input[@name='submit']</td>
-  <td></td>
-</tr>
-<tr>
-  <td>click</td>
+  <td>clickAndWait</td>
   <td>//input[@name='submit']</td>
   <td></td>
 </tr>
 <tr>
-  <td>waitForElementPresent</td>
-  <td>//div[@class='system-msg']</td>
+  <td>assertTextPresent</td>
+  <td>Content changed.</td>
   <td></td>
 </tr>
 <tr>

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testMultiRelationDefaultSortAndParameterList.zpt

@@ -30,13 +30,6 @@
   <td></td>
 </tr>
 
-
-<tr>
-  <td>waitForElementPresent</td>
-  <td>//textarea[@name='field_sort']</td>
-  <td></td>
-</tr>
-
 <tr>
   <td>type</td>
   <td>//textarea[@name='field_sort']</td>
@@ -45,31 +38,23 @@
 
 
 <tr>
-  <td>click</td>
+  <td>clickAndWait</td>
   <td>//input[@value='Save Changes']</td>
   <td></td>
 </tr>
 
 <tr>
-  <td>waitForElementPresent</td>
-  <td>//div[@class='system-msg']</td>
+  <td>assertTextPresent</td>
+  <td>Content changed.</td>
   <td></td>
 </tr>
 
-
 <tr>
   <td>open</td>
   <td>${base_url}/Foo_viewRelationField/my_bar_category_title_list/manage_talesForm</td>
   <td></td>
 </tr>
 
-<tr>
-  <td>waitForElementPresent</td>
-  <td>//input[@name='field_parameter_list']</td>
-  <td></td>
-</tr>
-
-
 <tr>
   <td>type</td>
   <td>//input[@name='field_parameter_list']</td>
@@ -77,14 +62,14 @@
 </tr>
 
 <tr>
-  <td>click</td>
+  <td>clickAndWait</td>
   <td>//input[@value='Save Changes']</td>
   <td></td>
 </tr>
 
 <tr>
-  <td>waitForElementPresent</td>
-  <td>//div[@class='system-msg']</td>
+  <td>assertTextPresent</td>
+  <td>Content changed.</td>
   <td></td>
 </tr>
 
@@ -236,46 +221,30 @@
   <td></td>
 </tr>
 
-
-<tr>
-  <td>waitForElementPresent</td>
-  <td>//textarea[@name='field_sort']</td>
-  <td></td>
-</tr>
-
 <tr>
   <td>type</td>
   <td>//textarea[@name='field_sort']</td>
   <td></td>
 </tr>
 
-
 <tr>
-  <td>click</td>
+  <td>clickAndWait</td>
   <td>//input[@value='Save Changes']</td>
   <td></td>
 </tr>
 
 <tr>
-  <td>waitForElementPresent</td>
-  <td>//div[@class='system-msg']</td>
+  <td>assertTextPresent</td>
+  <td>Content changed.</td>
   <td></td>
 </tr>
 
-
 <tr>
   <td>open</td>
   <td>${base_url}/Foo_viewRelationField/my_bar_category_title_list/manage_talesForm</td>
   <td></td>
 </tr>
 
-<tr>
-  <td>waitForElementPresent</td>
-  <td>//input[@name='field_parameter_list']</td>
-  <td></td>
-</tr>
-
-
 <tr>
   <td>type</td>
   <td>//input[@name='field_parameter_list']</td>
@@ -283,21 +252,17 @@
 </tr>
 
 <tr>
-  <td>click</td>
+  <td>clickAndWait</td>
   <td>//input[@value='Save Changes']</td>
   <td></td>
 </tr>
 
 <tr>
-  <td>waitForElementPresent</td>
-  <td>//div[@class='system-msg']</td>
+  <td>assertTextPresent</td>
+  <td>Content changed.</td>
   <td></td>
 </tr>
 
-
-
-
-
 </tbody></table>
 </body>
 </html>
\ No newline at end of file

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testRelationDefaultSortAndParameterList.zpt

@@ -45,14 +45,14 @@
 
 
 <tr>
-  <td>click</td>
+  <td>clickAndWait</td>
   <td>//input[@value='Save Changes']</td>
   <td></td>
 </tr>
 
 <tr>
-  <td>waitForElementPresent</td>
-  <td>//div[@class='system-msg']</td>
+  <td>assertTextPresent</td>
+  <td>Content changed.</td>
   <td></td>
 </tr>
 
@@ -63,13 +63,6 @@
   <td></td>
 </tr>
 
-<tr>
-  <td>waitForElementPresent</td>
-  <td>//input[@name='field_parameter_list']</td>
-  <td></td>
-</tr>
-
-
 <tr>
   <td>type</td>
   <td>//input[@name='field_parameter_list']</td>
@@ -77,14 +70,14 @@
 </tr>
 
 <tr>
-  <td>click</td>
+  <td>clickAndWait</td>
   <td>//input[@value='Save Changes']</td>
   <td></td>
 </tr>
 
 <tr>
-  <td>waitForElementPresent</td>
-  <td>//div[@class='system-msg']</td>
+  <td>assertTextPresent</td>
+  <td>Content changed.</td>
   <td></td>
 </tr>
 
@@ -252,14 +245,14 @@
 
 
 <tr>
-  <td>click</td>
+  <td>clickAndWait</td>
   <td>//input[@value='Save Changes']</td>
   <td></td>
 </tr>
 
 <tr>
-  <td>waitForElementPresent</td>
-  <td>//div[@class='system-msg']</td>
+  <td>assertTextPresent</td>
+  <td>Content changed.</td>
   <td></td>
 </tr>
 
@@ -270,13 +263,6 @@
   <td></td>
 </tr>
 
-<tr>
-  <td>waitForElementPresent</td>
-  <td>//input[@name='field_parameter_list']</td>
-  <td></td>
-</tr>
-
-
 <tr>
   <td>type</td>
   <td>//input[@name='field_parameter_list']</td>
@@ -284,14 +270,14 @@
 </tr>
 
 <tr>
-  <td>click</td>
+  <td>clickAndWait</td>
   <td>//input[@value='Save Changes']</td>
   <td></td>
 </tr>
 
 <tr>
-  <td>waitForElementPresent</td>
-  <td>//div[@class='system-msg']</td>
+  <td>assertTextPresent</td>
+  <td>Content changed.</td>
   <td></td>
 </tr>
 

product/ERP5/tests/testInvalidationBug.py

@@ -37,10 +37,15 @@ import threading
 import unittest
 import urllib.request, urllib.parse, urllib.error
 import transaction
+import pkg_resources
 from DateTime import DateTime
 from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
 from Products.ERP5Type.tests.utils import createZODBPythonScript
 
+ZEO5 = pkg_resources.parse_version(
+  pkg_resources.get_distribution('ZEO').version
+) >= pkg_resources.parse_version('5')
+
 class TestInvalidationBug(ERP5TypeTestCase):
 
   def getTitle(self):
@@ -99,9 +104,7 @@ class TestInvalidationBug(ERP5TypeTestCase):
     self.assertEqual(result_catalog_count, 1)
     self.assertGreaterEqual(result_activity_count, 1)
 
-  # TODO: - skip this test for ZEO>=5 because it's covered upstream
-  #         (and later remove it)
-  #       - in slapos.git, enable server_sync in zope.conf
+  @unittest.skipIf(ZEO5, "Covered upstream on ZEO>=5")
   def testLateInvalidationFromZEO(self):
     ### Check unit test is run properly
     from ZEO.ClientStorage import ClientStorage

product/ERP5Type/tests/runUnitTest.py

@@ -545,6 +545,9 @@ def runUnitTestList(test_list, verbosity=1, debug=0, run_only=None):
   # Set debug mode after importing ZopeLite that resets it to 0
   cfg.debug_mode = debug
 
+  from ZPublisher.HTTPRequest import HTTPRequest
+  HTTPRequest.retry_max_count = 3
+
   from ZConfig.components.logger import handlers, logger, loghandler
   import logging
   root_logger = logging.getLogger()