Skip to content

Commit

Permalink
syntax fix
Browse files Browse the repository at this point in the history
  • Loading branch information
micheelengronne committed Jun 13, 2019
1 parent 07b8800 commit 19760a4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion marge/bot.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def _get_merge_requests(self, project, project_name):
)
source_branch_regexp = self._config.source_branch_regexp
source_filtered_mrs = [mr for mr in filtered_mrs
if source_branch_regexp.match(mr.source_branch)]
if source_branch_regexp.match(mr.source_branch)]
log.debug(
'MRs that match source_branch_regexp: %s',
[mr.web_url for mr in source_filtered_mrs]
Expand Down
1 change: 1 addition & 0 deletions tests/test_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ def test_branch_regexp():
with main("--branch-regexp='foo.*bar'") as bot:
assert bot.config.branch_regexp == re.compile('foo.*bar')


def test_source_branch_regexp():
with env(MARGE_AUTH_TOKEN="NON-ADMIN-TOKEN", MARGE_SSH_KEY="KEY", MARGE_GITLAB_URL='http://foo.com'):
with main("--source-branch-regexp='foo.*bar'") as bot:
Expand Down

0 comments on commit 19760a4

Please sign in to comment.