fluentd 1.14.6-x86-mingw32 → 1.15.0-x86-mingw32

data/test/plugin/test_file_wrapper.rb

@@ -17,58 +17,6 @@ class FileWrapperTest < Test::Unit::TestCase
     FileUtils.rm_rf(TMP_DIR)
   end
 
-  sub_test_case 'Win32Error' do
-    test 'equal' do
-      assert_equal(Fluent::Win32Error.new(ERROR_SHARING_VIOLATION, "message"),
-                   Fluent::Win32Error.new(ERROR_SHARING_VIOLATION, "message"))
-    end
-
-    test 'different error code' do
-      assert_not_equal(Fluent::Win32Error.new(ERROR_FILE_NOT_FOUND),
-                       Fluent::Win32Error.new(ERROR_SHARING_VIOLATION))
-    end
-
-    test 'different error message' do
-      assert_not_equal(Fluent::Win32Error.new(ERROR_FILE_NOT_FOUND, "message1"),
-                       Fluent::Win32Error.new(ERROR_FILE_NOT_FOUND, "message2"))
-    end
-
-    test 'different class' do
-      assert_not_equal(Errno::EPIPE,
-                       Fluent::Win32Error.new(ERROR_SHARING_VIOLATION))
-    end
-
-    test 'ERROR_SHARING_VIOLATION message' do
-      assert_equal(Fluent::Win32Error.new(ERROR_SHARING_VIOLATION).message,
-                   "Fluent::Win32Error: code: 32, The process cannot access the file because it is being used by another process.")
-    end
-
-    test 'ERROR_SHARING_VIOLATION with a message' do
-      assert_equal(Fluent::Win32Error.new(ERROR_SHARING_VIOLATION, "cannot open the file").message,
-                   "Fluent::Win32Error: code: 32, The process cannot access the file because it is being used by another process." +
-                   " - cannot open the file")
-    end
-
-    test 'to_s' do
-      assert_equal("Fluent::Win32Error: code: 32, The process cannot access the file because it is being used by another process. - C:\file.txt",
-                   Fluent::Win32Error.new(ERROR_SHARING_VIOLATION, "C:\file.txt").to_s)
-    end
-
-    test 'inspect' do
-      assert_equal("#<Fluent::Win32Error: code: 32, The process cannot access the file because it is being used by another process. - C:\file.txt>",
-                   Fluent::Win32Error.new(ERROR_SHARING_VIOLATION, "C:\file.txt").inspect)
-    end
-
-    data('0' => [false, 0],
-         '9999' => [false, 9999],
-         '10000' => [true, 10000],
-         '10001' => [true, 10001])
-    test 'wsaerr?' do |data|
-      expected, code = data
-      assert_equal(expected, Fluent::Win32Error.new(code).wsaerr?)
-    end
-  end
-
   sub_test_case 'WindowsFile exceptions' do
     test 'nothing raised' do
       begin
@@ -106,21 +54,5 @@ class FileWrapperTest < Test::Unit::TestCase
         file.close if file
       end
     end
-
-    test 'ERROR_SHARING_VIOLATION raised' do
-      begin
-        path = "#{TMP_DIR}/test_windows_file.txt"
-        file1 = file2 = nil
-        file1 = File.open(path, "wb")
-        win32err = Fluent::Win32Error.new(ERROR_SHARING_VIOLATION, path)
-        assert_raise(Errno::EACCES.new(win32err.message)) do
-          file2 = Fluent::WindowsFile.new(path, 'r', FILE_SHARE_READ)
-        ensure
-          file2.close if file2
-        end
-      ensure
-        file1.close if file1
-      end
-    end
   end
 end if Fluent.windows?

data/test/plugin/test_in_object_space.rb

@@ -17,13 +17,19 @@ class ObjectSpaceInputTest < Test::Unit::TestCase
   end
 
   class FailObject
-    def self.class
-      raise "error"
-    end
   end
 
   def setup
     Fluent::Test.setup
+    # Overriding this behavior in the global scope will have an unexpected influence on other tests.
+    # So this should be overridden here and be removed in `teardown`.
+    def FailObject.class
+      raise "FailObject error for tests in ObjectSpaceInputTest."
+    end
+  end
+
+  def teardown
+    FailObject.singleton_class.remove_method(:class)
   end
 
   TESTCONFIG = %[

data/test/plugin/test_in_syslog.rb

@@ -497,7 +497,7 @@ EOS
 
   def test_send_keepalive_packet_can_not_be_enabled_for_udp
     assert_raise(Fluent::ConfigError) do
-      d = create_driver(ipv4_config + %[
+      create_driver(ipv4_config + %[
         send_keepalive_packet true
       ])
     end