Commit 90684739 authored by Jérome Perrin's avatar Jérome Perrin

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)]
parent 8473e65c
...@@ -273,9 +273,10 @@ class ProcessingNodeTestCase(ZopeTestCase.TestCase): ...@@ -273,9 +273,10 @@ class ProcessingNodeTestCase(ZopeTestCase.TestCase):
portal = self.app[self.app.test_portal_name] portal = self.app[self.app.test_portal_name]
except (AttributeError, KeyError): except (AttributeError, KeyError):
continue continue
try: if portal.portal_activities.isSubscribed():
portal.portal_activities.process_timer(None, None) try:
except Exception: portal.portal_activities.process_timer(None, None)
LOG('Invoking Activity Tool', ERROR, '', error=sys.exc_info()) except Exception:
LOG('Invoking Activity Tool', ERROR, '', error=sys.exc_info())
except KeyboardInterrupt: except KeyboardInterrupt:
pass pass
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