Merge pull request #2855 from fluent/fix-appveyor-ci-round1

Fix appveyor ci round1
fluent · Mar 4, 2020 · 1fa83cb · 1fa83cb
2 parents f412df5 + a1e736a
commit 1fa83cb
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 2 deletions.
diff --git a/test/plugin/test_in_tail.rb b/test/plugin/test_in_tail.rb
@@ -1145,7 +1145,11 @@ def test_pos_file_dir_creation_with_system_dir_permission
     end
 
     assert_path_exist("#{TMP_DIR}/pos")
-    assert_equal '744', File.stat("#{TMP_DIR}/pos").mode.to_s(8)[-3, 3]
+    if Fluent.windows?
+      assert_equal '755', File.stat("#{TMP_DIR}/pos").mode.to_s(8)[-3, 3]
+    else
+      assert_equal '744', File.stat("#{TMP_DIR}/pos").mode.to_s(8)[-3, 3]
+    end
   ensure
     cleanup_directory(TMP_DIR)
   end

diff --git a/test/plugin/test_output_as_buffered_backup.rb b/test/plugin/test_output_as_buffered_backup.rb
@@ -256,6 +256,8 @@ def wait_flush(target_file)
     end
 
     test 'create directory with specific mode' do
+      omit "NTFS doesn't support UNIX like permissions" if Fluent.windows?
+
       Fluent::SystemConfig.overwrite_system_config('root_dir' => TMP_DIR, 'dir_permission' => '744') do
         id = 'backup_test_with_same_secondary'
         hash = { 'flush_interval' => 1, 'flush_thread_burst_interval' => 0.1 }

diff --git a/test/test_logger_initializer.rb b/test/test_logger_initializer.rb
@@ -27,6 +27,8 @@ class LoggerInitializerTest < ::Test::Unit::TestCase
   end
 
   test 'apply_options with log_dir_perm' do
+    omit "NTFS doesn't support UNIX like permissions" if Fluent.windows?
+
     path = File.join(TMP_DIR, 'fluent_with_path.log')
 
     assert_false File.exist?(TMP_DIR)

diff --git a/test/test_plugin_id.rb b/test/test_plugin_id.rb
@@ -99,6 +99,8 @@ class MyPlugin < Fluent::Plugin::Base
     end
 
     test '#plugin_root_dir create dirctory with specify mode if not exists ' do
+      omit "NTFS doesn't support UNIX like permissions" if Fluent.windows?
+
       root_dir = Fluent::SystemConfig.overwrite_system_config({ 'root_dir' => File.join(TMP_DIR, "myroot"), 'dir_permission' => '0777' }) do
         @p.plugin_root_dir
       end

diff --git a/test/test_supervisor.rb b/test/test_supervisor.rb
@@ -161,7 +161,7 @@ def test_rpc_server
 
     assert{ $log.out.logs.first.end_with?(info_msg) }
   ensure
-    $log.out.reset
+    $log.out.reset if $log.out.is_a?(Fluent::Test::DummyLogDevice)
   end
 
   def test_load_config