diff --git a/ChangeLog b/ChangeLog index 9a01eebd0d..05bb6d55b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Feb 7 10:21:50 2011 NAKAMURA Usaku + + * test/rdoc/test_rdoc_options.rb (TestRDocOptions#test_check_files): + there is no easy way to create owner unreadable file on Windows. + So, skip the test. + Sun Feb 6 13:48:29 2011 Nobuyoshi Nakada * ext/json/lib/json/common.rb (JSON::MissingUnicodeSupport.iconv): diff --git a/test/rdoc/test_rdoc_options.rb b/test/rdoc/test_rdoc_options.rb index 8e5ec853cc..eaa10586fd 100644 --- a/test/rdoc/test_rdoc_options.rb +++ b/test/rdoc/test_rdoc_options.rb @@ -17,27 +17,28 @@ class TestRDocOptions < MiniTest::Unit::TestCase end def test_check_files + expected = '' out, err = capture_io do Dir.mktmpdir do |dir| - begin - unreadable = nil # variable for windows + if RUBY_PLATFORM =~ /mswin|mingw/ then + @options.files = %w[nonexistent] - Dir.chdir dir do - if RUBY_PLATFORM =~ /mswin|mingw/ then - unreadable = open 'unreadable' - File.delete 'unreadable' - else - FileUtils.touch 'unreadable' - FileUtils.chmod 0, 'unreadable' - end + expected = <<-EXPECTED +file 'nonexistent' not found + EXPECTED + else + FileUtils.touch 'unreadable' + FileUtils.chmod 0, 'unreadable' - @options.files = %w[nonexistent unreadable] + @options.files = %w[nonexistent unreadable] - @options.check_files - end - ensure - unreadable.close if unreadable + expected = <<-EXPECTED +file 'nonexistent' not found +file 'unreadable' not readable + EXPECTED end + + @options.check_files end end @@ -45,11 +46,6 @@ class TestRDocOptions < MiniTest::Unit::TestCase assert_equal '', out - expected = <<-EXPECTED -file 'nonexistent' not found -file 'unreadable' not readable - EXPECTED - assert_equal expected, err end