Update tests

Author: Jackenmen

cherry_picker/test_cherry_picker.py

@@ -17,15 +17,14 @@
     from_git_rev_read,
     get_author_info_from_short_sha,
     get_base_branch,
+    get_commits_from_backport_branch,
     get_current_branch,
     get_full_sha_from_short,
-    get_is_already_committed,
     get_sha1_from,
     get_state,
     load_config,
     load_val_from_git_cfg,
     normalize_commit_message,
-    reset_is_already_committed,
     reset_state,
     reset_stored_config_ref,
     set_state,
@@ -102,6 +101,12 @@ def git_cherry_pick():
     )
 
 
+@pytest.fixture
+def git_reset():
+    git_reset_cmd = "git", "reset"
+    return lambda *extra_args: (subprocess.run(git_reset_cmd + extra_args, check=True))
+
+
 @pytest.fixture
 def git_config():
     git_config_cmd = "git", "config"
@@ -851,7 +856,7 @@ def test_backport_success(
 @pytest.mark.parametrize("already_committed", (True, False))
 @pytest.mark.parametrize("push", (True, False))
 def test_backport_pause_and_continue(
-    tmp_git_repo_dir, git_branch, git_add, git_commit, git_checkout, already_committed, push
+    tmp_git_repo_dir, git_branch, git_add, git_commit, git_checkout, git_reset, already_committed, push
 ):
     cherry_pick_target_branches = ("3.8",)
     pr_remote = "origin"
@@ -872,18 +877,17 @@ def test_backport_pause_and_continue(
             pr_remote, scm_revision, cherry_pick_target_branches, push=False
         )
 
-    with mock.patch.object(cherry_picker, "checkout_branch"), mock.patch.object(
-        cherry_picker, "fetch_upstream"
-    ), mock.patch.object(
+    with mock.patch.object(cherry_picker, "fetch_upstream"), mock.patch.object(
         cherry_picker, "amend_commit_message", return_value="commit message"
     ):
         cherry_picker.backport()
 
-    assert get_is_already_committed()
+    assert len(get_commits_from_backport_branch(cherry_pick_target_branches[0])) == 1
     assert get_state() == WORKFLOW_STATES.BACKPORT_PAUSED
 
     if not already_committed:
-        reset_is_already_committed()
+        git_reset("HEAD~1")
+        assert len(get_commits_from_backport_branch(cherry_pick_target_branches[0])) == 0
 
     with mock.patch("cherry_picker.cherry_picker.validate_sha", return_value=True):
         cherry_picker = CherryPicker(pr_remote, "", [], push=push)
@@ -905,22 +909,24 @@ def test_backport_pause_and_continue(
         "cherry_picker.cherry_picker.get_current_branch",
         return_value="backport-xxx-3.8",
     ), mock.patch.object(
-        cherry_picker, "get_commit_message", return_value=commit_message
-    ) as get_commit_message, mock.patch.object(
+        cherry_picker, "amend_commit_message", return_value=commit_message
+    ) as amend_commit_message, mock.patch.object(
         cherry_picker, "get_updated_commit_message", return_value=commit_message
     ) as get_updated_commit_message, mock.patch.object(
         cherry_picker, "checkout_branch"
     ), mock.patch.object(
         cherry_picker, "fetch_upstream"
+    ), mock.patch.object(
+        cherry_picker, "cleanup_branch"
     ):
         cherry_picker.continue_cherry_pick()
 
     if already_committed:
-        get_commit_message.assert_called_once()
+        amend_commit_message.assert_called_once()
         get_updated_commit_message.assert_not_called()
     else:
         get_updated_commit_message.assert_called_once()
-        get_commit_message.assert_not_called()
+        amend_commit_message.assert_not_called()
 
     if push:
         assert get_state() == WORKFLOW_STATES.BACKPORTING_CONTINUATION_SUCCEED