[Python-checkins] cpython (merge 3.3 -> default): Issue #6419: Fix a test_kqueue failure on some BSD flavors.
charles-francois.natali
python-checkins at python.org
Sun Mar 31 20:39:02 CEST 2013
http://hg.python.org/cpython/rev/0c9415ddf403
changeset: 83042:0c9415ddf403
parent: 83039:fcb6c7119899
parent: 83041:96776fc3cbcc
user: Charles-Francois Natali <cf.natali at gmail.com>
date: Sun Mar 31 20:37:34 2013 +0200
summary:
Issue #6419: Fix a test_kqueue failure on some BSD flavors.
files:
Lib/test/test_kqueue.py | 35 ++++++++++------------------
1 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/Lib/test/test_kqueue.py b/Lib/test/test_kqueue.py
--- a/Lib/test/test_kqueue.py
+++ b/Lib/test/test_kqueue.py
@@ -101,11 +101,6 @@
pass # FreeBSD doesn't raise an exception here
server, addr = serverSocket.accept()
- if sys.platform.startswith("darwin"):
- flags = select.KQ_EV_ADD | select.KQ_EV_ENABLE
- else:
- flags = 0
-
kq = select.kqueue()
kq2 = select.kqueue.fromfd(kq.fileno())
@@ -127,11 +122,10 @@
kq2.control([ev], 0)
events = kq.control(None, 4, 1)
- events = [(e.ident, e.filter, e.flags) for e in events]
- events.sort()
- self.assertEqual(events, [
- (client.fileno(), select.KQ_FILTER_WRITE, flags),
- (server.fileno(), select.KQ_FILTER_WRITE, flags)])
+ events = set((e.ident, e.filter) for e in events)
+ self.assertEqual(events, set([
+ (client.fileno(), select.KQ_FILTER_WRITE),
+ (server.fileno(), select.KQ_FILTER_WRITE)]))
client.send(b"Hello!")
server.send(b"world!!!")
@@ -145,14 +139,12 @@
else:
self.fail('timeout waiting for event notifications')
- events = [(e.ident, e.filter, e.flags) for e in events]
- events.sort()
-
- self.assertEqual(events, [
- (client.fileno(), select.KQ_FILTER_WRITE, flags),
- (client.fileno(), select.KQ_FILTER_READ, flags),
- (server.fileno(), select.KQ_FILTER_WRITE, flags),
- (server.fileno(), select.KQ_FILTER_READ, flags)])
+ events = set((e.ident, e.filter) for e in events)
+ self.assertEqual(events, set([
+ (client.fileno(), select.KQ_FILTER_WRITE),
+ (client.fileno(), select.KQ_FILTER_READ),
+ (server.fileno(), select.KQ_FILTER_WRITE),
+ (server.fileno(), select.KQ_FILTER_READ)]))
# Remove completely client, and server read part
ev = select.kevent(client.fileno(),
@@ -169,10 +161,9 @@
kq.control([ev], 0, 0)
events = kq.control([], 4, 0.99)
- events = [(e.ident, e.filter, e.flags) for e in events]
- events.sort()
- self.assertEqual(events, [
- (server.fileno(), select.KQ_FILTER_WRITE, flags)])
+ events = set((e.ident, e.filter) for e in events)
+ self.assertEqual(events, set([
+ (server.fileno(), select.KQ_FILTER_WRITE)]))
client.close()
server.close()
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list