ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-04-07 10:56:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tests pass on Python 3.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2020-11-09 14:13:14 -05:00
parent da6dfcd86d
commit 2b9e269d3a
3 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1141,7 +1141,7 @@ class MutableFileVersion(object):
start_segments = {} # shnum -> start segment
end_segments = {} # shnum -> end segment
blockhashes = {} # shnum -> blockhash tree
for (shnum, original_data) in update_data.iteritems():
for (shnum, original_data) in update_data.items():
data = [d[1] for d in original_data if d[0] == self._version]
# data is [(blockhashes,start,end)..]

9
src/allmydata/mutable/publish.py
View File

@ -702,9 +702,10 @@ class Publish(object):
self.log("Pushing segment %d of %d" % (segnum + 1, self.num_segments))
# XXX: Why does this return a list?
data = self.data.read(segsize)
data = b"".join(data)
if not isinstance(data, bytes):
# XXX: Why does this return a list?
data = b"".join(data)
assert len(data) == segsize, len(data)
@ -1327,7 +1328,7 @@ class TransformingUploadable(object):
# are we in state 0?
self.log("reading %d bytes" % length)
old_start_data = ""
old_start_data = b""
old_data_length = self._first_segment_offset - self._read_marker
if old_data_length > 0:
if old_data_length > length:
@ -1345,7 +1346,7 @@ class TransformingUploadable(object):
# to pad the end of the data with data from our last segment.
old_end_length = length - \
(self._newdata.get_size() - self._newdata.pos())
old_end_data = ""
old_end_data = b""
if old_end_length > 0:
self.log("reading %d bytes of old end data" % old_end_length)

47
src/allmydata/test/mutable/test_update.py
View File

