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

Fix appveyor ci for round4 #2864

Merged
merged 4 commits into from
Mar 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/plugin/in_tail/test_position_file.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

class IntailPositionFileTest < Test::Unit::TestCase
setup do
@file = Tempfile.new('intail_position_file_test')
@file = Tempfile.new('intail_position_file_test').binmode
end

teardown do
Expand Down
4 changes: 2 additions & 2 deletions test/plugin/test_in_forward.rb
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ def create_driver(conf=CONFIG)
}
end

assert_equal(records, d.events.sort_by {|a| a[1] })
assert_equal(records, d.events.sort_by {|a| a[0] })
end

test 'json_with_newline' do
Expand All @@ -237,7 +237,7 @@ def create_driver(conf=CONFIG)
}
end

assert_equal(records, d.events.sort_by {|a| a[1] })
assert_equal(records, d.events.sort_by {|a| a[0] })
end
end

Expand Down
6 changes: 5 additions & 1 deletion test/plugin/test_out_forward.rb
Original file line number Diff line number Diff line change
Expand Up @@ -997,7 +997,11 @@ def plugin_id_for_test?
e = assert_raise Fluent::UnrecoverableError do
d.instance_start
end
assert_match(/Connection refused/, e.message)
if Fluent.windows?
assert_match(/No connection could be made because the target machine actively refused it/, e.message)
else
assert_match(/Connection refused/, e.message)
end

d.instance_shutdown
end
Expand Down