Skip to content

Make tests compatible with pyftpdlib 2.0 #595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make tests compatible with pyftpdlib 2.0 #595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions tests/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
# the bare requirements for running tests

# pyftpdlib is needed to spawn a FTP server for the
# FTPFS test suite
pyftpdlib ~=1.5

# these are optional dependencies for pyftpdlib that
# are not explicitly listed, we need to install these
# ourselves
psutil ~=5.0
pysendfile ~=2.0 ; python_version <= "3.3"
# FTPFS test suite; we import from pyftpdlib.test, so
# we need (at least some of) pyftpdlib's test
# dependencies
pyftpdlib[test] ~=2.0

# mock is only available from Python 3.3 onward, and
# mock v4+ doesn't support Python 2.7 anymore
Expand Down
8 changes: 4 additions & 4 deletions tests/test_ftpfs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,15 +146,15 @@ class TestFTPFS(FSTestCases, unittest.TestCase):

@classmethod
def setUpClass(cls):
from pyftpdlib.test import ThreadedTestFTPd
from pyftpdlib.test import FtpdThreadWrapper

super(TestFTPFS, cls).setUpClass()

cls._temp_dir = tempfile.mkdtemp("ftpfs2tests")
cls._temp_path = os.path.join(cls._temp_dir, text_type(uuid.uuid4()))
os.mkdir(cls._temp_path)

cls.server = ThreadedTestFTPd()
cls.server = FtpdThreadWrapper()
cls.server.shutdown_after = -1
cls.server.handler.authorizer = DummyAuthorizer()
cls.server.handler.authorizer.add_user(
Expand Down Expand Up @@ -336,15 +336,15 @@ class TestAnonFTPFS(FSTestCases, unittest.TestCase):

@classmethod
def setUpClass(cls):
from pyftpdlib.test import ThreadedTestFTPd
from pyftpdlib.test import FtpdThreadWrapper

super(TestAnonFTPFS, cls).setUpClass()

cls._temp_dir = tempfile.mkdtemp("ftpfs2tests")
cls._temp_path = os.path.join(cls._temp_dir, text_type(uuid.uuid4()))
os.mkdir(cls._temp_path)

cls.server = ThreadedTestFTPd()
cls.server = FtpdThreadWrapper()
cls.server.shutdown_after = -1
cls.server.handler.authorizer = DummyAuthorizer()
cls.server.handler.authorizer.add_anonymous(cls._temp_path, perm="elradfmw")
Expand Down