-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
WindowsFile: Fix incorrect error message
It passes win32 error codes to SystemCallError so that it doesn't show correct message for them. For example when ERROR_SHARING_VIOLATION(32) of win32 occurs, it shows Errno::EPIPE(32). Signed-off-by: Takuro Ashie <[email protected]>
- Loading branch information
Showing
2 changed files
with
105 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
require_relative '../helper' | ||
require 'fluent/plugin/file_wrapper' | ||
|
||
class FileWrapperTest < Test::Unit::TestCase | ||
require 'windows/file' | ||
include Windows::File | ||
|
||
TMP_DIR = File.dirname(__FILE__) + "/../tmp/file_wrapper#{ENV['TEST_ENV_NUMBER']}" | ||
|
||
def setup | ||
FileUtils.mkdir_p(TMP_DIR) | ||
end | ||
|
||
def teardown | ||
FileUtils.rm_rf(TMP_DIR) | ||
end | ||
|
||
sub_test_case 'Win32Error' do | ||
test 'equal' do | ||
assert_equal(Fluent::Win32Error.new(32), | ||
Fluent::Win32Error.new(32)) | ||
end | ||
|
||
test 'not equal' do | ||
assert_not_equal(Fluent::Win32Error.new(2), | ||
Fluent::Win32Error.new(32)) | ||
end | ||
|
||
test 'ERROR_SHARING_VIOLATION message' do | ||
assert_equal(Fluent::Win32Error.new(32).message, | ||
"code: 32, The process cannot access the file because it is being used by another process.") | ||
end | ||
end | ||
|
||
sub_test_case 'WindowsFile exceptions' do | ||
test 'nothing raised' do | ||
begin | ||
path = "#{TMP_DIR}/test_windows_file.txt" | ||
file1 = file2 = nil | ||
file1 = File.open(path, "wb") do |f| | ||
end | ||
assert_nothing_raised do | ||
file2 = Fluent::WindowsFile.new(path) | ||
ensure | ||
file2.close | ||
end | ||
ensure | ||
file1.close if file1 | ||
end | ||
end | ||
|
||
test 'Errno::ENOENT raised' do | ||
path = "#{TMP_DIR}/nofile.txt" | ||
file = nil | ||
assert_raise(SystemCallError.new(2)) do | ||
file = Fluent::WindowsFile.new(path) | ||
ensure | ||
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") | ||
assert_raise(Fluent::Win32Error.new(32)) 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? |