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

Normalize query workbench constant newlines #1105

Merged

Conversation

Swiddis
Copy link
Contributor

@Swiddis Swiddis commented Feb 16, 2024

Description

When running integration tests on windows, the CSV data inconsistently was encoded with \r\n or \n, which caused a failing test assertion. This PR adds a method to normalize the test data.

Issues Resolved

N/A

Check List

  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
This reverts commit f25a99f.

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
@Swiddis Swiddis closed this Feb 16, 2024
@Swiddis Swiddis reopened this Feb 16, 2024
@SuZhou-Joe
Copy link
Member

Need backport main or 2.x?

@SuZhou-Joe SuZhou-Joe merged commit 842fe0c into opensearch-project:2.12 Feb 17, 2024
73 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 17, 2024
* Normalize string newlines

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Revert "Normalize string newlines"

This reverts commit f25a99f.

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Fix which side is newline-normalized

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

---------

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
(cherry picked from commit 842fe0c)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 17, 2024
* Normalize string newlines

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Revert "Normalize string newlines"

This reverts commit f25a99f.

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Fix which side is newline-normalized

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

---------

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
(cherry picked from commit 842fe0c)
@Swiddis
Copy link
Contributor Author

Swiddis commented Feb 19, 2024

Yes, will also need backports, just starting here in reaction to failing RC tests.

Just saw it was already merged and backported, thanks 👍

@Swiddis Swiddis deleted the normalize-query-workbench-newlines branch February 19, 2024 18:52
SuZhou-Joe pushed a commit that referenced this pull request Feb 22, 2024
* Normalize string newlines

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Revert "Normalize string newlines"

This reverts commit f25a99f.

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Fix which side is newline-normalized

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

---------

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
(cherry picked from commit 842fe0c)

Co-authored-by: Simeon Widdis <sawiddis@amazon.com>
SuZhou-Joe pushed a commit that referenced this pull request Feb 26, 2024
* Normalize string newlines

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Revert "Normalize string newlines"

This reverts commit f25a99f.

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Fix which side is newline-normalized

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

---------

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
(cherry picked from commit 842fe0c)

Co-authored-by: Simeon Widdis <sawiddis@amazon.com>
@ps48
Copy link
Member

ps48 commented Mar 5, 2024

@wanglam @SuZhou-Joe Can we please backport this change to 1.3 branch. This PR fixes the issue for our windows test failures the 1.3.15 release.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.3 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.3 1.3
# Navigate to the new working tree
cd .worktrees/backport-1.3
# Create a new branch
git switch --create backport/backport-1105-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 842fe0ccc120b79337642c6c4c762453b8ec838d
# Push it to GitHub
git push --set-upstream origin backport/backport-1105-to-1.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.3

Then, create a pull request where the base branch is 1.3 and the compare/head branch is backport/backport-1105-to-1.3.

@wanglam
Copy link
Collaborator

wanglam commented Mar 5, 2024

@Swiddis @ps48 Seems automatic backport failed for 1.3 branch. Need manual backport.

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.

5 participants