From 277f3ff47b1ce955a44889158374aa5f24283455 Mon Sep 17 00:00:00 2001 From: Christof Date: Mon, 21 Dec 2020 09:52:10 +0100 Subject: [PATCH] tests: cleaup --- tests/rpc/test_rpc_telegram.py | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/tests/rpc/test_rpc_telegram.py b/tests/rpc/test_rpc_telegram.py index 148eb6428..26384a507 100644 --- a/tests/rpc/test_rpc_telegram.py +++ b/tests/rpc/test_rpc_telegram.py @@ -1736,9 +1736,6 @@ def test__send_msg_keyboard(default_conf, mocker, caplog) -> None: bot = MagicMock() bot.send_message = MagicMock() freqtradebot = get_patched_freqtradebot(mocker, default_conf) - telegram = Telegram(freqtradebot) - telegram._updater = MagicMock() - telegram._updater.bot = bot invalid_keys_list = [['/not_valid', '/profit'], ['/daily'], ['/alsoinvalid']] default_keys_list = [['/daily', '/profit', '/balance'], @@ -1750,8 +1747,15 @@ def test__send_msg_keyboard(default_conf, mocker, caplog) -> None: ['/count', '/start', '/reload_config', '/help']] custom_keyboard = ReplyKeyboardMarkup(custom_keys_list) + def init_telegram(freqtradebot): + telegram = Telegram(freqtradebot) + telegram._updater = MagicMock() + telegram._updater.bot = bot + return telegram + # no keyboard in config -> default keyboard - # telegram._config['telegram']['enabled'] = True + freqtradebot.config['telegram']['enabled'] = True + telegram = init_telegram(freqtradebot) telegram._send_msg('test') used_keyboard = bot.send_message.call_args[1]['reply_markup'] assert used_keyboard == default_keyboard @@ -1759,9 +1763,7 @@ def test__send_msg_keyboard(default_conf, mocker, caplog) -> None: # invalid keyboard in config -> default keyboard freqtradebot.config['telegram']['enabled'] = True freqtradebot.config['telegram']['keyboard'] = invalid_keys_list - telegram = Telegram(freqtradebot) - telegram._updater = MagicMock() - telegram._updater.bot = bot + telegram = init_telegram(freqtradebot) telegram._send_msg('test') used_keyboard = bot.send_message.call_args[1]['reply_markup'] assert used_keyboard == default_keyboard @@ -1772,11 +1774,7 @@ def test__send_msg_keyboard(default_conf, mocker, caplog) -> None: # valid keyboard in config -> custom keyboard freqtradebot.config['telegram']['enabled'] = True freqtradebot.config['telegram']['keyboard'] = custom_keys_list - telegram = Telegram(freqtradebot) - telegram._updater = MagicMock() - telegram._updater.bot = bot - telegram._config['telegram']['enabled'] = True - telegram._config['telegram']['keyboard'] = custom_keys_list + telegram = init_telegram(freqtradebot) telegram._send_msg('test') used_keyboard = bot.send_message.call_args[1]['reply_markup'] assert used_keyboard == custom_keyboard