[Zodb-checkins] CVS: Zope/lib/python/ZEO/tests - InvalidationTests.py:1.4.4.6

[Jeremy Hylton]

Update of /cvs-repository/Zope/lib/python/ZEO/tests
In directory cvs.zope.org:/tmp/cvs-serv25618

Modified Files:
      Tag: Zope-2_7-branch
	InvalidationTests.py 
Log Message:
Backout previous checkins: The potential fixes did more harm than good.

For some reason, the independent databases, which use the same ZEO
server, never got in sync.


=== Zope/lib/python/ZEO/tests/InvalidationTests.py 1.4.4.5 => 1.4.4.6 ===
--- Zope/lib/python/ZEO/tests/InvalidationTests.py:1.4.4.5	Mon Mar 22 12:09:08 2004
+++ Zope/lib/python/ZEO/tests/InvalidationTests.py	Mon Mar 22 12:15:34 2004
@@ -409,10 +409,6 @@
         t2 = self.StressThread(self, db2, stop, 2, cd, 2)
         self.go(stop, cd, t1, t2)
 
-        # XXX THese two never seem to get in sync.
-##        while storage1.lastTransaction() != storage2.lastTransaction():
-##            db1._storage.sync()
-##            db2._storage.sync()
         db1._storage.sync()
         db2._storage.sync()
 
@@ -451,9 +447,8 @@
 
     def checkConcurrentUpdates2StoragesMT(self):
         self._storage = storage1 = self.openClientStorage()
-        storage2 = self.openClientStorage()
         db1 = DB(storage1)
-        db2 = DB(storage2)
+        db2 = DB(self.openClientStorage())
         stop = threading.Event()
 
         cn = db1.open()
@@ -472,12 +467,9 @@
         t3 = self.StressThread(self, db2, stop, 3, cd, 3, 3, 0.01)
         self.go(stop, cd, t1, t2, t3)
 
-        # XXX THese two never seem to get in sync.
-##        while storage1.lastTransaction() != storage2.lastTransaction():
-##            db1._storage.sync()
-##            db2._storage.sync()
         db1._storage.sync()
         db2._storage.sync()
+
         cn = db1.open()
         tree = cn.root()["tree"]
         self._check_tree(cn, tree)
@@ -489,9 +481,8 @@
 
     def checkConcurrentUpdatesInVersions(self):
         self._storage = storage1 = self.openClientStorage()
-        storage2 = self.openClientStorage()
         db1 = DB(storage1)
-        db2 = DB(storage2)
+        db2 = DB(self.openClientStorage())
         stop = threading.Event()
 
         cn = db1.open()
@@ -510,9 +501,8 @@
         t3 = VersionStressThread(self, db2, stop, 3, cd, 3, 3, 0.01)
         self.go(stop, cd, t1, t2, t3)
 
-        while storage1.lastTransaction() != storage2.lastTransaction():
-            db1._storage.sync()
-            db2._storage.sync()
+        db1._storage.sync()
+        db2._storage.sync()
 
         cn = db1.open()
         tree = cn.root()["tree"]
@@ -526,9 +516,8 @@
     def checkConcurrentLargeUpdates(self):
         # Use 3 threads like the 2StorageMT test above.
         self._storage = storage1 = self.openClientStorage()
-        storage2 = self.openClientStorage()
         db1 = DB(storage1)
-        db2 = DB(storage2)
+        db2 = DB(self.openClientStorage())
         stop = threading.Event()
 
         cn = db1.open()
@@ -549,13 +538,9 @@
         t3 = LargeUpdatesThread(self, db2, stop, 3, cd, 3, 3, 0.01)
         self.go(stop, cd, t1, t2, t3)
 
-        # XXX THese two never seem to get in sync.
-##        while storage1.lastTransaction() != storage2.lastTransaction():
-##            db1._storage.sync()
-##            db2._storage.sync()
         db1._storage.sync()
         db2._storage.sync()
- 
+
         cn = db1.open()
         tree = cn.root()["tree"]
         self._check_tree(cn, tree)