Merge lp://staging/~jtv/launchpad/bug-569108 into lp://staging/launchpad

Proposed by Jeroen T. Vermeulen
Status: Merged
Approved by: Jeroen T. Vermeulen
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp://staging/~jtv/launchpad/bug-569108
Merge into: lp://staging/launchpad
Diff against target: 202 lines (+48/-42)
6 files modified
lib/lp/buildmaster/interfaces/buildfarmjob.py (+3/-1)
lib/lp/buildmaster/model/buildfarmjob.py (+7/-3)
lib/lp/buildmaster/model/buildqueue.py (+1/-2)
lib/lp/buildmaster/model/packagebuildfarmjob.py (+0/-2)
lib/lp/translations/model/translationtemplatesbuildjob.py (+10/-0)
lib/lp/translations/tests/test_translationtemplatesbuildjob.py (+27/-34)
To merge this branch: bzr merge lp://staging/~jtv/launchpad/bug-569108
Reviewer Review Type Date Requested Status
Michael Nelson (community) code Approve
Review via email: mp+24297@code.staging.launchpad.net

Commit message

Fix deletion of TranslationTemplateBuildJobs.

Description of the change

= Bug 569108 =

Work in progress. Fixing up deletion of BuildQueue/IBuildFarmJobDerived/Job when done.

To post a comment you must log in.
Revision history for this message
Jeroen T. Vermeulen (jtv) wrote :

Ready for review now. Also passed Q/A on dogfood. No lint. To test:
{{{
./bin/test -vv -t test_translationtemplatesbuildjob
}}}

As a drive-by, I also removed a TranslationTemplatesBuildBehavior test that had already been moved out into a file of its own, but never deleted from the file it was in.

Jeroen

Revision history for this message
Michael Nelson (michael.nelson) wrote :

Nice clean fix, thanks Jeroen.

I'm not sure how I'll cope with this when I merge it into the refactoring work, where BuildFarmJobs (and their derivations) can be db-backed themselves, but I'll figure that out :)

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.