[pypy-svn] pypy default: Fix rlib tests.

[alex_gaynor]

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: 
Changeset: r41506:80e7747e203a
Date: 2011-01-31 16:16 -0500
http://bitbucket.org/pypy/pypy/changeset/80e7747e203a/

Log:	Fix rlib tests.

diff --git a/pypy/rlib/test/test_rpoll.py b/pypy/rlib/test/test_rpoll.py
--- a/pypy/rlib/test/test_rpoll.py
+++ b/pypy/rlib/test/test_rpoll.py
@@ -12,7 +12,7 @@
     serv.listen(1)
     servaddr = serv.getsockname()
 
-    events = poll({serv.fileno(): POLLIN}, timeout=100)
+    events = poll({serv.fd: POLLIN}, timeout=100)
     assert len(events) == 0
 
     cli = RSocket(AF_INET, SOCK_STREAM)
@@ -20,17 +20,17 @@
     err = cli.connect_ex(servaddr)
     assert err != 0
 
-    events = poll({serv.fileno(): POLLIN}, timeout=500)
+    events = poll({serv.fd: POLLIN}, timeout=500)
     assert len(events) == 1
-    assert events[0][0] == serv.fileno()
+    assert events[0][0] == serv.fd
     assert events[0][1] & POLLIN
 
     servconn, cliaddr = serv.accept()
 
-    events = poll({serv.fileno(): POLLIN,
-                   cli.fileno(): POLLOUT}, timeout=500)
+    events = poll({serv.fd: POLLIN,
+                   cli.fd: POLLOUT}, timeout=500)
     assert len(events) == 1
-    assert events[0][0] == cli.fileno()
+    assert events[0][0] == cli.fd
     assert events[0][1] & POLLOUT
 
     err = cli.connect_ex(servaddr)
@@ -39,12 +39,12 @@
     assert (err == 0 or err == 10056 or
             err == getattr(errno, 'EISCONN', '???'))
 
-    events = poll({servconn.fileno(): POLLIN,
-                   cli.fileno(): POLLIN}, timeout=100)
+    events = poll({servconn.fd: POLLIN,
+                   cli.fd: POLLIN}, timeout=100)
     assert len(events) == 0
 
-    events = poll({servconn.fileno(): POLLOUT,
-                   cli.fileno(): POLLOUT}, timeout=100)
+    events = poll({servconn.fd: POLLOUT,
+                   cli.fd: POLLOUT}, timeout=100)
     assert len(events) >= 1
 
     cli.close()