From 01e844009b998759ce552efc24c9df3e8ed09a88 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 6 Feb 2020 13:45:16 +0100 Subject: [PATCH] use python from galaxy --- requirements.txt | 1 + tests/test_subscriptions.py | 32 +++++++++++++++++--------------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/requirements.txt b/requirements.txt index e812aa0..aade3e0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,3 +8,4 @@ pytest-flakes==4.0.0 aiohttp==3.5.4 certifi==2019.3.9 psutil==5.6.3; sys_platform == 'darwin' +asynctest==0.13.0 diff --git a/tests/test_subscriptions.py b/tests/test_subscriptions.py index e5d8cf0..f871390 100644 --- a/tests/test_subscriptions.py +++ b/tests/test_subscriptions.py @@ -5,13 +5,7 @@ from galaxy.api.errors import FailedParsingManifest, BackendError, UnknownError from galaxy.unittest.mock import async_return_value from tests import create_message, get_messages - -class AsyncIter: - def __init__(self, items): - self.items = items - - async def __aiter__(self): - yield self.items +from asynctest import MagicMock @pytest.mark.asyncio async def test_get_subscriptions_success(plugin, read, write): @@ -102,14 +96,19 @@ async def test_get_subscription_games_success(plugin, read, write): } read.side_effect = [async_return_value(create_message(request)), async_return_value(b"", 10)] - games = [ - SubscriptionGame(game_title="game A", game_id="game_A"), - SubscriptionGame(game_title="game B", game_id="game_B", start_time=1548495632), - SubscriptionGame(game_title="game C", game_id="game_C", end_time=1548495633), - SubscriptionGame(game_title="game D", game_id="game_D", start_time=1548495632, end_time=1548495633), - ] + async def sub_games(): + games = [ + SubscriptionGame(game_title="game A", game_id="game_A"), + SubscriptionGame(game_title="game B", game_id="game_B", start_time=1548495632), + SubscriptionGame(game_title="game C", game_id="game_C", end_time=1548495633), + SubscriptionGame(game_title="game D", game_id="game_D", start_time=1548495632, end_time=1548495633), + ] + yield [game for game in games] - plugin.get_subscription_games.return_value = AsyncIter(games) + print(type(sub_games())) + print(sub_games()) + + plugin.get_subscription_games.return_value = sub_games() await plugin.run() plugin.prepare_subscription_games_context.assert_called_with(["sub_a"]) plugin.get_subscription_games.assert_called_with("sub_a", 5) @@ -170,7 +169,10 @@ async def test_get_subscription_games_success_none_yield(plugin, read, write): } read.side_effect = [async_return_value(create_message(request)), async_return_value(b"", 10)] - plugin.get_subscription_games.return_value = AsyncIter(None) + async def sub_games(): + yield None + + plugin.get_subscription_games.return_value = sub_games() await plugin.run() plugin.prepare_subscription_games_context.assert_called_with(["sub_a"]) plugin.get_subscription_games.assert_called_with("sub_a", 5)