From 6838180187b32ae1af39e9c69cdb04caa933b03f Mon Sep 17 00:00:00 2001 From: hpk Date: Sun, 28 Jan 2007 11:14:22 +0100 Subject: [PATCH] [svn r37459] fix socketgateway test to run on both win32 and linux --HG-- branch : trunk --- py/execnet/register.py | 12 +++++------- py/execnet/testing/test_gateway.py | 4 +++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/py/execnet/register.py b/py/execnet/register.py index b3478e60f..c2afbf1a2 100644 --- a/py/execnet/register.py +++ b/py/execnet/register.py @@ -145,7 +145,7 @@ class SocketGateway(InstallableGateway): 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 @@ class SocketGateway(InstallableGateway): """ 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): diff --git a/py/execnet/testing/test_gateway.py b/py/execnet/testing/test_gateway.py index 6227b2bce..de6690724 100644 --- a/py/execnet/testing/test_gateway.py +++ b/py/execnet/testing/test_gateway.py @@ -437,7 +437,9 @@ class SocketGatewaySetup: 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()