Merged revisions 68897 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68897 | mark.dickinson | 2009-01-24 16:17:27 +0000 (Sat, 24 Jan 2009) | 2 lines

  Issue #5025: Fix occasional test_kqueue failure on OS X.
........

Lib/test/test_kqueue.py

@@ -120,12 +120,15 @@ class TestKQueue(unittest.TestCase):
         client.send("Hello!")
         server.send("world!!!")
 
-        events = kq.control(None, 4, 1)
         # We may need to call it several times
-        for i in range(5):
+        for i in range(10):
+            events = kq.control(None, 4, 1)
             if len(events) == 4:
                 break
-            events = kq.control(None, 4, 1)
+            time.sleep(1.0)
+        else:
+            self.fail('timeout waiting for event notifications')
+
         events = [(e.ident, e.filter, e.flags) for e in events]
         events.sort()