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

Fix control server integration tests #770

Merged
merged 2 commits into from
Apr 17, 2021
Merged

Fix control server integration tests #770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52b2442
Remove unused import
Askaholic Apr 10, 2021
f1d5c4d
Setup control server fixture to listen on localhost
Askaholic Apr 10, 2021
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
12 changes: 10 additions & 2 deletions tests/integration_tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
from aiohttp import web
from asynctest import exhaust_callbacks

from server import GameService, ServerInstance, run_control_server
from server import GameService, ServerInstance
from server.config import config
from server.control import ControlServer
from server.db.models import login
from server.ladder_service import LadderService
from server.party_service import PartyService
Expand Down Expand Up @@ -102,7 +104,13 @@ async def lobby_server(

@pytest.fixture
async def control_server(player_service, game_service):
server = await run_control_server(player_service, game_service)
server = ControlServer(
game_service,
player_service,
"127.0.0.1",
config.CONTROL_SERVER_PORT
)
await server.start()

yield server

Expand Down
2 changes: 0 additions & 2 deletions tests/integration_tests/test_control_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import asyncio

import aiohttp
import pytest

Expand Down