diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-09-10 10:34:15 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-09-10 10:34:15 +0000 |
| commit | 39ec2f686402fa4419cf2cafef57ebdcda569785 (patch) | |
| tree | d8cb7b9091b9758df003fc4864900ed7c83f0704 | |
| parent | 35551be6028626c44f90050be5937a48dbf7731b (diff) | |
Revert test fixes.
This reverts r33233, r33234, and r33235.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33245 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | test/ruby/test_process.rb | 2 | ||||
| -rw-r--r-- | test/ruby/test_thread.rb | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb index 49c0fa143d..c68b6008fe 100644 --- a/test/ruby/test_process.rb +++ b/test/ruby/test_process.rb @@ -1236,7 +1236,6 @@ class TestProcess < Test::Unit::TestCase end if File.executable?("/bin/sh") def test_too_long_path - GC.start bug4314 = '[ruby-core:34842]' exs = [Errno::ENOENT] exs << Errno::E2BIG if defined?(Errno::E2BIG) @@ -1244,7 +1243,6 @@ class TestProcess < Test::Unit::TestCase end def test_too_long_path2 - GC.start bug4315 = '[ruby-core:34833]' exs = [Errno::ENOENT] exs << Errno::E2BIG if defined?(Errno::E2BIG) diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb index 55667231b1..57e02849b9 100644 --- a/test/ruby/test_thread.rb +++ b/test/ruby/test_thread.rb @@ -237,16 +237,13 @@ class TestThread < Test::Unit::TestCase assert_equal(-1, t1.priority) assert_equal(-3, t2.priority) sleep 0.5 - - r1 = r2 = 0 5.times do - c1 > c2 ? r1+=1 : r2+=1 - c1 = c2 = 0 + break if c1 > c2 sleep 0.1 end t1.kill t2.kill - assert_operator(r1, :>, r2, "[ruby-dev:33124]") # not guaranteed + assert_operator(c1, :>, c2, "[ruby-dev:33124]") # not guaranteed end def test_new |