ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-19 04:57:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make the system test nodes have non-ASCII nicknames.

Browse Source 
This ensures that non-ASCII nicknames are exercised with the real server code.
refs #1298

Signed-off-by: David-Sarah Hopwood <davidsarah@mint>
This commit is contained in:
David-Sarah Hopwood 2012-12-27 19:00:22 +00:00
parent 0d4a826f0e
commit 5c4ca677e1
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -470,9 +470,10 @@ class SystemTestMixin(pollmixin.PollMixin, testutil.StallMixin):
iv_dir = self.getdir("introducer")
if not os.path.isdir(iv_dir):
fileutil.make_dirs(iv_dir)
fileutil.write(os.path.join(iv_dir, 'tahoe.cfg'), \
"[node]\n" + \
"web.port = tcp:0:interface=127.0.0.1\n")
fileutil.write(os.path.join(iv_dir, 'tahoe.cfg'),
"[node]\n" +
u"nickname = introducer \u263A\n".encode('utf-8') +
"web.port = tcp:0:interface=127.0.0.1\n")
if SYSTEM_TEST_CERTS:
os.mkdir(os.path.join(iv_dir, "private"))
f = open(os.path.join(iv_dir, "private", "node.pem"), "w")
@ -553,21 +554,26 @@ class SystemTestMixin(pollmixin.PollMixin, testutil.StallMixin):
if self.stats_gatherer_furl:
config += "stats_gatherer.furl = %s\n" % self.stats_gatherer_furl
nodeconfig = "[node]\n"
nodeconfig += (u"nickname = client %d \u263A\n" % (i,)).encode('utf-8')
if i == 0:
# clients[0] runs a webserver and a helper, no key_generator
config += "[node]\n"
config += nodeconfig
config += "web.port = tcp:0:interface=127.0.0.1\n"
config += "timeout.keepalive = 600\n"
config += "[helper]\n"
config += "enabled = True\n"
if i == 3:
elif i == 3:
# clients[3] runs a webserver and uses a helper, uses
# key_generator
if self.key_generator_furl:
config += "key_generator.furl = %s\n" % self.key_generator_furl
config += "[node]\n"
config += nodeconfig
config += "web.port = tcp:0:interface=127.0.0.1\n"
config += "timeout.disconnect = 1800\n"
else:
config += nodeconfig
fileutil.write(os.path.join(basedir, 'tahoe.cfg'), config)