dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[project @ robey@lag.net-20080324065111-qv8icii767fqex9j] 

fix some unit tests for windows
This commit is contained in:
Robey Pointer 2008-03-23 23:51:11 -07:00
parent 9a6ffec93f
commit f35a65bb0c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/test_transport.py
View File

@ -76,6 +76,7 @@ class NullServer (ServerInterface):
def check_port_forward_request(self, addr, port): def check_port_forward_request(self, addr, port):
self._listen = socket.socket() self._listen = socket.socket()
self._listen.bind(('127.0.0.1', 0))
self._listen.listen(1) self._listen.listen(1)
return self._listen.getsockname()[1] return self._listen.getsockname()[1]
@ -452,11 +453,11 @@ class TransportTest (unittest.TestCase):
requested.append((server_addr, server_port)) requested.append((server_addr, server_port))
self.tc._queue_incoming_channel(c) self.tc._queue_incoming_channel(c)
port = self.tc.request_port_forward('', 0, handler) port = self.tc.request_port_forward('127.0.0.1', 0, handler)
self.assertEquals(port, self.server._listen.getsockname()[1]) self.assertEquals(port, self.server._listen.getsockname()[1])
cs = socket.socket() cs = socket.socket()
cs.connect(('', port)) cs.connect(('127.0.0.1', port))
ss, _ = self.server._listen.accept() ss, _ = self.server._listen.accept()
sch = self.ts.open_forwarded_tcpip_channel(ss.getsockname(), ss.getpeername()) sch = self.ts.open_forwarded_tcpip_channel(ss.getsockname(), ss.getpeername())
cch = self.tc.accept() cch = self.tc.accept()
@ -469,7 +470,7 @@ class TransportTest (unittest.TestCase):
cs.close() cs.close()
# now cancel it. # now cancel it.
self.tc.cancel_port_forward('', port) self.tc.cancel_port_forward('127.0.0.1', port)
self.assertTrue(self.server._listen is None) self.assertTrue(self.server._listen is None)
def test_F_port_forwarding(self): def test_F_port_forwarding(self):
@ -484,10 +485,11 @@ class TransportTest (unittest.TestCase):
# open a port on the "server" that the client will ask to forward to. # open a port on the "server" that the client will ask to forward to.
greeting_server = socket.socket() greeting_server = socket.socket()
greeting_server.bind(('127.0.0.1', 0))
greeting_server.listen(1) greeting_server.listen(1)
greeting_port = greeting_server.getsockname()[1] greeting_port = greeting_server.getsockname()[1]
cs = self.tc.open_channel('direct-tcpip', ('', greeting_port), ('', 9000)) cs = self.tc.open_channel('direct-tcpip', ('127.0.0.1', greeting_port), ('', 9000))
sch = self.ts.accept(1.0) sch = self.ts.accept(1.0)
cch = socket.socket() cch = socket.socket()
cch.connect(self.server._tcpip_dest) cch.connect(self.server._tcpip_dest)