Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Investigate/fix test_cancel_running_job() in test_job.py #1022

Merged
merged 9 commits into from
Aug 28, 2023
Merged

Investigate/fix test_cancel_running_job() in test_job.py #1022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bb7c0c2
update `test_cancel_job_running` in `test_job.py` to wait_for_status()
robotAstray Aug 19, 2023
9fbdec9
update `cancel()` in `runtime_job.py` to include `ex.status_code == 204`
robotAstray Aug 19, 2023
3569bd8
release notes fix_test_cancel_job_running-771511870d82d4e4.yaml
robotAstray Aug 19, 2023
aef7e05
substitute line 248 with `ex.status_code in (409, 204)` in `runtime_j…
robotAstray Aug 19, 2023
28a852f
revert to `ex.status == 409` `in cancel()` function in `runtime_job.py`
robotAstray Aug 20, 2023
43b4f41
update release notes for `fix_test_cancel_job_running-771511870d82d4e…
robotAstray Aug 20, 2023
2fbf742
fix `test_cancel_job_running.py` in `test_job.py`
robotAstray Aug 20, 2023
1d2801a
release notes: `fix_test_cancel_job_running-771511870d82d4e4.yaml`
robotAstray Aug 20, 2023
f1dea18
Merge branch 'main' into issue-1019-bug-fix
kt474 Aug 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions releasenotes/notes/fix_test_cancel_job_running-771511870d82d4e4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
fixes:
- |
Fixes a race condition in the function `test_cancel_running_job()` in `test_job.py`
where job cancellation could not be performed.
Refer to #1019 <https://github.com/Qiskit/qiskit-ibm-runtime/issues/1019>_ for
more details.
6 changes: 3 additions & 3 deletions test/integration/test_job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,10 @@ def test_cancel_job_running(self, service):
service,
circuits=[ReferenceCircuits.bell()] * 10,
)
if not cancel_job_safe(job, self.log):
return
time.sleep(10) # Wait a bit for DB to update.
rjob = service.job(job.job_id())
if not cancel_job_safe(rjob, self.log):
return
time.sleep(10)
self.assertEqual(rjob.status(), JobStatus.CANCELLED)

@run_integration_test
Expand Down