From cd452b881de387caecfe6081efbb48be2b85b11a Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 10 Feb 2020 10:05:58 +0100 Subject: [PATCH] include subscription_name in partial finished notification --- src/galaxy/api/plugin.py | 11 ++++++++--- tests/test_subscriptions.py | 15 ++++++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/galaxy/api/plugin.py b/src/galaxy/api/plugin.py index 59dda07..fab5b97 100644 --- a/src/galaxy/api/plugin.py +++ b/src/galaxy/api/plugin.py @@ -129,7 +129,7 @@ class SubscriptionGamesImporter(Importer): logger.exception("Unexpected exception raised in %s importer", self._name) self._notification_failure(id_, UnknownError()) finally: - self._notification_partial_finished() + self._notification_partial_finished(id_) class Plugin: @@ -722,8 +722,13 @@ class Plugin: } ) - def _subscriptions_games_partial_import_finished(self) -> None: - self._connection.send_notification("subscription_games_partial_import_finished", None) + def _subscriptions_games_partial_import_finished(self, subscription_name: str) -> None: + self._connection.send_notification( + "subscription_games_partial_import_finished", + { + "subscription_name": subscription_name + } + ) def _subscription_games_import_finished(self) -> None: self._connection.send_notification("subscription_games_import_finished", None) diff --git a/tests/test_subscriptions.py b/tests/test_subscriptions.py index 8329590..368965b 100644 --- a/tests/test_subscriptions.py +++ b/tests/test_subscriptions.py @@ -143,7 +143,10 @@ async def test_get_subscription_games_success(plugin, read, write): { 'jsonrpc': '2.0', 'method': - 'subscription_games_partial_import_finished', 'params': None + 'subscription_games_partial_import_finished', + 'params': { + "subscription_name": "sub_a" + } }, { "jsonrpc": "2.0", @@ -191,7 +194,10 @@ async def test_get_subscription_games_success_empty(plugin, read, write): { 'jsonrpc': '2.0', 'method': - 'subscription_games_partial_import_finished', 'params': None + 'subscription_games_partial_import_finished', + 'params': { + "subscription_name": "sub_a" + } }, { "jsonrpc": "2.0", @@ -242,7 +248,10 @@ async def test_get_subscription_games_error(exception, code, message, plugin, re { 'jsonrpc': '2.0', 'method': - 'subscription_games_partial_import_finished', 'params': None + 'subscription_games_partial_import_finished', + 'params': { + "subscription_name": "sub_a" + } }, { "jsonrpc": "2.0",