[Zope-Checkins] CVS: Releases/Zope/lib/python/Products/Transience/tests - testTimeoutRelated.py:1.3

Matthew T. Kromer matt@zope.com
Thu, 15 Nov 2001 11:29:59 -0500


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

Modified Files:
	testTimeoutRelated.py 
Log Message:
Remove "import Zope" and replace with some slightly less evil stuff


=== Releases/Zope/lib/python/Products/Transience/tests/testTimeoutRelated.py 1.2 => 1.3 ===
 from DateTime import DateTime
 from unittest import TestCase, TestSuite, TextTestRunner, makeSuite
+from ZODB.DemoStorage import DemoStorage
+from OFS.Application import Application
 import time, threading, whrandom
 
 epoch = time.time()
+stuff = {}
+
+def _getApp():
+
+    app = stuff.get('app', None)
+    if not app:
+        ds = DemoStorage(quota=(1<<20))
+        db = ZODB.DB(ds)
+        conn = db.open()
+        root = conn.root()
+        app = Application()
+        root['Application']= app
+        get_transaction().commit()
+        stuff['app'] = app
+        stuff['conn'] = conn
+        stuff['db'] = db
+    return app
+
+def _openApp():
+    conn = stuff['db'].open()
+    root = conn.root()
+    app = root['Application']
+    return conn, app
+
+def _delApp():
+    get_transaction().abort()
+    stuff['conn'].close()
+    del stuff['conn']
+    del stuff['app']
+    del stuff['db']
+
 
 class TestBase(TestCase):
     def setUp(self):
-        import Zope
 
         Products.Transience.Transience.time = fauxtime
 
-        self.app = makerequest.makerequest(Zope.app())
-
-        del Zope
+        self.app = makerequest.makerequest(_getApp())
 
         timeout = self.timeout = 1
 
@@ -41,8 +71,9 @@
 
     def tearDown(self):
         get_transaction().abort()
-        self.app._p_jar.close()
-        self.app = None
+        #self.app._p_jar.close()
+        #self.app = None
+        _delApp()
         del self.app
 
 class TestLastAccessed(TestBase):