From: Mark Dickinson <dickinsm@gmail.com>
Date: Sat, 24 Jan 2009 16:26:46 +0000 (+0000)
Subject: Merged revisions 68900 via svnmerge from
X-Git-Tag: v3.0.1~104
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=302b2387868ec07c0bef070059aac529eafd3197;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 68900 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r68900 | mark.dickinson | 2009-01-24 16:22:21 +0000 (Sat, 24 Jan 2009) | 9 lines

  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.
  ........
................
---

diff --git a/Lib/test/test_kqueue.py b/Lib/test/test_kqueue.py
index ef4363301d63..93deb1e85ab2 100644
--- a/Lib/test/test_kqueue.py
+++ b/Lib/test/test_kqueue.py
@@ -120,12 +120,15 @@ class TestKQueue(unittest.TestCase):
         client.send(b"Hello!")
         server.send(b"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()