|
19 | 19 | import logging |
20 | 20 | import ssl |
21 | 21 | import threading |
22 | | -import time as datetime |
| 22 | +import time |
23 | 23 | import warnings |
| 24 | +from datetime import datetime |
24 | 25 | from os import getenv |
25 | 26 | from typing import Any, Coroutine, Optional, TypeVar, Union |
26 | 27 |
|
@@ -349,7 +350,7 @@ async def __get_launch_url(self, launch_uuid_future: Union[Optional[str], Task[O |
349 | 350 | async def start_launch( |
350 | 351 | self, |
351 | 352 | name: str, |
352 | | - start_time: str, |
| 353 | + start_time: Union[str, datetime], |
353 | 354 | *, |
354 | 355 | description: Optional[str] = None, |
355 | 356 | attributes: Optional[Union[list, dict]] = None, |
@@ -402,7 +403,7 @@ async def start_test_item( |
402 | 403 | self, |
403 | 404 | launch_uuid: Union[str, Task[str]], |
404 | 405 | name: str, |
405 | | - start_time: str, |
| 406 | + start_time: Union[str, datetime], |
406 | 407 | item_type: str, |
407 | 408 | *, |
408 | 409 | parent_item_id: Optional[Union[str, Task[str]]] = None, |
@@ -478,7 +479,7 @@ async def finish_test_item( |
478 | 479 | self, |
479 | 480 | launch_uuid: Union[str, Task[str]], |
480 | 481 | item_id: Union[str, Task[str]], |
481 | | - end_time: str, |
| 482 | + end_time: Union[str, datetime], |
482 | 483 | *, |
483 | 484 | status: Optional[str] = None, |
484 | 485 | description: Optional[str] = None, |
@@ -535,7 +536,7 @@ async def finish_test_item( |
535 | 536 | async def finish_launch( |
536 | 537 | self, |
537 | 538 | launch_uuid: Union[str, Task[str]], |
538 | | - end_time: str, |
| 539 | + end_time: Union[str, datetime], |
539 | 540 | *, |
540 | 541 | status: Optional[str] = None, |
541 | 542 | attributes: Optional[Union[list, dict]] = None, |
@@ -883,7 +884,7 @@ def __init__( |
883 | 884 | async def start_launch( |
884 | 885 | self, |
885 | 886 | name: str, |
886 | | - start_time: str, |
| 887 | + start_time: Union[str, datetime], |
887 | 888 | description: Optional[str] = None, |
888 | 889 | attributes: Optional[Union[list, dict]] = None, |
889 | 890 | rerun: bool = False, |
@@ -912,7 +913,7 @@ async def start_launch( |
912 | 913 | async def start_test_item( |
913 | 914 | self, |
914 | 915 | name: str, |
915 | | - start_time: str, |
| 916 | + start_time: Union[str, datetime], |
916 | 917 | item_type: str, |
917 | 918 | description: Optional[str] = None, |
918 | 919 | attributes: Optional[list[dict]] = None, |
@@ -973,7 +974,7 @@ async def start_test_item( |
973 | 974 | async def finish_test_item( |
974 | 975 | self, |
975 | 976 | item_id: str, |
976 | | - end_time: str, |
| 977 | + end_time: Union[str, datetime], |
977 | 978 | status: Optional[str] = None, |
978 | 979 | issue: Optional[Issue] = None, |
979 | 980 | attributes: Optional[Union[list, dict]] = None, |
@@ -1017,7 +1018,7 @@ async def finish_test_item( |
1017 | 1018 |
|
1018 | 1019 | async def finish_launch( |
1019 | 1020 | self, |
1020 | | - end_time: str, |
| 1021 | + end_time: Union[str, datetime], |
1021 | 1022 | status: Optional[str] = None, |
1022 | 1023 | attributes: Optional[Union[list, dict]] = None, |
1023 | 1024 | **kwargs: Any, |
@@ -1110,7 +1111,7 @@ async def get_project_settings(self) -> Optional[dict]: |
1110 | 1111 |
|
1111 | 1112 | async def log( |
1112 | 1113 | self, |
1113 | | - time: str, |
| 1114 | + time: Union[str, datetime], |
1114 | 1115 | message: str, |
1115 | 1116 | level: Optional[Union[int, str]] = None, |
1116 | 1117 | attachment: Optional[dict] = None, |
@@ -1340,7 +1341,7 @@ async def __int_value(self) -> int: |
1340 | 1341 | def start_launch( |
1341 | 1342 | self, |
1342 | 1343 | name: str, |
1343 | | - start_time: str, |
| 1344 | + start_time: Union[str, datetime], |
1344 | 1345 | description: Optional[str] = None, |
1345 | 1346 | attributes: Optional[Union[list, dict]] = None, |
1346 | 1347 | rerun: bool = False, |
@@ -1369,7 +1370,7 @@ def start_launch( |
1369 | 1370 | def start_test_item( |
1370 | 1371 | self, |
1371 | 1372 | name: str, |
1372 | | - start_time: str, |
| 1373 | + start_time: Union[str, datetime], |
1373 | 1374 | item_type: str, |
1374 | 1375 | description: Optional[str] = None, |
1375 | 1376 | attributes: Optional[list[dict]] = None, |
@@ -1428,7 +1429,7 @@ def start_test_item( |
1428 | 1429 | def finish_test_item( |
1429 | 1430 | self, |
1430 | 1431 | item_id: Task[str], |
1431 | | - end_time: str, |
| 1432 | + end_time: Union[str, datetime], |
1432 | 1433 | status: Optional[str] = None, |
1433 | 1434 | issue: Optional[Issue] = None, |
1434 | 1435 | attributes: Optional[Union[list, dict]] = None, |
@@ -1473,7 +1474,7 @@ def finish_test_item( |
1473 | 1474 |
|
1474 | 1475 | def finish_launch( |
1475 | 1476 | self, |
1476 | | - end_time: str, |
| 1477 | + end_time: Union[str, datetime], |
1477 | 1478 | status: Optional[str] = None, |
1478 | 1479 | attributes: Optional[Union[list, dict]] = None, |
1479 | 1480 | **kwargs: Any, |
@@ -1572,7 +1573,7 @@ async def _log(self, log_rq: AsyncRPRequestLog) -> Optional[tuple[str, ...]]: |
1572 | 1573 |
|
1573 | 1574 | def log( |
1574 | 1575 | self, |
1575 | | - time: str, |
| 1576 | + time: Union[str, datetime], |
1576 | 1577 | message: str, |
1577 | 1578 | level: Optional[Union[int, str]] = None, |
1578 | 1579 | attachment: Optional[dict] = None, |
@@ -1747,13 +1748,13 @@ def create_task(self, coro: Coroutine[Any, Any, _T]) -> Optional[Task[_T]]: |
1747 | 1748 |
|
1748 | 1749 | def finish_tasks(self): |
1749 | 1750 | """Ensure all pending Tasks are finished, block current Thread if necessary.""" |
1750 | | - shutdown_start_time = datetime.time() |
| 1751 | + shutdown_start_time = time.time() |
1751 | 1752 | with self._task_mutex: |
1752 | 1753 | tasks = self._task_list.flush() |
1753 | 1754 | if tasks: |
1754 | 1755 | for task in tasks: |
1755 | 1756 | task.blocking_result() |
1756 | | - if datetime.time() - shutdown_start_time >= self.shutdown_timeout: |
| 1757 | + if time.time() - shutdown_start_time >= self.shutdown_timeout: |
1757 | 1758 | break |
1758 | 1759 | logs = self._log_batcher.flush() |
1759 | 1760 | if logs: |
@@ -1916,7 +1917,7 @@ def __init__( |
1916 | 1917 | self.trigger_num = trigger_num |
1917 | 1918 | self.trigger_interval = trigger_interval |
1918 | 1919 | self.__init_task_list(task_list, task_mutex) |
1919 | | - self.__last_run_time = datetime.time() |
| 1920 | + self.__last_run_time = time.time() |
1920 | 1921 | self.__init_loop(loop) |
1921 | 1922 | if type(launch_uuid) is str: |
1922 | 1923 | super().__init__( |
|
0 commit comments