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.

Sign up for GitHub

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

Jump to bottom

disable failing socket reuse and proxy unittest #30

Merged
merged 1 commit into from
Jan 14, 2024
Merged

disable failing socket reuse and proxy unittest #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 22 additions & 19 deletions wpull/network/connection_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,27 +131,30 @@ async def test_read_timeout(self):

connection.close()

# FIXME: Broken unittest
# Python 3.11+ uses the _ensure_fd_no_transport method that
# prevents multiple transports from using a single socket
# Reference: https://github.com/python/cpython/issues/88968

# @gen_test(timeout=30)
async def test_sock_reuse(self):
# Python 3.11+ uses the _ensure_fd_no_transport method that
# prevents multiple transports from using a single socket
# Reference: https://github.com/python/cpython/issues/88968
connection1 = Connection(('127.0.0.1', self.get_http_port()))
await connection1.connect()

connection2 = Connection(
('127.0.0.1', self.get_http_port()),
sock=connection1.writer.get_extra_info('socket')
)

await connection2.connect()
await connection2.write(b'GET / HTTP/1.1\r\n\r\n')

data = await connection2.readline()
self.assertEqual(b'HTTP', data[:4])
# async def test_sock_reuse(self):

# connection1 = Connection(('127.0.0.1', self.get_http_port()))
# await connection1.connect()

# connection2 = Connection(
# ('127.0.0.1', self.get_http_port()),
# sock=connection1.writer.get_extra_info('socket')
# )

# await connection2.connect()
# await connection2.write(b'GET / HTTP/1.1\r\n\r\n')

# data = await connection2.readline()
# self.assertEqual(b'HTTP', data[:4])

connection1.close()
connection2.close()
# connection1.close()
# connection2.close()

class TestConnectionSSL(SSLBadAppTestCase2):
# @gen_test(timeout=30)
Expand Down
87 changes: 57 additions & 30 deletions wpull/proxy/proxy_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,44 +14,71 @@
from tornado.testing import gen_test


class Mixin:
@gen_test(timeout=30)
async def test_basic_requests(self):
proxy_http_client = Client()
proxy_server = HTTPProxyServer(proxy_http_client)
proxy_socket, proxy_port = tornado.testing.bind_unused_port()
# FIXME: Test currently fails due internal server returning: CONNECT: 501 CONNECT is intentionally not supported
# See: https://github.com/ArchiveTeam/wpull/pull/348
# See: https://github.com/ArchiveTeam/wpull/pull/348/commits/561380774baf5fd44990d16d64f545259c7385a1

await asyncio.start_server(proxy_server, sock=proxy_socket)

connection_pool = HTTPProxyConnectionPool(('127.0.0.1', proxy_port))
http_client = Client(connection_pool=connection_pool)
# class Mixin:
# @gen_test(timeout=30)
# async def test_basic_requests(self):
# proxy_http_client = Client()
# proxy_server = HTTPProxyServer(proxy_http_client)
# proxy_socket, proxy_port = tornado.testing.bind_unused_port()

for dummy in range(3):
with http_client.session() as session:
response = await session.start(Request(self.get_url('/')))
self.assertEqual(200, response.status_code)
# await asyncio.start_server(proxy_server, sock=proxy_socket)

file = io.BytesIO()
await session.download(file=file)
data = file.getvalue().decode('ascii', 'replace')
self.assertTrue(data.endswith('</html>'))
# connection_pool = HTTPProxyConnectionPool(('127.0.0.1', proxy_port))
# http_client = Client(connection_pool=connection_pool)

with http_client.session() as session:
response = await session.start(Request(
self.get_url('/always_error')))
self.assertEqual(500, response.status_code)
self.assertEqual('Dragon In Data Center', response.reason)
# for dummy in range(3):
# with http_client.session() as session:
# response = await session.start(Request(self.get_url('/')))
# self.assertEqual(200, response.status_code)

file = io.BytesIO()
await session.download(file=file)
data = file.getvalue().decode('ascii', 'replace')
self.assertEqual('Error', data)
# file = io.BytesIO()
# await session.download(file=file)
# data = file.getvalue().decode('ascii', 'replace')
# self.assertTrue(data.endswith('</html>'))

# with http_client.session() as session:
# response = await session.start(Request(
# self.get_url('/always_error')))
# self.assertEqual(500, response.status_code)
# self.assertEqual('Dragon In Data Center', response.reason)

class TestProxy(wpull.testing.goodapp.GoodAppTestCase, Mixin):
pass
# file = io.BytesIO()
# await session.download(file=file)
# data = file.getvalue().decode('ascii', 'replace')
# self.assertEqual('Error', data)


class TestProxySSL(wpull.testing.goodapp.GoodAppHTTPSTestCase, Mixin):
pass
# class TestProxy(wpull.testing.goodapp.GoodAppTestCase, Mixin):
# pass


# class TestProxySSL(wpull.testing.goodapp.GoodAppHTTPSTestCase, Mixin):
# pass # FIXME: Broken unittest
# Python 3.11+ uses the _ensure_fd_no_transport method that
# prevents multiple transports from using a single socket
# Reference: https://github.com/python/cpython/issues/88968

# @gen_test(timeout=30)
# async def test_sock_reuse(self):

# connection1 = Connection(('127.0.0.1', self.get_http_port()))
# await connection1.connect()

# connection2 = Connection(
# ('127.0.0.1', self.get_http_port()),
# sock=connection1.writer.get_extra_info('socket')
# )

# await connection2.connect()
# await connection2.write(b'GET / HTTP/1.1\r\n\r\n')

# data = await connection2.readline()
# self.assertEqual(b'HTTP', data[:4])

# connection1.close()
# connection2.close()
Loading