diff options
author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-05-15 04:16:08 +0000 |
---|---|---|
committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-05-15 04:16:08 +0000 |
commit | 84bb8e81c25d4d7d6020c3acfbbc36e9064200fa (patch) | |
tree | 4e3778f2047fa5f18188ae8799ca9cb30b1357e9 /test | |
parent | 4e09f414fc6e0bdc5cdf6863f5698464ac3e8a7d (diff) |
Revert "Merge fileutils-1.1.0."
This reverts commit 99da3d2570e110d3024039102205f6d64174bf5e.
The change caused the following build failure:
```
.../ruby/lib/fileutils.rb:88:in `require': cannot load such file -- rbconfig (LoadError)
uncommon.mk:987: recipe for target 'encdb.h' failed
make: *** [encdb.h] Error 1
```
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63428 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/fileutils/test_fileutils.rb | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb index f2600005f5..c531af1569 100644 --- a/test/fileutils/test_fileutils.rb +++ b/test/fileutils/test_fileutils.rb @@ -233,7 +233,7 @@ class TestFileUtils < Test::Unit::TestCase def test_assert_output_lines assert_raise(MiniTest::Assertion) { - Timeout.timeout(0.5) { + Timeout.timeout(0.1) { assert_output_lines([]) { Thread.current.report_on_exception = false raise "ok" @@ -834,15 +834,13 @@ class TestFileUtils < Test::Unit::TestCase check_singleton :ln_s TARGETS.each do |fname| - begin - fname = "../#{fname}" - lnfname = 'tmp/lnsdest' - ln_s fname, lnfname - assert FileTest.symlink?(lnfname), 'not symlink' - assert_equal fname, File.readlink(lnfname) - ensure - rm_f lnfname - end + fname = "../#{fname}" + lnfname = 'tmp/lnsdest' + ln_s fname, lnfname + assert FileTest.symlink?(lnfname), 'not symlink' + assert_equal fname, File.readlink(lnfname) + ensure + rm_f lnfname end end if have_symlink? and !no_broken_symlink? @@ -1615,10 +1613,6 @@ class TestFileUtils < Test::Unit::TestCase check_singleton :cd end - def test_cd_result - assert_equal 42, cd('.') { 42 } - end - def test_chdir check_singleton :chdir end |