Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Dec 16, 2024


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

The tests force closing the connection with an error

(cherry picked from commit bdaa31e)
(cherry picked from commit fe7a141)

# Conflicts:
#	deps/rabbit/test/amqp_utils.erl
#	deps/rabbit/test/msg_size_metrics_SUITE.erl
#	deps/rabbit/test/topic_permission_SUITE.erl
@mergify mergify bot added the conflicts label Dec 16, 2024
@mergify
Copy link
Author

mergify bot commented Dec 16, 2024

Cherry-pick of fe7a141 has failed:

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

You are currently cherry-picking commit fe7a14133.
  (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/test/amqp_address_SUITE.erl
	modified:   deps/rabbit/test/amqp_auth_SUITE.erl
	modified:   deps/rabbit/test/amqp_client_SUITE.erl
	modified:   deps/rabbit/test/amqp_credit_api_v2_SUITE.erl
	modified:   deps/rabbit/test/amqpl_consumer_ack_SUITE.erl
	modified:   deps/rabbit/test/amqpl_direct_reply_to_SUITE.erl
	modified:   deps/rabbit/test/backing_queue_SUITE.erl
	modified:   deps/rabbit/test/clustering_recovery_SUITE.erl
	modified:   deps/rabbit/test/confirms_rejects_SUITE.erl
	modified:   deps/rabbit/test/consumer_timeout_SUITE.erl
	modified:   deps/rabbit/test/dead_lettering_SUITE.erl
	modified:   deps/rabbit/test/direct_exchange_routing_v2_SUITE.erl
	modified:   deps/rabbit/test/disconnect_detected_during_alarm_SUITE.erl
	modified:   deps/rabbit/test/metadata_store_clustering_SUITE.erl
	modified:   deps/rabbit/test/mirrored_supervisor_SUITE.erl
	modified:   deps/rabbit/test/publisher_confirms_parallel_SUITE.erl
	modified:   deps/rabbit/test/queue_length_limits_SUITE.erl
	modified:   deps/rabbit/test/queue_parallel_SUITE.erl
	modified:   deps/rabbit/test/queue_type_SUITE.erl
	modified:   deps/rabbit/test/quorum_queue_SUITE.erl
	modified:   deps/rabbit/test/rabbit_db_topic_exchange_SUITE.erl
	modified:   deps/rabbit/test/rabbit_fifo_dlx_integration_SUITE.erl
	modified:   deps/rabbit/test/rabbit_fifo_int_SUITE.erl
	modified:   deps/rabbit/test/rabbit_local_random_exchange_SUITE.erl
	modified:   deps/rabbit/test/rabbit_stream_queue_SUITE.erl
	modified:   deps/rabbit/test/rabbitmq_queues_cli_integration_SUITE.erl
	modified:   deps/rabbit/test/single_active_consumer_SUITE.erl
	modified:   deps/rabbit/test/transactions_SUITE.erl
	modified:   deps/rabbit/test/unicode_SUITE.erl
	modified:   deps/rabbit/test/unit_file_handle_cache_SUITE.erl

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   deps/rabbit/test/amqp_utils.erl
	deleted by us:   deps/rabbit/test/msg_size_metrics_SUITE.erl
	both modified:   deps/rabbit/test/topic_permission_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
Copy link
Collaborator

All these failures are present in v4.0.x right now (but not in main), where this PR was first merged after passing all suites.

@michaelklishin michaelklishin merged commit d7a53bd into v4.0.x Dec 16, 2024
262 of 273 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v4.0.x/pr-12948 branch December 16, 2024 18:38
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