open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test describe_inbound, format IPv6 better

Browse Source
This commit is contained in:
Brian Warner 2019-08-11 14:09:26 -07:00
parent d0c27552cf
commit 16b6245f44
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wormhole/_dilation/connector.py
View File

@ -419,8 +419,10 @@ class OutboundConnectionFactory(ClientFactory, object):
def describe_inbound(addr): def describe_inbound(addr):
if isinstance(addr, HostnameAddress): if isinstance(addr, HostnameAddress):
return "<-tcp:%s:%d" % (addr.hostname, addr.port) return "<-tcp:%s:%d" % (addr.hostname, addr.port)
elif isinstance(addr, (IPv4Address, IPv6Address)): elif isinstance(addr, IPv4Address):
return "<-tcp:%s:%d" % (addr.host, addr.port) return "<-tcp:%s:%d" % (addr.host, addr.port)
elif isinstance(addr, IPv6Address):
return "<-tcp:[%s]:%d" % (addr.host, addr.port)
return "<-%r" % addr return "<-%r" % addr
@attrs(repr=False) @attrs(repr=False)

13
src/wormhole/test/dilate/test_connector.py
View File

@ -5,7 +5,7 @@ from zope.interface import alsoProvides
from twisted.trial import unittest from twisted.trial import unittest
from twisted.internet.task import Clock from twisted.internet.task import Clock
from twisted.internet.defer import Deferred from twisted.internet.defer import Deferred
from twisted.internet.address import IPv4Address from twisted.internet.address import IPv4Address, IPv6Address, HostnameAddress
from ...eventual import EventualQueue from ...eventual import EventualQueue
from ..._interfaces import IDilationManager, IDilationConnector from ..._interfaces import IDilationManager, IDilationConnector
from ..._hints import DirectTCPV1Hint, RelayV1Hint, TorTCPV1Hint from ..._hints import DirectTCPV1Hint, RelayV1Hint, TorTCPV1Hint
@ -15,6 +15,7 @@ from ..._dilation.connection import KCM
from ..._dilation.connector import (Connector, from ..._dilation.connector import (Connector,
build_sided_relay_handshake, build_sided_relay_handshake,
build_noise, build_noise,
describe_inbound,
OutboundConnectionFactory, OutboundConnectionFactory,
InboundConnectionFactory, InboundConnectionFactory,
PROLOGUE_LEADER, PROLOGUE_FOLLOWER, PROLOGUE_LEADER, PROLOGUE_FOLLOWER,
@ -461,3 +462,13 @@ class Race(unittest.TestCase):
self.assertEqual(h.manager.mock_calls, [mock.call.connector_connection_made(p1)]) self.assertEqual(h.manager.mock_calls, [mock.call.connector_connection_made(p1)])
c.stop() c.stop()
class Describe(unittest.TestCase):
def test_describe_inbound(self):
self.assertEqual(describe_inbound(HostnameAddress("example.com", 1234)),
"<-tcp:example.com:1234")
self.assertEqual(describe_inbound(IPv4Address("TCP", "1.2.3.4", 1234)),
"<-tcp:1.2.3.4:1234")
self.assertEqual(describe_inbound(IPv6Address("TCP", "::1", 1234)),
"<-tcp:[::1]:1234")
self.assertEqual(describe_inbound("none-of-the-above"), "<-'none-of-the-above'")