mirror of
https://github.com/python-telegram-bot/python-telegram-bot.git
synced 2025-01-23 16:56:31 +01:00
Fix failing tests
This commit is contained in:
parent
c5f3bf7e82
commit
0a1b976ac1
6 changed files with 49 additions and 20 deletions
|
@ -126,5 +126,5 @@ class Gifts(TelegramObject):
|
||||||
"""See :meth:`telegram.TelegramObject.de_json`."""
|
"""See :meth:`telegram.TelegramObject.de_json`."""
|
||||||
data = cls._parse_data(data)
|
data = cls._parse_data(data)
|
||||||
|
|
||||||
data["gifts"] = Gifts.de_list(data["gifts"], bot)
|
data["gifts"] = Gift.de_list(data["gifts"], bot)
|
||||||
return cls(**data)
|
return cls(**data)
|
||||||
|
|
|
@ -8,13 +8,17 @@ from telegram import (
|
||||||
BotName,
|
BotName,
|
||||||
BotShortDescription,
|
BotShortDescription,
|
||||||
BusinessConnection,
|
BusinessConnection,
|
||||||
|
Chat,
|
||||||
ChatAdministratorRights,
|
ChatAdministratorRights,
|
||||||
|
ChatBoost,
|
||||||
|
ChatBoostSource,
|
||||||
ChatFullInfo,
|
ChatFullInfo,
|
||||||
ChatInviteLink,
|
ChatInviteLink,
|
||||||
ChatMember,
|
ChatMember,
|
||||||
File,
|
File,
|
||||||
ForumTopic,
|
ForumTopic,
|
||||||
GameHighScore,
|
GameHighScore,
|
||||||
|
Gift,
|
||||||
Gifts,
|
Gifts,
|
||||||
MenuButton,
|
MenuButton,
|
||||||
MessageId,
|
MessageId,
|
||||||
|
@ -22,6 +26,7 @@ from telegram import (
|
||||||
PollOption,
|
PollOption,
|
||||||
PreparedInlineMessage,
|
PreparedInlineMessage,
|
||||||
SentWebAppMessage,
|
SentWebAppMessage,
|
||||||
|
StarTransaction,
|
||||||
StarTransactions,
|
StarTransactions,
|
||||||
Sticker,
|
Sticker,
|
||||||
StickerSet,
|
StickerSet,
|
||||||
|
@ -38,6 +43,15 @@ _DUMMY_USER = User(
|
||||||
id=123456, is_bot=False, first_name="Dummy", last_name="User", username="dummy_user"
|
id=123456, is_bot=False, first_name="Dummy", last_name="User", username="dummy_user"
|
||||||
)
|
)
|
||||||
_DUMMY_DATE = dtm.datetime(1970, 1, 1, 0, 0, 0, 0, tzinfo=dtm.timezone.utc)
|
_DUMMY_DATE = dtm.datetime(1970, 1, 1, 0, 0, 0, 0, tzinfo=dtm.timezone.utc)
|
||||||
|
_DUMMY_STICKER = Sticker(
|
||||||
|
file_id="dummy_file_id",
|
||||||
|
file_unique_id="dummy_file_unique_id",
|
||||||
|
width=1,
|
||||||
|
height=1,
|
||||||
|
is_animated=False,
|
||||||
|
is_video=False,
|
||||||
|
type="dummy_type",
|
||||||
|
)
|
||||||
|
|
||||||
_PREPARED_DUMMY_OBJECTS: dict[str, object] = {
|
_PREPARED_DUMMY_OBJECTS: dict[str, object] = {
|
||||||
"bool": True,
|
"bool": True,
|
||||||
|
@ -53,6 +67,7 @@ _PREPARED_DUMMY_OBJECTS: dict[str, object] = {
|
||||||
can_reply=True,
|
can_reply=True,
|
||||||
is_enabled=True,
|
is_enabled=True,
|
||||||
),
|
),
|
||||||
|
"Chat": Chat(id=123456, type="dummy_type"),
|
||||||
"ChatAdministratorRights": ChatAdministratorRights.all_rights(),
|
"ChatAdministratorRights": ChatAdministratorRights.all_rights(),
|
||||||
"ChatFullInfo": ChatFullInfo(
|
"ChatFullInfo": ChatFullInfo(
|
||||||
id=123456,
|
id=123456,
|
||||||
|
@ -70,7 +85,7 @@ _PREPARED_DUMMY_OBJECTS: dict[str, object] = {
|
||||||
"ChatMember": ChatMember(user=_DUMMY_USER, status="dummy_status"),
|
"ChatMember": ChatMember(user=_DUMMY_USER, status="dummy_status"),
|
||||||
"File": File(file_id="dummy_file_id", file_unique_id="dummy_file_unique_id"),
|
"File": File(file_id="dummy_file_id", file_unique_id="dummy_file_unique_id"),
|
||||||
"ForumTopic": ForumTopic(message_thread_id=2, name="dummy_name", icon_color=1),
|
"ForumTopic": ForumTopic(message_thread_id=2, name="dummy_name", icon_color=1),
|
||||||
"Gifts": Gifts(gifts=[]),
|
"Gifts": Gifts(gifts=[Gift(id="dummy_id", sticker=_DUMMY_STICKER, star_count=1)]),
|
||||||
"GameHighScore": GameHighScore(position=1, user=_DUMMY_USER, score=1),
|
"GameHighScore": GameHighScore(position=1, user=_DUMMY_USER, score=1),
|
||||||
"int": 123456,
|
"int": 123456,
|
||||||
"MenuButton": MenuButton(type="dummy_type"),
|
"MenuButton": MenuButton(type="dummy_type"),
|
||||||
|
@ -88,23 +103,29 @@ _PREPARED_DUMMY_OBJECTS: dict[str, object] = {
|
||||||
),
|
),
|
||||||
"PreparedInlineMessage": PreparedInlineMessage(id="dummy_id", expiration_date=_DUMMY_DATE),
|
"PreparedInlineMessage": PreparedInlineMessage(id="dummy_id", expiration_date=_DUMMY_DATE),
|
||||||
"SentWebAppMessage": SentWebAppMessage(inline_message_id="dummy_inline_message_id"),
|
"SentWebAppMessage": SentWebAppMessage(inline_message_id="dummy_inline_message_id"),
|
||||||
"StarTransactions": StarTransactions(transactions=[]),
|
"StarTransactions": StarTransactions(
|
||||||
"Sticker": Sticker(
|
transactions=[StarTransaction(id="dummy_id", amount=1, date=_DUMMY_DATE)]
|
||||||
file_id="dummy_file_id",
|
|
||||||
file_unique_id="dummy_file_unique_id",
|
|
||||||
width=1,
|
|
||||||
height=1,
|
|
||||||
is_animated=False,
|
|
||||||
is_video=False,
|
|
||||||
type="dummy_type",
|
|
||||||
),
|
),
|
||||||
|
"Sticker": _DUMMY_STICKER,
|
||||||
"StickerSet": StickerSet(
|
"StickerSet": StickerSet(
|
||||||
name="dummy_name", title="dummy_title", stickers=[], sticker_type="dummy_type"
|
name="dummy_name",
|
||||||
|
title="dummy_title",
|
||||||
|
stickers=[_DUMMY_STICKER],
|
||||||
|
sticker_type="dummy_type",
|
||||||
),
|
),
|
||||||
"str": "dummy_string",
|
"str": "dummy_string",
|
||||||
"Update": Update(update_id=123456),
|
"Update": Update(update_id=123456),
|
||||||
"User": _DUMMY_USER,
|
"User": _DUMMY_USER,
|
||||||
"UserChatBoosts": UserChatBoosts(boosts=[]),
|
"UserChatBoosts": UserChatBoosts(
|
||||||
|
boosts=[
|
||||||
|
ChatBoost(
|
||||||
|
boost_id="dummy_id",
|
||||||
|
add_date=_DUMMY_DATE,
|
||||||
|
expiration_date=_DUMMY_DATE,
|
||||||
|
source=ChatBoostSource(source="dummy_source"),
|
||||||
|
)
|
||||||
|
]
|
||||||
|
),
|
||||||
"UserProfilePhotos": UserProfilePhotos(total_count=1, photos=[[]]),
|
"UserProfilePhotos": UserProfilePhotos(total_count=1, photos=[[]]),
|
||||||
"WebhookInfo": WebhookInfo(
|
"WebhookInfo": WebhookInfo(
|
||||||
url="dummy_url",
|
url="dummy_url",
|
||||||
|
|
|
@ -105,6 +105,7 @@ from tests.auxil.pytest_classes import PytestBot, PytestExtBot, make_bot
|
||||||
from tests.auxil.slots import mro_slots
|
from tests.auxil.slots import mro_slots
|
||||||
|
|
||||||
from .auxil.build_messages import make_message
|
from .auxil.build_messages import make_message
|
||||||
|
from .auxil.dummy_objects import get_dummy_object
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
|
@ -1625,7 +1626,7 @@ class TestBotWithoutRequest:
|
||||||
message = Message(
|
message = Message(
|
||||||
1,
|
1,
|
||||||
dtm.datetime.utcnow(),
|
dtm.datetime.utcnow(),
|
||||||
None,
|
get_dummy_object(Chat),
|
||||||
reply_markup=offline_bot.callback_data_cache.process_keyboard(reply_markup),
|
reply_markup=offline_bot.callback_data_cache.process_keyboard(reply_markup),
|
||||||
)
|
)
|
||||||
message._unfreeze()
|
message._unfreeze()
|
||||||
|
@ -1639,7 +1640,7 @@ class TestBotWithoutRequest:
|
||||||
message_type: Message(
|
message_type: Message(
|
||||||
1,
|
1,
|
||||||
dtm.datetime.utcnow(),
|
dtm.datetime.utcnow(),
|
||||||
None,
|
get_dummy_object(Chat),
|
||||||
pinned_message=message,
|
pinned_message=message,
|
||||||
reply_to_message=Message.de_json(message.to_dict(), offline_bot),
|
reply_to_message=Message.de_json(message.to_dict(), offline_bot),
|
||||||
)
|
)
|
||||||
|
@ -1782,7 +1783,7 @@ class TestBotWithoutRequest:
|
||||||
message = Message(
|
message = Message(
|
||||||
1,
|
1,
|
||||||
dtm.datetime.utcnow(),
|
dtm.datetime.utcnow(),
|
||||||
None,
|
get_dummy_object(Chat),
|
||||||
reply_markup=reply_markup,
|
reply_markup=reply_markup,
|
||||||
via_bot=bot.bot if self_sender else User(1, "first", False),
|
via_bot=bot.bot if self_sender else User(1, "first", False),
|
||||||
)
|
)
|
||||||
|
|
|
@ -38,6 +38,7 @@ from telegram import (
|
||||||
from telegram._utils.datetime import UTC, to_timestamp
|
from telegram._utils.datetime import UTC, to_timestamp
|
||||||
from telegram.constants import ChatBoostSources
|
from telegram.constants import ChatBoostSources
|
||||||
from telegram.request import RequestData
|
from telegram.request import RequestData
|
||||||
|
from tests.auxil.dummy_objects import get_dummy_object_json_dict
|
||||||
from tests.auxil.slots import mro_slots
|
from tests.auxil.slots import mro_slots
|
||||||
|
|
||||||
|
|
||||||
|
@ -532,7 +533,7 @@ class TestUserChatBoostsWithoutRequest(ChatBoostDefaults):
|
||||||
user_id = data["user_id"] == "2"
|
user_id = data["user_id"] == "2"
|
||||||
if not all((chat_id, user_id)):
|
if not all((chat_id, user_id)):
|
||||||
pytest.fail("I got wrong parameters in post")
|
pytest.fail("I got wrong parameters in post")
|
||||||
return data
|
return get_dummy_object_json_dict(UserChatBoosts)
|
||||||
|
|
||||||
monkeypatch.setattr(offline_bot.request, "post", make_assertion)
|
monkeypatch.setattr(offline_bot.request, "post", make_assertion)
|
||||||
|
|
||||||
|
|
|
@ -89,6 +89,7 @@ from tests.auxil.bot_method_checks import (
|
||||||
check_shortcut_signature,
|
check_shortcut_signature,
|
||||||
)
|
)
|
||||||
from tests.auxil.build_messages import make_message
|
from tests.auxil.build_messages import make_message
|
||||||
|
from tests.auxil.dummy_objects import get_dummy_object_json_dict
|
||||||
from tests.auxil.pytest_classes import PytestExtBot, PytestMessage
|
from tests.auxil.pytest_classes import PytestExtBot, PytestMessage
|
||||||
from tests.auxil.slots import mro_slots
|
from tests.auxil.slots import mro_slots
|
||||||
|
|
||||||
|
@ -591,9 +592,9 @@ class TestMessageWithoutRequest(MessageTestBase):
|
||||||
def test_de_json_localization(self, offline_bot, raw_bot, tz_bot):
|
def test_de_json_localization(self, offline_bot, raw_bot, tz_bot):
|
||||||
json_dict = {
|
json_dict = {
|
||||||
"message_id": 12,
|
"message_id": 12,
|
||||||
"from_user": None,
|
"from_user": get_dummy_object_json_dict("User"),
|
||||||
"date": int(dtm.datetime.now().timestamp()),
|
"date": int(dtm.datetime.now().timestamp()),
|
||||||
"chat": None,
|
"chat": get_dummy_object_json_dict("Chat"),
|
||||||
"edit_date": int(dtm.datetime.now().timestamp()),
|
"edit_date": int(dtm.datetime.now().timestamp()),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -47,6 +47,7 @@ from telegram import (
|
||||||
PreCheckoutQuery,
|
PreCheckoutQuery,
|
||||||
ReactionCount,
|
ReactionCount,
|
||||||
ReactionTypeEmoji,
|
ReactionTypeEmoji,
|
||||||
|
ShippingAddress,
|
||||||
ShippingQuery,
|
ShippingQuery,
|
||||||
Update,
|
Update,
|
||||||
User,
|
User,
|
||||||
|
@ -158,7 +159,11 @@ params = [
|
||||||
{"edited_channel_post": channel_post},
|
{"edited_channel_post": channel_post},
|
||||||
{"inline_query": InlineQuery(1, User(1, "", False), "", "")},
|
{"inline_query": InlineQuery(1, User(1, "", False), "", "")},
|
||||||
{"chosen_inline_result": ChosenInlineResult("id", User(1, "", False), "")},
|
{"chosen_inline_result": ChosenInlineResult("id", User(1, "", False), "")},
|
||||||
{"shipping_query": ShippingQuery("id", User(1, "", False), "", None)},
|
{
|
||||||
|
"shipping_query": ShippingQuery(
|
||||||
|
"id", User(1, "", False), "", ShippingAddress("", "", "", "", "", "")
|
||||||
|
)
|
||||||
|
},
|
||||||
{"pre_checkout_query": PreCheckoutQuery("id", User(1, "", False), "", 0, "")},
|
{"pre_checkout_query": PreCheckoutQuery("id", User(1, "", False), "", 0, "")},
|
||||||
{"poll": Poll("id", "?", [PollOption(".", 1)], False, False, False, Poll.REGULAR, True)},
|
{"poll": Poll("id", "?", [PollOption(".", 1)], False, False, False, Poll.REGULAR, True)},
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Reference in a new issue