[Zodb-checkins] SVN: ZODB/trunk/s Split ZEO into separate project

jim cvs-admin at zope.org
Sun Oct 14 20:03:14 UTC 2012


Log message for revision 128005:
  Split ZEO into separate project

Changed:
  U   ZODB/trunk/setup.py
  D   ZODB/trunk/src/ZEO/
  U   ZODB/trunk/src/ZODB/tests/testConfig.py

-=-
Modified: ZODB/trunk/setup.py
===================================================================
--- ZODB/trunk/setup.py	2012-10-14 19:51:52 UTC (rev 128004)
+++ ZODB/trunk/setup.py	2012-10-14 20:03:11 UTC (rev 128005)
@@ -20,7 +20,7 @@
 interface, rich transaction support, and undo.
 """
 
-VERSION = "3.11dev"
+VERSION = "4.0.0dev"
 
 from ez_setup import use_setuptools
 use_setuptools()

Modified: ZODB/trunk/src/ZODB/tests/testConfig.py
===================================================================
--- ZODB/trunk/src/ZODB/tests/testConfig.py	2012-10-14 19:51:52 UTC (rev 128004)
+++ ZODB/trunk/src/ZODB/tests/testConfig.py	2012-10-14 20:03:11 UTC (rev 128005)
@@ -96,45 +96,6 @@
         self._test(cfg)
 
 
-class ZEOConfigTest(ConfigTestBase):
-    def test_zeo_config(self):
-        # We're looking for a port that doesn't exist so a
-        # connection attempt will fail.  Instead of elaborate
-        # logic to loop over a port calculation, we'll just pick a
-        # simple "random", likely to not-exist port number and add
-        # an elaborate comment explaining this instead.  Go ahead,
-        # grep for 9.
-        from ZEO.ClientStorage import ClientDisconnected
-        import ZConfig
-        from ZODB.config import getDbSchema
-        from StringIO import StringIO
-        cfg = """
-        <zodb>
-          <zeoclient>
-            server localhost:56897
-            wait false
-          </zeoclient>
-        </zodb>
-        """
-        config, handle = ZConfig.loadConfigFile(getDbSchema(), StringIO(cfg))
-        self.assertEqual(config.database[0].config.storage.config.blob_dir,
-                         None)
-        self.assertRaises(ClientDisconnected, self._test, cfg)
-
-        cfg = """
-        <zodb>
-          <zeoclient>
-            blob-dir blobs
-            server localhost:56897
-            wait false
-          </zeoclient>
-        </zodb>
-        """
-        config, handle = ZConfig.loadConfigFile(getDbSchema(), StringIO(cfg))
-        self.assertEqual(config.database[0].config.storage.config.blob_dir,
-                         'blobs')
-        self.assertRaises(ClientDisconnected, self._test, cfg)
-
 def database_xrefs_config():
     r"""
     >>> db = ZODB.config.databaseFromString(
@@ -227,7 +188,6 @@
     suite.addTest(doctest.DocTestSuite(
         setUp=ZODB.tests.util.setUp, tearDown=ZODB.tests.util.tearDown))
     suite.addTest(unittest.makeSuite(ZODBConfigTest))
-    suite.addTest(unittest.makeSuite(ZEOConfigTest))
     return suite
 
 



More information about the Zodb-checkins mailing list