Merge lp:~abentley/launchpad/bad-state-transition-2 into lp:launchpad
Status: | Merged |
---|---|
Approved by: | Graham Binns |
Approved revision: | no longer in the source branch. |
Merged at revision: | 13776 |
Proposed branch: | lp:~abentley/launchpad/bad-state-transition-2 |
Merge into: | lp:launchpad |
Diff against target: |
77 lines (+21/-13) 2 files modified
lib/lp/code/errors.py (+1/-0) lib/lp/code/model/tests/test_branchmergeproposal.py (+20/-13) |
To merge this branch: | bzr merge lp:~abentley/launchpad/bad-state-transition-2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Graham Binns (community) | code | Approve | |
Review via email: mp+72592@code.launchpad.net |
Commit message
Treat BadStateTransition as BadRequest.
Description of the change
= Summary =
Fix bug #820050: BadStateTransition: Invalid state transition for merge proposal: Superseded -> Approved
== Proposed fix ==
Have the web service treat BadStateTransition as a 400 Bad Request instead of a 500 Internal Server Error.
== Pre-implementation notes ==
None
== Implementation details ==
Modernized nearby tests.
== Tests ==
bin/test -t test_setStatus_
== Demo and Q/A ==
Create a merge proposal with a target that you can approvve, and resubmit it.
Using the web service, call setStatus(
= Launchpad lint =
Checking for conflicts and issues in changed files.
Linting changed files:
lib/lp/
lib/lp/