Skip to content

[release-23.0] tests: give vtctl/workflow tests their own port range (#20150)#20155

Open
vitess-bot[bot] wants to merge 2 commits into
release-23.0from
backport-20150-to-release-23.0
Open

[release-23.0] tests: give vtctl/workflow tests their own port range (#20150)#20155
vitess-bot[bot] wants to merge 2 commits into
release-23.0from
backport-20150-to-release-23.0

Conversation

@vitess-bot
Copy link
Copy Markdown
Contributor

@vitess-bot vitess-bot Bot commented May 20, 2026

Description

This is a backport of #20150

Copilot AI review requested due to automatic review settings May 20, 2026 19:47
@vitess-bot vitess-bot Bot added Type: Bug Component: VReplication Backport This is a backport Skip CI Skip CI actions from running Merge Conflict labels May 20, 2026
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

@vitess-bot
Copy link
Copy Markdown
Contributor Author

vitess-bot Bot commented May 20, 2026

Hello @arthurschreiber, there are conflicts in this backport.

Please address them in order to merge this Pull Request. You can execute the snippet below to reset your branch and resolve the conflict manually.

Make sure you replace origin by the name of the vitessio/vitess remote

git fetch --all
gh pr checkout 20155
git reset --hard origin/release-23.0
git cherry-pick -m 1 50e632b1fcc6283c78d095ad48e7725e5130f328

The conflict was a stylistic divergence: release-23.0 still uses
`for i := 0; i < len(cells); i++` while main was modernized to
`for i := range cells` by an unrelated PR. Keep the release-23.0
loop style and adopt the new startEtcd(client, peer) call from PR

Signed-off-by: Arthur Schreiber <arthur@planetscale.com>
#20150.
@arthurschreiber arthurschreiber marked this pull request as ready for review May 22, 2026 08:36
@arthurschreiber arthurschreiber requested a review from mattlord as a code owner May 22, 2026 08:36
Copilot AI review requested due to automatic review settings May 22, 2026 08:36
@arthurschreiber arthurschreiber enabled auto-merge (squash) May 22, 2026 08:36
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Comment thread go/testfiles/ports.go
Comment on lines +33 to +35
// Each port has its own constant; do not introduce ad-hoc `port + N`
// arithmetic at call sites or in this file. New entries must extend
// the range without overlapping any existing constant.
@@ -41,7 +42,7 @@ import (
// behavior accidentally/uinintentionally.
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