[Neo-report] r2326 gregory - in /trunk/neo: master/ tests/master/

[nobody at svn.erp5.org]

Author: gregory
Date: Fri Oct  1 16:12:39 2010
New Revision: 2326

Log:
Raise when an inconsistency is found between storages during verification.

Modified:
    trunk/neo/master/verification.py
    trunk/neo/tests/master/testVerification.py

Modified: trunk/neo/master/verification.py
==============================================================================
--- trunk/neo/master/verification.py [iso-8859-1] (original)
+++ trunk/neo/master/verification.py [iso-8859-1] Fri Oct  1 16:12:39 2010
@@ -216,7 +216,8 @@ class VerificationManager(BaseServiceHan
             # This is the first answer.
             self._oid_set.update(oid_set)
         elif self._oid_set != oid_set:
-            self._oid_set = None
+            raise ValueError, "Inconsistent transaction %s" % \
+                (dump(tid, ))
 
     def tidNotFound(self, conn, message):
         uuid = conn.getUUID()

Modified: trunk/neo/tests/master/testVerification.py
==============================================================================
--- trunk/neo/tests/master/testVerification.py [iso-8859-1] (original)
+++ trunk/neo/tests/master/testVerification.py [iso-8859-1] Fri Oct  1 16:12:39 2010
@@ -174,9 +174,8 @@ class MasterVerificationTests(NeoTestBas
         self.verification._uuid_set.add(uuid)
         self.assertEquals(len(self.verification._oid_set), 1)
         new_oid = self.getOID(2)
-        verification.answerTransactionInformation(conn, new_tid,
-                "user", "desc", "ext", False, [new_oid,])
-        self.assertEquals(self.verification._oid_set, None)
+        self.assertRaises(ValueError, verification.answerTransactionInformation,
+                conn, new_tid, "user", "desc", "ext", False, [new_oid,])
 
     def test_13_tidNotFound(self):
         verification = self.verification