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

Several internationalization tests broken with ICU 69.1 #383

Merged
merged 0 commits into from Apr 26, 2022

Conversation

mcatanzaro
Copy link
Contributor

@mcatanzaro mcatanzaro commented Apr 25, 2022

0eac6ea

Several internationalization tests broken with ICU 69.1
https://bugs.webkit.org/show_bug.cgi?id=239724

Patch by Michael Catanzaro <mcatanzaro@gnome.org > on 2022-04-26
Reviewed by Ross Kirsling and Yusuke Suzuki.

Update these tests to be more permissive of different results for different ICU versions.
ICU 69 on macOS is producing different results from ICU 69 on Linux for reasons unexplained,
so instead of checking the version number, let's instead just accept both ways.

* stress/array-toLocaleString.js:
(shouldBeOneOf):
* stress/date-toLocaleString.js:
(shouldBeOneOf):
* stress/intl-datetimeformat-formatrange-relevant-extensions-ja.js:
(shouldBeOneOf):
(vm.icuVersion):
(shouldBeOneOfThem): Deleted.
* stress/intl-datetimeformat-formatrangetoparts-relevant-extensions-ja.js:
(shouldBeOneOf):
* stress/intl-datetimeformat.js:
(shouldBeOneOf):
(shouldBeOneOfThem): Deleted.
* stress/intl-locale-info.js:
(shouldBeOneOf):
(shouldBe):
* stress/intl-locale.js:
(shouldBeOneOf):

Canonical link: https://commits.webkit.org/250000@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@293445 268f45cc-cd09-0410-ab3c-d52691b4dbfc

@mcatanzaro mcatanzaro self-assigned this Apr 25, 2022
@mcatanzaro mcatanzaro requested review from Constellation and rkirsling and removed request for Constellation April 26, 2022 00:04
Copy link
Member

@rkirsling rkirsling left a comment

Choose a reason for hiding this comment

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

I think this is an okay solution, but I'd rather call the function just shouldBeOneOf.

Copy link
Member

@Constellation Constellation left a comment

Choose a reason for hiding this comment

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

r=me too.

@webkit-early-warning-system webkit-early-warning-system added the merging-blocked Applied to prevent a change from being merged label Apr 26, 2022
@mcatanzaro
Copy link
Contributor Author

I think this is an okay solution, but I'd rather call the function just shouldBeOneOf.

I agree. Will rename it. Sadly, this will make the commit messier, since this function already exists in some files.

@mcatanzaro mcatanzaro force-pushed the eng/icu69 branch 3 times, most recently from 397a0ab to 3099107 Compare April 26, 2022 15:25
@mcatanzaro mcatanzaro added merge-queue Applied to send a pull request to merge-queue and removed merging-blocked Applied to prevent a change from being merged labels Apr 26, 2022
@mcatanzaro mcatanzaro changed the title Several internationalization tests broken with ICU 69.1 [GTK] Add user agent quirk for "ClicSalud+" (Andalusian Health Service, Spain) Apr 26, 2022
@mcatanzaro mcatanzaro changed the title [GTK] Add user agent quirk for "ClicSalud+" (Andalusian Health Service, Spain) Several internationalization tests broken with ICU 69.1 Apr 26, 2022
@JonWBedard
Copy link
Member

@mcatanzaro, force-pushing is going to stop Merge-Queue

@mcatanzaro
Copy link
Contributor Author

Er... so what am I supposed to do? Unset and reset the label?

@mcatanzaro
Copy link
Contributor Author

BTW that was a mistake: I misused git-webkit pr and wound up pushing unrelated changes here. :)

@mcatanzaro mcatanzaro added merge-queue Applied to send a pull request to merge-queue and removed merge-queue Applied to send a pull request to merge-queue labels Apr 26, 2022
@webkit-early-warning-system webkit-early-warning-system merged commit 0eac6ea into WebKit:main Apr 26, 2022
@webkit-early-warning-system
Copy link
Collaborator

Committed r293445 (250000@main): https://commits.webkit.org/250000@main

Reviewed commits have been landed. Closing PR #383 and removing active labels.

@webkit-early-warning-system webkit-early-warning-system removed the merge-queue Applied to send a pull request to merge-queue label Apr 26, 2022
@mcatanzaro mcatanzaro deleted the eng/icu69 branch April 26, 2022 21:48
@mcatanzaro
Copy link
Contributor Author

(250000@main)

🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
5 participants