Skip to content

test: fix TestStateDoesntCrashOnInvalidVote (backport #4439)#4440

Merged
mergify[bot] merged 4 commits intov0.38.x-experimentalfrom
mergify/bp/v0.38.x-experimental/pr-4439
Nov 6, 2024
Merged

test: fix TestStateDoesntCrashOnInvalidVote (backport #4439)#4440
mergify[bot] merged 4 commits intov0.38.x-experimentalfrom
mergify/bp/v0.38.x-experimental/pr-4439

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 6, 2024


This is an automatic backport of pull request #4439 done by [Mergify](https://mergify.com).

(cherry picked from commit d8980f9)

# Conflicts:
#	consensus/state_test.go
@mergify mergify bot requested a review from a team as a code owner November 6, 2024 08:35
@mergify mergify bot added the conflicts label Nov 6, 2024
@mergify
Copy link
Contributor Author

mergify bot commented Nov 6, 2024

Cherry-pick of d8980f9 has failed:

On branch mergify/bp/v0.38.x-experimental/pr-4439
Your branch is up to date with 'origin/v0.38.x-experimental'.

You are currently cherry-picking commit d8980f927.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   consensus/state_test.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot assigned melekes Nov 6, 2024
@cason
Copy link

cason commented Nov 6, 2024

We probably should merge v0.38.x into this experimental branch before adding this one.

@melekes
Copy link
Collaborator

melekes commented Nov 6, 2024

We probably should merge v0.38.x into this experimental branch before adding this one.

That's not how we do it anymore.

Copy link

@cason cason left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Diffs match, except for the empty line.

There is a suggestion to remove it.

@mergify mergify bot merged commit ce1906d into v0.38.x-experimental Nov 6, 2024
@mergify mergify bot deleted the mergify/bp/v0.38.x-experimental/pr-4439 branch November 6, 2024 11:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants