[Neo-report] r2589 gregory - in /trunk/neo: ./ tests/storage/

[nobody at svn.erp5.org]

Author: gregory
Date: Wed Jan  5 18:52:08 2011
New Revision: 2589

Log:
Define MAX_TID to a different value than INVALID_TID.

And remove its definition from protocol as it's used only by tests.

Modified:
    trunk/neo/protocol.py
    trunk/neo/tests/storage/testReplication.py
    trunk/neo/tests/storage/testStorageDBTests.py

Modified: trunk/neo/protocol.py
==============================================================================
--- trunk/neo/protocol.py [iso-8859-1] (original)
+++ trunk/neo/protocol.py [iso-8859-1] Wed Jan  5 18:52:08 2011
@@ -113,7 +113,6 @@ ZERO_TID = '\0' * 8
 ZERO_OID = '\0' * 8
 OID_LEN = len(INVALID_OID)
 TID_LEN = len(INVALID_TID)
-MAX_TID = '\xff' * 8
 
 UUID_NAMESPACES = {
     NodeTypes.STORAGE: 'S',

Modified: trunk/neo/tests/storage/testReplication.py
==============================================================================
--- trunk/neo/tests/storage/testReplication.py [iso-8859-1] (original)
+++ trunk/neo/tests/storage/testReplication.py [iso-8859-1] Wed Jan  5 18:52:08 2011
@@ -30,6 +30,7 @@ from neo.protocol import ZERO_OID, ZERO_
 
 MAX_TRANSACTIONS = 10000
 MAX_OBJECTS = 100000
+MAX_TID = '\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFE' # != INVALID_TID
 
 class FakeConnection(object):
 
@@ -77,7 +78,7 @@ class ReplicationTests(NeoUnitTestBase):
         oapp.replicator = Replicator(oapp)
         oapp.replicator.getCurrentRID = lambda: 0
         oapp.replicator.isCurrentConnection = lambda c: True
-        oapp.replicator.getCurrentCriticalTID = lambda: '\xFF' * 8
+        oapp.replicator.getCurrentCriticalTID = lambda: MAX_TID
         # handlers and connections
         rhandler = StorageOperationHandler(rapp)
         rconn = FakeConnection()

Modified: trunk/neo/tests/storage/testStorageDBTests.py
==============================================================================
--- trunk/neo/tests/storage/testStorageDBTests.py [iso-8859-1] (original)
+++ trunk/neo/tests/storage/testStorageDBTests.py [iso-8859-1] Wed Jan  5 18:52:08 2011
@@ -18,11 +18,13 @@
 import unittest
 from mock import Mock
 from neo.util import dump, p64, u64
-from neo.protocol import CellStates, ZERO_OID, ZERO_TID, MAX_TID
+from neo.protocol import CellStates, ZERO_OID, ZERO_TID
 from neo.tests import NeoUnitTestBase
 from neo.exception import DatabaseFailure
 from neo.storage.database.mysqldb import MySQLDatabaseManager
 
+MAX_TID = '\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFE' # != INVALID_TID
+
 class StorageDBTests(NeoUnitTestBase):
 
     def setUp(self):