From 3c9066fce54b78cc8b46e82eba033aaa373cdef1 Mon Sep 17 00:00:00 2001 From: Marc Hoersken Date: Tue, 17 Mar 2020 10:36:25 +0100 Subject: tests: make Python-based servers compatible with Python 2 and 3 Update smbserver.py and negtelnetserver.py to be compatible with Python 3 while staying backwards-compatible to support Python 2. Fix string encoding and handling of echoed and transferred data. Tested with both Python 2.7.17 and Python 3.7.7 Reported-by: Daniel Stenberg Assisted-by: Kamil Dudka Reviewed-by: Marcel Raad Fixes #5104 Closes #5110 --- tests/README | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) (limited to 'tests/README') diff --git a/tests/README b/tests/README index 5fe16c16e..6ab61c5fc 100644 --- a/tests/README +++ b/tests/README @@ -39,7 +39,7 @@ The curl Test Suite 1.1 Requires to run perl (and a unix-style shell) - python (and a unix-style shell) + python (and a unix-style shell, for SMB and TELNET tests) python-impacket (for SMB tests) diff (when a test fails, a diff is shown) stunnel (for HTTPS and FTPS tests) @@ -47,13 +47,28 @@ The curl Test Suite nghttpx (for HTTP/2 tests) nroff (for --manual tests) + 1.1.1 Installation of python-impacket + + The Python-based test servers support both recent Python 2 and 3. + You can figure out your default Python interpreter with python -V + Please install python-impacket in the correct Python environment. - At the moment the Python-based test servers still require Python 2. - Therefore you will need to use pip2 or your OS' package manager to - install the Python 2 version of impacket (if it is still available). + You can use pip or your OS' package manager to install 'impacket'. + + On Debian/Ubuntu the package names are: + Python 2: 'python-impacket' + Python 3: 'python3-impacket' + + On FreeBSD the package names are: + Python 2: 'py27-impacket' + Python 3: 'py37-impacket' + + On any system where pip is available: + Python 2: 'pip2 install impacket' + Python 3: 'pip3 install impacket' - On stable Debian/Ubuntu the package name is "python-impacket". - On FreeBSD the package name is "py27-impacket". + You may also need to manually install the Python package 'six' + as that may be a missing requirement for impacket on Python 3. 1.2 Port numbers used by test servers -- cgit v1.2.3