[Zodb-checkins] CVS: ZEO/ZEO/tests - testZEO.py:1.16.4.6

[Jeremy Hylton]

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

Modified Files:
      Tag: Standby-branch
	testZEO.py 
Log Message:
Don't call StorageTestBase setUp() or tearDown().


=== ZEO/ZEO/tests/testZEO.py 1.16.4.5 => 1.16.4.6 ===
     """
 
-    __super_setUp = StorageTestBase.StorageTestBase.setUp
-    __super_tearDown = StorageTestBase.StorageTestBase.tearDown
-
     def setUp(self):
-        self.__super_setUp()
         zLOG.LOG("testZEO", zLOG.BLATHER, "setUp() new test")
         self.running = 1
         client, exit, pid = forker.start_zeo(self.getStorage())
@@ -97,7 +93,6 @@
         for pid in self._pids:
             os.waitpid(pid, 0)
         self.delStorage()
-        self.__super_tearDown()
 
     def checkLargeUpdate(self):
         obj = MinPO("X" * (10 * 128 * 1024))
@@ -139,11 +134,8 @@
     can't be created in the parent process and passed to the child.
     All the work has to be done in the server's process.
     """
-    __super_setUp = StorageTestBase.StorageTestBase.setUp
-    __super_tearDown = StorageTestBase.StorageTestBase.tearDown
     
     def setUp(self):
-        self.__super_setUp()
         args = self.getStorageInfo()
         name = args[0]
         args = args[1:]
@@ -162,7 +154,6 @@
         # the connection should cause the storage server to die
         time.sleep(0.5)
         self.delStorage()
-        self.__super_tearDown()
 
 class WindowsZEOFileStorageTests(WindowsGenericTests):
 
@@ -328,7 +319,6 @@
             # inherit from POSException. 
 
 class UnixConnectionTests(ConnectionTests):
-    __super_setUp = StorageTestBase.StorageTestBase.setUp
 
     def setUp(self):
         """Start a ZEO server using a Unix domain socket
@@ -343,7 +333,6 @@
         self._servers = []
         self._newAddr()
         self._startServer()
-        self.__super_setUp()
 
     def _newAddr(self):
         self.addr.append(self._getAddr())
@@ -378,14 +367,12 @@
                 pass
 
 class WindowsConnectionTests(ConnectionTests):
-    __super_setUp = StorageTestBase.StorageTestBase.setUp
 
     # XXX these tests are now out-of-date
 
     def setUp(self):
         self.file = tempfile.mktemp()
         self._startServer()
-        self.__super_setUp()
 
     def _startServer(self, create=1):
         if create == 0:
@@ -418,7 +405,7 @@
 
     def tearDown(self):
         self.shutdownServer()
-
+        self._storage.close()
 
 def get_methods(klass):
     l = [klass]