Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Dec 30, 2024

Multiple test cases were recently slowed down by up to 30 seconds. This commit reverts these changes.


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

Multiple test cases were recently slowed down by up to 30 seconds.
This commit reverts these changes.

(cherry picked from commit 42ede4a)

# Conflicts:
#	deps/rabbit/test/amqp_client_SUITE.erl
@mergify mergify bot added the conflicts label Dec 30, 2024
@mergify mergify bot assigned ansd Dec 30, 2024
@mergify
Copy link
Author

mergify bot commented Dec 30, 2024

Cherry-pick of 42ede4a has failed:

On branch mergify/bp/v4.0.x/pr-13002
Your branch is up to date with 'origin/v4.0.x'.

You are currently cherry-picking commit 42ede4a25.
  (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)

Changes to be committed:
	modified:   deps/rabbitmq_mqtt/test/util.erl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbit/test/amqp_client_SUITE.erl

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.6 milestone Dec 31, 2024
@ansd ansd merged commit 58bcffe into v4.0.x Dec 31, 2024
273 checks passed
@ansd ansd deleted the mergify/bp/v4.0.x/pr-13002 branch December 31, 2024 10:28
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