mergify[bot]
commented
1 week ago Cherry-pick of 1e577a82fc91a832366aa647ba9492467bc2559f has failed:
On branch mergify/bp/v3.13.x/pr-11528
Your branch is up to date with 'origin/v3.13.x'.
You are currently cherry-picking commit 1e577a82fc.
(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/rabbit/src/rabbit_amqqueue.erl
modified: deps/rabbit/src/rabbit_queue_type.erl
modified: deps/rabbit/test/definition_import_SUITE.erl
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: deps/rabbit/src/rabbit_vhost.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
The queue type argument won't always be a binary, for example, when a virtual host is created.
As such, the validation code should accept at least atoms in addition to binaries.
While at it, improve logging and error reporting when DQT validation fails, and while at it, make the definition import tests focussed on virtual host a bit more robust.
Fixes a subtle regression introduced in #11457.
This is an automatic backport of pull request #11528 done by Mergify.