ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-23 01:08:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More passing tests.

Browse Source
This commit is contained in:
Itamar Turner-Trauring
2020-12-09 14:05:03 -05:00
parent 016240d6e6
commit 59968d099c
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/allmydata/dirnode.py
View File

@ -354,7 +354,7 @@ class DirectoryNode(object):
# pack("16ss32s", iv, AES(H(writekey+iv), plaintext_rw_uri), mac) # pack("16ss32s", iv, AES(H(writekey+iv), plaintext_rw_uri), mac)
assert isinstance(data, bytes), (repr(data), type(data)) assert isinstance(data, bytes), (repr(data), type(data))
# an empty directory is serialized as an empty string # an empty directory is serialized as an empty string
if data == "": if data == b"":
return AuxValueDict() return AuxValueDict()
writeable = not self.is_readonly() writeable = not self.is_readonly()
mutable = self.is_mutable() mutable = self.is_mutable()
@ -373,7 +373,7 @@ class DirectoryNode(object):
# Therefore we normalize names going both in and out of directories. # Therefore we normalize names going both in and out of directories.
name = normalize(namex_utf8.decode("utf-8")) name = normalize(namex_utf8.decode("utf-8"))
rw_uri = "" rw_uri = b""
if writeable: if writeable:
rw_uri = self._decrypt_rwcapdata(rwcapdata) rw_uri = self._decrypt_rwcapdata(rwcapdata)

36
src/allmydata/test/test_dirnode.py
View File

