[Checkins] SVN: zope.server/branches/3.6/ Merge some minor fixes from trunk: r115862, r118690, r121089
Gediminas Paulauskas
menesis at pov.lt
Tue Jun 7 12:56:39 EDT 2011
Log message for revision 121875:
Merge some minor fixes from trunk: r115862, r118690, r121089
Changed:
U zope.server/branches/3.6/CHANGES.txt
U zope.server/branches/3.6/src/zope/server/ftp/server.py
U zope.server/branches/3.6/src/zope/server/ftp/tests/test_ftpserver.py
U zope.server/branches/3.6/src/zope/server/http/tests/test_wsgiserver.py
U zope.server/branches/3.6/src/zope/server/tests/test_serverbase.py
-=-
Modified: zope.server/branches/3.6/CHANGES.txt
===================================================================
--- zope.server/branches/3.6/CHANGES.txt 2011-06-07 16:43:34 UTC (rev 121874)
+++ zope.server/branches/3.6/CHANGES.txt 2011-06-07 16:56:38 UTC (rev 121875)
@@ -6,9 +6,12 @@
3.6.3 (unreleased)
------------------
-- Nothing changed yet.
+- Fixed testHELP that sometimes failed on a busy buildbot.
+- Using python's ``doctest`` module instead of deprecated
+ ``zope.testing.doctest``.
+
3.6.2 (2010-06-11)
------------------
Modified: zope.server/branches/3.6/src/zope/server/ftp/server.py
===================================================================
--- zope.server/branches/3.6/src/zope/server/ftp/server.py 2011-06-07 16:43:34 UTC (rev 121874)
+++ zope.server/branches/3.6/src/zope/server/ftp/server.py 2011-06-07 16:56:38 UTC (rev 121875)
@@ -194,7 +194,7 @@
def cmd_help(self, args):
'See IFTPCommandHandler'
- self.reply('HELP_START')
+ self.reply('HELP_START', flush=0)
self.write('Help goes here somewhen.\r\n')
self.reply('HELP_END')
Modified: zope.server/branches/3.6/src/zope/server/ftp/tests/test_ftpserver.py
===================================================================
--- zope.server/branches/3.6/src/zope/server/ftp/tests/test_ftpserver.py 2011-06-07 16:43:34 UTC (rev 121874)
+++ zope.server/branches/3.6/src/zope/server/ftp/tests/test_ftpserver.py 2011-06-07 16:56:38 UTC (rev 121875)
@@ -15,7 +15,6 @@
"""
import asyncore
import ftplib
-import unittest
import socket
import sys
import time
@@ -171,7 +170,6 @@
for command in commands:
ftp.send('%s\r\n' %command)
- time.sleep(.01)
result = ftp.recv(10000)
self.failUnless(result.endswith('\r\n'))
finally:
@@ -268,9 +266,6 @@
# import only now to prevent the testrunner from importing it too early
# Otherwise dualmodechannel.the_trigger is closed by the ZEO tests
from zope.server.ftp.server import status_messages
- # TODO This test doesn't work. I think it is because execute()
- # doesn't read the whole reply. The execeute() helper
- # function should be fixed, but that's for another day.
result = status_messages['HELP_START'] + '\r\n'
result += 'Help goes here somewhen.\r\n'
result += status_messages['HELP_END'] + '\r\n'
Modified: zope.server/branches/3.6/src/zope/server/http/tests/test_wsgiserver.py
===================================================================
--- zope.server/branches/3.6/src/zope/server/http/tests/test_wsgiserver.py 2011-06-07 16:43:34 UTC (rev 121874)
+++ zope.server/branches/3.6/src/zope/server/http/tests/test_wsgiserver.py 2011-06-07 16:56:38 UTC (rev 121875)
@@ -3,7 +3,7 @@
# Copyright (c) 2001 Zope Foundation and Contributors.
#
# This software is subject to the provisions of the Zope Public License,
-# Version 1.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
Modified: zope.server/branches/3.6/src/zope/server/tests/test_serverbase.py
===================================================================
--- zope.server/branches/3.6/src/zope/server/tests/test_serverbase.py 2011-06-07 16:43:34 UTC (rev 121874)
+++ zope.server/branches/3.6/src/zope/server/tests/test_serverbase.py 2011-06-07 16:56:38 UTC (rev 121875)
@@ -13,11 +13,10 @@
##############################################################################
"""Tests for zope.server.serverbase
"""
+import doctest
import unittest
-from zope.testing import doctest
-
def doctest_ServerBase():
r"""Regression test for ServerBase
More information about the checkins
mailing list