Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Feb 12, 2025

Proposed Changes

Separate invalid client test from the valid one onto separate group and this way they use different SSL certs

Types of Changes

What types of changes does your code introduce to this project?
Put an x in the boxes that apply

  • Bug fix (non-breaking change which fixes issue #NNNN)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause an observable behavior change in existing systems)
  • Documentation improvements (corrections, new content, etc)
  • Cosmetic change (whitespace, formatting, etc)
  • Build system and/or CI

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

* Separate invalid client test from the valid one

* Apply same changes from pr #13197

* Deal with stalereferences caused by timing issues

looking up objects in the DOM

* Unlink before assertion

(cherry picked from commit 2ab890f)
(cherry picked from commit e84a516)

# Conflicts:
#	deps/rabbitmq_mqtt/test/auth_SUITE.erl
#	selenium/package.json
@mergify mergify bot added the conflicts label Feb 12, 2025
@mergify
Copy link
Author

mergify bot commented Feb 12, 2025

Cherry-pick of e84a516 has failed:

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

You are currently cherry-picking commit e84a51603.
  (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/test/pageobjects/BasePage.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbitmq_mqtt/test/auth_SUITE.erl
	both modified:   selenium/package.json

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

@MarcialRosales please resolve this conflict.

@michaelklishin
Copy link
Collaborator

I had to resolve these elsewhere, so I'll do it.

@michaelklishin michaelklishin added this to the 4.0.7 milestone Feb 12, 2025
@michaelklishin michaelklishin merged commit 94576a0 into v4.0.x Feb 12, 2025
270 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v4.0.x/pr-13246 branch February 12, 2025 21:27
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