summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-19 03:46:20 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-19 03:46:20 (GMT)
commit4176db205ebd817c4dc8dac2ad59b27a43485338 (patch)
treeb34d6e48f9247f1811fd657219a9a97eb877a363 /test
parenta28c12af1458f25f3c0d9c0b24908fcee1a44ad3 (diff)
assertions.rb: leave timeout to invoke_ruby
* test/lib/test/unit/assertions.rb (assert_separately): leave timeout to invoke_ruby, which handles outputs and status of the target process since r51539. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55070 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/lib/test/unit/assertions.rb2
-rw-r--r--test/testunit/test_assertion.rb8
2 files changed, 9 insertions, 1 deletions
diff --git a/test/lib/test/unit/assertions.rb b/test/lib/test/unit/assertions.rb
index 4e30de1..2a75871 100644
--- a/test/lib/test/unit/assertions.rb
+++ b/test/lib/test/unit/assertions.rb
@@ -602,7 +602,7 @@ EOT
eom
args = args.dup
args.insert((Hash === args.first ? 1 : 0), "-w", "--disable=gems", *$:.map {|l| "-I#{l}"})
- stdout, stderr, status = EnvUtil.invoke_ruby(args, src, true, true, timeout_error: nil, **opt)
+ stdout, stderr, status = EnvUtil.invoke_ruby(args, src, true, true, **opt)
abort = status.coredump? || (status.signaled? && ABORT_SIGNALS.include?(status.termsig))
assert(!abort, FailDesc[status, nil, stderr])
self._assertions += stdout[/^assertions=(\d+)/, 1].to_i
diff --git a/test/testunit/test_assertion.rb b/test/testunit/test_assertion.rb
index 4cd7bd7..7e772cc 100644
--- a/test/testunit/test_assertion.rb
+++ b/test/testunit/test_assertion.rb
@@ -6,4 +6,12 @@ class TestAssertion < Test::Unit::TestCase
assert_match(/assertion message must be String or Proc, but TrueClass was given/, error.message)
assert_match(/\A#{Regexp.quote(__FILE__)}:#{line}:/, error.backtrace[0])
end
+
+ def test_timeout_separately
+ assert_raise(Timeout::Error) do
+ assert_separately([], <<~"end;", timeout: 0.1)
+ sleep
+ end;
+ end
+ end
end