[Zope-Checkins] CVS: Zope/lib/python/Products/Transience/tests - fauxtime.py:1.2.6.1 testTransientObjectContainer.py:1.11.6.1

Chris McDonough chrism@zope.com
Thu, 30 Jan 2003 20:34:39 -0500


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

Modified Files:
      Tag: Zope-2_6-branch
	fauxtime.py testTransientObjectContainer.py 
Log Message:
Commit new supercharged fauxtime and change TOC tests to deal with
speed difference.


=== Zope/lib/python/Products/Transience/tests/fauxtime.py 1.2 => 1.2.6.1 ===
--- Zope/lib/python/Products/Transience/tests/fauxtime.py:1.2	Wed Aug 14 18:25:14 2002
+++ Zope/lib/python/Products/Transience/tests/fauxtime.py	Thu Jan 30 20:34:36 2003
@@ -3,9 +3,9 @@
 epoch = origtime.time()
 
 def time():
-    """ False timer -- returns time 10 x faster than normal time """
-    return (origtime.time() - epoch) * 10.0
+    """ False timer -- returns time 60 x faster than normal time """
+    return (origtime.time() - epoch) * 60.0
 
 def sleep(duration):
-    """ False sleep -- sleep for 1/10 the time specifed """
-    origtime.sleep(duration / 10.0)
+    """ False sleep -- sleep for 1/60 the time specifed """
+    origtime.sleep(duration / 60.0)


=== Zope/lib/python/Products/Transience/tests/testTransientObjectContainer.py 1.11 => 1.11.6.1 ===
--- Zope/lib/python/Products/Transience/tests/testTransientObjectContainer.py:1.11	Wed Aug 14 18:25:14 2002
+++ Zope/lib/python/Products/Transience/tests/testTransientObjectContainer.py	Thu Jan 30 20:34:36 2003
@@ -222,10 +222,9 @@
         r = range(10, 1010)
         for x in r:
             self.t[x] = 1
-        assert lsubtract(self.t.keys(), r) == []
-        for x in r:
-            del self.t[x]
-        assert lsubtract(self.t.keys(), []) == [], self.t.keys()
+        assert list(self.t.keys()) == r, (self.t.keys(), r)
+        map(self.t.__delitem__, r)
+        assert list(self.t.keys()) == [], self.t.keys()
 
     def testPathologicalLeftBranching(self):
         r = range(10, 1010)
@@ -233,10 +232,9 @@
         revr.reverse()
         for x in revr:
             self.t[x] = 1
-        assert lsubtract(self.t.keys(),r) == []
-        for x in revr:
-            del self.t[x]
-        assert lsubtract(self.t.keys(),[]) == [], self.t.keys()
+        assert list(self.t.keys()) == r, (self.t.keys(), r)
+        map(self.t.__delitem__, revr)
+        assert list(self.t.keys()) == [], self.t.keys()
 
     def donttestSuccessorChildParentRewriteExerciseCase(self):
         add_order = [