[Zope3-checkins] SVN: Zope3/branches/ZopeX3-3.0/src/zope/server/ftp/tests/test_ftpserver.py Merged from trunk:

[Jim Fulton]

Log message for revision 27513:
  Merged from trunk:
  
    r27419 | jim | 2004-09-02 06:53:34 -0400 (Thu, 02 Sep 2004) | 10 lines
  
  Tried to improve error handling in the look method:
  
  - Remove (only) entries from socket map with bad file 
    descriptors
  
  - Print a report of good and bad file descriptors
  
  - Try hard not to fail out of the loop, as that is likely to
    lead to a test hang.
  
  


Changed:
  U   Zope3/branches/ZopeX3-3.0/src/zope/server/ftp/tests/test_ftpserver.py


-=-
Modified: Zope3/branches/ZopeX3-3.0/src/zope/server/ftp/tests/test_ftpserver.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/server/ftp/tests/test_ftpserver.py	2004-09-13 15:10:48 UTC (rev 27512)
+++ Zope3/branches/ZopeX3-3.0/src/zope/server/ftp/tests/test_ftpserver.py	2004-09-13 15:47:38 UTC (rev 27513)
@@ -17,8 +17,12 @@
 """
 import asyncore
 import ftplib
+import unittest
 import socket
+import sys
+import traceback
 import unittest
+
 from time import time
 from types import StringType
 from StringIO import StringIO
@@ -29,7 +33,6 @@
 from zope.server.ftp.tests import demofs
 from zope.server.taskthreads import ThreadedTaskDispatcher
 from zope.server.tests.asyncerror import AsyncoreErrorHook
-from zope.server.trigger import trigger
 
 td = ThreadedTaskDispatcher()
 
@@ -111,26 +114,35 @@
         self.thread_started.set()
         import select
         from errno import EBADF
-        nerr = 0
         while self.run_loop:
             self.counter = self.counter + 1
+            # Note that it isn't acceptable to fail out of
+            # this loop. That will likely make the tests hang.
             try:
                 asyncore.poll(0.1)
+                continue
             except select.error, data:
+                print "EXCEPTION POLLING IN LOOP(): ", data
                 if data[0] == EBADF:
-                    nerr += 1
-                    if nerr > 100:
-                        # Things are pretty bad if we got here
-                        for socket in asyncore.socket_map.values():
-                            if not isinstance(socket, trigger):
-                                try:
-                                    socket.close()
-                                except:
-                                    pass
-                        break
-                else:
-                    raise
-
+                    for key in asyncore.socket_map.keys():
+                        print
+                        try:
+                            select.select([], [], [key], 0.0)
+                        except select.error, v:
+                            print "Bad entry in socket map", key, v
+                            print asyncore.socket_map[key]
+                            print asyncore.socket_map[key].__class__
+                            del asyncore.socket_map[key]
+                        else:
+                            print "OK entry in socket map", key
+                            print asyncore.socket_map[key]
+                            print asyncore.socket_map[key].__class__
+                        print
+            except:
+                print "WEIRD EXCEPTION IN LOOP"
+                traceback.print_exception(*(sys.exc_info()+(100,)))
+            print
+                
     def getFTPConnection(self, login=1):
         ftp = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         ftp.connect((LOCALHOST, self.port))