Merge lp:~abentley/launchpad/simplify-twisted-runner-2 into lp:launchpad
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 13831 | ||||
Proposed branch: | lp:~abentley/launchpad/simplify-twisted-runner-2 | ||||
Merge into: | lp:launchpad | ||||
Prerequisite: | lp:~abentley/launchpad/simplify-twisted-runner | ||||
Diff against target: |
142 lines (+55/-20) 2 files modified
lib/lp/services/job/runner.py (+28/-20) lib/lp/services/job/tests/test_runner.py (+27/-0) |
||||
To merge this branch: | bzr merge lp:~abentley/launchpad/simplify-twisted-runner-2 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Deryck Hodge (community) | code | Approve | |
Review via email: mp+73402@code.launchpad.net |
Commit message
Simplify Twisted job runner.
Description of the change
= Summary =
Ensure runJobInSubprocess doesn't violate its expected return value.
== Proposed fix ==
Always return a Deferred from runJobInSubprocess, by returning twisted.
== Pre-implementation notes ==
None
== Implementation details ==
Unified lease acquisition by moving it to BaseJobRunner.
Also extracted job string generation to BaseJobRunner.
== Tests ==
bin/test -t test_lease_
== Demo and Q/A ==
Propose a merge on qastaging. Run merge-proposal-
should run successfully.
= Launchpad lint =
Checking for conflicts and issues in changed files.
Linting changed files:
lib/lp/
lib/lp/
rolling back due to mysterious problems in QA: https:/ /pastebin. canonical. com/52118/