ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-05-02 17:12:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 3496.mutable-tests-python-3-part-3

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2020-11-09 14:37:46 -05:00 committed by GitHub
commit e41e660917
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
newsfragments/3499.minor Normal file
View File

2
src/allmydata/mutable/checker.py
View File

@ -187,7 +187,7 @@ class MutableChecker(object):
if self.bad_shares: if self.bad_shares:
report.append("Corrupt Shares:") report.append("Corrupt Shares:")
summary.append("Corrupt Shares:") summary.append("Corrupt Shares:")
for (server, shnum, f) in self.bad_shares: for (server, shnum, f) in sorted(self.bad_shares, key=id):
serverid = server.get_serverid() serverid = server.get_serverid()
locator = (server, self._storage_index, shnum) locator = (server, self._storage_index, shnum)
corrupt_share_locators.append(locator) corrupt_share_locators.append(locator)

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

@ -20,7 +20,7 @@ from __future__ import unicode_literals
# Tubs, so it is not useful for tests that involve a Helper or the # Tubs, so it is not useful for tests that involve a Helper or the
# control.furl . # control.furl .
from future.utils import PY2, PY3 from future.utils import PY2
if PY2: if PY2:
from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min # noqa: F401 from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min # noqa: F401
from past.builtins import unicode from past.builtins import unicode
@ -294,10 +294,6 @@ class _NoNetworkClient(_Client):
pass pass
#._servers will be set by the NoNetworkGrid which creates us #._servers will be set by the NoNetworkGrid which creates us
if PY3:
def init_web(self, *args, **kwargs):
print("Web service is temporarily disabled until nevow is gone.")
class SimpleStats(object): class SimpleStats(object):
def __init__(self): def __init__(self):
@ -504,8 +500,6 @@ class GridTestMixin(object):
def _record_webports_and_baseurls(self): def _record_webports_and_baseurls(self):
self.g._check_clients() self.g._check_clients()
if PY2:
# Temporarily disabled on Python 3 until Nevow is gone:
self.client_webports = [c.getServiceNamed("webish").getPortnum() self.client_webports = [c.getServiceNamed("webish").getPortnum()
for c in self.g.clients] for c in self.g.clients]
self.client_baseurls = [c.getServiceNamed("webish").getURL() self.client_baseurls = [c.getServiceNamed("webish").getURL()