[Zodb-checkins] CVS: ZEO/ZEO/tests - Cache.py:1.8.4.1 CommitLockTests.py:1.2.4.1 ThreadTests.py:1.2.4.1 forker.py:1.16.4.1 testZEO.py:1.25.4.1

[Jeremy Hylton]

Update of /cvs-repository/ZEO/ZEO/tests
In directory cvs.zope.org:/tmp/cvs-serv13969/tests

Modified Files:
      Tag: ZODB4-ZEO-branch
	Cache.py CommitLockTests.py ThreadTests.py forker.py 
	testZEO.py 
Log Message:
Track API changes for ZODB4.



=== ZEO/ZEO/tests/Cache.py 1.8 => 1.8.4.1 ===
 ##############################################################################
 """Tests of the ZEO cache"""
 
-from ZODB.Transaction import Transaction
+from ZODB.ZTransaction import Transaction
 from ZODB.tests.MinPO import MinPO
 from ZODB.tests.StorageTestBase import zodb_unpickle
 


=== ZEO/ZEO/tests/CommitLockTests.py 1.2 => 1.2.4.1 ===
 
 import threading
 
-from ZODB.Transaction import Transaction
+from ZODB.ZTransaction import Transaction
 from ZODB.tests.StorageTestBase import zodb_pickle, MinPO
 
 import ZEO.ClientStorage


=== ZEO/ZEO/tests/ThreadTests.py 1.2 => 1.2.4.1 ===
 
 import threading
 
-from ZODB.Transaction import Transaction
+from ZODB.ZTransaction import Transaction
 from ZODB.tests.StorageTestBase import zodb_pickle, MinPO
 
 import ZEO.ClientStorage


=== ZEO/ZEO/tests/forker.py 1.16 => 1.16.4.1 ===
         rd, wr = os.pipe()
         pid = os.fork()
         if pid == 0:
-            import ZEO.zrpc.log
-            reload(ZEO.zrpc.log)
             try:
-                if PROFILE:
-                    p = hotshot.Profile("stats.s.%d" % os.getpid())
-                    p.runctx("run_server(storage, addr, rd, wr)",
-                             globals(), locals())
-                    p.close()
-                else:
-                    run_server(addr, rd, wr, storage_name, args)
-            except:
-                print "Exception in ZEO server process"
-                traceback.print_exc()
-            os._exit(0)
+                import ZEO.zrpc.log
+                reload(ZEO.zrpc.log)
+                try:
+                    if PROFILE:
+                        p = hotshot.Profile("stats.s.%d" % os.getpid())
+                        p.runctx("run_server(storage, addr, rd, wr)",
+                                 globals(), locals())
+                        p.close()
+                    else:
+                        run_server(addr, rd, wr, storage_name, args)
+                except:
+                    print "Exception in ZEO server process"
+                    traceback.print_exc()
+            finally:
+                os._exit(0)
         else:
             os.close(rd)
             return pid, ZEOClientExit(wr)


=== ZEO/ZEO/tests/testZEO.py 1.25 => 1.25.4.1 ===
 import ZEO.ClientStorage, ZEO.StorageServer
 import ThreadedAsync, ZEO.trigger
 from ZODB.FileStorage import FileStorage
-from ZODB.Transaction import Transaction
+from ZODB.ZTransaction import Transaction
 from ZODB.tests.StorageTestBase import zodb_pickle, MinPO
 import zLOG
 
@@ -88,7 +88,7 @@
         self._pids = [pid]
         self._servers = [exit]
         self._storage = PackWaitWrapper(client)
-        client.registerDB(DummyDB(), None)
+        client.registerDB(DummyDB())
 
     def tearDown(self):
         self.running = 0