Skip to content

Remove unnecessary timeout to fix unstable test#2946

Merged
ganmacs merged 1 commit into
fluent:masterfrom
ganmacs:remove-unnecessary-timeout
Apr 13, 2020
Merged

Remove unnecessary timeout to fix unstable test#2946
ganmacs merged 1 commit into
fluent:masterfrom
ganmacs:remove-unnecessary-timeout

Conversation

@ganmacs

@ganmacs ganmacs commented Apr 13, 2020

Copy link
Copy Markdown
Member

Which issue(s) this PR fixes:
Fix https://travis-ci.org/github/fluent/fluentd/jobs/674236542#L752

What this PR does / why we need it:

if timeout is given, the breaking condition is set.

@run_breaking_conditions << ->(){ Fluent::Clock.now >= stop_at }

if breaking condition is true, it passed without errors. So timeout must be removed.

if @run_breaking_conditions.any? {|proc| proc.call }

Docs Changes:

no need

Release Note:

same as title

@ganmacs ganmacs requested review from cosmo0920 and repeatedly April 13, 2020 03:30
@ganmacs ganmacs self-assigned this Apr 13, 2020
if timeout is given, breaking condition is set. if breaking condition
is positive, the it passed and without errors. So no need to timeout.

https://github.com/fluent/fluentd/blob/a8b6d6ff4aa83bb0f7c8aa54f3367018383236d6/lib/fluent/test/driver/base.rb#L81
https://github.com/fluent/fluentd/blob/a8b6d6ff4aa83bb0f7c8aa54f3367018383236d6/lib/fluent/test/driver/base.rb#L215

Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
@ganmacs ganmacs force-pushed the remove-unnecessary-timeout branch from 8e63bf6 to e063f89 Compare April 13, 2020 03:42
@ganmacs ganmacs merged commit 76de5c7 into fluent:master Apr 13, 2020
@ganmacs ganmacs deleted the remove-unnecessary-timeout branch April 13, 2020 06:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants