mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2024-12-31 18:27:00 +00:00
Merge pull request #917 from tahoe-lafs/3547.furl-py36-regression
Fix the furl/py36 test suite regression Fixes: ticket:3547
This commit is contained in:
commit
08a36d1e0d
0
newsfragments/3547.minor
Normal file
0
newsfragments/3547.minor
Normal file
@ -121,11 +121,13 @@ def write_introducer(basedir, petname, furl):
|
||||
Overwrite the node's ``introducers.yaml`` with a file containing the given
|
||||
introducer information.
|
||||
"""
|
||||
if isinstance(furl, bytes):
|
||||
furl = furl.decode("utf-8")
|
||||
basedir.child(b"private").child(b"introducers.yaml").setContent(
|
||||
safe_dump({
|
||||
"introducers": {
|
||||
petname: {
|
||||
"furl": furl.decode("ascii"),
|
||||
"furl": furl,
|
||||
},
|
||||
},
|
||||
}).encode("ascii"),
|
||||
|
@ -818,8 +818,8 @@ class Announcements(AsyncTestCase):
|
||||
# until the introducer connection is established). To avoid getting
|
||||
# confused by this, disable storage.
|
||||
with basedir.child("tahoe.cfg").open("w") as f:
|
||||
f.write("[storage]\n")
|
||||
f.write("enabled = false\n")
|
||||
f.write(b"[storage]\n")
|
||||
f.write(b"enabled = false\n")
|
||||
|
||||
c = yield create_client(basedir.path)
|
||||
ic = c.introducer_clients[0]
|
||||
@ -906,8 +906,8 @@ class ClientSeqnums(AsyncBrokenTestCase):
|
||||
# until the introducer connection is established). To avoid getting
|
||||
# confused by this, disable storage.
|
||||
with basedir.child("tahoe.cfg").open("w") as f:
|
||||
f.write("[storage]\n")
|
||||
f.write("enabled = false\n")
|
||||
f.write(b"[storage]\n")
|
||||
f.write(b"enabled = false\n")
|
||||
|
||||
c = yield create_client(basedir.path)
|
||||
ic = c.introducer_clients[0]
|
||||
|
Loading…
Reference in New Issue
Block a user