ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-03 19:54:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #917 from tahoe-lafs/3547.furl-py36-regression

Browse Source 
Fix the furl/py36 test suite regression

Fixes: ticket:3547
This commit is contained in:
Jean-Paul Calderone 2020-12-06 09:40:12 -05:00 committed by GitHub
commit 08a36d1e0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
newsfragments/3547.minor Normal file
View File

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 Overwrite the node's ``introducers.yaml`` with a file containing the given
introducer information. introducer information.
""" """
if isinstance(furl, bytes):
furl = furl.decode("utf-8")
basedir.child(b"private").child(b"introducers.yaml").setContent( basedir.child(b"private").child(b"introducers.yaml").setContent(
safe_dump({ safe_dump({
"introducers": { "introducers": {
petname: { petname: {
"furl": furl.decode("ascii"), "furl": furl,
}, },
}, },
}).encode("ascii"), }).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 # until the introducer connection is established). To avoid getting
# confused by this, disable storage. # confused by this, disable storage.
with basedir.child("tahoe.cfg").open("w") as f: with basedir.child("tahoe.cfg").open("w") as f:
f.write("[storage]\n") f.write(b"[storage]\n")
f.write("enabled = false\n") f.write(b"enabled = false\n")
c = yield create_client(basedir.path) c = yield create_client(basedir.path)
ic = c.introducer_clients[0] ic = c.introducer_clients[0]
@ -906,8 +906,8 @@ class ClientSeqnums(AsyncBrokenTestCase):
# until the introducer connection is established). To avoid getting # until the introducer connection is established). To avoid getting
# confused by this, disable storage. # confused by this, disable storage.
with basedir.child("tahoe.cfg").open("w") as f: with basedir.child("tahoe.cfg").open("w") as f:
f.write("[storage]\n") f.write(b"[storage]\n")
f.write("enabled = false\n") f.write(b"enabled = false\n")
c = yield create_client(basedir.path) c = yield create_client(basedir.path)
ic = c.introducer_clients[0] ic = c.introducer_clients[0]