Skip to content

Commit dc8b7c7

Browse files
committed
refactor(tests): update annotations
1 parent ed0fb08 commit dc8b7c7

File tree

4 files changed

+29
-33
lines changed

4 files changed

+29
-33
lines changed

tests/conftest.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import os
2-
from typing import List, Tuple
32

43
import pytest
54

@@ -44,7 +43,7 @@ def redis_cluster_url() -> str:
4443

4544

4645
@pytest.fixture
47-
def redis_sentinels() -> List[Tuple[str, int]]:
46+
def redis_sentinels() -> list[tuple[str, int]]:
4847
"""
4948
List of redis sentinel hosts.
5049

tests/test_broker.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import asyncio
22
import uuid
3-
from typing import List, Tuple, Union
43

54
import pytest
65
from redis.asyncio import Redis
@@ -26,7 +25,7 @@ def test_no_url_should_raise_typeerror() -> None:
2625

2726
async def get_message(
2827
broker: AsyncBroker,
29-
) -> Union[bytes, AckableMessage]:
28+
) -> bytes | AckableMessage:
3029
"""
3130
Get a message from the broker.
3231
@@ -253,7 +252,7 @@ async def test_stream_cluster_broker(
253252
@pytest.mark.anyio
254253
async def test_pub_sub_sentinel_broker(
255254
valid_broker_message: BrokerMessage,
256-
redis_sentinels: List[Tuple[str, int]],
255+
redis_sentinels: list[tuple[str, int]],
257256
redis_sentinel_master_name: str,
258257
) -> None:
259258
"""
@@ -284,7 +283,7 @@ async def test_pub_sub_sentinel_broker(
284283
@pytest.mark.anyio
285284
async def test_list_queue_sentinel_broker(
286285
valid_broker_message: BrokerMessage,
287-
redis_sentinels: List[Tuple[str, int]],
286+
redis_sentinels: list[tuple[str, int]],
288287
redis_sentinel_master_name: str,
289288
) -> None:
290289
"""
@@ -313,7 +312,7 @@ async def test_list_queue_sentinel_broker(
313312
@pytest.mark.anyio
314313
async def test_streams_sentinel_broker(
315314
valid_broker_message: BrokerMessage,
316-
redis_sentinels: List[Tuple[str, int]],
315+
redis_sentinels: list[tuple[str, int]],
317316
redis_sentinel_master_name: str,
318317
) -> None:
319318
"""
@@ -405,7 +404,7 @@ async def test_maxlen_in_cluster_stream_broker(
405404
@pytest.mark.anyio
406405
async def test_maxlen_in_sentinel_stream_broker(
407406
redis_sentinel_master_name: str,
408-
redis_sentinels: List[Tuple[str, int]],
407+
redis_sentinels: list[tuple[str, int]],
409408
valid_broker_message: BrokerMessage,
410409
) -> None:
411410
"""

tests/test_result_backend.py

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import asyncio
22
import uuid
3-
from typing import List, Tuple
43

54
import pytest
65
from taskiq import TaskiqResult
@@ -25,7 +24,7 @@ async def test_set_result_success(redis_url: str) -> None:
2524
redis_url=redis_url,
2625
)
2726
task_id = uuid.uuid4().hex
28-
result: "TaskiqResult[int]" = TaskiqResult(
27+
result: TaskiqResult[int] = TaskiqResult(
2928
is_err=True,
3029
log="My Log",
3130
return_value=11,
@@ -58,7 +57,7 @@ async def test_fetch_without_logs(redis_url: str) -> None:
5857
redis_url=redis_url,
5958
)
6059
task_id = uuid.uuid4().hex
61-
result: "TaskiqResult[int]" = TaskiqResult(
60+
result: TaskiqResult[int] = TaskiqResult(
6261
is_err=True,
6362
log="My Log",
6463
return_value=11,
@@ -92,7 +91,7 @@ async def test_remove_results_after_reading(redis_url: str) -> None:
9291
keep_results=False,
9392
)
9493
task_id = uuid.uuid4().hex
95-
result: "TaskiqResult[int]" = TaskiqResult(
94+
result: TaskiqResult[int] = TaskiqResult(
9695
is_err=True,
9796
log="My Log",
9897
return_value=11,
@@ -122,7 +121,7 @@ async def test_keep_results_after_reading(redis_url: str) -> None:
122121
keep_results=True,
123122
)
124123
task_id = uuid.uuid4().hex
125-
result: "TaskiqResult[int]" = TaskiqResult(
124+
result: TaskiqResult[int] = TaskiqResult(
126125
is_err=True,
127126
log="My Log",
128127
return_value=11,
@@ -153,7 +152,7 @@ async def test_set_result_max_connections(redis_url: str) -> None:
153152
)
154153

155154
task_id = uuid.uuid4().hex
156-
result: "TaskiqResult[int]" = TaskiqResult(
155+
result: TaskiqResult[int] = TaskiqResult(
157156
is_err=True,
158157
log="My Log",
159158
return_value=11,
@@ -182,7 +181,7 @@ async def test_set_result_success_cluster(redis_cluster_url: str) -> None:
182181
redis_url=redis_cluster_url,
183182
)
184183
task_id = uuid.uuid4().hex
185-
result: "TaskiqResult[int]" = TaskiqResult(
184+
result: TaskiqResult[int] = TaskiqResult(
186185
is_err=True,
187186
log="My Log",
188187
return_value=11,
@@ -215,7 +214,7 @@ async def test_fetch_without_logs_cluster(redis_cluster_url: str) -> None:
215214
redis_url=redis_cluster_url,
216215
)
217216
task_id = uuid.uuid4().hex
218-
result: "TaskiqResult[int]" = TaskiqResult(
217+
result: TaskiqResult[int] = TaskiqResult(
219218
is_err=True,
220219
log="My Log",
221220
return_value=11,
@@ -249,7 +248,7 @@ async def test_remove_results_after_reading_cluster(redis_cluster_url: str) -> N
249248
keep_results=False,
250249
)
251250
task_id = uuid.uuid4().hex
252-
result: "TaskiqResult[int]" = TaskiqResult(
251+
result: TaskiqResult[int] = TaskiqResult(
253252
is_err=True,
254253
log="My Log",
255254
return_value=11,
@@ -279,7 +278,7 @@ async def test_keep_results_after_reading_cluster(redis_cluster_url: str) -> Non
279278
keep_results=True,
280279
)
281280
task_id = uuid.uuid4().hex
282-
result: "TaskiqResult[int]" = TaskiqResult(
281+
result: TaskiqResult[int] = TaskiqResult(
283282
is_err=True,
284283
log="My Log",
285284
return_value=11,
@@ -298,7 +297,7 @@ async def test_keep_results_after_reading_cluster(redis_cluster_url: str) -> Non
298297

299298
@pytest.mark.anyio
300299
async def test_set_result_success_sentinel(
301-
redis_sentinels: List[Tuple[str, int]],
300+
redis_sentinels: list[tuple[str, int]],
302301
redis_sentinel_master_name: str,
303302
) -> None:
304303
"""
@@ -312,7 +311,7 @@ async def test_set_result_success_sentinel(
312311
master_name=redis_sentinel_master_name,
313312
)
314313
task_id = uuid.uuid4().hex
315-
result: "TaskiqResult[int]" = TaskiqResult(
314+
result: TaskiqResult[int] = TaskiqResult(
316315
is_err=True,
317316
log="My Log",
318317
return_value=11,
@@ -336,7 +335,7 @@ async def test_set_result_success_sentinel(
336335

337336
@pytest.mark.anyio
338337
async def test_fetch_without_logs_sentinel(
339-
redis_sentinels: List[Tuple[str, int]],
338+
redis_sentinels: list[tuple[str, int]],
340339
redis_sentinel_master_name: str,
341340
) -> None:
342341
"""
@@ -350,7 +349,7 @@ async def test_fetch_without_logs_sentinel(
350349
master_name=redis_sentinel_master_name,
351350
)
352351
task_id = uuid.uuid4().hex
353-
result: "TaskiqResult[int]" = TaskiqResult(
352+
result: TaskiqResult[int] = TaskiqResult(
354353
is_err=True,
355354
log="My Log",
356355
return_value=11,
@@ -374,7 +373,7 @@ async def test_fetch_without_logs_sentinel(
374373

375374
@pytest.mark.anyio
376375
async def test_remove_results_after_reading_sentinel(
377-
redis_sentinels: List[Tuple[str, int]],
376+
redis_sentinels: list[tuple[str, int]],
378377
redis_sentinel_master_name: str,
379378
) -> None:
380379
"""
@@ -389,7 +388,7 @@ async def test_remove_results_after_reading_sentinel(
389388
keep_results=False,
390389
)
391390
task_id = uuid.uuid4().hex
392-
result: "TaskiqResult[int]" = TaskiqResult(
391+
result: TaskiqResult[int] = TaskiqResult(
393392
is_err=True,
394393
log="My Log",
395394
return_value=11,
@@ -409,7 +408,7 @@ async def test_remove_results_after_reading_sentinel(
409408

410409
@pytest.mark.anyio
411410
async def test_keep_results_after_reading_sentinel(
412-
redis_sentinels: List[Tuple[str, int]],
411+
redis_sentinels: list[tuple[str, int]],
413412
redis_sentinel_master_name: str,
414413
) -> None:
415414
"""
@@ -424,7 +423,7 @@ async def test_keep_results_after_reading_sentinel(
424423
keep_results=True,
425424
)
426425
task_id = uuid.uuid4().hex
427-
result: "TaskiqResult[int]" = TaskiqResult(
426+
result: TaskiqResult[int] = TaskiqResult(
428427
is_err=True,
429428
log="My Log",
430429
return_value=11,
@@ -521,7 +520,7 @@ async def test_set_progress_cluster(redis_cluster_url: str) -> None:
521520

522521
@pytest.mark.anyio
523522
async def test_set_progress_sentinel(
524-
redis_sentinels: List[Tuple[str, int]],
523+
redis_sentinels: list[tuple[str, int]],
525524
redis_sentinel_master_name: str,
526525
) -> None:
527526
"""

tests/test_schedule_source.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import asyncio
22
import datetime as dt
33
import uuid
4-
from typing import List, Tuple
54

65
import pytest
76
from taskiq import ScheduledTask
@@ -243,7 +242,7 @@ async def test_cluster_get_schedules(redis_cluster_url: str) -> None:
243242

244243
@pytest.mark.anyio
245244
async def test_sentinel_set_schedule(
246-
redis_sentinels: List[Tuple[str, int]],
245+
redis_sentinels: list[tuple[str, int]],
247246
redis_sentinel_master_name: str,
248247
) -> None:
249248
prefix = uuid.uuid4().hex
@@ -267,7 +266,7 @@ async def test_sentinel_set_schedule(
267266

268267
@pytest.mark.anyio
269268
async def test_sentinel_delete_schedule(
270-
redis_sentinels: List[Tuple[str, int]],
269+
redis_sentinels: list[tuple[str, int]],
271270
redis_sentinel_master_name: str,
272271
) -> None:
273272
prefix = uuid.uuid4().hex
@@ -295,7 +294,7 @@ async def test_sentinel_delete_schedule(
295294

296295
@pytest.mark.anyio
297296
async def test_sentinel_post_run_cron(
298-
redis_sentinels: List[Tuple[str, int]],
297+
redis_sentinels: list[tuple[str, int]],
299298
redis_sentinel_master_name: str,
300299
) -> None:
301300
prefix = uuid.uuid4().hex
@@ -320,7 +319,7 @@ async def test_sentinel_post_run_cron(
320319

321320
@pytest.mark.anyio
322321
async def test_sentinel_post_run_time(
323-
redis_sentinels: List[Tuple[str, int]],
322+
redis_sentinels: list[tuple[str, int]],
324323
redis_sentinel_master_name: str,
325324
) -> None:
326325
prefix = uuid.uuid4().hex
@@ -345,7 +344,7 @@ async def test_sentinel_post_run_time(
345344

346345
@pytest.mark.anyio
347346
async def test_sentinel_buffer(
348-
redis_sentinels: List[Tuple[str, int]],
347+
redis_sentinels: list[tuple[str, int]],
349348
redis_sentinel_master_name: str,
350349
) -> None:
351350
prefix = uuid.uuid4().hex

0 commit comments

Comments
 (0)