From cfcefe8bda08f93168f81cbfad7acdd44b127836 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 20 Jan 2025 01:49:20 +0100 Subject: [PATCH] Update test compat with pyftpdlib>=1.5.10 --- tests/requirements.txt | 2 +- tests/test_ftpfs.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index b7ff3ce4..03052a76 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -2,7 +2,7 @@ # pyftpdlib is needed to spawn a FTP server for the # FTPFS test suite -pyftpdlib ~=1.5 +pyftpdlib ~=1.5.10 # these are optional dependencies for pyftpdlib that # are not explicitly listed, we need to install these diff --git a/tests/test_ftpfs.py b/tests/test_ftpfs.py index 2bb2c73c..451d950f 100644 --- a/tests/test_ftpfs.py +++ b/tests/test_ftpfs.py @@ -146,7 +146,7 @@ class TestFTPFS(FSTestCases, unittest.TestCase): @classmethod def setUpClass(cls): - from pyftpdlib.test import ThreadedTestFTPd + from pyftpdlib.test import FtpdThreadWrapper super(TestFTPFS, cls).setUpClass() @@ -154,7 +154,7 @@ def setUpClass(cls): cls._temp_path = os.path.join(cls._temp_dir, text_type(uuid.uuid4())) os.mkdir(cls._temp_path) - cls.server = ThreadedTestFTPd() + cls.server = FtpThreadWrapper() cls.server.shutdown_after = -1 cls.server.handler.authorizer = DummyAuthorizer() cls.server.handler.authorizer.add_user(