[Zope-Checkins] CVS: Zope/lib/python/Products/Transience/tests - testTimeoutRelated.py:1.11.38.1 testTransientObject.py:1.8.106.1 testTransientObjectContainer.py:1.14.38.1

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/Products/Transience/tests
In directory cvs.zope.org:/tmp/cvs-serv15188/tests

Modified Files:
      Tag: chrism-sessiongeddon
	testTimeoutRelated.py testTransientObject.py 
	testTransientObjectContainer.py 
Log Message:
New Transience implementation.  This might even hold up under load.


=== Zope/lib/python/Products/Transience/tests/testTimeoutRelated.py 1.11 => 1.11.38.1 ===
--- Zope/lib/python/Products/Transience/tests/testTimeoutRelated.py:1.11	Tue Jun 17 21:01:11 2003
+++ Zope/lib/python/Products/Transience/tests/testTimeoutRelated.py	Sun Feb 29 03:42:49 2004
@@ -58,6 +58,7 @@
     def setUp(self):
         Products.Transience.Transience.time = fauxtime
         Products.Transience.TransientObject.time = fauxtime
+        Products.Transience.Transience.setStrict(1)
         self.app = makerequest.makerequest(_getApp())
         timeout = self.timeout = 1
         sm=TransientObjectContainer(
@@ -72,6 +73,7 @@
         del self.app
         Products.Transience.Transience.time = oldtime
         Products.Transience.TransientObject.time = oldtime
+        Products.Transience.Transience.setStrict(0)
 
 class TestLastAccessed(TestBase):
     def testLastAccessed(self):
@@ -97,6 +99,7 @@
 class TestNotifications(TestBase):
     def testAddNotification(self):
         self.app.sm.setAddNotificationTarget(addNotificationTarget)
+        #import pdb; pdb.set_trace()
         sdo = self.app.sm.new_or_existing('TempObject')
         now = fauxtime.time()
         k = sdo.get('starttime')
@@ -110,8 +113,7 @@
         fauxtime.sleep(timeout + (timeout * .75))
         sdo1 = self.app.sm.get('TempObject')
         # force the sdm to do housekeeping
-        self.app.sm._housekeep(self.app.sm._deindex_next() -
-                                   self.app.sm._period)
+        self.app.sm._gc()
         now = fauxtime.time()
         k = sdo.get('endtime')
         assert (type(k) == type(now)), type(k)


=== Zope/lib/python/Products/Transience/tests/testTransientObject.py 1.8 => 1.8.106.1 ===
--- Zope/lib/python/Products/Transience/tests/testTransientObject.py:1.8	Wed Aug 14 18:25:14 2002
+++ Zope/lib/python/Products/Transience/tests/testTransientObject.py	Sun Feb 29 03:42:49 2004
@@ -25,6 +25,7 @@
     def setUp(self):
         Products.Transience.Transience.time = fauxtime
         Products.Transience.TransientObject.time = fauxtime
+        Products.Transience.Transience.setStrict(1)
         self.errmargin = .20
         self.timeout = 60
         self.t = TransientObjectContainer('sdc', timeout_mins=self.timeout/60)
@@ -32,6 +33,7 @@
     def tearDown(self):
         Products.Transience.Transience.time = oldtime
         Products.Transience.TransientObject.time = oldtime
+        Products.Transience.Transience.setStrict(0)
         self.t = None
         del self.t
 


=== Zope/lib/python/Products/Transience/tests/testTransientObjectContainer.py 1.14 => 1.14.38.1 ===
--- Zope/lib/python/Products/Transience/tests/testTransientObjectContainer.py:1.14	Thu May 15 11:21:53 2003
+++ Zope/lib/python/Products/Transience/tests/testTransientObjectContainer.py	Sun Feb 29 03:42:49 2004
@@ -30,6 +30,7 @@
     def setUp(self):
         Products.Transience.Transience.time = fauxtime
         Products.Transience.TransientObject.time = fauxtime
+        Products.Transience.Transience.setStrict(1)
         self.errmargin = .20
         self.timeout = 60
         self.t = TransientObjectContainer('sdc', timeout_mins=self.timeout/60)
@@ -38,6 +39,7 @@
         self.t = None
         Products.Transience.Transience.time = oldtime
         Products.Transience.TransientObject.time = oldtime
+        Products.Transience.Transience.setStrict(0)
 
 class TestTransientObjectContainer(TestBase):
     def testGetItemFails(self):
@@ -208,14 +210,28 @@
 
     def testTargetedDeletes(self):
         r = range(10, 1010)
+        seen = {}
         for x in r:
             k = random.choice(r)
+            vals = seen.setdefault(k, [])
+            vals.append(x)
             self.t[k] = x
+        couldntdelete = {}
+        weird = []
+        results = {}
         for x in r:
             try:
-                del self.t[x]
-            except KeyError:
-                pass
+                ts, item = self.t.__delitem__(x)
+                results[x] = ts, item
+            except KeyError, v:
+                if v.args[0] != x:
+                    weird.append(x)
+                couldntdelete[x] = v.args[0]
+##         if self.t.keys() != []:
+##             data = self.t._data
+##             import pdb; pdb.set_trace()
+##             while 1:
+##                 pass
         assert self.t.keys() == [], `self.t.keys()`
 
     def testPathologicalRightBranching(self):
@@ -236,7 +252,7 @@
         map(self.t.__delitem__, revr)
         assert list(self.t.keys()) == [], self.t.keys()
 
-    def donttestSuccessorChildParentRewriteExerciseCase(self):
+    def testSuccessorChildParentRewriteExerciseCase(self):
         add_order = [
             85, 73, 165, 273, 215, 142, 233, 67, 86, 166, 235, 225, 255,
             73, 175, 171, 285, 162, 108, 28, 283, 258, 232, 199, 260,