8000 Simplified fake server by mjcaley · Pull Request #415 · mjcaley/aiospamc · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Simplified fake server #415

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

Merged
merged 1 commit into from
Aug 24, 2023
Merged

Simplified fake server #415

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
21 changes: 5 ad 8000 ditions & 16 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,6 @@ def __init__(self, loop: asyncio.AbstractEventLoop, resp: ServerResponse):
self.resp = resp
self.is_ready = threading.Event()
self.is_done = None
self.shutdown = None

async def server(self, reader: StreamReader, writer: StreamWriter):
buffer_size = 1024
Expand All @@ -397,25 +396,15 @@ async def create_server(self, *args, **kwargs):

async def start_server(self, *args, **kwargs):
server = await self.create_server(*args, **kwargs)
self.loop.call_soon_threadsafe(self.is_ready.set)
self.is_ready.set()
await self.is_done.wait()
server.close()
await server.wait_closed()

async def start_controller(self, *args, **kwargs):
server_task = asyncio.create_task(self.start_server(*args, **kwargs))
await self.shutdown.wait()
server_task.cancel()
try:
await server_task
except asyncio.CancelledError:
pass

def run(self, *args, **kwargs):
asyncio.set_event_loop(self.loop)
self.is_done = asyncio.Event()
self.shutdown = asyncio.Event()
self.loop.run_until_complete(self.start_controller(*args, **kwargs))
self.loop.run_until_complete(self.start_server(*args, **kwargs))


class FakeTcpServer(FakeServer):
Expand All @@ -438,7 +427,7 @@ async def fake_tcp_server(unused_tcp_port, response_ok):
executor.submit(fake.run, unused_tcp_port)
fake.is_ready.wait()
yield resp, "localhost", unused_tcp_port
fake.loop.call_soon_threadsafe(fake.shutdown.set)
fake.loop.call_soon_threadsafe(fake.is_done.set)


@pytest.fixture
Expand All @@ -451,7 +440,7 @@ async def fake_tcp_ssl_server(unused_tcp_port, response_ok, server_cert):
executor.submit(fake.run, unused_tcp_port, context)
fake.is_ready.wait()
yield resp, "localhost", unused_tcp_port
fake.loop.call_soon_threadsafe(fake.shutdown.set)
fake.loop.call_soon_threadsafe(fake.is_done.set)


@pytest.fixture
Expand All @@ -466,7 +455,7 @@ async def fake_tcp_ssl_client(unused_tcp_port, response_ok, ca, server_cert):
executor.submit(fake.run, unused_tcp_port, context)
fake.is_ready.wait()
yield resp, "localhost", unused_tcp_port
fake.loop.call_soon_threadsafe(fake.shutdown.set)
fake.loop.call_soon_threadsafe(fake.is_done.set)


@pytest.fixture
Expand Down
2 changes: 1 addition & 1 deletion tests/test_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def test_cli_builder_add_ca_client(client_cert_path, client_key_path):
assert hasattr(c.connection_manager, "ssl_context")


def test_cli_runner_init_defaults(fake_tcp_server):
def test_cli_runner_init_defaults():
request = Request("PING")
c = CommandRunner(
Client(ConnectionManagerBuilder().with_tcp("localhost", 783).build()), request
Expand Down
0