Merge lp:~abentley/launchpad/re-roll-r15692 into lp:launchpad
Status: | Merged |
---|---|
Approved by: | Aaron Bentley |
Approved revision: | no longer in the source branch. |
Merged at revision: | 15704 |
Proposed branch: | lp:~abentley/launchpad/re-roll-r15692 |
Merge into: | lp:launchpad |
Prerequisite: | lp:~abentley/launchpad/enable-tests |
Diff against target: |
86 lines (+23/-21) 1 file modified
lib/lp/services/job/tests/test_celeryjob.py (+23/-21) |
To merge this branch: | bzr merge lp:~abentley/launchpad/re-roll-r15692 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Abel Deuring (community) | code | Approve | |
Review via email: mp+117070@code.launchpad.net |
Commit message
Fix waiting for queue length.
Description of the change
= Summary =
Fix spuriously-failing test.
== Proposed fix ==
Change != to ==.
== Pre-implementation notes ==
None
== LOC Rationale ==
I have a LOC credit of 1928
== Implementation details ==
wait_for_queue's logic was inverted. It was waiting when it did not need to, and not waiting when it needed to. But since it didn't indicate when waiting had timed out, this was not apparent in local testing.
This branch fixes the logic, and also causes it to fail when waiting times out, to prevent similar future errors. So it becomes assertQueueSize.
== Tests ==
bin/test test_celeryjob
== Demo and Q/A ==
None
= Launchpad lint =
Checking for conflicts and issues in changed files.
Linting changed files:
lib/lp/
thanks for spotting the "inverted logic"