ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-04-08 19:34:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

get_name() should always return bytes, apparently.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2021-03-01 10:53:25 -05:00
parent 9d13e82db7
commit 6fc44f7a31
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/allmydata/immutable/downloader/share.py
View File

@ -108,7 +108,7 @@ class Share(object):
self.had_corruption = False # for unit tests
def __repr__(self):
return "Share(sh%d-on-%r)" % (self._shnum, self._server.get_name())
return "Share(sh%d-on-%s)" % (self._shnum, str(self._server.get_name(), "utf-8"))
def is_alive(self):
# XXX: reconsider. If the share sees a single error, should it remain

3
src/allmydata/test/no_network.py
View File

@ -200,7 +200,8 @@ class NoNetworkServer(object):
return self.serverid
def get_name(self):
return idlib.shortnodeid_b2a(self.serverid)
# Other implementations return bytes.
return idlib.shortnodeid_b2a(self.serverid).encode("utf-8")
def get_longname(self):
return idlib.nodeid_b2a(self.serverid)
def get_nickname(self):

2
src/allmydata/test/web/test_grid.py
View File

@ -1144,7 +1144,7 @@ class Grid(GridTestMixin, WebErrorMixin, ShouldFailMixin, testutil.ReallyEqualMi
" overdue= unused= need 3. Last failure: None")
msg2 = msgbase + (" ran out of shares:"
" complete="
" pending=Share(sh0-on-'ysbz4st7')"
" pending=Share(sh0-on-ysbz4st7)"
" overdue= unused= need 3. Last failure: None")
self.failUnless(body == msg1 or body == msg2, body)
d.addCallback(_check_one_share)