Merge lp://staging/~facundo/magicicada-gui/fix-queue-same-opid into lp://staging/magicicada-gui
Proposed by
Facundo Batista
| Status: | Merged |
|---|---|
| Approved by: | Natalia Bidart |
| Approved revision: | 141 |
| Merged at revision: | 141 |
| Proposed branch: | lp://staging/~facundo/magicicada-gui/fix-queue-same-opid |
| Merge into: | lp://staging/magicicada-gui |
| Diff against target: |
115 lines (+84/-6) 2 files modified
magicicada/queue_content.py (+1/-1) magicicada/tests/test_queue_content.py (+83/-5) |
| To merge this branch: | bzr merge lp://staging/~facundo/magicicada-gui/fix-queue-same-opid |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Natalia Bidart | Approve | ||
|
Review via email:
|
|||
Commit message
Ignore done operations when searching for finish an operation.
Description of the change
Ignore done operations when searching for finish an operation.
This is needed for a corner case where same operations with same id are received from the client *and* other operations are queued before the original one finishes.
Added two tests, one for a simple situation with same id (which worked ok with past code, but better to be covered) and another for the situation described above.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
+1!