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

fix unicode/bytes stuff in the affected tests

Browse Source
This commit is contained in:
Jean-Paul Calderone 2020-12-05 09:06:45 -05:00
parent 96bee384c9
commit ac7491680b
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/allmydata/scripts/common.py
View 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"),

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

@ -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]