Skip to content

Commit d561022

Browse files
committed
Do not wait for external tasks in run
1 parent aa7b398 commit d561022

7 files changed

Lines changed: 13 additions & 14 deletions

File tree

src/galaxy/api/plugin.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ async def wrapper(*args, **kwargs):
174174
async def run(self):
175175
"""Plugin's main coroutine."""
176176
await self._server.run()
177-
await self._external_task_manager.wait()
178177

179178
def close(self) -> None:
180179
if not self._active:

tests/test_achievements.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ async def test_prepare_get_unlocked_achievements_context_error(plugin, read, wri
135135
"game_ids": ["14"]
136136
}
137137
}
138-
read.side_effect = [async_return_value(create_message(request)), async_return_value(b"")]
138+
read.side_effect = [async_return_value(create_message(request)), async_return_value(b"", 10)]
139139

140140
await plugin.run()
141141

@@ -176,7 +176,7 @@ async def test_import_in_progress(plugin, read, write):
176176
read.side_effect = [
177177
async_return_value(create_message(requests[0])),
178178
async_return_value(create_message(requests[1])),
179-
async_return_value(b"")
179+
async_return_value(b"", 10)
180180
]
181181

182182
await plugin.run()

tests/test_authenticate.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ async def test_success(plugin, read, write):
1717
"id": "3",
1818
"method": "init_authentication"
1919
}
20-
read.side_effect = [async_return_value(create_message(request)), async_return_value(b"")]
20+
read.side_effect = [async_return_value(create_message(request)), async_return_value(b"", 10)]
2121
plugin.authenticate.return_value = async_return_value(Authentication("132", "Zenek"))
2222
await plugin.run()
2323
plugin.authenticate.assert_called_with()
@@ -55,7 +55,7 @@ async def test_failure(plugin, read, write, error, code, message):
5555
"method": "init_authentication"
5656
}
5757

58-
read.side_effect = [async_return_value(create_message(request)), async_return_value(b"")]
58+
read.side_effect = [async_return_value(create_message(request)), async_return_value(b"", 10)]
5959
plugin.authenticate.side_effect = error()
6060
await plugin.run()
6161
plugin.authenticate.assert_called_with()
@@ -84,7 +84,7 @@ async def test_stored_credentials(plugin, read, write):
8484
}
8585
}
8686
}
87-
read.side_effect = [async_return_value(create_message(request)), async_return_value(b"")]
87+
read.side_effect = [async_return_value(create_message(request)), async_return_value(b"", 10)]
8888
plugin.authenticate.return_value = async_return_value(Authentication("132", "Zenek"))
8989
await plugin.run()
9090
plugin.authenticate.assert_called_with(stored_credentials={"token": "ABC"})

tests/test_friends.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ async def test_get_friends_success(plugin, read, write):
1515
"method": "import_friends"
1616
}
1717

18-
read.side_effect = [async_return_value(create_message(request)), async_return_value(b"")]
18+
read.side_effect = [async_return_value(create_message(request)), async_return_value(b"", 10)]
1919
plugin.get_friends.return_value = async_return_value([
2020
FriendInfo("3", "Jan"),
2121
FriendInfo("5", "Ola")
@@ -45,7 +45,7 @@ async def test_get_friends_failure(plugin, read, write):
4545
"method": "import_friends"
4646
}
4747

48-
read.side_effect = [async_return_value(create_message(request)), async_return_value(b"")]
48+
read.side_effect = [async_return_value(create_message(request)), async_return_value(b"", 10)]
4949
plugin.get_friends.side_effect = UnknownError()
5050
await plugin.run()
5151
plugin.get_friends.assert_called_with()

tests/test_game_times.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ async def test_prepare_get_game_time_context_error(plugin, read, write):
135135
"game_ids": ["6"]
136136
}
137137
}
138-
read.side_effect = [async_return_value(create_message(request)), async_return_value(b"")]
138+
read.side_effect = [async_return_value(create_message(request)), async_return_value(b"", 10)]
139139
await plugin.run()
140140

141141
assert get_messages(write) == [
@@ -174,7 +174,7 @@ async def test_import_in_progress(plugin, read, write):
174174
read.side_effect = [
175175
async_return_value(create_message(requests[0])),
176176
async_return_value(create_message(requests[1])),
177-
async_return_value(b"")
177+
async_return_value(b"", 10)
178178
]
179179

180180
await plugin.run()

tests/test_local_games.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ async def test_success(plugin, read, write):
1515
"id": "3",
1616
"method": "import_local_games"
1717
}
18-
read.side_effect = [async_return_value(create_message(request)), async_return_value(b"")]
18+
read.side_effect = [async_return_value(create_message(request)), async_return_value(b"", 10)]
1919

2020
plugin.get_local_games.return_value = async_return_value([
2121
LocalGame("1", LocalGameState.Running),
@@ -63,7 +63,7 @@ async def test_failure(plugin, read, write, error, code, message):
6363
"id": "3",
6464
"method": "import_local_games"
6565
}
66-
read.side_effect = [async_return_value(create_message(request)), async_return_value(b"")]
66+
read.side_effect = [async_return_value(create_message(request)), async_return_value(b"", 10)]
6767
plugin.get_local_games.side_effect = error()
6868
await plugin.run()
6969
plugin.get_local_games.assert_called_with()

tests/test_owned_games.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ async def test_success(plugin, read, write):
1515
"id": "3",
1616
"method": "import_owned_games"
1717
}
18-
read.side_effect = [async_return_value(create_message(request)), async_return_value(b"")]
18+
read.side_effect = [async_return_value(create_message(request)), async_return_value(b"", 10)]
1919

2020
plugin.get_owned_games.return_value = async_return_value([
2121
Game("3", "Doom", None, LicenseInfo(LicenseType.SinglePurchase, None)),
@@ -80,7 +80,7 @@ async def test_failure(plugin, read, write):
8080
"method": "import_owned_games"
8181
}
8282

83-
read.side_effect = [async_return_value(create_message(request)), async_return_value(b"")]
83+
read.side_effect = [async_return_value(create_message(request)), async_return_value(b"", 10)]
8484
plugin.get_owned_games.side_effect = UnknownError()
8585
await plugin.run()
8686
plugin.get_owned_games.assert_called_with()

0 commit comments

Comments
 (0)