ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-04-27 06:20:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Even more tests passing on Python 3.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2021-01-04 11:39:25 -05:00
parent 3d42030e01
commit 2bf278e55d
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/allmydata/frontends/sftpd.py
View File

@ -1785,7 +1785,7 @@ class SFTPUserHandler(ConchUser, PrefixingLogMixin):
# We implement the three main OpenSSH SFTP extensions; see # We implement the three main OpenSSH SFTP extensions; see
# <http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/PROTOCOL?rev=1.15> # <http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/PROTOCOL?rev=1.15>
if extensionName == 'posix-rename@openssh.com': if extensionName == b'posix-rename@openssh.com':
def _bad(): raise SFTPError(FX_BAD_MESSAGE, "could not parse posix-rename@openssh.com request") def _bad(): raise SFTPError(FX_BAD_MESSAGE, "could not parse posix-rename@openssh.com request")
if 4 > len(extensionData): return defer.execute(_bad) if 4 > len(extensionData): return defer.execute(_bad)
@ -1807,7 +1807,7 @@ class SFTPUserHandler(ConchUser, PrefixingLogMixin):
d.addCallback(_succeeded) d.addCallback(_succeeded)
return d return d
if extensionName == 'statvfs@openssh.com' or extensionName == 'fstatvfs@openssh.com': if extensionName == b'statvfs@openssh.com' or extensionName == b'fstatvfs@openssh.com':
# f_bsize and f_frsize should be the same to avoid a bug in 'df' # f_bsize and f_frsize should be the same to avoid a bug in 'df'
return defer.succeed(struct.pack('>11Q', return defer.succeed(struct.pack('>11Q',
1024, # uint64 f_bsize /* file system block size */ 1024, # uint64 f_bsize /* file system block size */

42
src/allmydata/test/test_sftp.py
View File

@ -42,7 +42,7 @@ class Handler(GridTestMixin, ShouldFailMixin, ReallyEqualMixin, unittest.TestCas
def shouldFailWithSFTPError(self, expected_code, which, callable, *args, **kwargs): def shouldFailWithSFTPError(self, expected_code, which, callable, *args, **kwargs):
assert isinstance(expected_code, int), repr(expected_code) assert isinstance(expected_code, int), repr(expected_code)
assert isinstance(which, str), repr(which) assert isinstance(which, bytes), repr(which)
s = traceback.format_stack() s = traceback.format_stack()
d = defer.maybeDeferred(callable, *args, **kwargs) d = defer.maybeDeferred(callable, *args, **kwargs)
def _done(res): def _done(res):
@ -198,10 +198,10 @@ class Handler(GridTestMixin, ShouldFailMixin, ReallyEqualMixin, unittest.TestCas
d.addCallback(_check) d.addCallback(_check)
d.addCallback(lambda ign: d.addCallback(lambda ign:
self.shouldFailWithSFTPError(sftp.FX_NO_SUCH_FILE, "_path_from_string invalid UTF-8", self.shouldFailWithSFTPError(sftp.FX_NO_SUCH_FILE, b"_path_from_string invalid UTF-8",
self.handler._path_from_string, b"\xFF")) self.handler._path_from_string, b"\xFF"))
d.addCallback(lambda ign: d.addCallback(lambda ign:
self.shouldFailWithSFTPError(sftp.FX_NO_SUCH_FILE, "realPath invalid UTF-8", self.shouldFailWithSFTPError(sftp.FX_NO_SUCH_FILE, b"realPath invalid UTF-8",
self.handler.realPath, b"\xFF")) self.handler.realPath, b"\xFF"))
return d return d
@ -211,29 +211,29 @@ class Handler(GridTestMixin, ShouldFailMixin, ReallyEqualMixin, unittest.TestCas
d = defer.succeed(None) d = defer.succeed(None)
d.addCallback(lambda ign: d.addCallback(lambda ign:
self.shouldFailWithSFTPError(sftp.FX_FAILURE, "_convert_error SFTPError", self.shouldFailWithSFTPError(sftp.FX_FAILURE, b"_convert_error SFTPError",
sftpd._convert_error, Failure(sftp.SFTPError(sftp.FX_FAILURE, "foo")), "request")) sftpd._convert_error, Failure(sftp.SFTPError(sftp.FX_FAILURE, "foo")), "request"))
d.addCallback(lambda ign: d.addCallback(lambda ign:
self.shouldFailWithSFTPError(sftp.FX_NO_SUCH_FILE, "_convert_error NoSuchChildError", self.shouldFailWithSFTPError(sftp.FX_NO_SUCH_FILE, b"_convert_error NoSuchChildError",
sftpd._convert_error, Failure(NoSuchChildError("foo")), "request")) sftpd._convert_error, Failure(NoSuchChildError("foo")), "request"))
d.addCallback(lambda ign: d.addCallback(lambda ign:
self.shouldFailWithSFTPError(sftp.FX_FAILURE, "_convert_error ExistingChildError", self.shouldFailWithSFTPError(sftp.FX_FAILURE, b"_convert_error ExistingChildError",
sftpd._convert_error, Failure(ExistingChildError("foo")), "request")) sftpd._convert_error, Failure(ExistingChildError("foo")), "request"))
d.addCallback(lambda ign: d.addCallback(lambda ign:
self.shouldFailWithSFTPError(sftp.FX_PERMISSION_DENIED, "_convert_error NotWriteableError", self.shouldFailWithSFTPError(sftp.FX_PERMISSION_DENIED, b"_convert_error NotWriteableError",
sftpd._convert_error, Failure(NotWriteableError("foo")), "request")) sftpd._convert_error, Failure(NotWriteableError("foo")), "request"))
d.addCallback(lambda ign: d.addCallback(lambda ign:
self.shouldFailWithSFTPError(sftp.FX_OP_UNSUPPORTED, "_convert_error NotImplementedError", self.shouldFailWithSFTPError(sftp.FX_OP_UNSUPPORTED, b"_convert_error NotImplementedError",
sftpd._convert_error, Failure(NotImplementedError("foo")), "request")) sftpd._convert_error, Failure(NotImplementedError("foo")), "request"))
d.addCallback(lambda ign: d.addCallback(lambda ign:
self.shouldFailWithSFTPError(sftp.FX_EOF, "_convert_error EOFError", self.shouldFailWithSFTPError(sftp.FX_EOF, b"_convert_error EOFError",
sftpd._convert_error, Failure(EOFError("foo")), "request")) sftpd._convert_error, Failure(EOFError("foo")), "request"))
d.addCallback(lambda ign: d.addCallback(lambda ign:
self.shouldFailWithSFTPError(sftp.FX_EOF, "_convert_error defer.FirstError", self.shouldFailWithSFTPError(sftp.FX_EOF, b"_convert_error defer.FirstError",
sftpd._convert_error, Failure(defer.FirstError( sftpd._convert_error, Failure(defer.FirstError(
Failure(sftp.SFTPError(sftp.FX_EOF, "foo")), 0)), "request")) Failure(sftp.SFTPError(sftp.FX_EOF, "foo")), 0)), "request"))
d.addCallback(lambda ign: d.addCallback(lambda ign:
self.shouldFailWithSFTPError(sftp.FX_FAILURE, "_convert_error AssertionError", self.shouldFailWithSFTPError(sftp.FX_FAILURE, b"_convert_error AssertionError",
sftpd._convert_error, Failure(AssertionError("foo")), "request")) sftpd._convert_error, Failure(AssertionError("foo")), "request"))
return d return d
@ -1464,24 +1464,24 @@ class Handler(GridTestMixin, ShouldFailMixin, ReallyEqualMixin, unittest.TestCas
def test_extendedRequest(self): def test_extendedRequest(self):
d = self._set_up("extendedRequest") d = self._set_up("extendedRequest")
d.addCallback(lambda ign: self.handler.extendedRequest("statvfs@openssh.com", "/")) d.addCallback(lambda ign: self.handler.extendedRequest(b"statvfs@openssh.com", b"/"))
def _check(res): def _check(res):
self.failUnless(isinstance(res, str)) self.failUnless(isinstance(res, bytes))
self.failUnlessEqual(len(res), 8*11) self.failUnlessEqual(len(res), 8*11)
d.addCallback(_check) d.addCallback(_check)
d.addCallback(lambda ign: d.addCallback(lambda ign:
self.shouldFailWithSFTPError(sftp.FX_OP_UNSUPPORTED, "extendedRequest foo bar", self.shouldFailWithSFTPError(sftp.FX_OP_UNSUPPORTED, b"extendedRequest foo bar",
self.handler.extendedRequest, "foo", "bar")) self.handler.extendedRequest, b"foo", b"bar"))
d.addCallback(lambda ign: d.addCallback(lambda ign:
self.shouldFailWithSFTPError(sftp.FX_BAD_MESSAGE, "extendedRequest posix-rename@openssh.com invalid 1", self.shouldFailWithSFTPError(sftp.FX_BAD_MESSAGE, b"extendedRequest posix-rename@openssh.com invalid 1",
self.handler.extendedRequest, 'posix-rename@openssh.com', '')) self.handler.extendedRequest, b'posix-rename@openssh.com', b''))
d.addCallback(lambda ign: d.addCallback(lambda ign:
self.shouldFailWithSFTPError(sftp.FX_BAD_MESSAGE, "extendedRequest posix-rename@openssh.com invalid 2", self.shouldFailWithSFTPError(sftp.FX_BAD_MESSAGE, b"extendedRequest posix-rename@openssh.com invalid 2",
self.handler.extendedRequest, 'posix-rename@openssh.com', '\x00\x00\x00\x01')) self.handler.extendedRequest, b'posix-rename@openssh.com', b'\x00\x00\x00\x01'))
d.addCallback(lambda ign: d.addCallback(lambda ign:
self.shouldFailWithSFTPError(sftp.FX_BAD_MESSAGE, "extendedRequest posix-rename@openssh.com invalid 3", self.shouldFailWithSFTPError(sftp.FX_BAD_MESSAGE, b"extendedRequest posix-rename@openssh.com invalid 3",
self.handler.extendedRequest, 'posix-rename@openssh.com', '\x00\x00\x00\x01_\x00\x00\x00\x01')) self.handler.extendedRequest, b'posix-rename@openssh.com', b'\x00\x00\x00\x01_\x00\x00\x00\x01'))
return d return d