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

Fix some plain-str()-of-bytes bugs.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2021-04-13 09:53:08 -04:00
parent 2299c2dcc8
commit 953c06a18d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/allmydata/test/test_download.py
View File

@ -1304,7 +1304,7 @@ class MyShare(object):
self._dyhb_rtt = rtt self._dyhb_rtt = rtt
def __repr__(self): def __repr__(self):
return "sh%d-on-%s" % (self._shnum, self._server.get_name()) return "sh%d-on-%s" % (self._shnum, str(self._server.get_name(), "ascii"))
class MySegmentFetcher(SegmentFetcher): class MySegmentFetcher(SegmentFetcher):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
@ -1383,7 +1383,7 @@ class Selection(unittest.TestCase):
self.failUnless(node.failed) self.failUnless(node.failed)
self.failUnless(node.failed.check(NotEnoughSharesError)) self.failUnless(node.failed.check(NotEnoughSharesError))
sname = serverA.get_name() sname = serverA.get_name()
self.failUnlessIn("complete= pending=sh0-on-%s overdue= unused=" % sname, self.failUnlessIn("complete= pending=sh0-on-%s overdue= unused=" % str(sname, "ascii"),
str(node.failed)) str(node.failed))
d.addCallback(_check2) d.addCallback(_check2)
return d return d
@ -1605,7 +1605,7 @@ class Selection(unittest.TestCase):
self.failUnless(node.failed) self.failUnless(node.failed)
self.failUnless(node.failed.check(NotEnoughSharesError)) self.failUnless(node.failed.check(NotEnoughSharesError))
sname = servers[b"peer-2"].get_name() sname = servers[b"peer-2"].get_name()
self.failUnlessIn("complete=sh0 pending= overdue=sh2-on-%s unused=" % sname, self.failUnlessIn("complete=sh0 pending= overdue=sh2-on-%s unused=" % str(sname, "ascii"),
str(node.failed)) str(node.failed))
d.addCallback(_check4) d.addCallback(_check4)
return d return d