Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Nov 14, 2024

Multiple test flakes fixes


This is an automatic backport of pull request #12722 done by Mergify.

(cherry picked from commit 5ef4fba)

# Conflicts:
#	deps/rabbit/test/amqp_client_SUITE.erl
Catch exceptions when closing connections during cleanup

(cherry picked from commit 6e72699)
@mergify
Copy link
Author

mergify bot commented Nov 14, 2024

Cherry-pick of 5ef4fba has failed:

On branch mergify/bp/v4.0.x/pr-12722
Your branch is ahead of 'origin/v4.0.x' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 5ef4fba851.
  (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:   deps/rabbit/test/amqp_client_SUITE.erl

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

@michaelklishin michaelklishin added this to the 4.0.4 milestone Nov 14, 2024
@michaelklishin michaelklishin merged commit b0a7afe into v4.0.x Nov 14, 2024
195 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v4.0.x/pr-12722 branch November 14, 2024 19:57
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.

3 participants