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

refactor: remove redundant pytest marks (#654)

Browse source
This commit is contained in:
Oleg A 2021-08-03 23:40:14 +03:00 • committed by GitHub
parent fff33e4ac9
commit f2f276b8cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
111 changed files with 221 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/test_dispatcher/test_event/test_event.py
View file

@ -12,6 +12,8 @@ except ImportError:
from unittest.mock import AsyncMock as CoroutineMock # type: ignore
from unittest.mock import patch
pytestmark = pytest.mark.asyncio
async def my_handler(value: str, index: int = 0) -> Any:
return value
@ -39,7 +41,6 @@ class TestEventObserver:
assert registered_handler.callback == wrapped_handler
assert not registered_handler.filters
@pytest.mark.asyncio
async def test_trigger(self):
observer = EventObserver()

10
tests/test_dispatcher/test_event/test_handler.py
View file

@ -9,6 +9,8 @@ from aiogram.dispatcher.filters.base import BaseFilter
from aiogram.dispatcher.handler.base import BaseHandler
from aiogram.types import Update
pytestmark = pytest.mark.asyncio
def callback1(foo: int, bar: int, baz: int):
return locals()
@ -126,14 +128,12 @@ class TestCallableMixin:
obj = CallableMixin(callback)
assert obj._prepare_kwargs(kwargs) == result
@pytest.mark.asyncio
async def test_sync_call(self):
obj = CallableMixin(callback1)
result = await obj.call(foo=42, bar="test", baz="fuz", spam=True)
assert result == {"foo": 42, "bar": "test", "baz": "fuz"}
@pytest.mark.asyncio
async def test_async_call(self):
obj = CallableMixin(callback2)
@ -154,14 +154,12 @@ async def simple_handler(*args, **kwargs):
class TestHandlerObject:
@pytest.mark.asyncio
async def test_check_with_bool_result(self):
handler = HandlerObject(simple_handler, [FilterObject(lambda value: True)] * 3)
result, data = await handler.check(42, foo=True)
assert result
assert data == {"foo": True}
@pytest.mark.asyncio
async def test_check_with_dict_result(self):
handler = HandlerObject(
simple_handler,
@ -176,7 +174,6 @@ class TestHandlerObject:
assert result
assert data == {"foo": True, "test0": "ok", "test1": "ok", "test2": "ok"}
@pytest.mark.asyncio
async def test_check_with_combined_result(self):
handler = HandlerObject(
simple_handler,
@ -186,13 +183,11 @@ class TestHandlerObject:
assert result
assert data == {"foo": True, "test": 42}
@pytest.mark.asyncio
async def test_check_rejected(self):
handler = HandlerObject(simple_handler, [FilterObject(lambda value: False)])
result, data = await handler.check(42, foo=True)
assert not result
@pytest.mark.asyncio
async def test_check_partial_rejected(self):
handler = HandlerObject(
simple_handler, [FilterObject(lambda value: True), FilterObject(lambda value: False)]
@ -200,7 +195,6 @@ class TestHandlerObject:
result, data = await handler.check(42, foo=True)
assert not result
@pytest.mark.asyncio
async def test_class_based_handler(self):
class MyHandler(BaseHandler):
event: Update

7
tests/test_dispatcher/test_event/test_telegram.py
View file

@ -11,6 +11,9 @@ from aiogram.dispatcher.filters.base import BaseFilter
from aiogram.dispatcher.router import Router
from aiogram.types import Chat, Message, User
pytestmark = pytest.mark.asyncio
# TODO: Test middlewares in routers tree
@ -138,7 +141,6 @@ class TestTelegramEventObserver:
assert len(observer.handlers) == 1
assert observer.handlers[0].callback == my_handler
@pytest.mark.asyncio
async def test_trigger(self):
router = Router(use_builtin_filters=False)
observer = router.message
@ -178,7 +180,6 @@ class TestTelegramEventObserver:
assert registered_handler.callback == wrapped_handler
assert len(registered_handler.filters) == len(filters)
@pytest.mark.asyncio
async def test_trigger_right_context_in_handlers(self):
router = Router(use_builtin_filters=False)
observer = router.message
@ -250,7 +251,6 @@ class TestTelegramEventObserver:
assert len(router.message._handler.filters) == 1
assert router.message._handler.filters[0].callback is my_filter
@pytest.mark.asyncio
async def test_global_filter(self):
r1 = Router()
r2 = Router()
@ -265,7 +265,6 @@ class TestTelegramEventObserver:
assert await r1.message.trigger(None) is REJECTED
assert await r2.message.trigger(None) is None
@pytest.mark.asyncio
async def test_global_filter_in_nested_router(self):
r1 = Router()
r2 = Router()