Skip to content
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.

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

Update tests for test-server 0.0.31 #137

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion requirements_dev.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
six
test_server==0.0.27
test_server==0.0.31
psutil
pytest
pylint
Expand Down
4 changes: 2 additions & 2 deletions test/test_pysocks.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,7 @@ def setUpClass(cls):
from test_server import TestServer

cls.test_server = TestServer(address=TEST_SERVER_HOST,
port=TEST_SERVER_PORT,
engine='subprocess')
port=TEST_SERVER_PORT)
cls.test_server.start()

@classmethod
Expand Down Expand Up @@ -112,6 +111,7 @@ def assert_proxy_response(self, resp_data, content, address,
self.test_server.request['headers']['user-agent'])
self.assertEqual('%s:%d' % address,
self.test_server.request['headers']['host'])
content = b'3\r\n' + content + b'\r\n0'
Copy link
Author

@jayvdb jayvdb Dec 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I havent investigated why the 3 & 0 are appearing.

Also I noticed on openSUSE_Factory_zSystems' arch 's390x' this intermittently fails with

AssertionError: '3\r\nzzz\r\n0' != '3\r\nzzz\r\n'

self.assertEqual(content, resp_body)
self.assertEqual(client_ip or PROXY_HOST_IP,
self.test_server.request['client_ip'])
Expand Down