ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-05-29 13:54:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

test_introducer: stop using tcp:0

Browse Source 
This fixes some of the upcoming-deprecation warnings against Foolscap
(>=0.11.0). There are still a bunch related to the key-generator and the
stats gatherer.
This commit is contained in:
Brian Warner 2016-04-27 22:33:38 -07:00
parent 5a5ba643e6
commit 22c1031d19
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,7 @@ from allmydata.introducer import old
from allmydata.introducer import IntroducerNode from allmydata.introducer import IntroducerNode
from allmydata.web import introweb from allmydata.web import introweb
from allmydata.client import Client as TahoeClient from allmydata.client import Client as TahoeClient
from allmydata.util import pollmixin, keyutil, idlib, fileutil from allmydata.util import pollmixin, keyutil, idlib, fileutil, iputil
import allmydata.test.common_util as testutil import allmydata.test.common_util as testutil
class LoggingMultiService(service.MultiService): class LoggingMultiService(service.MultiService):
@ -444,17 +444,17 @@ NICKNAME = u"n\u00EDickname-%s" # LATIN SMALL LETTER I WITH ACUTE
class SystemTestMixin(ServiceMixin, pollmixin.PollMixin): class SystemTestMixin(ServiceMixin, pollmixin.PollMixin):
def create_tub(self, portnum=0): def create_tub(self, portnum=None):
tubfile = os.path.join(self.basedir, "tub.pem") tubfile = os.path.join(self.basedir, "tub.pem")
self.central_tub = tub = Tub(certFile=tubfile) self.central_tub = tub = Tub(certFile=tubfile)
#tub.setOption("logLocalFailures", True) #tub.setOption("logLocalFailures", True)
#tub.setOption("logRemoteFailures", True) #tub.setOption("logRemoteFailures", True)
tub.setOption("expose-remote-exception-types", False) tub.setOption("expose-remote-exception-types", False)
tub.setServiceParent(self.parent) tub.setServiceParent(self.parent)
l = tub.listenOn("tcp:%d" % portnum) if portnum is None:
self.central_portnum = l.getPortnum() portnum = iputil.allocate_tcp_port()
if portnum != 0: tub.listenOn("tcp:%d" % portnum)
assert self.central_portnum == portnum self.central_portnum = portnum
tub.setLocation("localhost:%d" % self.central_portnum) tub.setLocation("localhost:%d" % self.central_portnum)
class Queue(SystemTestMixin, unittest.TestCase): class Queue(SystemTestMixin, unittest.TestCase):
@ -544,8 +544,8 @@ class SystemTest(SystemTestMixin, unittest.TestCase):
#tub.setOption("logRemoteFailures", True) #tub.setOption("logRemoteFailures", True)
tub.setOption("expose-remote-exception-types", False) tub.setOption("expose-remote-exception-types", False)
tub.setServiceParent(self.parent) tub.setServiceParent(self.parent)
l = tub.listenOn("tcp:0") portnum = iputil.allocate_tcp_port()
portnum = l.getPortnum() tub.listenOn("tcp:%d" % portnum)
tub.setLocation("localhost:%d" % portnum) tub.setLocation("localhost:%d" % portnum)
log.msg("creating client %d: %s" % (i, tub.getShortTubID())) log.msg("creating client %d: %s" % (i, tub.getShortTubID()))
@ -1073,8 +1073,8 @@ class NonV1Server(SystemTestMixin, unittest.TestCase):
tub = Tub() tub = Tub()
tub.setOption("expose-remote-exception-types", False) tub.setOption("expose-remote-exception-types", False)
tub.setServiceParent(self.parent) tub.setServiceParent(self.parent)
l = tub.listenOn("tcp:0") portnum = iputil.allocate_tcp_port()
portnum = l.getPortnum() tub.listenOn("tcp:%d" % portnum)
tub.setLocation("localhost:%d" % portnum) tub.setLocation("localhost:%d" % portnum)
c = IntroducerClient(tub, self.introducer_furl, c = IntroducerClient(tub, self.introducer_furl,