Skip to content

When raising error, show the current state vs expected state #87

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

Merged
ambv merged 3 commits into from
Oct 10, 2023
Merged

When raising error, show the current state vs expected state #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41211d2
When raising error, show what the current state vs expected state.
Mariatta Oct 10, 2023
e167070
Fix the test
Mariatta Oct 10, 2023
44d9343
Fix isort
Mariatta Oct 10, 2023
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
4 changes: 3 additions & 1 deletion cherry_picker/cherry_picker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,9 @@ def abort_cherry_pick(self):
run `git cherry-pick --abort` and then clean up the branch
"""
if self.initial_state != WORKFLOW_STATES.BACKPORT_PAUSED:
raise ValueError("One can only abort a paused process.")
raise ValueError(
f"One can only abort a paused process. Current state: {self.initial_state}. Expected state: {WORKFLOW_STATES.BACKPORT_PAUSED}"
)

try:
validate_sha("CHERRY_PICK_HEAD")
Expand Down
5 changes: 3 additions & 2 deletions cherry_picker/test_cherry_picker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import os
import pathlib
import re
import subprocess
import warnings
from collections import ChainMap
Expand Down Expand Up @@ -1141,7 +1142,7 @@ def test_continue_cherry_pick_invalid_state(tmp_git_repo_dir):

assert get_state() == WORKFLOW_STATES.UNSET

with pytest.raises(ValueError, match=r"^One can only continue a paused process.$"):
with pytest.raises(ValueError, match=re.compile(r"^One can only continue a paused process.")):
cherry_picker.continue_cherry_pick()

assert get_state() == WORKFLOW_STATES.UNSET # success
Expand All @@ -1167,7 +1168,7 @@ def test_abort_cherry_pick_invalid_state(tmp_git_repo_dir):

assert get_state() == WORKFLOW_STATES.UNSET

with pytest.raises(ValueError, match=r"^One can only abort a paused process.$"):
with pytest.raises(ValueError, match=re.compile(r"^One can only abort a paused process.")):
cherry_picker.abort_cherry_pick()


Expand Down