Show More
@@ -109,6 +109,7 b' class TestMergePullRequest(object):' | |||||
109 | expected = { |
|
109 | expected = { | |
110 | 'executed': True, |
|
110 | 'executed': True, | |
111 | 'failure_reason': 0, |
|
111 | 'failure_reason': 0, | |
|
112 | 'merge_status_message': 'This pull request can be automatically merged.', | |||
112 | 'possible': True, |
|
113 | 'possible': True, | |
113 | 'merge_commit_id': pull_request.shadow_merge_ref.commit_id, |
|
114 | 'merge_commit_id': pull_request.shadow_merge_ref.commit_id, | |
114 | 'merge_ref': pull_request.shadow_merge_ref._asdict() |
|
115 | 'merge_ref': pull_request.shadow_merge_ref._asdict() |
@@ -267,10 +267,11 b' def merge_pull_request(' | |||||
267 |
|
267 | |||
268 | "id": <id_given_in_input>, |
|
268 | "id": <id_given_in_input>, | |
269 | "result": { |
|
269 | "result": { | |
270 | "executed": "<bool>", |
|
270 | "executed": "<bool>", | |
271 | "failure_reason": "<int>", |
|
271 | "failure_reason": "<int>", | |
272 |
"merge_ |
|
272 | "merge_status_message": "<str>", | |
273 |
" |
|
273 | "merge_commit_id": "<merge_commit_id>", | |
|
274 | "possible": "<bool>", | |||
274 | "merge_ref": { |
|
275 | "merge_ref": { | |
275 | "commit_id": "<commit_id>", |
|
276 | "commit_id": "<commit_id>", | |
276 | "type": "<type>", |
|
277 | "type": "<type>", |
@@ -221,7 +221,8 b' class MergeResponse(object):' | |||||
221 |
|
221 | |||
222 | def asdict(self): |
|
222 | def asdict(self): | |
223 | data = {} |
|
223 | data = {} | |
224 |
for k in ['possible', 'executed', 'merge_ref', 'failure_reason' |
|
224 | for k in ['possible', 'executed', 'merge_ref', 'failure_reason', | |
|
225 | 'merge_status_message']: | |||
225 | data[k] = getattr(self, k) |
|
226 | data[k] = getattr(self, k) | |
226 | return data |
|
227 | return data | |
227 |
|
228 |
General Comments 0
You need to be logged in to leave comments.
Login now