Tests pass on Python 3.

This commit is contained in:
Itamar Turner-Trauring 2021-03-15 11:07:03 -04:00
parent 6bce1e8459
commit 47f2c143d0

View File

@ -14,8 +14,8 @@ from allmydata.test.common import ShouldFailMixin
from allmydata.util.pollmixin import PollMixin from allmydata.util.pollmixin import PollMixin
from allmydata.interfaces import NotEnoughSharesError from allmydata.interfaces import NotEnoughSharesError
immutable_plaintext = "data" * 10000 immutable_plaintext = b"data" * 10000
mutable_plaintext = "muta" * 10000 mutable_plaintext = b"muta" * 10000
class HungServerDownloadTest(GridTestMixin, ShouldFailMixin, PollMixin, class HungServerDownloadTest(GridTestMixin, ShouldFailMixin, PollMixin,
unittest.TestCase): unittest.TestCase):
@ -105,7 +105,7 @@ class HungServerDownloadTest(GridTestMixin, ShouldFailMixin, PollMixin,
self.shares = self.find_uri_shares(self.uri) self.shares = self.find_uri_shares(self.uri)
d.addCallback(_uploaded_mutable) d.addCallback(_uploaded_mutable)
else: else:
data = upload.Data(immutable_plaintext, convergence="") data = upload.Data(immutable_plaintext, convergence=b"")
d = self.c0.upload(data) d = self.c0.upload(data)
def _uploaded_immutable(upload_res): def _uploaded_immutable(upload_res):
self.uri = upload_res.get_uri() self.uri = upload_res.get_uri()
@ -262,7 +262,7 @@ class HungServerDownloadTest(GridTestMixin, ShouldFailMixin, PollMixin,
# is shut off. That will leave 4 OVERDUE and 1 # is shut off. That will leave 4 OVERDUE and 1
# stuck-but-not-overdue, for a total of 5 requests in in # stuck-but-not-overdue, for a total of 5 requests in in
# _sf.pending_requests # _sf.pending_requests
for t in self._sf.overdue_timers.values()[:4]: for t in list(self._sf.overdue_timers.values())[:4]:
t.reset(-1.0) t.reset(-1.0)
# the timers ought to fire before the eventual-send does # the timers ought to fire before the eventual-send does
return fireEventually() return fireEventually()