Skip to content

Commit a63f303

Browse files
committed
Update types to support microseconds
1 parent d3220be commit a63f303

2 files changed

Lines changed: 30 additions & 28 deletions

File tree

reportportal_client/aio/client.py

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@
1919
import logging
2020
import ssl
2121
import threading
22-
import time as datetime
22+
import time
2323
import warnings
24+
from datetime import datetime
2425
from os import getenv
2526
from typing import Any, Coroutine, Optional, TypeVar, Union
2627

@@ -349,7 +350,7 @@ async def __get_launch_url(self, launch_uuid_future: Union[Optional[str], Task[O
349350
async def start_launch(
350351
self,
351352
name: str,
352-
start_time: str,
353+
start_time: Union[str, datetime],
353354
*,
354355
description: Optional[str] = None,
355356
attributes: Optional[Union[list, dict]] = None,
@@ -402,7 +403,7 @@ async def start_test_item(
402403
self,
403404
launch_uuid: Union[str, Task[str]],
404405
name: str,
405-
start_time: str,
406+
start_time: Union[str, datetime],
406407
item_type: str,
407408
*,
408409
parent_item_id: Optional[Union[str, Task[str]]] = None,
@@ -478,7 +479,7 @@ async def finish_test_item(
478479
self,
479480
launch_uuid: Union[str, Task[str]],
480481
item_id: Union[str, Task[str]],
481-
end_time: str,
482+
end_time: Union[str, datetime],
482483
*,
483484
status: Optional[str] = None,
484485
description: Optional[str] = None,
@@ -535,7 +536,7 @@ async def finish_test_item(
535536
async def finish_launch(
536537
self,
537538
launch_uuid: Union[str, Task[str]],
538-
end_time: str,
539+
end_time: Union[str, datetime],
539540
*,
540541
status: Optional[str] = None,
541542
attributes: Optional[Union[list, dict]] = None,
@@ -883,7 +884,7 @@ def __init__(
883884
async def start_launch(
884885
self,
885886
name: str,
886-
start_time: str,
887+
start_time: Union[str, datetime],
887888
description: Optional[str] = None,
888889
attributes: Optional[Union[list, dict]] = None,
889890
rerun: bool = False,
@@ -912,7 +913,7 @@ async def start_launch(
912913
async def start_test_item(
913914
self,
914915
name: str,
915-
start_time: str,
916+
start_time: Union[str, datetime],
916917
item_type: str,
917918
description: Optional[str] = None,
918919
attributes: Optional[list[dict]] = None,
@@ -973,7 +974,7 @@ async def start_test_item(
973974
async def finish_test_item(
974975
self,
975976
item_id: str,
976-
end_time: str,
977+
end_time: Union[str, datetime],
977978
status: Optional[str] = None,
978979
issue: Optional[Issue] = None,
979980
attributes: Optional[Union[list, dict]] = None,
@@ -1017,7 +1018,7 @@ async def finish_test_item(
10171018

10181019
async def finish_launch(
10191020
self,
1020-
end_time: str,
1021+
end_time: Union[str, datetime],
10211022
status: Optional[str] = None,
10221023
attributes: Optional[Union[list, dict]] = None,
10231024
**kwargs: Any,
@@ -1110,7 +1111,7 @@ async def get_project_settings(self) -> Optional[dict]:
11101111

11111112
async def log(
11121113
self,
1113-
time: str,
1114+
time: Union[str, datetime],
11141115
message: str,
11151116
level: Optional[Union[int, str]] = None,
11161117
attachment: Optional[dict] = None,
@@ -1340,7 +1341,7 @@ async def __int_value(self) -> int:
13401341
def start_launch(
13411342
self,
13421343
name: str,
1343-
start_time: str,
1344+
start_time: Union[str, datetime],
13441345
description: Optional[str] = None,
13451346
attributes: Optional[Union[list, dict]] = None,
13461347
rerun: bool = False,
@@ -1369,7 +1370,7 @@ def start_launch(
13691370
def start_test_item(
13701371
self,
13711372
name: str,
1372-
start_time: str,
1373+
start_time: Union[str, datetime],
13731374
item_type: str,
13741375
description: Optional[str] = None,
13751376
attributes: Optional[list[dict]] = None,
@@ -1428,7 +1429,7 @@ def start_test_item(
14281429
def finish_test_item(
14291430
self,
14301431
item_id: Task[str],
1431-
end_time: str,
1432+
end_time: Union[str, datetime],
14321433
status: Optional[str] = None,
14331434
issue: Optional[Issue] = None,
14341435
attributes: Optional[Union[list, dict]] = None,
@@ -1473,7 +1474,7 @@ def finish_test_item(
14731474

14741475
def finish_launch(
14751476
self,
1476-
end_time: str,
1477+
end_time: Union[str, datetime],
14771478
status: Optional[str] = None,
14781479
attributes: Optional[Union[list, dict]] = None,
14791480
**kwargs: Any,
@@ -1572,7 +1573,7 @@ async def _log(self, log_rq: AsyncRPRequestLog) -> Optional[tuple[str, ...]]:
15721573

15731574
def log(
15741575
self,
1575-
time: str,
1576+
time: Union[str, datetime],
15761577
message: str,
15771578
level: Optional[Union[int, str]] = None,
15781579
attachment: Optional[dict] = None,
@@ -1747,13 +1748,13 @@ def create_task(self, coro: Coroutine[Any, Any, _T]) -> Optional[Task[_T]]:
17471748

17481749
def finish_tasks(self):
17491750
"""Ensure all pending Tasks are finished, block current Thread if necessary."""
1750-
shutdown_start_time = datetime.time()
1751+
shutdown_start_time = time.time()
17511752
with self._task_mutex:
17521753
tasks = self._task_list.flush()
17531754
if tasks:
17541755
for task in tasks:
17551756
task.blocking_result()
1756-
if datetime.time() - shutdown_start_time >= self.shutdown_timeout:
1757+
if time.time() - shutdown_start_time >= self.shutdown_timeout:
17571758
break
17581759
logs = self._log_batcher.flush()
17591760
if logs:
@@ -1916,7 +1917,7 @@ def __init__(
19161917
self.trigger_num = trigger_num
19171918
self.trigger_interval = trigger_interval
19181919
self.__init_task_list(task_list, task_mutex)
1919-
self.__last_run_time = datetime.time()
1920+
self.__last_run_time = time.time()
19201921
self.__init_loop(loop)
19211922
if type(launch_uuid) is str:
19221923
super().__init__(

reportportal_client/client.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import sys
2020
import warnings
2121
from abc import abstractmethod
22+
from datetime import datetime
2223
from enum import Enum
2324
from os import getenv
2425
from typing import Any, Optional, TextIO, Union
@@ -147,7 +148,7 @@ def step_reporter(self) -> StepReporter:
147148
def start_launch(
148149
self,
149150
name: str,
150-
start_time: str,
151+
start_time: Union[str, datetime],
151152
description: Optional[str] = None,
152153
attributes: Optional[Union[list, dict]] = None,
153154
rerun: bool = False,
@@ -171,7 +172,7 @@ def start_launch(
171172
def start_test_item(
172173
self,
173174
name: str,
174-
start_time: str,
175+
start_time: Union[str, datetime],
175176
item_type: str,
176177
description: Optional[str] = None,
177178
attributes: Optional[Union[list[dict], dict]] = None,
@@ -212,7 +213,7 @@ def start_test_item(
212213
def finish_test_item(
213214
self,
214215
item_id: str,
215-
end_time: str,
216+
end_time: Union[str, datetime],
216217
status: Optional[str] = None,
217218
issue: Optional[Issue] = None,
218219
attributes: Optional[Union[list, dict]] = None,
@@ -243,7 +244,7 @@ def finish_test_item(
243244
@abstractmethod
244245
def finish_launch(
245246
self,
246-
end_time: str,
247+
end_time: Union[str, datetime],
247248
status: Optional[str] = None,
248249
attributes: Optional[Union[list, dict]] = None,
249250
**kwargs: Any,
@@ -318,7 +319,7 @@ def get_project_settings(self) -> Optional[dict]:
318319
@abstractmethod
319320
def log(
320321
self,
321-
time: str,
322+
time: Union[str, datetime],
322323
message: str,
323324
level: Optional[Union[int, str]] = None,
324325
attachment: Optional[dict] = None,
@@ -637,7 +638,7 @@ def __init__(
637638
def start_launch(
638639
self,
639640
name: str,
640-
start_time: str,
641+
start_time: Union[str, datetime],
641642
description: Optional[str] = None,
642643
attributes: Optional[Union[list, dict]] = None,
643644
rerun: bool = False,
@@ -693,7 +694,7 @@ def start_launch(
693694
def start_test_item(
694695
self,
695696
name: str,
696-
start_time: str,
697+
start_time: Union[str, datetime],
697698
item_type: str,
698699
description: Optional[str] = None,
699700
attributes: Optional[Union[list[dict], dict]] = None,
@@ -772,7 +773,7 @@ def start_test_item(
772773
def finish_test_item(
773774
self,
774775
item_id: Any,
775-
end_time: str,
776+
end_time: Union[str, datetime],
776777
status: Optional[str] = None,
777778
issue: Optional[Issue] = None,
778779
attributes: Optional[Union[list, dict]] = None,
@@ -834,7 +835,7 @@ def finish_test_item(
834835

835836
def finish_launch(
836837
self,
837-
end_time: str,
838+
end_time: Union[str, datetime],
838839
status: Optional[str] = None,
839840
attributes: Optional[Union[list, dict]] = None,
840841
**kwargs: Any,
@@ -936,7 +937,7 @@ def _log(self, batch: Optional[list[RPRequestLog]]) -> Optional[tuple[str, ...]]
936937

937938
def log(
938939
self,
939-
time: str,
940+
time: Union[str, datetime],
940941
message: str,
941942
level: Optional[Union[int, str]] = None,
942943
attachment: Optional[dict] = None,

0 commit comments

Comments
 (0)