test_fileutils.rb: enclose helper methods

* test/fileutils/test_fileutils.rb: enclose helper methods in a
  module from global functions.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44386 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-12-24 14:04:35 +00:00
parent 20c38381a8
commit 9ef195f8d6

View File

@ -25,71 +25,70 @@ class TestFileUtils < Test::Unit::TestCase
ensure ensure
fu.instance_variable_set(:@fileutils_output, old) if old fu.instance_variable_set(:@fileutils_output, old) if old
end end
end
prevdir = Dir.pwd m = Module.new do
tmproot = TestFileUtils::TMPROOT def have_drive_letter?
Dir.mkdir tmproot unless File.directory?(tmproot)
Dir.chdir tmproot
def have_drive_letter?
/mswin(?!ce)|mingw|bcc|emx/ =~ RUBY_PLATFORM /mswin(?!ce)|mingw|bcc|emx/ =~ RUBY_PLATFORM
end end
def have_file_perm? def have_file_perm?
/mswin|mingw|bcc|emx/ !~ RUBY_PLATFORM /mswin|mingw|bcc|emx/ !~ RUBY_PLATFORM
end
$fileutils_rb_have_symlink = nil
def have_symlink?
if $fileutils_rb_have_symlink == nil
$fileutils_rb_have_symlink = check_have_symlink?
end end
$fileutils_rb_have_symlink
end
def check_have_symlink? @@have_symlink = nil
def have_symlink?
if @@have_symlink == nil
@@have_symlink = check_have_symlink?
end
@@have_symlink
end
def check_have_symlink?
File.symlink nil, nil File.symlink nil, nil
rescue NotImplementedError rescue NotImplementedError
return false return false
rescue rescue
return true return true
end
$fileutils_rb_have_hardlink = nil
def have_hardlink?
if $fileutils_rb_have_hardlink == nil
$fileutils_rb_have_hardlink = check_have_hardlink?
end end
$fileutils_rb_have_hardlink
end
def check_have_hardlink? @@have_hardlink = nil
def have_hardlink?
if @@have_hardlink == nil
@@have_hardlink = check_have_hardlink?
end
@@have_hardlink
end
def check_have_hardlink?
File.link nil, nil File.link nil, nil
rescue NotImplementedError rescue NotImplementedError
return false return false
rescue rescue
return true return true
end end
begin begin
tmproot = TMPROOT
Dir.mkdir tmproot unless File.directory?(tmproot)
Dir.chdir tmproot do
Dir.mkdir("\n") Dir.mkdir("\n")
Dir.rmdir("\n") Dir.rmdir("\n")
end
def lf_in_path_allowed? def lf_in_path_allowed?
true true
end end
rescue rescue
def lf_in_path_allowed? def lf_in_path_allowed?
false false
end end
end ensure
Dir.rmdir tmproot
Dir.chdir prevdir end
Dir.rmdir tmproot end
include m
class TestFileUtils extend m
include FileUtils include FileUtils