Skip to content

Commit c5c157d

Browse files
committed
fix: fix job_timeout keyword in rq
1 parent d9bd6bf commit c5c157d

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

src/dioptra/restapi/v1/shared/rq_service.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,5 @@ def submit(
5858
RUN_V1_DIOPTRA_JOB_FUNC,
5959
kwargs=cmd_kwargs,
6060
job_id=str(job_id),
61-
timeout=timeout,
61+
job_timeout=timeout if timeout else TIMEOUT_24_HOURS,
6262
)

tests/unit/restapi/lib/mock_rq.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,20 @@ def __init__(
3030
self,
3131
id: str = "4520511d-678b-4966-953e-af2d0edcea32",
3232
queue: Optional[str] = None,
33-
timeout: Optional[str] = None,
33+
job_timeout: Optional[str] = None,
3434
cmd_kwargs: Optional[Dict[str, Any]] = None,
3535
depends_on: Optional[Union[str, MockRQJob]] = None,
3636
) -> None:
3737
LOGGER.info(
3838
"Mocking rq.job.Job instance",
3939
id=id,
4040
queue=queue,
41-
timeout=timeout,
41+
job_timeout=job_timeout,
4242
cmd_kwargs=cmd_kwargs,
4343
depends_on=depends_on,
4444
)
4545
self.queue = queue
46-
self.timeout = timeout
46+
self.job_timeout = job_timeout
4747
self.cmd_kwargs = cmd_kwargs
4848
self._id = id
4949
self._dependency_ids = None
@@ -98,11 +98,11 @@ def enqueue(self, *args, **kwargs) -> MockRQJob:
9898
job_id = kwargs.get("job_id", str(uuid.uuid4()))
9999
cmd_kwargs = kwargs.get("kwargs")
100100
depends_on = kwargs.get("depends_on")
101-
timeout = kwargs.get("timeout")
101+
job_timeout = kwargs.get("job_timeout")
102102
return MockRQJob(
103103
id=job_id,
104104
queue=self.name,
105-
timeout=timeout,
105+
job_timeout=job_timeout,
106106
cmd_kwargs=cmd_kwargs,
107107
depends_on=depends_on,
108108
)

0 commit comments

Comments
 (0)