Author: Amaury Forgeot d'Arc <[email protected]>
Branch: py3k
Changeset: r61442:24ac49ab776d
Date: 2013-02-19 09:10 +0100
http://bitbucket.org/pypy/pypy/changeset/24ac49ab776d/
Log: Fix -A tests in module/select
diff --git a/pypy/module/select/test/test_select.py
b/pypy/module/select/test/test_select.py
--- a/pypy/module/select/test/test_select.py
+++ b/pypy/module/select/test/test_select.py
@@ -267,34 +267,30 @@
"usemodules": ["select", "_socket", "rctime", "thread"],
}
- def setup_class(cls):
- space = cls.space
- w_import = space.getattr(space.builtin, space.wrap("__import__"))
- w_socketmod = space.call_function(w_import, space.wrap("socket"))
- cls.w_sock = cls.space.call_method(w_socketmod, "socket")
- cls.w_sock_err = space.getattr(w_socketmod, space.wrap("error"))
-
- try_ports = [1023] + range(20000, 30000, 437)
+ def w_make_server(self):
+ import socket
+ if hasattr(self, 'sock'):
+ return self.sock
+ self.sock = socket.socket()
+ try_ports = [1023] + list(range(20000, 30000, 437))
for port in try_ports:
- print 'binding to port %d:' % (port,),
- cls.w_sockaddress = space.wrap(('127.0.0.1', port))
+ print('binding to port %d:' % (port,))
+ self.sockaddress = ('127.0.0.1', port)
try:
- space.call_method(cls.w_sock, "bind", cls.w_sockaddress)
+ self.sock.bind(self.sockaddress)
break
- except OperationError, e: # should get a "Permission denied"
- if not e.match(space, space.getattr(w_socketmod,
space.wrap("error"))):
- raise
- print e
- except cls.w_sock_err, e: # should get a "Permission denied"
- print e
+ except socket.error as e: # should get a "Permission denied"
+ print(e)
else:
- raise e
+ raise(e)
def w_getpair(self):
"""Helper method which returns a pair of connected sockets."""
import socket
import _thread
+ self.make_server()
+
self.sock.listen(1)
s2 = socket.socket()
_thread.start_new_thread(s2.connect, (self.sockaddress,))
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
