1
=== modified file 'lib/lp/code/errors.py'
2
--- lib/lp/code/errors.py	2010-02-24 02:43:52 +0000
3
+++ lib/lp/code/errors.py	2010-03-10 19:00:50 +0000
4
@@ -17,6 +17,8 @@
5
17
    'WrongBranchMergeProposal',
17
    'WrongBranchMergeProposal',
6
18
]
18
]
7
19
19
8
20
from lazr.restful.declarations import webservice_error
9
21
10
20
22
11
21
class BadBranchMergeProposalSearchContext(Exception):
23
class BadBranchMergeProposalSearchContext(Exception):
12
22
    """The context is not valid for a branch merge proposal search."""
24
    """The context is not valid for a branch merge proposal search."""
13
@@ -39,6 +41,7 @@
14
39
41
15
40
class BranchMergeProposalExists(InvalidBranchMergeProposal):
42
class BranchMergeProposalExists(InvalidBranchMergeProposal):
16
41
    """Raised if there is already a matching BranchMergeProposal."""
43
    """Raised if there is already a matching BranchMergeProposal."""
17
44
    webservice_error(400) #Bad request.
18
42
45
19
43
46
20
44
class ReviewNotPending(Exception):
47
class ReviewNotPending(Exception):
21
45
48
22
=== modified file 'lib/lp/code/stories/webservice/xx-branchmergeproposal.txt'
23
--- lib/lp/code/stories/webservice/xx-branchmergeproposal.txt	2010-03-09 17:30:18 +0000
24
+++ lib/lp/code/stories/webservice/xx-branchmergeproposal.txt	2010-03-10 19:00:50 +0000
25
@@ -76,6 +76,18 @@
26
76
    votes_collection_link:
76
    votes_collection_link:
27
77
        u'http://api.launchpad.dev/devel/~.../+merge/.../votes'
77
        u'http://api.launchpad.dev/devel/~.../+merge/.../votes'
28
78
78
29
79
If we try and create the merge proposal again, we should get a ValueError.
30
80
31
81
    >>> print registrant_webservice.named_post(
32
82
    ...     source_url, 'createMergeProposal', target_branch=target_url,
33
83
    ...     prerequisite_branch=prerequisite_url,
34
84
    ...     initial_comment='Merge\nit!', needs_review=True,
35
85
    ...     commit_message='It was merged!\n', reviewers=[reviewer_url],
36
86
    ...     review_types=['green'])
37
87
    HTTP/1.1 500 Internal Server Error ...
38
88
    BranchMergeProposalExists: There is already a branch merge proposal
39
89
    registered for branch ... to land on ... that is still active.
40
90
41
79
Our review request is listed in the votes collection.
91
Our review request is listed in the votes collection.
42
80
92
43
81
    >>> votes = webservice.get(
93
    >>> votes = webservice.get(
Reviewer	Review Type	Date Requested	Status
Graham Binns (community)	code	2010-03-10	Approve on 2010-03-10
Review via email: mp+21025@code.launchpad.net