Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Aug 24, 2024

when virtual host does not have any metadata.

With this change, an x-queue-type header will be injected into optional queue arguments
and returned as part of definitions and the HTTP API in virtually all cases.

This also relaxes the assert_list/2 assertion a bit: it
no longer requires the size of an actually returned list element
to be exactly equal to the size of the expected one.

Sometimes it makes perfect sense to not assert on
every single key but only a subset, and with this
change, it now will be possible.

Individual tests may choose to assert on all
keys by listing them explicitly.

References #11541 #11457 #11528


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

michaelklishin and others added 3 commits August 24, 2024 22:30
when virtual host does not have any metadata.

References #11541 #11457 #11528

(cherry picked from commit 29051a8)
(cherry picked from commit f90a4e1)
References #11541 #11457 #11528

(cherry picked from commit c41c27d)
(cherry picked from commit bd6097f)

# Conflicts:
#	deps/rabbitmq_amqp_client/test/management_SUITE.erl
This relaxes assert_list/2 assertion to
not require the size of an actually returned list element
to be exactly equal to the size of the expected one.

Sometimes it makes perfect sense to not assert on
every single key but only a subset, and with this
change, it now will be possible.

Individual tests may choose to assert on all
keys by listing them explicitly.

(cherry picked from commit 768b2f6)
(cherry picked from commit bd2ea28)

# Conflicts:
#	deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl
@mergify mergify bot added the conflicts label Aug 24, 2024
@mergify
Copy link
Author

mergify bot commented Aug 24, 2024

Cherry-pick of bd6097f has failed:

On branch mergify/bp/v3.13.x/pr-12112
Your branch is ahead of 'origin/v3.13.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit bd6097f957.
  (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_queue_type.erl
	modified:   deps/rabbit/test/quorum_queue_SUITE.erl

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   deps/rabbitmq_amqp_client/test/management_SUITE.erl

Cherry-pick of bd2ea28 has failed:

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

You are currently cherry-picking commit bd2ea280cc.
  (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_ct_helpers/src/rabbit_mgmt_test_util.erl
	modified:   deps/rabbitmq_management/test/rabbit_mgmt_only_http_SUITE.erl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbitmq_management/test/rabbit_mgmt_http_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 deleted the mergify/bp/v3.13.x/pr-12112 branch August 24, 2024 22:51
@michaelklishin
Copy link
Collaborator

This needs the HTTP API suite to be updated with the changes from main first.

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.

2 participants