Commit 12d3ee0f authored by Jérome Perrin's avatar Jérome Perrin Committed by Kazuhiko Shiozaki

ProcessingNodeTestCase: Disable alarms for timerserver_thread loop

parent 7ae4f1e3
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import errno, logging, os, socket, time import errno, logging, mock, os, socket, time
import itertools import itertools
from threading import Thread from threading import Thread
from UserDict import IterableUserDict from UserDict import IterableUserDict
...@@ -396,20 +396,28 @@ class ProcessingNodeTestCase(ZopeTestCase.TestCase): ...@@ -396,20 +396,28 @@ class ProcessingNodeTestCase(ZopeTestCase.TestCase):
""" """
import Products.TimerService import Products.TimerService
timerserver_thread = None # AlarmTool uses alarmNode='' as a way to bootstrap an alarm node, but
try: # during these tests we don't want the first node to start executing
while not Lifetime._shutdown_phase: # alarms directly, because this usually cause conflicts when other
time.sleep(.3) # nodes register.
transaction.begin() with mock.patch(
try: 'Products.ERP5.Tool.AlarmTool.AlarmTool.getAlarmNode',
self.portal = self.app[self.app.test_portal_name] return_value='bootstrap_disabled_in_test'):
except (AttributeError, KeyError):
continue timerserver_thread = None
self._setUpDummyMailHost() try:
if not timerserver_thread: while not Lifetime._shutdown_phase:
timerserver_thread = Products.TimerService.timerserver.TimerServer.TimerServer( time.sleep(.3)
module='Zope2', transaction.begin()
interval=0.1, try:
) self.portal = self.app[self.app.test_portal_name]
except KeyboardInterrupt: except (AttributeError, KeyError):
pass continue
self._setUpDummyMailHost()
if not timerserver_thread:
timerserver_thread = Products.TimerService.timerserver.TimerServer.TimerServer(
module='Zope2',
interval=0.1,
)
except KeyboardInterrupt:
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