ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-31 08:25:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SystemTestMixin: don't auto-detect IP addresses

Browse Source 
The tubs created for test_system should always use 127.0.0.1 .

refs ticket:2491
This commit is contained in:
Brian Warner 2016-04-26 13:39:30 -07:00
parent 6dfcd52b06
commit e9e12653f8
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/allmydata/test/common.py
View File

@ -18,7 +18,7 @@ from allmydata.storage_client import StubServer
from allmydata.mutable.layout import unpack_header from allmydata.mutable.layout import unpack_header
from allmydata.mutable.publish import MutableData from allmydata.mutable.publish import MutableData
from allmydata.storage.mutable import MutableShareFile from allmydata.storage.mutable import MutableShareFile
from allmydata.util import hashutil, log, fileutil, pollmixin from allmydata.util import hashutil, log, fileutil, pollmixin, iputil
from allmydata.util.assertutil import precondition from allmydata.util.assertutil import precondition
from allmydata.util.consumer import download_to_data from allmydata.util.consumer import download_to_data
from allmydata.stats import StatsGathererService from allmydata.stats import StatsGathererService
@ -557,6 +557,11 @@ class SystemTestMixin(pollmixin.PollMixin, testutil.StallMixin):
nodeconfig = "[node]\n" nodeconfig = "[node]\n"
nodeconfig += (u"nickname = client %d \u263A\n" % (i,)).encode('utf-8') nodeconfig += (u"nickname = client %d \u263A\n" % (i,)).encode('utf-8')
tub_port = iputil.allocate_tcp_port()
# Don't let it use AUTO: there's no need for tests to use
# anything other than 127.0.0.1
nodeconfig += "tub.port = tcp:%d\n" % tub_port
nodeconfig += "tub.location = tcp:127.0.0.1:%d\n" % tub_port
if i == 0: if i == 0:
# clients[0] runs a webserver and a helper, no key_generator # clients[0] runs a webserver and a helper, no key_generator