[Neo-report] r2251 vincent - in /trunk/neo: client/ client/handlers/ tests/client/

[nobody at svn.erp5.org]

Author: vincent
Date: Sat Aug 28 09:38:44 2010
New Revision: 2251

Log:
Replace error code with exception for tidNotFound.

Modified:
    trunk/neo/client/app.py
    trunk/neo/client/handlers/storage.py
    trunk/neo/tests/client/testStorageHandler.py

Modified: trunk/neo/client/app.py
==============================================================================
--- trunk/neo/client/app.py [iso-8859-1] (original)
+++ trunk/neo/client/app.py [iso-8859-1] Sat Aug 28 09:38:44 2010
@@ -1053,8 +1053,7 @@ class Application(object):
                             Packets.AskTransactionInformation(serial))
                 except ConnectionClosed:
                     continue
-
-                if self.local_var.txn_info == -1:
+                except NEOStorageNotFoundError:
                     # TID not found
                     continue
                 if isinstance(self.local_var.txn_info, dict):

Modified: trunk/neo/client/handlers/storage.py
==============================================================================
--- trunk/neo/client/handlers/storage.py [iso-8859-1] (original)
+++ trunk/neo/client/handlers/storage.py [iso-8859-1] Sat Aug 28 09:38:44 2010
@@ -118,7 +118,7 @@ class StorageAnswersHandler(AnswerBaseHa
 
     def tidNotFound(self, conn, message):
         # This can happen when requiring txn informations
-        self.app.local_var.txn_info = -1
+        raise NEOStorageNotFoundError(message)
 
     def answerTIDs(self, conn, tid_list):
         self.app.local_var.node_tids[conn.getUUID()] = tid_list

Modified: trunk/neo/tests/client/testStorageHandler.py
==============================================================================
--- trunk/neo/tests/client/testStorageHandler.py [iso-8859-1] (original)
+++ trunk/neo/tests/client/testStorageHandler.py [iso-8859-1] Sat Aug 28 09:38:44 2010
@@ -220,8 +220,8 @@ class StorageAnswerHandlerTests(NeoTestB
         
     def test_tidNotFound(self):
         conn = self.getConnection()
-        self.handler.tidNotFound(conn, 'message')
-        self.assertEqual(self.app.local_var.txn_info, -1)
+        self.assertRaises(NEOStorageNotFoundError, self.handler.tidNotFound,
+            conn, 'message')
 
     def test_answerTIDs(self):
         uuid = self.getNewUUID()