@ -704,7 +704,7 @@ class Dirnode(GridTestMixin, unittest.TestCase,
set([u"short"]))) set([u"short"])))
d2.addCallback(lambda ignored: tinylit_node.list()) d2.addCallback(lambda ignored: tinylit_node.list())
d2.addCallback(lambda children: children[u"short"][0].read(MemAccum())) d2.addCallback(lambda children: children[u"short"][0].read(MemAccum()))
d2.addCallback(lambda accum: self.failUnlessReallyEqual(accum.data, "The end.")) d2.addCallback(lambda accum: self.failUnlessReallyEqual(accum.data, b"The end."))
return d2 return d2
d.addCallback(_check_kids) d.addCallback(_check_kids)
@ -789,7 +789,7 @@ class Dirnode(GridTestMixin, unittest.TestCase,
rep = str(dn) rep = str(dn)
self.failUnless("RO-IMM" in rep) self.failUnless("RO-IMM" in rep)
cap = dn.get_cap() cap = dn.get_cap()
self.failUnlessIn("CHK", cap.to_string()) self.failUnlessIn(b"CHK", cap.to_string())
self.cap = cap self.cap = cap
return dn.list() return dn.list()
d.addCallback(_created) d.addCallback(_created)
@ -901,8 +901,8 @@ class Dirnode(GridTestMixin, unittest.TestCase,
rep = str(dn) rep = str(dn)
self.failUnless("RO-IMM" in rep) self.failUnless("RO-IMM" in rep)
cap = dn.get_cap() cap = dn.get_cap()
self.failUnlessIn("LIT", cap.to_string()) self.failUnlessIn(b"LIT", cap.to_string())
self.failUnlessReallyEqual(cap.to_string(), "URI:DIR2-LIT:") self.failUnlessReallyEqual(cap.to_string(), b"URI:DIR2-LIT:")
self.cap = cap self.cap = cap
return dn.list() return dn.list()
d.addCallback(_created_empty) d.addCallback(_created_empty)
@ -919,9 +919,9 @@ class Dirnode(GridTestMixin, unittest.TestCase,
rep = str(dn) rep = str(dn)
self.failUnless("RO-IMM" in rep) self.failUnless("RO-IMM" in rep)
cap = dn.get_cap() cap = dn.get_cap()
self.failUnlessIn("LIT", cap.to_string()) self.failUnlessIn(b"LIT", cap.to_string())
self.failUnlessReallyEqual(cap.to_string(), self.failUnlessReallyEqual(cap.to_string(),
"URI:DIR2-LIT:gi4tumj2n4wdcmz2kvjesosmjfkdu3rvpbtwwlbqhiwdeot3puwcy") b"URI:DIR2-LIT:gi4tumj2n4wdcmz2kvjesosmjfkdu3rvpbtwwlbqhiwdeot3puwcy")
self.cap = cap self.cap = cap
return dn.list() return dn.list()
d.addCallback(_created_small) d.addCallback(_created_small)
@ -969,14 +969,14 @@ class Dirnode(GridTestMixin, unittest.TestCase,
# It also tests that we store child names as UTF-8 NFC, and normalize # It also tests that we store child names as UTF-8 NFC, and normalize
# them again when retrieving them. # them again when retrieving them.
stripped_write_uri = "lafs://from_the_future\t" stripped_write_uri = b"lafs://from_the_future\t"
stripped_read_uri = "lafs://readonly_from_the_future\t" stripped_read_uri = b"lafs://readonly_from_the_future\t"
spacedout_write_uri = stripped_write_uri + " " spacedout_write_uri = stripped_write_uri + b" "
spacedout_read_uri = stripped_read_uri + " " spacedout_read_uri = stripped_read_uri + b" "
child = nm.create_from_cap(spacedout_write_uri, spacedout_read_uri) child = nm.create_from_cap(spacedout_write_uri, spacedout_read_uri)
self.failUnlessReallyEqual(child.get_write_uri(), spacedout_write_uri) self.failUnlessReallyEqual(child.get_write_uri(), spacedout_write_uri)
self.failUnlessReallyEqual(child.get_readonly_uri(), "ro." + spacedout_read_uri) self.failUnlessReallyEqual(child.get_readonly_uri(), b"ro." + spacedout_read_uri)
child_dottedi = u"ch\u0131\u0307ld" child_dottedi = u"ch\u0131\u0307ld"
@ -1393,7 +1393,7 @@ class Dirnode(GridTestMixin, unittest.TestCase,
class MinimalFakeMutableFile(object): class MinimalFakeMutableFile(object):
def get_writekey(self): def get_writekey(self):
return "writekey" return b"writekey"
class Packing(testutil.ReallyEqualMixin, unittest.TestCase): class Packing(testutil.ReallyEqualMixin, unittest.TestCase):
# This is a base32-encoded representation of the directory tree # This is a base32-encoded representation of the directory tree
@ -1535,10 +1535,10 @@ class Packing(testutil.ReallyEqualMixin, unittest.TestCase):
@implementer(IMutableFileNode) @implementer(IMutableFileNode)
class FakeMutableFile(object): class FakeMutableFile(object):
counter = 0 counter = 0
def __init__(self, initial_contents=""): def __init__(self, initial_contents=b""):
data = self._get_initial_contents(initial_contents) data = self._get_initial_contents(initial_contents)
self.data = data.read(data.get_size()) self.data = data.read(data.get_size())
self.data = "".join(self.data) self.data = b"".join(self.data)
counter = FakeMutableFile.counter counter = FakeMutableFile.counter
FakeMutableFile.counter += 1 FakeMutableFile.counter += 1
@ -1547,10 +1547,10 @@ class FakeMutableFile(object):
self.uri = uri.WriteableSSKFileURI(writekey, fingerprint) self.uri = uri.WriteableSSKFileURI(writekey, fingerprint)
def _get_initial_contents(self, contents): def _get_initial_contents(self, contents):
if isinstance(contents, str): if isinstance(contents, bytes):
return contents return contents
if contents is None: if contents is None:
return "" return b""
assert callable(contents), "%s should be callable, not %s" % \ assert callable(contents), "%s should be callable, not %s" % \
(contents, type(contents)) (contents, type(contents))
return contents(self) return contents(self)
@ -1568,7 +1568,7 @@ class FakeMutableFile(object):
return defer.succeed(self.data) return defer.succeed(self.data)
def get_writekey(self): def get_writekey(self):
return "writekey" return b"writekey"
def is_readonly(self): def is_readonly(self):
return False return False
@ -1591,7 +1591,7 @@ class FakeMutableFile(object):
return defer.succeed(None) return defer.succeed(None)
class FakeNodeMaker(NodeMaker): class FakeNodeMaker(NodeMaker):
def create_mutable_file(self, contents="", keysize=None, version=None): def create_mutable_file(self, contents=b"", keysize=None, version=None):
return defer.succeed(FakeMutableFile(contents)) return defer.succeed(FakeMutableFile(contents))
class FakeClient2(_Client): class FakeClient2(_Client):

4
src/allmydata/unknown.py
View File

@ -31,8 +31,8 @@ class UnknownNode(object):
def __init__(self, given_rw_uri, given_ro_uri, deep_immutable=False, def __init__(self, given_rw_uri, given_ro_uri, deep_immutable=False,
name=u"<unknown name>"): name=u"<unknown name>"):
assert given_rw_uri is None or isinstance(given_rw_uri, str) assert given_rw_uri is None or isinstance(given_rw_uri, bytes)
assert given_ro_uri is None or isinstance(given_ro_uri, str) assert given_ro_uri is None or isinstance(given_ro_uri, bytes)
given_rw_uri = given_rw_uri or None given_rw_uri = given_rw_uri or None
given_ro_uri = given_ro_uri or None given_ro_uri = given_ro_uri or None