[Checkins] SVN: zope.app.server/trunk/ Moved a doctest into a unittest to prevent importing zope.server stuff when the

[Christophe Combelles]

Log message for revision 89850:
  Moved a doctest into a unittest to prevent importing zope.server stuff when the
  testrunner find_test. Otherwise the ZEO tests close a socket that will be used
  in zope.server tests.
  

Changed:
  U   zope.app.server/trunk/CHANGES.txt
  U   zope.app.server/trunk/setup.py
  U   zope.app.server/trunk/src/zope/app/server/ftp.py
  U   zope.app.server/trunk/src/zope/app/server/tests/test_ftp.py

-=-
Modified: zope.app.server/trunk/CHANGES.txt
===================================================================
--- zope.app.server/trunk/CHANGES.txt	2008-08-14 23:59:30 UTC (rev 89849)
+++ zope.app.server/trunk/CHANGES.txt	2008-08-15 00:04:15 UTC (rev 89850)
@@ -2,10 +2,11 @@
 CHANGES
 =======
 
-3.5.0dev (unreleased)
----------------------
+3.4.2 (unreleased)
+------------------
 
-- ...
+- Moved a doctest into a unittest to fix failures in the KGS test suite
+  (see LP #257954)
 
 3.4.1 (2008-02-25)
 ------------------

Modified: zope.app.server/trunk/setup.py
===================================================================
--- zope.app.server/trunk/setup.py	2008-08-14 23:59:30 UTC (rev 89849)
+++ zope.app.server/trunk/setup.py	2008-08-15 00:04:15 UTC (rev 89850)
@@ -22,10 +22,10 @@
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name='zope.app.server',
-      version = '3.5.0dev',
+      version = '3.4.2dev',
       author='Zope Corporation and Contributors',
-      author_email='zope3-dev at zope.org',
-      description='ZServer Integration for Zope 3 Applications',
+      author_email='zope-dev at zope.org',
+      description='ZServer integration for Zope 3 Applications',
       long_description=(
           read('README.txt')
           + '\n\n' +

Modified: zope.app.server/trunk/src/zope/app/server/ftp.py
===================================================================
--- zope.app.server/trunk/src/zope/app/server/ftp.py	2008-08-14 23:59:30 UTC (rev 89849)
+++ zope.app.server/trunk/src/zope/app/server/ftp.py	2008-08-15 00:04:15 UTC (rev 89850)
@@ -26,9 +26,11 @@
 class FTPRequestFactory(object):
     """FTP Request factory
 
-    FTP request factories for a given database create FTP requets with
+    FTP request factories for a given database create FTP requests with
     publications on the given database:
 
+.. The test below has been disabled and moved to test_ftp.py (LP #257954)
+
       >>> from ZODB.tests.util import DB
       >>> db = DB()
       >>> factory = FTPRequestFactory(db)

Modified: zope.app.server/trunk/src/zope/app/server/tests/test_ftp.py
===================================================================
--- zope.app.server/trunk/src/zope/app/server/tests/test_ftp.py	2008-08-14 23:59:30 UTC (rev 89849)
+++ zope.app.server/trunk/src/zope/app/server/tests/test_ftp.py	2008-08-15 00:04:15 UTC (rev 89850)
@@ -16,12 +16,23 @@
 $Id$
 """
 import unittest
-from zope.testing.doctestunit import DocTestSuite
 
+class Tests(unittest.TestCase):
+
+    def test_ftp(self):
+        from ZODB.tests.util import DB
+        from zope.app.server.ftp import FTPRequestFactory
+        from cStringIO import StringIO
+        db = DB()
+        factory = FTPRequestFactory(db)
+        request = factory(StringIO(''), {'credentials': None, 'path': '/'})
+        self.assertTrue(request.publication.db is db)
+        db.close()
+
+
 def test_suite():
-    return unittest.TestSuite((
-        DocTestSuite('zope.app.server.ftp'),
-        ))
+    loader = unittest.TestLoader()
+    return loader.loadTestsFromTestCase(Tests)
 
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')