Skip to content

Scrapy, a fast high-level web crawling & scraping framework for Python.

Simplify MockFTPServer to avoid flaky failures. (#8317)

Andrey Rakhmatullin5969555c8152
diff --git a/tests/mockserver/ftp.py b/tests/mockserver/ftp.py
index 2398466c6..9a1632e56 100644
--- a/tests/mockserver/ftp.py
+++ b/tests/mockserver/ftp.py
@@ -1,13 +1,11 @@
from __future__ import annotations
-import re
import sys
from argparse import ArgumentParser
from pathlib import Path
from shutil import rmtree
from subprocess import PIPE, Popen
from tempfile import mkdtemp
-from threading import Thread
from typing import TYPE_CHECKING, Self
from pyftpdlib.authorizers import DummyAuthorizer
@@ -30,7 +28,6 @@ class MockFTPServer:
"""
proc: Popen[str]
- _stderr_reader: Thread
port: int
path: Path
@@ -43,24 +40,12 @@ class MockFTPServer:
self.proc = Popen(
[sys.executable, "-u", "-m", "tests.mockserver.ftp", "-d", str(self.path)]
+ (["--tls"] if self.tls else []),
- stderr=PIPE,
+ stdout=PIPE,
env=get_script_run_env(),
text=True,
)
- assert self.proc.stderr is not None
- for line in self.proc.stderr:
- if m := re.search(r"starting FTPS? .*on ([^ :]+):(\d+),", line):
- self.port = int(m.group(2))
- break
- else:
- self.proc.kill()
- self.proc.communicate()
- raise RuntimeError(
- "The FTP server failed to start or the output is unrecognized"
- )
- # Keep the pipe from filling up, which would block the server.
- self._stderr_reader = Thread(target=self.proc.stderr.read, daemon=True)
- self._stderr_reader.start()
+ assert self.proc.stdout is not None
+ self.port = int(self.proc.stdout.readline())
return self
def __exit__(
@@ -71,7 +56,6 @@ class MockFTPServer:
) -> None:
rmtree(str(self.path))
self.proc.kill()
- self._stderr_reader.join()
self.proc.communicate()
def url(self, path: str) -> str:
@@ -100,6 +84,7 @@ def main() -> None:
handler.authorizer = authorizer
address = ("127.0.0.1", 0)
server = FTPServer(address, handler)
+ print(server.address[1])
server.serve_forever()