Skip to content

bot: Use phabricator url in low coverage mail #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions bot/code_coverage_bot/notifier.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import structlog

from code_coverage_bot.phabricator import parse_revision_id
from code_coverage_bot.phabricator import parse_revision_url
from code_coverage_bot.secrets import secrets
from code_coverage_bot.taskcluster import taskcluster_config

Expand All @@ -21,8 +22,6 @@ def notify_email(revision, changesets, changesets_coverage):
if any(text in desc for text in ["r=merge", "a=merge"]):
continue

rev = changeset["node"]

# Lookup changeset coverage from phabricator uploader
rev_id = parse_revision_id(changeset["desc"])
if rev_id is None:
Expand All @@ -37,9 +36,8 @@ def notify_email(revision, changesets, changesets_coverage):
added = sum(c["lines_added"] for c in coverage.values())

if covered < 0.2 * added:
content += "* [{}](https://firefox-code-coverage.herokuapp.com/#/changeset/{}): {} covered out of {} added.\n".format(
desc, rev, covered, added
) # noqa
url = parse_revision_url(changeset["desc"])
content += f"* [{desc}]({url}): {covered} covered out of {added} added.\n"

if content == "":
return
Expand Down
11 changes: 9 additions & 2 deletions bot/code_coverage_bot/phabricator.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,22 @@
logger = structlog.get_logger(__name__)

PHABRICATOR_REVISION_REGEX = re.compile(
"Differential Revision: https://phabricator.services.mozilla.com/D([0-9]+)"
"Differential Revision: (https://phabricator.services.mozilla.com/D([0-9]+))"
)


def parse_revision_id(desc):
match = PHABRICATOR_REVISION_REGEX.search(desc)
if not match:
return None
return int(match.group(1))
return int(match.group(2))


def parse_revision_url(desc):
match = PHABRICATOR_REVISION_REGEX.search(desc)
if not match:
return None
return match.group(1)


class PhabricatorUploader(object):
Expand Down
4 changes: 1 addition & 3 deletions bot/tests/test_notifier.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,5 @@ def test_notification(mock_secrets, mock_taskcluster, mock_phabricator, fake_hg_
mail = notify_email(revision, stack, changesets_coverage)
assert (
mail
== "* [Commit [(b'M', b'file')]Differential Revision: https://phabricator.services.mozilla.com/D2](https://firefox-code-coverage.herokuapp.com/#/changeset/{}): 0 covered out of 6 added.\n".format( ## noqa
revision
)
== "* [Commit [(b'M', b'file')]Differential Revision: https://phabricator.services.mozilla.com/D2](https://phabricator.services.mozilla.com/D2): 0 covered out of 6 added.\n" # noqa
)