python/aiogram
1
0
Fork 0
mirror of https://github.com/aiogram/aiogram.git synced 2025-12-12 18:19:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bump Telegram Bot API version

Browse source 
Change request timeout mechanism
Bump package version
This commit is contained in:
Alex Root Junior 2020-06-14 17:14:10 +03:00
parent b78f1cdb17
commit 7844a663a9
58 changed files with 526 additions and 369 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tests/mocked_bot.py
View file

@ -5,6 +5,7 @@ from aiogram import Bot
from aiogram.api.client.session.base import BaseSession
from aiogram.api.methods import TelegramMethod
from aiogram.api.methods.base import Request, Response, T
from aiogram.api.types import UNSET
class MockedSession(BaseSession):
@ -23,7 +24,9 @@ class MockedSession(BaseSession):
async def close(self):
pass
async def make_request(self, token: str, method: TelegramMethod[T]) -> T:
async def make_request(
self, token: str, method: TelegramMethod[T], timeout: Optional[int] = UNSET
) -> T:
self.requests.append(method.build_request())
response: Response[T] = self.responses.pop()
self.raise_for_status(response)

5
tests/test_api/test_client/test_session/test_base_session.py
View file

@ -1,12 +1,13 @@
import datetime
import json
from typing import AsyncContextManager, AsyncGenerator
from typing import AsyncContextManager, AsyncGenerator, Optional
import pytest
from aiogram.api.client.session.base import BaseSession, T
from aiogram.api.client.telegram import PRODUCTION, TelegramAPIServer
from aiogram.api.methods import GetMe, Response, TelegramMethod
from aiogram.api.types import UNSET
try:
from asynctest import CoroutineMock, patch
@ -18,7 +19,7 @@ class CustomSession(BaseSession):
async def close(self):
pass
async def make_request(self, token: str, method: TelegramMethod[T]) -> None: # type: ignore
async def make_request(self, token: str, method: TelegramMethod[T], timeout: Optional[int] = UNSET) -> None: # type: ignore
assert isinstance(token, str)
assert isinstance(method, TelegramMethod)

11
tests/test_api/test_types/test_chat_member.py
View file

@ -7,12 +7,7 @@ user = User(id=42, is_bot=False, first_name="User", last_name=None)
class TestChatMember:
@pytest.mark.parametrize(
"status,result",
[
["administrator", True],
["creator", True],
["member", False]
]
"status,result", [["administrator", True], ["creator", True], ["member", False]]
)
def test_is_chat_admin(self, status: str, result: bool):
chat_member = ChatMember(user=user, status=status)
@ -26,8 +21,8 @@ class TestChatMember:
["member", True],
["restricted", True],
["kicked", False],
["left", False]
]
["left", False],
],
)
def test_is_chat_member(self, status: str, result: bool):
chat_member = ChatMember(user=user, status=status)