Skip to content

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

Merge remote-tracking branch 'upstream/master' into zope4py3

parents 41691152 69d9157f
Pipeline #33939 failed with stage
    in 0 seconds
    Show whitespace changes
    Inline Side-by-side
    Showing with 2 additions and 1 deletion
    bt5/erp5_ui_test_core/ExtensionTemplateItem/portal_components/extension.erp5.ERP5Zuite.py
    View file @ f40c78a7
    ...@@ -13,7 +13,8 @@ def waitForActivities(self, delay=100, count=None): ...@@ -13,7 +13,8 @@ def waitForActivities(self, delay=100, count=None):
    activity_tool = self.getPortalObject().portal_activities activity_tool = self.getPortalObject().portal_activities
    assert not ( assert not (
    activity_tool.isSubscribed() activity_tool.isSubscribed()
    and getCurrentNode() in activity_tool.getProcessingNodeList()) and getCurrentNode() in activity_tool.getProcessingNodeList()),
    'still subscribed to activities'
    if count is not None: # BBB if count is not None: # BBB
    # completely arbitrary conversion factor: count used to default to 1000 # completely arbitrary conversion factor: count used to default to 1000
    ......
    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