From d5610221a90c7414e34b0be26b7b5d9bcd14230b Mon Sep 17 00:00:00 2001 From: Romuald Juchnowicz-Bierbasz Date: Wed, 18 Sep 2019 12:15:18 +0200 Subject: [PATCH] Do not wait for external tasks in run --- src/galaxy/api/plugin.py | 1 - tests/test_achievements.py | 4 ++-- tests/test_authenticate.py | 6 +++--- tests/test_friends.py | 4 ++-- tests/test_game_times.py | 4 ++-- tests/test_local_games.py | 4 ++-- tests/test_owned_games.py | 4 ++-- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/galaxy/api/plugin.py b/src/galaxy/api/plugin.py index f573ebb..6badaed 100644 --- a/src/galaxy/api/plugin.py +++ b/src/galaxy/api/plugin.py @@ -174,7 +174,6 @@ class Plugin: async def run(self): """Plugin's main coroutine.""" await self._server.run() - await self._external_task_manager.wait() def close(self) -> None: if not self._active: diff --git a/tests/test_achievements.py b/tests/test_achievements.py index 593fb22..598a51a 100644 --- a/tests/test_achievements.py +++ b/tests/test_achievements.py @@ -135,7 +135,7 @@ async def test_prepare_get_unlocked_achievements_context_error(plugin, read, wri "game_ids": ["14"] } } - read.side_effect = [async_return_value(create_message(request)), async_return_value(b"")] + read.side_effect = [async_return_value(create_message(request)), async_return_value(b"", 10)] await plugin.run() @@ -176,7 +176,7 @@ async def test_import_in_progress(plugin, read, write): read.side_effect = [ async_return_value(create_message(requests[0])), async_return_value(create_message(requests[1])), - async_return_value(b"") + async_return_value(b"", 10) ] await plugin.run() diff --git a/tests/test_authenticate.py b/tests/test_authenticate.py index e43d59c..1c29ad2 100644 --- a/tests/test_authenticate.py +++ b/tests/test_authenticate.py @@ -17,7 +17,7 @@ async def test_success(plugin, read, write): "id": "3", "method": "init_authentication" } - read.side_effect = [async_return_value(create_message(request)), async_return_value(b"")] + read.side_effect = [async_return_value(create_message(request)), async_return_value(b"", 10)] plugin.authenticate.return_value = async_return_value(Authentication("132", "Zenek")) await plugin.run() plugin.authenticate.assert_called_with() @@ -55,7 +55,7 @@ async def test_failure(plugin, read, write, error, code, message): "method": "init_authentication" } - read.side_effect = [async_return_value(create_message(request)), async_return_value(b"")] + read.side_effect = [async_return_value(create_message(request)), async_return_value(b"", 10)] plugin.authenticate.side_effect = error() await plugin.run() plugin.authenticate.assert_called_with() @@ -84,7 +84,7 @@ async def test_stored_credentials(plugin, read, write): } } } - read.side_effect = [async_return_value(create_message(request)), async_return_value(b"")] + read.side_effect = [async_return_value(create_message(request)), async_return_value(b"", 10)] plugin.authenticate.return_value = async_return_value(Authentication("132", "Zenek")) await plugin.run() plugin.authenticate.assert_called_with(stored_credentials={"token": "ABC"}) diff --git a/tests/test_friends.py b/tests/test_friends.py index 2917fea..820f824 100644 --- a/tests/test_friends.py +++ b/tests/test_friends.py @@ -15,7 +15,7 @@ async def test_get_friends_success(plugin, read, write): "method": "import_friends" } - read.side_effect = [async_return_value(create_message(request)), async_return_value(b"")] + read.side_effect = [async_return_value(create_message(request)), async_return_value(b"", 10)] plugin.get_friends.return_value = async_return_value([ FriendInfo("3", "Jan"), FriendInfo("5", "Ola") @@ -45,7 +45,7 @@ async def test_get_friends_failure(plugin, read, write): "method": "import_friends" } - read.side_effect = [async_return_value(create_message(request)), async_return_value(b"")] + read.side_effect = [async_return_value(create_message(request)), async_return_value(b"", 10)] plugin.get_friends.side_effect = UnknownError() await plugin.run() plugin.get_friends.assert_called_with() diff --git a/tests/test_game_times.py b/tests/test_game_times.py index 12cf496..7f34e58 100644 --- a/tests/test_game_times.py +++ b/tests/test_game_times.py @@ -135,7 +135,7 @@ async def test_prepare_get_game_time_context_error(plugin, read, write): "game_ids": ["6"] } } - read.side_effect = [async_return_value(create_message(request)), async_return_value(b"")] + read.side_effect = [async_return_value(create_message(request)), async_return_value(b"", 10)] await plugin.run() assert get_messages(write) == [ @@ -174,7 +174,7 @@ async def test_import_in_progress(plugin, read, write): read.side_effect = [ async_return_value(create_message(requests[0])), async_return_value(create_message(requests[1])), - async_return_value(b"") + async_return_value(b"", 10) ] await plugin.run() diff --git a/tests/test_local_games.py b/tests/test_local_games.py index 74c0636..9899ccb 100644 --- a/tests/test_local_games.py +++ b/tests/test_local_games.py @@ -15,7 +15,7 @@ async def test_success(plugin, read, write): "id": "3", "method": "import_local_games" } - read.side_effect = [async_return_value(create_message(request)), async_return_value(b"")] + read.side_effect = [async_return_value(create_message(request)), async_return_value(b"", 10)] plugin.get_local_games.return_value = async_return_value([ LocalGame("1", LocalGameState.Running), @@ -63,7 +63,7 @@ async def test_failure(plugin, read, write, error, code, message): "id": "3", "method": "import_local_games" } - read.side_effect = [async_return_value(create_message(request)), async_return_value(b"")] + read.side_effect = [async_return_value(create_message(request)), async_return_value(b"", 10)] plugin.get_local_games.side_effect = error() await plugin.run() plugin.get_local_games.assert_called_with() diff --git a/tests/test_owned_games.py b/tests/test_owned_games.py index 64ece04..0f2752d 100644 --- a/tests/test_owned_games.py +++ b/tests/test_owned_games.py @@ -15,7 +15,7 @@ async def test_success(plugin, read, write): "id": "3", "method": "import_owned_games" } - read.side_effect = [async_return_value(create_message(request)), async_return_value(b"")] + read.side_effect = [async_return_value(create_message(request)), async_return_value(b"", 10)] plugin.get_owned_games.return_value = async_return_value([ Game("3", "Doom", None, LicenseInfo(LicenseType.SinglePurchase, None)), @@ -80,7 +80,7 @@ async def test_failure(plugin, read, write): "method": "import_owned_games" } - read.side_effect = [async_return_value(create_message(request)), async_return_value(b"")] + read.side_effect = [async_return_value(create_message(request)), async_return_value(b"", 10)] plugin.get_owned_games.side_effect = UnknownError() await plugin.run() plugin.get_owned_games.assert_called_with()