mozreview: add diffstat information to test output (
Bug 1286017). r?glob
MozReview-Commit-ID: 9ZlVCiSTB1P
--- a/hgext/reviewboard/tests/test-review-request-delegation.t
+++ b/hgext/reviewboard/tests/test-review-request-delegation.t
@@ -60,58 +60,70 @@ Change the reviewer while logged in as r
id: 1
submitter: l3author
issue_open_count: 0
status: pending
has_draft: false
reviewers:
- reviewer1
- reviewer2
+ diff:
+ delete: 1
+ insert: 2
children:
- summary: Bug 1 - Initial commit to review r?reviewer1
id: 2
commit: 80ffd9136b8b9d9541de1780e1a3e027665017fb
submitter: l3author
issue_open_count: 0
status: pending
has_draft: false
reviewers:
- reviewer2
reviewers_status:
reviewer2:
review_flag: r?
ship_it: false
+ diff:
+ delete: 1
+ insert: 1
- summary: Bug 1 - Forgot water r?reviewer1
id: 3
commit: 4935598400374354824ffde84a8b6767823100d1
submitter: l3author
issue_open_count: 0
status: pending
has_draft: false
reviewers:
- reviewer1
reviewers_status:
reviewer1:
review_flag: r?
ship_it: false
+ diff:
+ delete: 0
+ insert: 1
Test multiple reviewers
$ rbmanage modify-reviewers 1 2 'reviewer1,reviewer2'
$ rbmanage dump-summary 1
parent:
summary: bz://1/mynick
id: 1
submitter: l3author
issue_open_count: 0
status: pending
has_draft: false
reviewers:
- reviewer1
- reviewer2
+ diff:
+ delete: 1
+ insert: 2
children:
- summary: Bug 1 - Initial commit to review r?reviewer1
id: 2
commit: 80ffd9136b8b9d9541de1780e1a3e027665017fb
submitter: l3author
issue_open_count: 0
status: pending
has_draft: false
@@ -120,29 +132,35 @@ Test multiple reviewers
- reviewer2
reviewers_status:
reviewer1:
review_flag: r?
ship_it: false
reviewer2:
review_flag: r?
ship_it: false
+ diff:
+ delete: 1
+ insert: 1
- summary: Bug 1 - Forgot water r?reviewer1
id: 3
commit: 4935598400374354824ffde84a8b6767823100d1
submitter: l3author
issue_open_count: 0
status: pending
has_draft: false
reviewers:
- reviewer1
reviewers_status:
reviewer1:
review_flag: r?
ship_it: false
+ diff:
+ delete: 0
+ insert: 1
Test invalid reviewer
$ rbmanage modify-reviewers 1 2 'invalid'
API Error: 400: 105: The reviewer 'invalid' was not found
[1]
Change the reviewer while logged in as the submitter
@@ -155,43 +173,52 @@ Change the reviewer while logged in as t
id: 1
submitter: l3author
issue_open_count: 0
status: pending
has_draft: false
reviewers:
- reviewer1
- reviewer2
+ diff:
+ delete: 1
+ insert: 2
children:
- summary: Bug 1 - Initial commit to review r?reviewer1
id: 2
commit: 80ffd9136b8b9d9541de1780e1a3e027665017fb
submitter: l3author
issue_open_count: 0
status: pending
has_draft: false
reviewers:
- reviewer2
reviewers_status:
reviewer2:
review_flag: r?
ship_it: false
+ diff:
+ delete: 1
+ insert: 1
- summary: Bug 1 - Forgot water r?reviewer1
id: 3
commit: 4935598400374354824ffde84a8b6767823100d1
submitter: l3author
issue_open_count: 0
status: pending
has_draft: false
reviewers:
- reviewer1
reviewers_status:
reviewer1:
review_flag: r?
ship_it: false
+ diff:
+ delete: 0
+ insert: 1
Test user without editbugs
$ exportbzauth reviewer2@example.com password
$ rbmanage modify-reviewers 1 2 'reviewer1'
API Error: 500: 225: Error publishing: Bugzilla error: You are not authorized to edit attachment 1.
[1]
@@ -217,94 +244,115 @@ Test ensure-drafts
id: 1
submitter: l3author
issue_open_count: 0
status: pending
has_draft: true
reviewers:
- reviewer1
- reviewer2
+ diff:
+ delete: 1
+ insert: 2
children:
- summary: Bug 1 - Initial commit to review r?reviewer1
id: 2
commit: 80ffd9136b8b9d9541de1780e1a3e027665017fb
submitter: l3author
issue_open_count: 0
status: pending
has_draft: true
reviewers:
- reviewer2
reviewers_status:
reviewer2:
review_flag: r?
ship_it: false
+ diff:
+ delete: 1
+ insert: 1
- summary: Bug 1 - Forgot water r?reviewer1
id: 3
commit: 4935598400374354824ffde84a8b6767823100d1
submitter: l3author
issue_open_count: 0
status: pending
has_draft: false
reviewers:
- reviewer1
reviewers_status:
reviewer1:
review_flag: r?
ship_it: false
+ diff:
+ delete: 0
+ insert: 1
$ rbmanage ensure-drafts 1
$ rbmanage dump-summary 1
parent:
summary: bz://1/mynick
id: 1
submitter: l3author
issue_open_count: 0
status: pending
has_draft: true
reviewers:
- reviewer1
- reviewer2
+ diff:
+ delete: 1
+ insert: 2
children:
- summary: Bug 1 - Initial commit to review r?reviewer1
id: 2
commit: 80ffd9136b8b9d9541de1780e1a3e027665017fb
submitter: l3author
issue_open_count: 0
status: pending
has_draft: true
reviewers:
- reviewer2
reviewers_status:
reviewer2:
review_flag: r?
ship_it: false
+ diff:
+ delete: 1
+ insert: 1
- summary: Bug 1 - Forgot water r?reviewer1
id: 3
commit: 4935598400374354824ffde84a8b6767823100d1
submitter: l3author
issue_open_count: 0
status: pending
has_draft: true
reviewers:
- reviewer1
reviewers_status:
reviewer1:
review_flag: r?
ship_it: false
+ diff:
+ delete: 0
+ insert: 1
$ rbmanage publish 1
$ rbmanage dump-summary 1
parent:
summary: bz://1/mynick
id: 1
submitter: l3author
issue_open_count: 0
status: pending
has_draft: false
reviewers:
- reviewer1
- reviewer2
+ diff:
+ delete: 1
+ insert: 2
children:
- summary: Bug 1 - Initial commit to review r?reviewer1
id: 2
commit: 80ffd9136b8b9d9541de1780e1a3e027665017fb
submitter: l3author
issue_open_count: 0
status: pending
has_draft: false
@@ -313,21 +361,27 @@ Test ensure-drafts
- reviewer2
reviewers_status:
reviewer1:
review_flag: r?
ship_it: false
reviewer2:
review_flag: r?
ship_it: false
+ diff:
+ delete: 1
+ insert: 1
- summary: Bug 1 - Forgot water r?reviewer1
id: 3
commit: 4935598400374354824ffde84a8b6767823100d1
submitter: l3author
issue_open_count: 0
status: pending
has_draft: false
reviewers:
- reviewer1
reviewers_status:
reviewer1:
review_flag: r?
ship_it: false
+ diff:
+ delete: 0
+ insert: 1
--- a/hgext/reviewboard/tests/test-review-request-summary.t
+++ b/hgext/reviewboard/tests/test-review-request-summary.t
@@ -54,39 +54,48 @@
summary: bz://1/mynick
id: 1
submitter: default+5
issue_open_count: 0
status: pending
has_draft: false
reviewers:
- reviewer
+ diff:
+ delete: 1
+ insert: 1
children:
- summary: Bug 1 - Foo 1
id: 2
commit: 98467d80785ec84dd871f213c167ed704a6d974d
submitter: default+5
issue_open_count: 0
status: pending
has_draft: false
reviewers:
- reviewer
reviewers_status:
reviewer:
review_flag: r?
ship_it: false
+ diff:
+ delete: 1
+ insert: 1
- summary: Bug 1 - Foo 2
id: 3
commit: 3a446ae4382006c43cdfa5aa33c494f582736f35
submitter: default+5
issue_open_count: 0
status: pending
has_draft: false
reviewers: []
reviewers_status: {}
+ diff:
+ delete: 1
+ insert: 1
Only parents have summaries.
$ rbmanage dump-summary 2
API Error: 400: 1001: Review request is not a parent
[1]
$ rbmanage create-review 2
@@ -104,78 +113,96 @@ Opening an issue should be reflected in
summary: bz://1/mynick
id: 1
submitter: default+5
issue_open_count: 0
status: pending
has_draft: false
reviewers:
- reviewer
+ diff:
+ delete: 1
+ insert: 1
children:
- summary: Bug 1 - Foo 1
id: 2
commit: 98467d80785ec84dd871f213c167ed704a6d974d
submitter: default+5
issue_open_count: 1
status: pending
has_draft: false
reviewers:
- reviewer
reviewers_status:
reviewer:
review_flag: r?
ship_it: false
+ diff:
+ delete: 1
+ insert: 1
- summary: Bug 1 - Foo 2
id: 3
commit: 3a446ae4382006c43cdfa5aa33c494f582736f35
submitter: default+5
issue_open_count: 0
status: pending
has_draft: false
reviewers: []
reviewers_status: {}
+ diff:
+ delete: 1
+ insert: 1
Resolving an issue should decrement the issue count.
$ rbmanage update-issue-status 2 1 1 resolved
updated issue status on diff comment 1
$ rbmanage dump-summary 1
parent:
summary: bz://1/mynick
id: 1
submitter: default+5
issue_open_count: 0
status: pending
has_draft: false
reviewers:
- reviewer
+ diff:
+ delete: 1
+ insert: 1
children:
- summary: Bug 1 - Foo 1
id: 2
commit: 98467d80785ec84dd871f213c167ed704a6d974d
submitter: default+5
issue_open_count: 0
status: pending
has_draft: false
reviewers:
- reviewer
reviewers_status:
reviewer:
review_flag: r?
ship_it: false
+ diff:
+ delete: 1
+ insert: 1
- summary: Bug 1 - Foo 2
id: 3
commit: 3a446ae4382006c43cdfa5aa33c494f582736f35
submitter: default+5
issue_open_count: 0
status: pending
has_draft: false
reviewers: []
reviewers_status: {}
+ diff:
+ delete: 1
+ insert: 1
Giving a ship-it should result in a change in the reviewer status
$ exportbzauth reviewer@example.com password1
$ rbmanage create-review 2 --review-flag='r+' --public
created review 2
$ rbmanage dump-summary 1
@@ -183,39 +210,48 @@ Giving a ship-it should result in a chan
summary: bz://1/mynick
id: 1
submitter: default+5
issue_open_count: 0
status: pending
has_draft: false
reviewers:
- reviewer
+ diff:
+ delete: 1
+ insert: 1
children:
- summary: Bug 1 - Foo 1
id: 2
commit: 98467d80785ec84dd871f213c167ed704a6d974d
submitter: default+5
issue_open_count: 0
status: pending
has_draft: false
reviewers:
- reviewer
reviewers_status:
reviewer:
review_flag: r+
ship_it: true
+ diff:
+ delete: 1
+ insert: 1
- summary: Bug 1 - Foo 2
id: 3
commit: 3a446ae4382006c43cdfa5aa33c494f582736f35
submitter: default+5
issue_open_count: 0
status: pending
has_draft: false
reviewers: []
reviewers_status: {}
+ diff:
+ delete: 1
+ insert: 1
$ exportbzauth default@example.com password
Verify we can also get the summaries by bug, including closed ones.
$ rbmanage closesubmitted 2
$ rbmanage dump-summaries-by-bug 1
@@ -223,39 +259,48 @@ Verify we can also get the summaries by
summary: bz://1/mynick
id: 1
submitter: default+5
issue_open_count: 0
status: pending
has_draft: false
reviewers:
- reviewer
+ diff:
+ delete: 1
+ insert: 1
children:
- summary: Bug 1 - Foo 1
id: 2
commit: 98467d80785ec84dd871f213c167ed704a6d974d
submitter: default+5
issue_open_count: 0
status: submitted
has_draft: false
reviewers:
- reviewer
reviewers_status:
reviewer:
review_flag: r+
ship_it: true
+ diff:
+ delete: 1
+ insert: 1
- summary: Bug 1 - Foo 2
id: 3
commit: 3a446ae4382006c43cdfa5aa33c494f582736f35
submitter: default+5
issue_open_count: 0
status: pending
has_draft: false
reviewers: []
reviewers_status: {}
+ diff:
+ delete: 1
+ insert: 1
Verify that we get nothing from non-existent bugs.
$ rbmanage dump-summaries-by-bug 2
[]
Cleanup
--- a/testing/vcttesting/reviewboard/mach_commands.py
+++ b/testing/vcttesting/reviewboard/mach_commands.py
@@ -155,16 +155,20 @@ def short_review_request_dict(rr):
d[k] = rr[k]
d['reviewers'] = [x for x in rr['reviewers']]
if 'reviewers_status' in rr:
d['reviewers_status'] = dict()
for reviewer, status in rr[u'reviewers_status'].iteritems():
d['reviewers_status'][reviewer] = dict(status.iteritems())
+
+ if 'diff' in rr:
+ d['diff'] = dict(rr[u'diff'].iteritems())
+
return d
@CommandProvider
class ReviewBoardCommands(object):
def __init__(self, context):
from vcttesting.mozreview import MozReview
if 'MOZREVIEW_HOME' in os.environ: