Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Selenium suites: replace Java AMQP 1.0 client with a JavaScript one (backport #12786) #12832

Merged
merged 2 commits into from
Nov 27, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 27, 2024

Proposed Changes

Given that selenium tests are written in javascript, it makes more sense and it is clearer to use a amqp10 client in javascript.


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

(cherry picked from commit 0ba194a)

# Conflicts:
#	selenium/amqp10-roundtriptest/src/main/java/com/rabbitmq/amqp1_0/RoundTripTest.java
#	selenium/test/authnz-msg-protocols/amqp10.js
#	selenium/test/connections/amqp10/sessions-for-monitoring-user.js
Copy link
Author

mergify bot commented Nov 27, 2024

Cherry-pick of 0ba194a has failed:

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

You are currently cherry-picking commit 0ba194ae53.
  (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:   selenium/Dockerfile
	deleted:    selenium/amqp10-roundtriptest/pom.xml
	deleted:    selenium/amqp10-roundtriptest/run
	modified:   selenium/package.json
	new file:   selenium/test/amqp.js

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: selenium/amqp10-roundtriptest/src/main/java/com/rabbitmq/amqp1_0/RoundTripTest.java
	both modified:   selenium/test/authnz-msg-protocols/amqp10.js
	deleted by us:   selenium/test/connections/amqp10/sessions-for-monitoring-user.js

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
Member

@MarcialRosales can you please resolve these conflicts? You have all the context.

@michaelklishin michaelklishin added this to the 4.0.5 milestone Nov 27, 2024
@michaelklishin michaelklishin merged commit 1468489 into v4.0.x Nov 27, 2024
193 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v4.0.x/pr-12786 branch November 27, 2024 17:50
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