Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Oct 17, 2025

This PR adds a few testcases common to all protocols and some bugfixes:

  • Count confirmed messages just once in local shovels
  • Auto-delete amqp10 shovels with 0 messages set to transfer
  • Reject amqp10 shovels with delete-after and no-ack options set together - same behaviour as 0.9.1 and local shovels

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

(cherry picked from commit d5f9ff2)

# Conflicts:
#	deps/rabbitmq_shovel/test/shovel_dynamic_SUITE.erl
Test cases covered by shovel_dynamic_SUITE

(cherry picked from commit 629cf77)
(cherry picked from commit 059813a)

# Conflicts:
#	deps/rabbitmq_shovel/test/shovel_dynamic_SUITE.erl
@mergify
Copy link
Author

mergify bot commented Oct 17, 2025

Cherry-pick of d5f9ff2 has failed:

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

You are currently cherry-picking commit d5f9ff27b.
  (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/rabbitmq_shovel/test/shovel_dynamic_SUITE.erl

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

Cherry-pick of 059813a has failed:

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

You are currently cherry-picking commit 059813a83.
  (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_shovel/test/amqp091_dynamic_SUITE.erl
	modified:   deps/rabbitmq_shovel/test/amqp10_dynamic_SUITE.erl
	modified:   deps/rabbitmq_shovel/test/local_dynamic_SUITE.erl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbitmq_shovel/test/shovel_dynamic_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 merged commit fca2ffe into v4.2.x Oct 17, 2025
284 of 289 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v4.2.x/pr-14732 branch October 17, 2025 23:52
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