From 70be8872ddfe8dd71f0036e2cf9e8109c10ccdfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Fri, 19 Oct 2018 08:40:51 +0200 Subject: [PATCH] ProcessingNodeTestCase: respect isSubscribed state of activity tool This is needed when running livetests in a runUnitTest instance, in the following scenario: - `runUnitTest --save test_bt:testXXX` - `runUnitTest --save --load` - run the live test from the browser because livetest way of processing activities is to unsubscribe at the beginning of the test and subscribe at the end to have control of activities when running .tic, if ProcessingNodeTestCase also process the activities automatically, they interfere and test often fail with errors like: ``` File "ERP5Type/tests/ProcessingNodeTestCase.py", line 249, in tic raise RuntimeError(error_message) RuntimeError: tic is looping forever. These messages are pending: [('/erp5/portal_components/test.erp5.testSupportRequest', 'immediateReindexObject', 1, 0), ('/erp5/support_request_module/2617', 'immediateReindexObject', -1, 0)] ``` /reviewed-on https://lab.nexedi.com/nexedi/erp5/merge_requests/779 --- product/ERP5Type/tests/ProcessingNodeTestCase.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/product/ERP5Type/tests/ProcessingNodeTestCase.py b/product/ERP5Type/tests/ProcessingNodeTestCase.py index 7e125ba0fc..64b88aa193 100644 --- a/product/ERP5Type/tests/ProcessingNodeTestCase.py +++ b/product/ERP5Type/tests/ProcessingNodeTestCase.py @@ -273,9 +273,10 @@ class ProcessingNodeTestCase(ZopeTestCase.TestCase): portal = self.app[self.app.test_portal_name] except (AttributeError, KeyError): continue - try: - portal.portal_activities.process_timer(None, None) - except Exception: - LOG('Invoking Activity Tool', ERROR, '', error=sys.exc_info()) + if portal.portal_activities.isSubscribed(): + try: + portal.portal_activities.process_timer(None, None) + except Exception: + LOG('Invoking Activity Tool', ERROR, '', error=sys.exc_info()) except KeyboardInterrupt: pass -- 2.30.9