diff options
| author | Marc Hoersken <info@marc-hoersken.de> | 2020-03-17 10:36:25 +0100 |
|---|---|---|
| committer | Marc Hoersken <info@marc-hoersken.de> | 2020-03-19 03:26:19 +0100 |
| commit | 3c9066fce54b78cc8b46e82eba033aaa373cdef1 (patch) | |
| tree | 25620b454e007eb89162bf9437cfaadb2bdf5db4 /.cirrus.yml | |
| parent | 8d9802b0aed12932612847f4267a42d08b7bfa71 (diff) | |
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
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 058cd1753..ee8a4e802 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -17,7 +17,11 @@ task: pkginstall_script: - pkg update -f - - pkg install -y autoconf automake libtool pkgconf brotli openldap-client heimdal libpsl libmetalink libssh2 openssh-portable libidn2 librtmp libnghttp2 nghttp2 stunnel py27-impacket + - pkg install -y autoconf automake libtool pkgconf brotli openldap-client heimdal libpsl libmetalink libssh2 openssh-portable libidn2 librtmp libnghttp2 nghttp2 stunnel + - case `python -V` in + Python?3.7*) pkg install -y py37-impacket ;; + Python?2.7*) pkg install -y py27-impacket ;; + esac - pkg delete -y curl configure_script: - ./buildconf |