Merge pull request #2864 from fluent/fix-appveyor-ci-for-round4

Fix appveyor ci for round4
fluent · Mar 10, 2020 · 66cad23 · 66cad23
2 parents 9ce9bf4 + 7560a48
commit 66cad23
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/test/plugin/in_tail/test_position_file.rb b/test/plugin/in_tail/test_position_file.rb
@@ -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

diff --git a/test/plugin/test_in_forward.rb b/test/plugin/test_in_forward.rb
@@ -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
@@ -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
 

diff --git a/test/plugin/test_out_forward.rb b/test/plugin/test_out_forward.rb
@@ -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