Commit a49dad05 authored by Vincent Pelletier's avatar Vincent Pelletier

Fix thread leak in client test.

git-svn-id: https://svn.erp5.org/repos/neo/trunk@2400 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent d3154a9d
...@@ -68,8 +68,12 @@ class ClientApplicationTests(NeoUnitTestBase): ...@@ -68,8 +68,12 @@ class ClientApplicationTests(NeoUnitTestBase):
Application._getMasterConnection = _getMasterConnection Application._getMasterConnection = _getMasterConnection
Application._waitMessage = _waitMessage Application._waitMessage = _waitMessage
Application._getPartitionTable = _getPartitionTable Application._getPartitionTable = _getPartitionTable
self._to_stop_list = []
def tearDown(self): def tearDown(self):
# stop threads
for app in self._to_stop_list:
app.close()
# restore environnement # restore environnement
Application._getMasterConnection = self._getMasterConnection Application._getMasterConnection = self._getMasterConnection
Application._waitMessage = self._waitMessage Application._waitMessage = self._waitMessage
...@@ -92,6 +96,7 @@ class ClientApplicationTests(NeoUnitTestBase): ...@@ -92,6 +96,7 @@ class ClientApplicationTests(NeoUnitTestBase):
def getApp(self, master_nodes='127.0.0.1:10010', name='test', def getApp(self, master_nodes='127.0.0.1:10010', name='test',
connector='SocketConnector', **kw): connector='SocketConnector', **kw):
app = Application(master_nodes, name, connector, **kw) app = Application(master_nodes, name, connector, **kw)
self._to_stop_list.append(app)
app.dispatcher = Mock({ }) app.dispatcher = Mock({ })
return app return app
...@@ -1091,7 +1096,7 @@ class ClientApplicationTests(NeoUnitTestBase): ...@@ -1091,7 +1096,7 @@ class ClientApplicationTests(NeoUnitTestBase):
app._waitMessage = _waitMessage1 app._waitMessage = _waitMessage1
# faked environnement # faked environnement
app.connector_handler = DoNothingConnector app.connector_handler = DoNothingConnector
app.em = Mock({}) app.em = Mock({'getConnectionList': []})
app.pt = Mock({ 'operational': False}) app.pt = Mock({ 'operational': False})
app.master_conn = app._connectToPrimaryNode() app.master_conn = app._connectToPrimaryNode()
self.assertEqual(len(all_passed), 1) self.assertEqual(len(all_passed), 1)
......
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