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.

Sign up for GitHub

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

Jump to bottom

Fix or suppress failed tests on Ruby 3.3 #4375

Merged
merged 5 commits into from
Jan 11, 2024
Merged

Fix or suppress failed tests on Ruby 3.3 #4375

merged 5 commits into from
Jan 11, 2024

Conversation

ashie
Copy link
Member

@ashie ashie commented Jan 10, 2024 •
edited
Loading

Which issue(s) this PR fixes:
N/A

What this PR does / why we need it:
Fix failed tests on Ruby 3.3.
They seem just only test's problem except #4058, no need to fix fluentd itself.
For #4058, we have to decide whether to fix in fluentd or Ruby, so mark these tests as pending until decide it.

Docs Changes:
N/A

Release Note:
N/A

@ashie ashie changed the title WIP: Fix or suppress failure test on Ruby 3.3 WIP: Fix or suppress failure tests on Ruby 3.3 Jan 10, 2024
@ashie
test: Check Socket::ResolutionError instead of SocketError on Ruby 3.3
07cacad 
Signed-off-by: Takuro Ashie <ashie@clear-code.com>
@ashie ashie changed the title WIP: Fix or suppress failure tests on Ruby 3.3 Fix or suppress failed tests on Ruby 3.3 Jan 11, 2024
@ashie
Copy link
Member Author

ashie commented Jan 11, 2024 •
edited
Loading

BTW I'm considering to stop running CI for Ruby head on push and pull_request events.
Instead, I'll modify to run it per week. I'll do it in another pull request.

@ashie ashie marked this pull request as ready for review January 11, 2024 02:36
@ashie ashie requested review from daipom and kenhys January 11, 2024 02:36
kenhys
kenhys requested changes Jan 11, 2024
View reviewed changes
Copy link
Contributor

@kenhys kenhys left a comment

Choose a reason for hiding this comment

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

Basically LGTM except typo.

test/plugin_helper/test_child_process.rb Outdated Show resolved Hide resolved
ashie added 4 commits January 11, 2024 17:49
@ashie
test_child_process: Replace some UTF-8 byte sequences with named vari…
a2c4b46 
…ables

Make easy to understand what these tests do.

Signed-off-by: Takuro Ashie <ashie@clear-code.com>
@ashie
test_child_process: Mark scrubbing tests as pending
d7e5a02 
Behaviour of `IO#set_encoding` has been changed as of Ruby 3.3.
We don't yet determine how to solve this issue, it might be better to
address in Ruby.

Signed-off-by: Takuro Ashie <ashie@clear-code.com>
@ashie
CI: Add Ruby 3.3
2c2cdc0 
Signed-off-by: Takuro Ashie <ashie@clear-code.com>
@ashie
test_fluentd: Fix failed tests on Ruby 3.3
49030d7 
Signed-off-by: Takuro Ashie <ashie@clear-code.com>
kenhys
kenhys approved these changes Jan 11, 2024
View reviewed changes
Copy link
Contributor

@kenhys kenhys left a comment

Choose a reason for hiding this comment

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

LGTM.

@kenhys kenhys merged commit e1516b5 into master Jan 11, 2024
19 checks passed
@kenhys kenhys deleted the ruby-3.3 branch January 11, 2024 10:39
daipom
daipom reviewed Jan 11, 2024
View reviewed changes
Copy link
Contributor

@daipom daipom left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks!

@kenhys I believe that either a squash merge or creating a merge commit is better than a normal merge.
Is there any reason for doing a normal merge?

@kenhys
Copy link
Contributor

kenhys commented Jan 11, 2024

Oops, it seems that applied "Rebase and merge" accidentally.

@ashie ashie mentioned this pull request Jan 15, 2024
Merged
@daipom daipom mentioned this pull request Mar 11, 2024
Merged
ashie added a commit that referenced this pull request Mar 11, 2024
@ashie
Merge pull request #4430 from fluent/v1.16-backport-4375
00aec89 
Backport (v1.16):  Fix or suppress failed tests on Ruby 3.3 (#4375)
@ashie ashie added this to the v1.17.0 milestone Apr 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@daipom daipom daipom left review comments

@kenhys kenhys kenhys approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v1.17.0
Development

Successfully merging this pull request may close these issues.
3 participants
@ashie @kenhys @daipom