Skip to content
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.

Sign up for GitHub

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

add: nicer error message for unknown block reason #139

Merged
merged 2 commits into from
Jul 28, 2019
Merged

add: nicer error message for unknown block reason #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5389ace
add: nicer error message for unknown block reason
chdsbd Jul 28, 2019
f584fbf
fix test
chdsbd Jul 28, 2019
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
2 changes: 1 addition & 1 deletion kodiak/evaluation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ def mergeable(
if need_branch_update:
raise NeedsBranchUpdate("behind branch. need update")

raise NotQueueable("Could not determine why PR is blocked")
raise NotQueueable("Merging blocked by branch protection settings")

# okay to merge
return None
2 changes: 1 addition & 1 deletion kodiak/test_evaluation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ def test_unknown_blockage(
branch_protection.requiredApprovingReviewCount = 0
branch_protection.requiresStatusChecks = False
pull_request.mergeStateStatus = MergeStateStatus.BLOCKED
with pytest.raises(NotQueueable, match="determine why PR is blocked"):
with pytest.raises(NotQueueable, match="blocked by branch protection settings"):
mergeable(
config=config,
pull_request=pull_request,
Expand Down