@ -23,10 +23,10 @@ class Update(GridTestMixin, unittest.TestCase, testutil.ShouldFailMixin):
self.c = self.g.clients[0]
self.nm = self.c.nodemaker
# self.data should be at least three segments long.
td = "testdata "
td = b"testdata "
self.data = td*(int(3*SEGSIZE/len(td))+10) # currently about 400kB
assert len(self.data) > 3*SEGSIZE
self.small_data = "test data" * 10 # 90 B; SDMF
self.small_data = b"test data" * 10 # 90 B; SDMF
def do_upload_sdmf(self):
@ -68,42 +68,42 @@ class Update(GridTestMixin, unittest.TestCase, testutil.ShouldFailMixin):
def test_append(self):
# We should be able to append data to a mutable file and get
# what we expect.
return self._test_replace(len(self.data), "appended")
return self._test_replace(len(self.data), b"appended")
def test_replace_middle(self):
# We should be able to replace data in the middle of a mutable
# file and get what we expect back.
return self._test_replace(100, "replaced")
return self._test_replace(100, b"replaced")
def test_replace_beginning(self):
# We should be able to replace data at the beginning of the file
# without truncating the file
return self._test_replace(0, "beginning")
return self._test_replace(0, b"beginning")
def test_replace_segstart1(self):
return self._test_replace(128*1024+1, "NNNN")
return self._test_replace(128*1024+1, b"NNNN")
def test_replace_zero_length_beginning(self):
return self._test_replace(0, "")
return self._test_replace(0, b"")
def test_replace_zero_length_middle(self):
return self._test_replace(50, "")
return self._test_replace(50, b"")
def test_replace_zero_length_segstart1(self):
return self._test_replace(128*1024+1, "")
return self._test_replace(128*1024+1, b"")
def test_replace_and_extend(self):
# We should be able to replace data in the middle of a mutable
# file and extend that mutable file and get what we expect.
return self._test_replace(100, "modified " * 100000)
return self._test_replace(100, b"modified " * 100000)
def _check_differences(self, got, expected):
# displaying arbitrary file corruption is tricky for a
# 1MB file of repeating data,, so look for likely places
# with problems and display them separately
gotmods = [mo.span() for mo in re.finditer('([A-Z]+)', got)]
expmods = [mo.span() for mo in re.finditer('([A-Z]+)', expected)]
gotmods = [mo.span() for mo in re.finditer(b'([A-Z]+)', got)]
expmods = [mo.span() for mo in re.finditer(b'([A-Z]+)', expected)]
gotspans = ["%d:%d=%s" % (start,end,got[start:end])
for (start,end) in gotmods]
expspans = ["%d:%d=%s" % (start,end,expected[start:end])
@ -131,14 +131,15 @@ class Update(GridTestMixin, unittest.TestCase, testutil.ShouldFailMixin):
def test_replace_locations(self):
# exercise fencepost conditions
suspects = range(SEGSIZE-3, SEGSIZE+1)+range(2*SEGSIZE-3, 2*SEGSIZE+1)
suspects = list(range(SEGSIZE-3, SEGSIZE+1)) + list(
range(2*SEGSIZE-3, 2*SEGSIZE+1))
letters = iter("ABCDEFGHIJKLMNOPQRSTUVWXYZ")
d0 = self.do_upload_mdmf()
def _run(ign):
expected = self.data
d = defer.succeed(None)
for offset in suspects:
new_data = letters.next()*2 # "AA", then "BB", etc
new_data = next(letters).encode("ascii") * 2 # "AA", then "BB", etc
expected = expected[:offset]+new_data+expected[offset+2:]
d.addCallback(lambda ign:
self.mdmf_node.get_best_mutable_version())
@ -164,7 +165,7 @@ class Update(GridTestMixin, unittest.TestCase, testutil.ShouldFailMixin):
# long -- this is 7 segments in the default segment size. So we
# need to add 2 segments worth of data to push it over a
# power-of-two boundary.
segment = "a" * DEFAULT_MAX_SEGMENT_SIZE
segment = b"a" * DEFAULT_MAX_SEGMENT_SIZE
new_data = self.data + (segment * 2)
d0 = self.do_upload_mdmf()
def _run(ign):
@ -181,12 +182,12 @@ class Update(GridTestMixin, unittest.TestCase, testutil.ShouldFailMixin):
def test_update_sdmf(self):
# Running update on a single-segment file should still work.
new_data = self.small_data + "appended"
new_data = self.small_data + b"appended"
d0 = self.do_upload_sdmf()
def _run(ign):
d = defer.succeed(None)
d.addCallback(lambda ign: self.sdmf_node.get_best_mutable_version())
d.addCallback(lambda mv: mv.update(MutableData("appended"),
d.addCallback(lambda mv: mv.update(MutableData(b"appended"),
len(self.small_data)))
d.addCallback(lambda ign: self.sdmf_node.download_best_version())
d.addCallback(lambda results:
@ -199,14 +200,14 @@ class Update(GridTestMixin, unittest.TestCase, testutil.ShouldFailMixin):
# The wrapper should know how to handle the tail segment
# appropriately.
replace_offset = len(self.data) - 100
new_data = self.data[:replace_offset] + "replaced"
rest_offset = replace_offset + len("replaced")
new_data = self.data[:replace_offset] + b"replaced"
rest_offset = replace_offset + len(b"replaced")
new_data += self.data[rest_offset:]
d0 = self.do_upload_mdmf()
def _run(ign):
d = defer.succeed(None)
d.addCallback(lambda ign: self.mdmf_node.get_best_mutable_version())
d.addCallback(lambda mv: mv.update(MutableData("replaced"),
d.addCallback(lambda mv: mv.update(MutableData(b"replaced"),
replace_offset))
d.addCallback(lambda ign: self.mdmf_node.download_best_version())
d.addCallback(lambda results:
@ -218,16 +219,16 @@ class Update(GridTestMixin, unittest.TestCase, testutil.ShouldFailMixin):
def test_multiple_segment_replace(self):
replace_offset = 2 * DEFAULT_MAX_SEGMENT_SIZE
new_data = self.data[:replace_offset]
new_segment = "a" * DEFAULT_MAX_SEGMENT_SIZE
new_segment = b"a" * DEFAULT_MAX_SEGMENT_SIZE
new_data += 2 * new_segment
new_data += "replaced"
new_data += b"replaced"
rest_offset = len(new_data)
new_data += self.data[rest_offset:]
d0 = self.do_upload_mdmf()
def _run(ign):
d = defer.succeed(None)
d.addCallback(lambda ign: self.mdmf_node.get_best_mutable_version())
d.addCallback(lambda mv: mv.update(MutableData((2 * new_segment) + "replaced"),
d.addCallback(lambda mv: mv.update(MutableData((2 * new_segment) + b"replaced"),
replace_offset))
d.addCallback(lambda ignored: self.mdmf_node.download_best_version())
d.addCallback(lambda results: