mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-02-12 05:55:35 +00:00
Ported to Python 3.
This commit is contained in:
parent
eb55c10eea
commit
63ff67a7be
@ -1,3 +1,15 @@
|
|||||||
|
"""
|
||||||
|
Ported to Python 3.
|
||||||
|
"""
|
||||||
|
from __future__ import absolute_import
|
||||||
|
from __future__ import division
|
||||||
|
from __future__ import print_function
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
|
from future.utils import 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 zope.interface import implementer
|
from zope.interface import implementer
|
||||||
from twisted.internet import defer
|
from twisted.internet import defer
|
||||||
from allmydata.storage.server import si_b2a
|
from allmydata.storage.server import si_b2a
|
||||||
|
@ -1,5 +1,15 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
"""
|
||||||
|
Ported to Python 3.
|
||||||
|
"""
|
||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
|
from __future__ import absolute_import
|
||||||
|
from __future__ import division
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
|
from future.utils import 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 allmydata.test import common
|
from allmydata.test import common
|
||||||
from allmydata.monitor import Monitor
|
from allmydata.monitor import Monitor
|
||||||
@ -464,7 +474,7 @@ class Repairer(GridTestMixin, unittest.TestCase, RepairTestMixin,
|
|||||||
# previously-deleted share #2.
|
# previously-deleted share #2.
|
||||||
|
|
||||||
d.addCallback(lambda ignored:
|
d.addCallback(lambda ignored:
|
||||||
self.delete_shares_numbered(self.uri, range(3, 10+1)))
|
self.delete_shares_numbered(self.uri, list(range(3, 10+1))))
|
||||||
d.addCallback(lambda ignored: download_to_data(self.c1_filenode))
|
d.addCallback(lambda ignored: download_to_data(self.c1_filenode))
|
||||||
d.addCallback(lambda newdata:
|
d.addCallback(lambda newdata:
|
||||||
self.failUnlessEqual(newdata, common.TEST_DATA))
|
self.failUnlessEqual(newdata, common.TEST_DATA))
|
||||||
@ -476,7 +486,7 @@ class Repairer(GridTestMixin, unittest.TestCase, RepairTestMixin,
|
|||||||
self.set_up_grid(num_clients=2)
|
self.set_up_grid(num_clients=2)
|
||||||
d = self.upload_and_stash()
|
d = self.upload_and_stash()
|
||||||
d.addCallback(lambda ignored:
|
d.addCallback(lambda ignored:
|
||||||
self.delete_shares_numbered(self.uri, range(7)))
|
self.delete_shares_numbered(self.uri, list(range(7))))
|
||||||
d.addCallback(lambda ignored: self._stash_counts())
|
d.addCallback(lambda ignored: self._stash_counts())
|
||||||
d.addCallback(lambda ignored:
|
d.addCallback(lambda ignored:
|
||||||
self.c0_filenode.check_and_repair(Monitor(),
|
self.c0_filenode.check_and_repair(Monitor(),
|
||||||
@ -509,7 +519,7 @@ class Repairer(GridTestMixin, unittest.TestCase, RepairTestMixin,
|
|||||||
# previously-deleted share #2.
|
# previously-deleted share #2.
|
||||||
|
|
||||||
d.addCallback(lambda ignored:
|
d.addCallback(lambda ignored:
|
||||||
self.delete_shares_numbered(self.uri, range(3, 10+1)))
|
self.delete_shares_numbered(self.uri, list(range(3, 10+1))))
|
||||||
d.addCallback(lambda ignored: download_to_data(self.c1_filenode))
|
d.addCallback(lambda ignored: download_to_data(self.c1_filenode))
|
||||||
d.addCallback(lambda newdata:
|
d.addCallback(lambda newdata:
|
||||||
self.failUnlessEqual(newdata, common.TEST_DATA))
|
self.failUnlessEqual(newdata, common.TEST_DATA))
|
||||||
@ -640,7 +650,7 @@ class Repairer(GridTestMixin, unittest.TestCase, RepairTestMixin,
|
|||||||
# downloading and has the right contents. This can't work
|
# downloading and has the right contents. This can't work
|
||||||
# unless it has already repaired the previously-corrupted share.
|
# unless it has already repaired the previously-corrupted share.
|
||||||
def _then_delete_7_and_try_a_download(unused=None):
|
def _then_delete_7_and_try_a_download(unused=None):
|
||||||
shnums = range(10)
|
shnums = list(range(10))
|
||||||
shnums.remove(shnum)
|
shnums.remove(shnum)
|
||||||
random.shuffle(shnums)
|
random.shuffle(shnums)
|
||||||
for sharenum in shnums[:7]:
|
for sharenum in shnums[:7]:
|
||||||
|
@ -50,6 +50,7 @@ PORTED_MODULES = [
|
|||||||
"allmydata.immutable.layout",
|
"allmydata.immutable.layout",
|
||||||
"allmydata.immutable.literal",
|
"allmydata.immutable.literal",
|
||||||
"allmydata.immutable.offloaded",
|
"allmydata.immutable.offloaded",
|
||||||
|
"allmydata.immutable.repairer",
|
||||||
"allmydata.immutable.upload",
|
"allmydata.immutable.upload",
|
||||||
"allmydata.interfaces",
|
"allmydata.interfaces",
|
||||||
"allmydata.introducer.client",
|
"allmydata.introducer.client",
|
||||||
@ -155,6 +156,7 @@ PORTED_TEST_MODULES = [
|
|||||||
"allmydata.test.test_observer",
|
"allmydata.test.test_observer",
|
||||||
"allmydata.test.test_pipeline",
|
"allmydata.test.test_pipeline",
|
||||||
"allmydata.test.test_python3",
|
"allmydata.test.test_python3",
|
||||||
|
"allmydata.test.test_repairer",
|
||||||
"allmydata.test.test_spans",
|
"allmydata.test.test_spans",
|
||||||
"allmydata.test.test_statistics",
|
"allmydata.test.test_statistics",
|
||||||
"allmydata.test.test_storage",
|
"allmydata.test.test_storage",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user