[py-svn] r37459 - in py/trunk/py/execnet: . testing
hpk at codespeak.net
hpk at codespeak.net
Sun Jan 28 11:14:24 CET 2007
Author: hpk
Date: Sun Jan 28 11:14:22 2007
New Revision: 37459
Modified:
py/trunk/py/execnet/register.py
py/trunk/py/execnet/testing/test_gateway.py
Log:
fix socketgateway test to run on both win32 and linux
Modified: py/trunk/py/execnet/register.py
==============================================================================
--- py/trunk/py/execnet/register.py (original)
+++ py/trunk/py/execnet/register.py Sun Jan 28 11:14:22 2007
@@ -145,7 +145,7 @@
given gateway.
"""
if hostport is None:
- host, port = ('', 0)
+ host, port = ('', 0) # XXX works on all platforms?
else:
host, port = hostport
socketserverbootstrap = py.code.Source(
@@ -153,18 +153,16 @@
"""
import socket
sock = bind_and_listen((%r, %r))
- hostname = socket.gethostname()
- channel.send((hostname, sock.getsockname()))
+ port = sock.getsockname()
+ channel.send(port)
startserver(sock)
""" % (host, port))
# execute the above socketserverbootstrap on the other side
channel = gateway.remote_exec(socketserverbootstrap)
- hostname, (realhost, realport) = channel.receive()
- if not hostname:
- hostname = realhost
+ (realhost, realport) = channel.receive()
#gateway._trace("remote_install received"
# "port=%r, hostname = %r" %(realport, hostname))
- return py.execnet.SocketGateway(hostname, realport)
+ return py.execnet.SocketGateway(host, realport)
remote_install = classmethod(remote_install)
class SshGateway(PopenCmdGateway):
Modified: py/trunk/py/execnet/testing/test_gateway.py
==============================================================================
--- py/trunk/py/execnet/testing/test_gateway.py (original)
+++ py/trunk/py/execnet/testing/test_gateway.py Sun Jan 28 11:14:22 2007
@@ -437,7 +437,9 @@
def setup_class(cls):
# open a gateway to a fresh child process
cls.proxygw = py.execnet.PopenGateway()
- cls.gw = py.execnet.SocketGateway.remote_install(cls.proxygw)
+ cls.gw = py.execnet.SocketGateway.remote_install(cls.proxygw,
+ ("127.0.0.1", 0)
+ )
## def teardown_class(cls):
## cls.gw.exit()
More information about the pytest-commit
mailing list