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

Jeremy Hylton jeremy@zope.com
Tue, 15 Jan 2002 10:22:22 -0500


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

Modified Files:
      Tag: ZEO-ZRPC-Dev
	testZEO.py 
Log Message:
Fix missing storage in ZEO tests.

The StandbyTestBase was changed to set self._storage = None to
initialize it.  But the GenericTests in testZEO initialized
self._storage and then called StandbyTestBase setUp().  Fixed by
calling superclass setUp() first.

Also, remove some doc strings and re-enable all the
ZEOFileStorageTests.


=== StandaloneZODB/ZEO/tests/testZEO.py 1.1.2.18 => 1.1.2.19 ===
 
     def setUp(self):
-        """Start a ZEO server using a Unix domain socket
-
-        The ZEO server uses the storage object returned by the
-        getStorage() method.
-        """
+        self.__super_setUp()
         self.running = 1
         client, exit, pid = forker.start_zeo(self.getStorage())
         self._pids = [pid]
         self._servers = [exit]
         self._storage = PackWaitWrapper(client)
         client.registerDB(DummyDB(), None)
-        self.__super_setUp()
 
     def tearDown(self):
-        """Try to cause the tests to halt"""
         self.running = 0
         self._storage.close()
         for server in self._servers:
@@ -510,8 +504,8 @@
     return meth.keys()
 
 if os.name == "posix":
-##    test_classes = ZEOFileStorageTests, UnixConnectionTests
-    test_classes = UnixConnectionTests,
+    test_classes = ZEOFileStorageTests, UnixConnectionTests
+##    test_classes = UnixConnectionTests,
 elif os.name == "nt":
     test_classes = WindowsZEOFileStorageTests, WindowsConnectionTests
 else: