summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-19 07:47:26 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-19 07:47:26 +0000
commit689333a0ba8b727836281b9e4c434413de8cae7b (patch)
tree981f2c91727ba75bbe5025d54edde4ee36894804
parentc704bb3149dab22bb41f0c5061a0b5df7f525aa3 (diff)
test/testunit: reap zombie
* test/testunit/test_hideskip.rb (test_hideskip): reap zombie by reading with IO.popen instead of separated spawn and assert. * test/testunit/test_redefinition.rb (test_redefinition): ditto. * test/testunit/test_sorting.rb (test_sorting): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41421 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/testunit/test_hideskip.rb29
-rw-r--r--test/testunit/test_redefinition.rb14
-rw-r--r--test/testunit/test_sorting.rb14
3 files changed, 24 insertions, 33 deletions
diff --git a/test/testunit/test_hideskip.rb b/test/testunit/test_hideskip.rb
index 6104fb63ea4..a7dac42bd7f 100644
--- a/test/testunit/test_hideskip.rb
+++ b/test/testunit/test_hideskip.rb
@@ -2,26 +2,15 @@ require 'test/unit'
class TestHideSkip < Test::Unit::TestCase
def test_hideskip
- test_out, o = IO.pipe
- spawn(*@options[:ruby], "#{File.dirname(__FILE__)}/test4test_hideskip.rb",
- "--verbose", out: o, err: o)
- o.close
- assert_match(/assertions\/s.\n\n 1\) Skipped/,test_out.read)
- test_out.close
-
- test_out, o = IO.pipe
- spawn(*@options[:ruby], "#{File.dirname(__FILE__)}/test4test_hideskip.rb",
- "--verbose", "--show-skip", out: o, err: o)
- o.close
- assert_match(/assertions\/s.\n\n 1\) Skipped/,test_out.read)
- test_out.close
+ assert_match(/assertions\/s.\n\n 1\) Skipped/, hideskip)
+ assert_match(/assertions\/s.\n\n 1\) Skipped/, hideskip("--show-skip"))
+ assert_match(/assertions\/s.\n\n1 tests, 0 assertions, 0 failures, 0 errors, 1 skips/, hideskip("--hide-skip"))
+ end
- test_out, o = IO.pipe
- spawn(*@options[:ruby], "#{File.dirname(__FILE__)}/test4test_hideskip.rb",
- "--verbose", "--hide-skip", out: o, err: o)
- o.close
- assert_match(/assertions\/s.\n\n1 tests, 0 assertions, 0 failures, 0 errors, 1 skips/,
- test_out.read)
- test_out.close
+ def hideskip(*args)
+ IO.popen([*@options[:ruby], "#{File.dirname(__FILE__)}/test4test_hideskip.rb",
+ "--verbose", *args], err: [:child, :out]) {|f|
+ f.read
+ }
end
end
diff --git a/test/testunit/test_redefinition.rb b/test/testunit/test_redefinition.rb
index 677027a331f..4540461be1d 100644
--- a/test/testunit/test_redefinition.rb
+++ b/test/testunit/test_redefinition.rb
@@ -2,12 +2,14 @@ require 'test/unit'
class TestRedefinition < Test::Unit::TestCase
def test_redefinition
- test_out, o = IO.pipe
- spawn(*@options[:ruby], "#{File.dirname(__FILE__)}/test4test_redefinition.rb", out: File::NULL, err: o)
- o.close
-
assert_match /^test\/unit warning: method TestForTestRedefinition#test_redefinition is redefined$/,
- test_out.read
- test_out.close
+ redefinition
+ end
+
+ def redefinition(*args)
+ IO.popen([*@options[:ruby], "#{File.dirname(__FILE__)}/test4test_redefinition.rb", *args],
+ err: [:child, :out]) {|f|
+ f.read
+ }
end
end
diff --git a/test/testunit/test_sorting.rb b/test/testunit/test_sorting.rb
index 77374f68437..96348dd1728 100644
--- a/test/testunit/test_sorting.rb
+++ b/test/testunit/test_sorting.rb
@@ -2,16 +2,16 @@ require 'test/unit'
class TestTestUnitSorting < Test::Unit::TestCase
def test_sorting
- test_out, o = IO.pipe
- spawn(*@options[:ruby], "#{File.dirname(__FILE__)}/test4test_sorting.rb",
- "--verbose", out: o, err: o)
- o.close
- result = test_out.read
-
+ result = sorting
assert_match(/^ 1\) Skipped:/, result)
assert_match(/^ 2\) Failure:/, result)
assert_match(/^ 3\) Error:/, result)
+ end
- test_out.close
+ def sorting(*args)
+ IO.popen([*@options[:ruby], "#{File.dirname(__FILE__)}/test4test_sorting.rb",
+ "--verbose", *args], err: [:child, :out]) {|f|
+ f.read
+ }
end
end