[Zope-Checkins] CVS: Zope/lib/python/ZEO/tests - CommitLockTests.py:1.16 auth_plaintext.py:1.5 multi.py:1.11 speed.py:1.10 testMonitor.py:1.8 testZEO.py:1.76

[Jim Fulton]

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

Modified Files:
	CommitLockTests.py auth_plaintext.py multi.py speed.py 
	testMonitor.py testZEO.py 
Log Message:
Merged Jeremy and Tim's changes from the zodb33-devel-branch.


=== Zope/lib/python/ZEO/tests/CommitLockTests.py 1.15 => 1.16 ===
--- Zope/lib/python/ZEO/tests/CommitLockTests.py:1.15	Thu Oct  2 14:17:21 2003
+++ Zope/lib/python/ZEO/tests/CommitLockTests.py	Fri Nov 28 11:44:48 2003
@@ -17,7 +17,7 @@
 import time
 
 from ZODB.Transaction import Transaction
-from ZODB.TimeStamp import TimeStamp
+from persistent.TimeStamp import TimeStamp
 from ZODB.tests.StorageTestBase import zodb_pickle, MinPO
 
 import ZEO.ClientStorage


=== Zope/lib/python/ZEO/tests/auth_plaintext.py 1.4 => 1.5 ===
--- Zope/lib/python/ZEO/tests/auth_plaintext.py:1.4	Thu Oct  2 18:14:03 2003
+++ Zope/lib/python/ZEO/tests/auth_plaintext.py	Fri Nov 28 11:44:48 2003
@@ -29,6 +29,7 @@
     return sha.new("%s:%s:%s" % (username, realm, password)).hexdigest()
 
 class StorageClass(ZEOStorage):
+    
     def auth(self, username, password):
         try:
             dbpw = self.database.get_password(username)
@@ -41,7 +42,6 @@
                                                       self.database.realm,
                                                       password))
         return self.finish_auth(dbpw == password_dig)
-
 
 class PlaintextClient(Client):
     extensions = ["auth"]


=== Zope/lib/python/ZEO/tests/multi.py 1.10 => 1.11 ===
--- Zope/lib/python/ZEO/tests/multi.py:1.10	Thu Sep 26 11:23:08 2002
+++ Zope/lib/python/ZEO/tests/multi.py	Fri Nov 28 11:44:48 2003
@@ -15,8 +15,8 @@
 # XXX This code is currently broken.
 
 import ZODB, ZODB.DB, ZODB.FileStorage, ZODB.POSException
-import Persistence
-import PersistentMapping
+import persistent
+import persistent.mapping
 from ZEO.tests import forker
 
 import asyncore
@@ -32,7 +32,7 @@
 CONNECT_DELAY = 0.1
 CLIENT_CACHE = '' # use temporary cache
 
-class Record(Persistence.Persistent):
+class Record(persistent.Persistent):
     def __init__(self, client=None, value=None):
         self.client = client
         self.value = None
@@ -41,7 +41,7 @@
     def set_next(self, next):
         self.next = next
 
-class Stats(Persistence.Persistent):
+class Stats(persistent.Persistent):
     def __init__(self):
         self.begin = time.time()
         self.end = None
@@ -57,7 +57,7 @@
 
     db = ZODB.DB(fs)
     root = db.open().root()
-    root["multi"] = PersistentMapping.PersistentMapping()
+    root["multi"] = persistent.mapping.PersistentMapping()
     get_transaction().commit()
 
     return fs


=== Zope/lib/python/ZEO/tests/speed.py 1.9 => 1.10 ===
--- Zope/lib/python/ZEO/tests/speed.py:1.9	Thu Sep  5 15:28:07 2002
+++ Zope/lib/python/ZEO/tests/speed.py	Fri Nov 28 11:44:48 2003
@@ -46,12 +46,12 @@
 ##sys.path.insert(0, os.getcwd())
 
 import ZODB, ZODB.FileStorage
-import Persistence
+import persistent
 import ZEO.ClientStorage, ZEO.StorageServer
 from ZEO.tests import forker
 from ZODB.POSException import ConflictError
 
-class P(Persistence.Persistent):
+class P(persistent.Persistent):
     pass
 
 fs_name = "zeo-speed.fs"


=== Zope/lib/python/ZEO/tests/testMonitor.py 1.7 => 1.8 ===


=== Zope/lib/python/ZEO/tests/testZEO.py 1.75 => 1.76 ===
--- Zope/lib/python/ZEO/tests/testZEO.py:1.75	Thu Oct  2 14:17:21 2003
+++ Zope/lib/python/ZEO/tests/testZEO.py	Fri Nov 28 11:44:48 2003
@@ -262,10 +262,6 @@
 
 
 def test_suite():
-    # shutup warnings about mktemp
-    import warnings
-    warnings.filterwarnings("ignore", "mktemp")
-
     suite = unittest.TestSuite()
     for klass in test_classes:
         sub = unittest.makeSuite(klass, "check")