Merge lp://staging/~michael.nelson/launchpad/delegate-to-buildfarmjob into lp://staging/launchpad
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Michael Nelson | ||||
| Approved revision: | no longer in the source branch. | ||||
| Merged at revision: | not available | ||||
| Proposed branch: | lp://staging/~michael.nelson/launchpad/delegate-to-buildfarmjob | ||||
| Merge into: | lp://staging/launchpad | ||||
| Diff against target: |
718 lines (+215/-123) 15 files modified
lib/lp/buildmaster/doc/buildfarmjob.txt (+32/-9) lib/lp/buildmaster/interfaces/buildfarmbranchjob.py (+1/-2) lib/lp/buildmaster/interfaces/buildfarmjob.py (+15/-25) lib/lp/buildmaster/model/buildfarmjob.py (+64/-37) lib/lp/buildmaster/model/packagebuildfarmjob.py (+29/-3) lib/lp/buildmaster/tests/test_buildqueue.py (+24/-17) lib/lp/code/configure.zcml (+2/-1) lib/lp/code/model/sourcepackagerecipebuild.py (+5/-4) lib/lp/soyuz/configure.zcml (+2/-0) lib/lp/soyuz/model/binarypackagebuild.py (+1/-3) lib/lp/soyuz/model/buildpackagejob.py (+11/-5) lib/lp/soyuz/tests/test_buildpackagejob.py (+13/-0) lib/lp/translations/configure.zcml (+2/-0) lib/lp/translations/model/translationtemplatesbuildjob.py (+8/-9) lib/lp/translations/tests/test_translationtemplatesbuildjob.py (+6/-8) |
||||
| To merge this branch: | bzr merge lp://staging/~michael.nelson/launchpad/delegate-to-buildfarmjob | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Brad Crittenden (community) | code | Approve | |
|
Review via email:
|
|||
Commit message
Switch BuildFarmJob from an inherited mix-in to a delegated object in preparation for the build generalisation work.
Description of the change
This branch switches BuildFarmJob from an inherited mix-in to a delegated object, in preparation for the build generalisation work (where BuildFarmJob will become a concrete Storm class).
While at it, I used the opportunity to merge two interfaces specific to the build farm queue scheduling into existing interfaces (see bug 562252).
There is no demo url, this is just an implementation detail.
Test command:
bin/test -vvt test_translatio
Pre-implementation:
This is part of the LEP https:/
Hi Michael,
This branch looks good.
Since _set_build_
Also, our coding guidelines state the docstring must be a single line followed by a longer explanation if needed. It is quite Draconian and leads to some haiku-like challenges but please see if you can adhere to the rule.