Merge lp://staging/~cjwatson/launchpad/fix-git-authenticateWithPassword into lp://staging/launchpad
Proposed by
Colin Watson
| Status: | Merged |
|---|---|
| Merged at revision: | 19064 |
| Proposed branch: | lp://staging/~cjwatson/launchpad/fix-git-authenticateWithPassword |
| Merge into: | lp://staging/launchpad |
| Diff against target: |
342 lines (+116/-62) 3 files modified
lib/lp/code/interfaces/gitapi.py (+7/-2) lib/lp/code/xmlrpc/git.py (+12/-3) lib/lp/code/xmlrpc/tests/test_git.py (+97/-57) |
| To merge this branch: | bzr merge lp://staging/~cjwatson/launchpad/fix-git-authenticateWithPassword |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tony Simpson (community) | Approve | ||
| Launchpad code reviewers | Pending | ||
|
Review via email:
|
|||
Commit message
Fix XML-RPC publication of IGitAPI.
Description of the change
Zope's XML-RPC publication machinery was confused by the return_fault decorator, and published a method taking zero arguments. Pushing this decorator down a layer avoids that problem.
To test this, I needed to refactor the tests to call the API under test via an XML-RPC ServerProxy (which I probably should have done from the start anyway). Since this has the effect of serialising and deserialising any fault that's raised, I also had to rearrange how they test for faults.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good to me!