[Neo-report] r2175 vincent - in /trunk/neo/tests/functional: __init__.py testClient.py

[nobody at svn.erp5.org]

Author: vincent
Date: Thu Jun 17 17:57:58 2010
New Revision: 2175

Log:
Allow passing parameters via runWithTimeout.

Modified:
    trunk/neo/tests/functional/__init__.py
    trunk/neo/tests/functional/testClient.py

Modified: trunk/neo/tests/functional/__init__.py
==============================================================================
--- trunk/neo/tests/functional/__init__.py [iso-8859-1] (original)
+++ trunk/neo/tests/functional/__init__.py [iso-8859-1] Thu Jun 17 17:57:58 2010
@@ -526,8 +526,10 @@ class NEOFunctionalTest(unittest.TestCas
             os.makedirs(temp_dir)
         return temp_dir
 
-    def runWithTimeout(self, method, timeout):
-        thread = threading.Thread(None, method)
+    def runWithTimeout(self, timeout, method, args=(), kwargs=None):
+        if kwargs is None:
+            kwargs = {}
+        thread = threading.Thread(None, method, args=args, kwargs=kwargs)
         thread.setDaemon(True)
         thread.start()
         thread.join(timeout)

Modified: trunk/neo/tests/functional/testClient.py
==============================================================================
--- trunk/neo/tests/functional/testClient.py [iso-8859-1] (original)
+++ trunk/neo/tests/functional/testClient.py [iso-8859-1] Thu Jun 17 17:57:58 2010
@@ -252,7 +252,7 @@ class ClientTests(NEOFunctionalTest):
             st2.store(oid, rev, data, '', t2)
             # the vote will timeout as t1 never release the lock
             self.assertRaises(ConflictError, st2.tpc_vote, t2)
-        self.runWithTimeout(test, 40)
+        self.runWithTimeout(40, test)
 
     def testDelayedLocksCancelled(self):
         """
@@ -298,7 +298,7 @@ class ClientTests(NEOFunctionalTest):
             # the vote should not timeout
             st3.tpc_vote(t3)
             st3.tpc_finish(t3)
-        self.runWithTimeout(test, 10)
+        self.runWithTimeout(10, test)
 
 def test_suite():
     return unittest.makeSuite(ClientTests)