ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-20 17:52:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Factor a little more duplication out of the tests

Browse Source
This commit is contained in:
Jean-Paul Calderone 2018-06-08 11:21:25 -04:00
parent c491b1a7d4
commit d25693145c
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/allmydata/test/test_introducer.py
View File

@ -358,20 +358,32 @@ def foolscapEndpointForPortNumber(portnum):
portnum = iputil.allocate_tcp_port()
return (portnum, "tcp:%d" % (portnum,))
def listenOnUnused(tub, portnum=None):
"""
Start listening on an unused TCP port number with the given tub.
:param portnum: Either an integer port number indicating which TCP/IPv4
port number the endpoint should bind or ``None`` to automatically
allocate such a port number.
:return: An integer indicating the TCP port number on which the tub is now
listening.
"""
portnum, endpoint = foolscapEndpointForPortNumber(portnum)
tub.listenOn(endpoint)
tub.setLocation("localhost:%d" % (portnum,))
return portnum
class SystemTestMixin(ServiceMixin, pollmixin.PollMixin):
def create_tub(self, portnum=None):
portnum, endpoint = foolscapEndpointForPortNumber(portnum)
tubfile = os.path.join(self.basedir, "tub.pem")
self.central_tub = tub = Tub(certFile=tubfile)
#tub.setOption("logLocalFailures", True)
#tub.setOption("logRemoteFailures", True)
tub.setOption("expose-remote-exception-types", False)
tub.setServiceParent(self.parent)
tub.listenOn(endpoint)
self.central_portnum = portnum
tub.setLocation("localhost:%d" % self.central_portnum)
self.central_portnum = listenOnUnused(tub, portnum)
class Queue(SystemTestMixin, unittest.TestCase):
def test_queue_until_connected(self):
@ -458,10 +470,7 @@ class SystemTest(SystemTestMixin, unittest.TestCase):
#tub.setOption("logRemoteFailures", True)
tub.setOption("expose-remote-exception-types", False)
tub.setServiceParent(self.parent)
portnum, endpoint = foolscapEndpointForPortNumber(None)
tub.listenOn(endpoint)
tub.setLocation("localhost:%d" % portnum)
listenOnUnused(tub)
log.msg("creating client %d: %s" % (i, tub.getShortTubID()))
c = IntroducerClient(tub, self.introducer_furl,
NICKNAME % str(i),
@ -939,10 +948,7 @@ class NonV1Server(SystemTestMixin, unittest.TestCase):
tub = Tub()
tub.setOption("expose-remote-exception-types", False)
tub.setServiceParent(self.parent)
portnum, endpoint = foolscapEndpointForPortNumber(None)
tub.listenOn(endpoint)
tub.setLocation("localhost:%d" % portnum)
listenOnUnused(tub)
c = IntroducerClient(tub, self.introducer_furl,
u"nickname-client", "version", "oldest", {},
fakeseq, FilePath(self.mktemp()))