search

rabbitmq / rabbitmq-server

Open source RabbitMQ: core server and tier 1 (built-in) plugins
https://www.rabbitmq.com/
Other
12.31k stars 3.92k forks source link

Fix flakes (backport #12722) #12726

Closed mergify[bot] closed 1 week ago

mergify[bot] commented 1 week ago

Multiple test flakes fixes

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

mergify[bot] commented 1 week ago

Cherry-pick of 5ef4fba8515cca5746b6ae40651d3ea4a6eba218 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