[Checkins] SVN: zope.server/trunk/src/zope/server/ftp/ Fix testHELP that sometimes fails on a busy buildbot

[Gediminas Paulauskas]

Log message for revision 121089:
  Fix testHELP that sometimes fails on a busy buildbot
  

Changed:
  U   zope.server/trunk/src/zope/server/ftp/server.py
  U   zope.server/trunk/src/zope/server/ftp/tests/test_ftpserver.py

-=-
Modified: zope.server/trunk/src/zope/server/ftp/server.py
===================================================================
--- zope.server/trunk/src/zope/server/ftp/server.py	2011-03-23 08:36:17 UTC (rev 121088)
+++ zope.server/trunk/src/zope/server/ftp/server.py	2011-03-23 14:21:43 UTC (rev 121089)
@@ -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/trunk/src/zope/server/ftp/tests/test_ftpserver.py
===================================================================
--- zope.server/trunk/src/zope/server/ftp/tests/test_ftpserver.py	2011-03-23 08:36:17 UTC (rev 121088)
+++ zope.server/trunk/src/zope/server/ftp/tests/test_ftpserver.py	2011-03-23 14:21:43 UTC (rev 121089)
@@ -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'