paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 13:33:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

python: Normalize quotes with Black.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2021-02-11 23:20:45 -08:00
committed by Tim Abbott
parent 11741543da
commit 6e4c3e41dc
989 changed files with 32792 additions and 32792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
zerver/webhooks/bitbucket/tests.py
View File

@@ -7,53 +7,53 @@ TOPIC_BRANCH_EVENTS = "Repository name / master"
class BitbucketHookTests(WebhookTestCase):
STREAM_NAME = 'bitbucket'
STREAM_NAME = "bitbucket"
URL_TEMPLATE = "/api/v1/external/bitbucket?stream={stream}"
FIXTURE_DIR_NAME = 'bitbucket'
FIXTURE_DIR_NAME = "bitbucket"
def test_bitbucket_on_push_event(self) -> None:
fixture_name = 'push'
fixture_name = "push"
self.url = self.build_webhook_url(payload=self.get_body(fixture_name))
commit_info = '* c ([25f93d2](https://bitbucket.org/kolaszek/repository-name/commits/25f93d22b719e2d678a7ad5ee0ef0d1fcdf39c12))'
commit_info = "* c ([25f93d2](https://bitbucket.org/kolaszek/repository-name/commits/25f93d22b719e2d678a7ad5ee0ef0d1fcdf39c12))"
expected_message = f"kolaszek pushed 1 commit to branch master.\n\n{commit_info}"
self.api_stream_message(self.test_user, fixture_name, TOPIC_BRANCH_EVENTS, expected_message)
def test_bitbucket_on_push_event_without_user_info(self) -> None:
fixture_name = 'push_without_user_info'
fixture_name = "push_without_user_info"
self.url = self.build_webhook_url(payload=self.get_body(fixture_name))
commit_info = '* c ([25f93d2](https://bitbucket.org/kolaszek/repository-name/commits/25f93d22b719e2d678a7ad5ee0ef0d1fcdf39c12))'
commit_info = "* c ([25f93d2](https://bitbucket.org/kolaszek/repository-name/commits/25f93d22b719e2d678a7ad5ee0ef0d1fcdf39c12))"
expected_message = (
f"Someone pushed 1 commit to branch master. Commits by eeshangarg (1).\n\n{commit_info}"
)
self.api_stream_message(self.test_user, fixture_name, TOPIC_BRANCH_EVENTS, expected_message)
def test_bitbucket_on_push_event_filtered_by_branches(self) -> None:
fixture_name = 'push'
fixture_name = "push"
self.url = self.build_webhook_url(
payload=self.get_body(fixture_name), branches='master,development'
payload=self.get_body(fixture_name), branches="master,development"
)
commit_info = '* c ([25f93d2](https://bitbucket.org/kolaszek/repository-name/commits/25f93d22b719e2d678a7ad5ee0ef0d1fcdf39c12))'
commit_info = "* c ([25f93d2](https://bitbucket.org/kolaszek/repository-name/commits/25f93d22b719e2d678a7ad5ee0ef0d1fcdf39c12))"
expected_message = f"kolaszek pushed 1 commit to branch master.\n\n{commit_info}"
self.api_stream_message(self.test_user, fixture_name, TOPIC_BRANCH_EVENTS, expected_message)
def test_bitbucket_on_push_commits_above_limit_event(self) -> None:
fixture_name = 'push_commits_above_limit'
fixture_name = "push_commits_above_limit"
self.url = self.build_webhook_url(payload=self.get_body(fixture_name))
commit_info = '* c ([25f93d2](https://bitbucket.org/kolaszek/repository-name/commits/25f93d22b719e2d678a7ad5ee0ef0d1fcdf39c12))\n'
commit_info = "* c ([25f93d2](https://bitbucket.org/kolaszek/repository-name/commits/25f93d22b719e2d678a7ad5ee0ef0d1fcdf39c12))\n"
expected_message = f"kolaszek pushed 50 commits to branch master.\n\n{commit_info * 20}[and 30 more commit(s)]"
self.api_stream_message(self.test_user, fixture_name, TOPIC_BRANCH_EVENTS, expected_message)
def test_bitbucket_on_push_commits_above_limit_event_filtered_by_branches(self) -> None:
fixture_name = 'push_commits_above_limit'
fixture_name = "push_commits_above_limit"
self.url = self.build_webhook_url(
payload=self.get_body(fixture_name), branches='master,development'
payload=self.get_body(fixture_name), branches="master,development"
)
commit_info = '* c ([25f93d2](https://bitbucket.org/kolaszek/repository-name/commits/25f93d22b719e2d678a7ad5ee0ef0d1fcdf39c12))\n'
commit_info = "* c ([25f93d2](https://bitbucket.org/kolaszek/repository-name/commits/25f93d22b719e2d678a7ad5ee0ef0d1fcdf39c12))\n"
expected_message = f"kolaszek pushed 50 commits to branch master.\n\n{commit_info * 20}[and 30 more commit(s)]"
self.api_stream_message(self.test_user, fixture_name, TOPIC_BRANCH_EVENTS, expected_message)
def test_bitbucket_on_force_push_event(self) -> None:
fixture_name = 'force_push'
fixture_name = "force_push"
self.url = self.build_webhook_url(payload=self.get_body(fixture_name))
expected_message = (
"kolaszek [force pushed](https://bitbucket.org/kolaszek/repository-name)."
@@ -61,31 +61,31 @@ class BitbucketHookTests(WebhookTestCase):
self.api_stream_message(self.test_user, fixture_name, TOPIC, expected_message)
def test_bitbucket_on_force_push_event_without_user_info(self) -> None:
fixture_name = 'force_push_without_user_info'
fixture_name = "force_push_without_user_info"
self.url = self.build_webhook_url(payload=self.get_body(fixture_name))
expected_message = (
"Someone [force pushed](https://bitbucket.org/kolaszek/repository-name/)."
)
self.api_stream_message(self.test_user, fixture_name, TOPIC, expected_message)
@patch('zerver.webhooks.bitbucket.view.check_send_webhook_message')
@patch("zerver.webhooks.bitbucket.view.check_send_webhook_message")
def test_bitbucket_on_push_event_filtered_by_branches_ignore(
self, check_send_webhook_message_mock: MagicMock
) -> None:
fixture_name = 'push'
fixture_name = "push"
payload = self.get_body(fixture_name)
self.url = self.build_webhook_url(payload=payload, branches='changes,development')
self.url = self.build_webhook_url(payload=payload, branches="changes,development")
result = self.api_post(self.test_user, self.url, payload, content_type="application/json,")
self.assertFalse(check_send_webhook_message_mock.called)
self.assert_json_success(result)
@patch('zerver.webhooks.bitbucket.view.check_send_webhook_message')
@patch("zerver.webhooks.bitbucket.view.check_send_webhook_message")
def test_bitbucket_push_commits_above_limit_filtered_by_branches_ignore(
self, check_send_webhook_message_mock: MagicMock
) -> None:
fixture_name = 'push_commits_above_limit'
fixture_name = "push_commits_above_limit"
payload = self.get_body(fixture_name)
self.url = self.build_webhook_url(payload=payload, branches='changes,development')
self.url = self.build_webhook_url(payload=payload, branches="changes,development")
result = self.api_post(self.test_user, self.url, payload, content_type="application/json,")
self.assertFalse(check_send_webhook_message_mock.called)
self.assert_json_success(result)

28
zerver/webhooks/bitbucket/view.py
View File

@@ -19,38 +19,38 @@ def api_bitbucket_webhook(
payload: Mapping[str, Any] = REQ(validator=check_dict([])),
branches: Optional[str] = REQ(default=None),
) -> HttpResponse:
repository = payload['repository']
repository = payload["repository"]
commits = [
{
'name': commit.get('author') or payload.get('user'),
'sha': commit.get('raw_node'),
'message': commit.get('message'),
'url': '{}{}commits/{}'.format(
payload.get('canon_url'), repository.get('absolute_url'), commit.get('raw_node')
"name": commit.get("author") or payload.get("user"),
"sha": commit.get("raw_node"),
"message": commit.get("message"),
"url": "{}{}commits/{}".format(
payload.get("canon_url"), repository.get("absolute_url"), commit.get("raw_node")
),
}
for commit in payload['commits']
for commit in payload["commits"]
]
if len(commits) == 0:
# Bitbucket doesn't give us enough information to really give
# a useful message :/
subject = repository['name']
subject = repository["name"]
content = "{} [force pushed]({}).".format(
payload.get('user', 'Someone'),
payload['canon_url'] + repository['absolute_url'],
payload.get("user", "Someone"),
payload["canon_url"] + repository["absolute_url"],
)
else:
branch = payload['commits'][-1]['branch']
branch = payload["commits"][-1]["branch"]
if branches is not None and branches.find(branch) == -1:
return json_success()
committer = payload.get('user')
committer = payload.get("user")
content = get_push_commits_event_message(
committer if committer is not None else 'Someone', None, branch, commits
committer if committer is not None else "Someone", None, branch, commits
)
subject = TOPIC_WITH_BRANCH_TEMPLATE.format(repo=repository['name'], branch=branch)
subject = TOPIC_WITH_BRANCH_TEMPLATE.format(repo=repository["name"], branch=branch)
check_send_webhook_message(request, user_profile, subject, content, unquote_url_parameters=True)
return json_success()