Merge lp:~jtv/launchpad/bug-643345 into lp:launchpad
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 11599 | ||||
Proposed branch: | lp:~jtv/launchpad/bug-643345 | ||||
Merge into: | lp:launchpad | ||||
Diff against target: |
262 lines (+108/-24) 4 files modified
lib/lp/code/model/directbranchcommit.py (+21/-4) lib/lp/code/tests/test_directbranchcommit.py (+71/-12) lib/lp/translations/scripts/tests/test_translations_to_branch.py (+13/-5) lib/lp/translations/scripts/translations_to_branch.py (+3/-3) |
||||
To merge this branch: | bzr merge lp:~jtv/launchpad/bug-643345 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Penhey (community) | production-change | Approve | |
Robert Collins | production-change | Pending | |
Launchpad code reviewers | code | Pending | |
Review via email: mp+36258@code.launchpad.net |
Commit message
Fixes translations-
Description of the change
= Bug 643345 =
For cherrypicking.
DirectBranchCommit has been changed in such a way that it errors out when the committer has no preferred email (which is often the case with teams). This is breaking our daily translations-
This branch fixes that. It makes several changes:
* Allows a user of DirectBranchCommit to specify a bzr committer id as a string.
* Makes DirectBranchCommit fall back to a safe default for the committer id.
* Documents and tests the choice of default committer (it's the branch owner).
* Sets a more accurate committer string in translations exports.
* Cleans out the obsolete boilerplate that we used to need at the bottom of each unit test.
* Sanitizes the inheritance tree for some test classes.
There are probably better fixes for the general case. This branch lays some groundwork for them, but is primarily intended to solve our immediate problem.
To test:
{{{
./bin/test -vvc lp.code.
./bin/test -vvc lp.translations -t branch
}}}
No lint,
Jeroen
For the TestGetBzrCommi tterID test case, remove the tearDown, and instead
do something like:
committer = DirectBranchCom mit(... ) (committer. unlock)
self.addCleanup
The test should also work in the DatabaseFunctio nalLayer rather than the eLayer. Unless there is a reason why you are running it in
ZopelessDatabas
that layer, in which case, document it.
How about "Launchpad Translations on behalf of %s"?