tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

Merge pull request #1003 from LeastAuthority/3637.mypy-vs-allmydata-test 

Fix src/allmydata/test mypy errors w/ Twisted 21.2.0 

Fixes: ticket:3637
This commit is contained in:
Jean-Paul Calderone 2021-03-17 21:20:14 -04:00 committed by GitHub
parent 47cb644fbb 950a03cf64
commit e15c4184f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
newsfragments/3637.minor Normal file
View File

5
src/allmydata/test/common.py
View File

@ -323,7 +323,7 @@ class AdoptedServerPort(object):
""" """
prefix = "adopt-socket" prefix = "adopt-socket"
def parseStreamServer(self, reactor, fd): def parseStreamServer(self, reactor, fd): # type: ignore # https://twistedmatrix.com/trac/ticket/10134
log.msg("Adopting {}".format(fd)) log.msg("Adopting {}".format(fd))
# AdoptedStreamServerEndpoint wants to own the file descriptor. It # AdoptedStreamServerEndpoint wants to own the file descriptor. It
# will duplicate it and then close the one we pass in. This means it # will duplicate it and then close the one we pass in. This means it
@ -425,6 +425,9 @@ class DummyProducer(object):
def resumeProducing(self): def resumeProducing(self):
pass pass
def stopProducing(self):
pass
@implementer(IImmutableFileNode) @implementer(IImmutableFileNode)
class FakeCHKFileNode(object): # type: ignore # incomplete implementation class FakeCHKFileNode(object): # type: ignore # incomplete implementation
"""I provide IImmutableFileNode, but all of my data is stored in a """I provide IImmutableFileNode, but all of my data is stored in a

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

@ -175,6 +175,3 @@ class NoDefault(unittest.TestCase):
self.yaml_path.setContent(yamlutil.safe_dump(connections)) self.yaml_path.setContent(yamlutil.safe_dump(connections))
myclient = yield create_client(self.basedir) myclient = yield create_client(self.basedir)
self.assertEquals(len(myclient.introducer_clients), 0) self.assertEquals(len(myclient.introducer_clients), 0)
if __name__ == "__main__":
unittest.main()

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

@ -30,9 +30,6 @@ MAX_DELTA_READS = 10 * READ_LEEWAY # N = 10
timeout=240 # François's ARM box timed out after 120 seconds of Verifier.test_corrupt_crypttext_hashtree timeout=240 # François's ARM box timed out after 120 seconds of Verifier.test_corrupt_crypttext_hashtree
class RepairTestMixin(object): class RepairTestMixin(object):
def failUnlessIsInstance(self, x, xtype):
self.failUnless(isinstance(x, xtype), x)
def _count_reads(self): def _count_reads(self):
sum_of_read_counts = 0 sum_of_read_counts = 0
for (i, ss, storedir) in self.iterate_servers(): for (i, ss, storedir) in self.iterate_servers():

4
src/allmydata/test/web/test_web.py
View File

@ -108,7 +108,7 @@ class FakeNodeMaker(NodeMaker):
return n.create(contents, version=version) return n.create(contents, version=version)
class FakeUploader(service.Service): class FakeUploader(service.Service):
name = "uploader" name = "uploader" # type: ignore # https://twistedmatrix.com/trac/ticket/10135
helper_furl = None helper_furl = None
helper_connected = False helper_connected = False
@ -254,7 +254,7 @@ class FakeLeaseChecker(object):
"remaining-wait-time": 0} "remaining-wait-time": 0}
class FakeStorageServer(service.MultiService): class FakeStorageServer(service.MultiService):
name = 'storage' name = 'storage' # type: ignore # https://twistedmatrix.com/trac/ticket/10135
def __init__(self, nodeid, nickname): def __init__(self, nodeid, nickname):
service.MultiService.__init__(self) service.MultiService.__init__(self)
self.my_nodeid = nodeid self.my_nodeid = nodeid