romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-28 07:23:07 +03:00
Code Issues Projects Releases Packages Wiki Activity

tests: make Python-based servers compatible with Python 2 and 3

Browse source 
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
This commit is contained in:
Marc Hoersken 2020-03-17 10:36:25 +01:00
parent 8d9802b0ae
commit 3c9066fce5
No known key found for this signature in database
GPG key ID: 61E03CBED7BC859E
7 changed files with 59 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/data/test1451
View file

@ -29,7 +29,7 @@ Basic SMB request
-u 'curltest:curltest' smb://%HOSTIP:%SMBPORT/TESTS/1451
</command>
<precheck>
python2 -c "__import__('pkgutil').find_loader('impacket') or (__import__('sys').stdout.write('Test only works if Python package impacket is installed\n'), __import__('sys').exit(1))"
python -c "__import__('pkgutil').find_loader('impacket') or (__import__('sys').stdout.write('Test only works if Python package impacket is installed\n'), __import__('sys').exit(1))"
</precheck>
</client>

1
tests/data/test1452
View file

@ -3,7 +3,6 @@
<keywords>
TELNET
UPLOAD
flaky
</keywords>
</info>