SelfPrivacy/selfprivacy-rest-api
1
0
Fork 0
mirror of https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git synced 2024-11-26 05:51:29 +00:00
Code Issues Projects Releases Wiki Activity

fix(jobs): make finishing the job set progress to 100

Browse source
This commit is contained in:
Houkime 2023-06-28 13:22:53 +00:00 committed by Inex Code
parent 5ff89c21d5
commit 559de63221
2 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
selfprivacy_api/jobs/__init__.py
View file

@ -198,7 +198,10 @@ class Jobs:
job.description = description
if status_text is not None:
job.status_text = status_text
if status == JobStatus.FINISHED:
job.progress = 100
if progress is not None:
# explicitly provided progress has priority
job.progress = progress
Jobs.log_progress_update(job, progress)
job.status = status

23
tests/test_jobs.py
View file

@ -80,6 +80,29 @@ def test_jobs(jobs_with_one_job):
jobsmodule.JOB_EXPIRATION_SECONDS = backup
def test_finishing_equals_100(jobs_with_one_job):
jobs = jobs_with_one_job
test_job = jobs.get_jobs()[0]
assert not jobs.is_busy()
assert test_job.progress != 100
jobs.update(job=test_job, status=JobStatus.FINISHED)
assert test_job.progress == 100
def test_finishing_equals_100_unless_stated_otherwise(jobs_with_one_job):
jobs = jobs_with_one_job
test_job = jobs.get_jobs()[0]
assert not jobs.is_busy()
assert test_job.progress != 100
assert test_job.progress != 23
jobs.update(job=test_job, status=JobStatus.FINISHED, progress=23)
assert test_job.progress == 23
@pytest.fixture
def jobs():
j = Jobs()