зеркало из https://github.com/github/ruby.git
test_rubyoptions.rb: use assert_in_out_err
* test/ruby/test_rubyoptions.rb (assert_segv): assert_in_out_err with the pattern list instead of invoke_ruby. * test/-ext-/bug_reporter/test_bug_reporter.rb (test_bug_reporter_add): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49824 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
f73a92e46b
Коммит
1e4550ac03
|
@ -16,9 +16,7 @@ class TestBugReporter < Test::Unit::TestCase
|
|||
args = ["--disable-gems", "-r-test-/bug_reporter/bug_reporter",
|
||||
"-C", tmpdir]
|
||||
stdin = "register_sample_bug_reporter(12345); Process.kill :SEGV, $$"
|
||||
_, stderr, status = EnvUtil.invoke_ruby(args, stdin, false, true)
|
||||
stderr.force_encoding("ASCII-8BIT")
|
||||
assert_pattern_list(expected_stderr, stderr)
|
||||
assert_in_out_err(args, stdin, [], expected_stderr, encoding: "ASCII-8BIT")
|
||||
ensure
|
||||
FileUtils.rm_rf(tmpdir) if tmpdir
|
||||
end
|
||||
|
|
|
@ -552,18 +552,9 @@ class TestRubyOptions < Test::Unit::TestCase
|
|||
def assert_segv(args, message=nil)
|
||||
test_stdin = ""
|
||||
opt = SEGVTest::ExecOptions.dup
|
||||
list = SEGVTest::ExpectedStderrList
|
||||
|
||||
_, stderr, status = EnvUtil.invoke_ruby(args, test_stdin, false, true, **opt)
|
||||
stderr.force_encoding("ASCII-8BIT")
|
||||
|
||||
if signo = status.termsig
|
||||
sleep 0.1
|
||||
EnvUtil.diagnostic_reports(Signal.signame(signo), EnvUtil.rubybin, status.pid, Time.now)
|
||||
end
|
||||
|
||||
assert_pattern_list(SEGVTest::ExpectedStderrList, stderr, message)
|
||||
|
||||
status
|
||||
assert_in_out_err(args, test_stdin, //, list, encoding: "ASCII-8BIT", **opt)
|
||||
end
|
||||
|
||||
def test_segv_test
|
||||
|
|
Загрузка…
Ссылка в новой задаче